Implement a PluginLoader, which can load plugin jars.

.gitignore

@@ -20,12 +20,3 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
-
-# Custom Stuff
-# Gradle
-.gradle/*
-build/*
-
-# IntelliJ
-.idea/*
-abacus.iml

build.gradle

@@ -1,22 +0,0 @@
-apply plugin: 'java'
-apply plugin: 'application'
-
-sourceSets {
-  main {
-    java {
-      srcDirs = ['src']
-    }
-  }
-}
-
-repositories {
-  mavenCentral()
-}
-
-dependencies {
-    testCompile 'junit:junit:4.12'
-}
-
-// Define the main class for the application
-mainClassName = 'org.nwapw.abacus.Abacus'
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Fri Jul 28 17:18:51 PDT 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

gradlew

@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save ( ) {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

settings.gradle

@@ -1 +0,0 @@
-rootProject.name = 'abacus'

src/org/nwapw/abacus/Abacus.java

@@ -1,14 +1,10 @@
 package org.nwapw.abacus;
 
 import org.nwapw.abacus.plugin.PluginManager;
-//import org.nwapw.abacus.plugin.StandardPlugin;
 import org.nwapw.abacus.plugin.StandardPlugin;
 import org.nwapw.abacus.window.Window;
-import org.nwapw.abacus.plugin.ClassFinder;
 
 import javax.swing.*;
-import java.io.IOException;
-import java.util.ArrayList;
 
 public class Abacus {
 
@@ -27,16 +23,9 @@ public class Abacus {
         }
         manager = new PluginManager();
         manager.addInstantiated(new StandardPlugin(manager));
-        try {
-            ClassFinder.loadJars("plugins")
-                    .forEach(plugin -> manager.addClass(plugin));
-        } catch (IOException | ClassNotFoundException e) {
-            e.printStackTrace();
-        }
         mainUi = new Window(manager);
         mainUi.setVisible(true);
         manager.load();
-
     }
 
     public static void main(String[] args){

src/org/nwapw/abacus/function/Function.java

@@ -2,7 +2,6 @@ package org.nwapw.abacus.function;
 
 import org.nwapw.abacus.number.NaiveNumber;
 import org.nwapw.abacus.number.NumberInterface;
-import org.nwapw.abacus.number.PreciseNumber;
 
 import java.util.HashMap;
 
@@ -18,7 +17,6 @@ public abstract class Function {
     private static final HashMap<Class<? extends NumberInterface>, Integer> priorityMap =
             new HashMap<Class<? extends NumberInterface>, Integer>() {{
                 put(NaiveNumber.class, 0);
-                put(PreciseNumber.class, 1);
             }};
 
     /**

src/org/nwapw/abacus/function/Operator.java

@@ -9,10 +9,6 @@ public class Operator {
      * The associativity of the operator.
      */
     private OperatorAssociativity associativity;
-    /**
-     * The type of this operator.
-     */
-    private OperatorType type;
     /**
      * The precedence of the operator.
      */
@@ -28,9 +24,8 @@ public class Operator {
      * @param precedence the precedence of the operator.
      * @param function the function that the operator calls.
      */
-    public Operator(OperatorAssociativity associativity, OperatorType operatorType, int precedence, Function function){
+    public Operator(OperatorAssociativity associativity, int precedence, Function function){
         this.associativity = associativity;
-        this.type = operatorType;
         this.precedence = precedence;
         this.function = function;
     }
@@ -43,14 +38,6 @@ public class Operator {
         return associativity;
     }
 
-    /**
-     * Gets the operator's type.
-     * @return the type.
-     */
-    public OperatorType getType() {
-        return type;
-    }
-
     /**
      * Gets the operator's precedence.
      * @return the precedence.

src/org/nwapw/abacus/function/OperatorType.java

@@ -1,8 +0,0 @@
-package org.nwapw.abacus.function;
-
-/**
- * The type of an operator, describing how it should behave.
- */
-public enum OperatorType {
-    BINARY_INFIX, UNARY_POSTFIX
-}

src/org/nwapw/abacus/lexing/Lexer.java

@@ -54,7 +54,7 @@ public class Lexer<T> {
     /**
      * The registered patterns.
      */
-    private Map<PatternEntry<T>, Pattern<T>> patterns;
+    private HashMap<PatternEntry<T>, Pattern<T>> patterns;
 
     /**
      * Creates a new lexer with no registered patterns.
@@ -127,7 +127,7 @@ public class Lexer<T> {
      * @param compare the comparator used to sort matches by their IDs.
      * @return the resulting list of matches, in order, or null on error.
      */
-    public List<Match<T>> lexAll(String from, int startAt, Comparator<T> compare){
+    public ArrayList<Match<T>> lexAll(String from, int startAt, Comparator<T> compare){
         int index = startAt;
         ArrayList<Match<T>> matches = new ArrayList<>();
         Match<T> lastMatch = null;

src/org/nwapw/abacus/lexing/pattern/LinkNode.java

@@ -11,10 +11,7 @@ public class LinkNode<T> extends PatternNode<T> {
 
     @Override
     public void addInto(Collection<PatternNode<T>> into) {
-        if(!into.contains(this)) {
+        addOutputsInto(into);
-            into.add(this);
-            addOutputsInto(into);
-        }
     }
 
 }

src/org/nwapw/abacus/lexing/pattern/Pattern.java

@@ -2,7 +2,6 @@ package org.nwapw.abacus.lexing.pattern;
 
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Map;
 import java.util.Stack;
 import java.util.function.Function;
 
@@ -33,7 +32,7 @@ public class Pattern<T> {
      * A map of regex operator to functions that modify a PatternChain
      * with the appropriate operation.
      */
-    private Map<Character, Function<PatternChain<T>, PatternChain<T>>> operations =
+    private HashMap<Character, Function<PatternChain<T>, PatternChain<T>>> operations =
             new HashMap<Character, Function<PatternChain<T>, PatternChain<T>>>() {{
                 put('+', Pattern.this::transformPlus);
                 put('*', Pattern.this::transformStar);

src/org/nwapw/abacus/lexing/pattern/PatternNode.java

@@ -3,7 +3,6 @@ package org.nwapw.abacus.lexing.pattern;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Set;
 
 /**
  * A base class for a pattern node. Provides all functions
@@ -17,7 +16,7 @@ public class PatternNode<T> {
      * The set of states to which the lexer should continue
      * should this node be correctly matched.
      */
-    protected Set<PatternNode<T>> outputStates;
+    protected HashSet<PatternNode<T>> outputStates;
 
     /**
      * Creates a new pattern node.

src/org/nwapw/abacus/number/NaiveNumber.java

@@ -88,15 +88,11 @@ public class NaiveNumber implements NumberInterface {
     @Override
     public NumberInterface promoteTo(Class<? extends NumberInterface> toClass) {
         if(toClass == this.getClass()) return this;
-        else if(toClass == PreciseNumber.class){
-            return new PreciseNumber(Double.toString(value));
-        }
         return null;
     }
 
     public String toString(){
-        double shiftBy = Math.pow(10, 10);
+        return Double.toString(value);
-        return Double.toString(Math.round(value * shiftBy) / shiftBy);
     }
 
 }

src/org/nwapw/abacus/number/PreciseNumber.java

@@ -1,115 +0,0 @@
-package org.nwapw.abacus.number;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.math.MathContext;
-import java.math.RoundingMode;
-
-public class PreciseNumber implements NumberInterface{
-
-    /**
-     * The number one.
-     */
-    static final PreciseNumber ONE = new PreciseNumber(BigDecimal.ONE);
-    /**
-     * The number zero.
-     */
-    static final PreciseNumber ZERO = new PreciseNumber(BigDecimal.ZERO);
-    /**
-     * The number ten.
-     */
-    static final PreciseNumber TEN = new PreciseNumber(BigDecimal.TEN);
-
-    /**
-     * The value of the PreciseNumber.
-     */
-    BigDecimal value;
-
-    /**
-     * Constructs a precise number from the given string.
-     * @param string a string representation of the number meeting the same conditions
-     *               as the BidDecimal(String) constructor.
-     */
-    public PreciseNumber(String string){
-        value = new BigDecimal(string);
-    }
-
-    /**
-     * Constructs a precise number from the given BigDecimal.
-     * @param value a BigDecimal object representing the value of the number.
-     */
-    public PreciseNumber(BigDecimal value){
-        this.value = value;
-    }
-
-    @Override
-    public int precision() {
-        return 54;
-    }
-
-    @Override
-    public NumberInterface multiply(NumberInterface multiplier) {
-        return new PreciseNumber(value.multiply(((PreciseNumber) multiplier).value));
-    }
-
-    @Override
-    public NumberInterface divide(NumberInterface divisor) {
-        return new PreciseNumber(value.divide(((PreciseNumber) divisor).value, this.precision(), RoundingMode.HALF_UP));
-    }
-
-    @Override
-    public NumberInterface add(NumberInterface summand) {
-        return new PreciseNumber(value.add(((PreciseNumber) summand).value));
-    }
-
-    @Override
-    public NumberInterface subtract(NumberInterface subtrahend) {
-        return new PreciseNumber(value.subtract(((PreciseNumber) subtrahend).value));
-    }
-
-    @Override
-    public NumberInterface intPow(int exponent) {
-        if(exponent == 0){
-            return PreciseNumber.ONE;
-        }
-        boolean takeReciprocal = exponent < 0;
-        exponent = Math.abs(exponent);
-        NumberInterface power = this;
-        for(int currentExponent = 1; currentExponent < exponent; currentExponent++){
-            power = power.multiply(this);
-        }
-        if(takeReciprocal){
-            power = PreciseNumber.ONE.divide(power);
-        }
-        return power;
-    }
-
-    @Override
-    public int compareTo(NumberInterface number) {
-        return value.compareTo(((PreciseNumber) number).value);
-    }
-
-    @Override
-    public int signum() {
-        return value.signum();
-    }
-
-    @Override
-    public NumberInterface negate(){
-        return new PreciseNumber(value.negate());
-    }
-
-    @Override
-    public NumberInterface promoteTo(Class<? extends NumberInterface> toClass) {
-        if(toClass == this.getClass()){
-            return this;
-        }
-        return null;
-    }
-
-    @Override
-    public String toString() {
-        BigDecimal rounded = value.setScale(precision() - 4, RoundingMode.HALF_UP);
-        return rounded.stripTrailingZeros().toPlainString();
-    }
-}

src/org/nwapw/abacus/plugin/ClassFinder.java

@@ -1,76 +1,65 @@
-package org.nwapw.abacus.plugin;
+package org.nwapw.abacus.plugin;
-
+
-import java.io.File;
+import java.io.BufferedInputStream;
-import java.io.IOException;
+import java.io.File;
-import java.net.URL;
+import java.io.FileInputStream;
-import java.net.URLClassLoader;
+import java.io.IOException;
-import java.nio.file.Files;
+import java.util.ArrayList;
-import java.nio.file.Path;
+import java.util.Enumeration;
-import java.util.ArrayList;
+import java.util.HashMap;
-import java.util.Enumeration;
+import java.util.jar.JarEntry;
-import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
-import java.util.jar.JarFile;
+import java.util.zip.ZipInputStream;
-import java.util.stream.Collectors;
+
-
+public class ClassFinder extends ClassLoader{
-/**
+
- * Class that loads plugin classes from their jars.
+    ArrayList<Class> classes;
- */
+
-public class ClassFinder {
+    public ClassFinder(){
-
+        super(ClassFinder.class.getClassLoader());
-    /**
+        classes=new ArrayList();
-     * Loads all the plugin classes from the given plugin folder.
+    }
-     * @param filePath the path for the plugin folder.
+    public Class loadClass(String className) throws ClassNotFoundException{
-     * @return the list of all loaded classes.
+        return findClass(className);
-     * @throws IOException thrown if an error occurred scanning the plugin folder.
+    }
-     * @throws ClassNotFoundException thrown if the class listed in the file doesn't get loaded.
+    public ArrayList<String> loadClass(File jarLocation) throws ClassNotFoundException, IOException{
-     */
+        return addJar(jarLocation);
-    public static ArrayList<Class<?>> loadJars(String filePath) throws IOException, ClassNotFoundException {
+    }
-        return loadJars(new File(filePath));
+    public ArrayList<String> addJar(File jarLocation) throws IOException {
-    }
+        JarFile jarFolder = new JarFile(jarLocation);
-
+        Enumeration jarList = jarFolder.entries();
-    /**
+        HashMap classSize = new HashMap();
-     * Loads all the plugin classes from the given plugin folder.
+        HashMap classContent = new HashMap();
-     * @param pluginFolderPath the folder in which to look for plugins.
+        ArrayList<String> classNames = new ArrayList();
-     * @return the list of all loaded classes.
+        JarEntry tempJar;
-     * @throws IOException thrown if an error occurred scanning the plugin folder.
+        ZipInputStream zipStream = new ZipInputStream(new BufferedInputStream(new FileInputStream(jarLocation)));
-     * @throws ClassNotFoundException thrown if the class listed in the file doesn't get loaded.
+        while(jarList.hasMoreElements()){
-     */
+            tempJar = (JarEntry)jarList.nextElement();
-    public static ArrayList<Class<?>> loadJars(File pluginFolderPath) throws IOException, ClassNotFoundException {
+            zipStream.getNextEntry();
-        ArrayList<Class<?>> toReturn = new ArrayList<>();
+            if(!tempJar.isDirectory()) {
-        if(!pluginFolderPath.exists()) return toReturn;
+                if (tempJar.getName().substring(tempJar.getName().indexOf('.')).equals(".class") && (tempJar.getName().length() < 9 || !tempJar.getName().substring(0, 9).equals("META-INF/"))) {
-        ArrayList<File> files = Files.walk(pluginFolderPath.toPath())
+                    int size = (int)tempJar.getSize();
-                .map(Path::toFile)
+                    classSize.put(tempJar.getName(),new Integer((int)tempJar.getSize()));
-                .filter(f -> f.getName().endsWith(".jar"))
+                    byte[] bytes = new byte[size];
-                .collect(Collectors.toCollection(ArrayList::new));
+                    zipStream.read(bytes,0,size);
-        for (File file : files){
+                    classContent.put(tempJar.getName(),bytes);
-            toReturn.addAll(loadJar(file));
+                    classNames.add(tempJar.getName());
-        }
+                }
-        return toReturn;
+            }
-    }
+        }
-
+        jarFolder.close();
-    /**
+        for(String name:classNames) {
-     * Loads the classes from a single path, given by the file.
+            classes.add(super.defineClass(name, (byte[]) classContent.get(name), 0, (int) classSize.get(name)));
-     * @param jarLocation the location of the jar to load.
+        }
-     * @return the list of loaded classes loaded from the jar.
+        return classNames;
-     * @throws IOException thrown if there was an error reading the file
+    }
-     * @throws ClassNotFoundException thrown if the class could not be loaded.
+    public ArrayList<Class> getClasses(){
-     */
+        return classes;
-    public static ArrayList<Class<?>> loadJar(File jarLocation) throws IOException, ClassNotFoundException {
+    }
-        ArrayList<Class<?>> loadedClasses = new ArrayList<>();
+    public Class getClass(int number){
-        String path = jarLocation.getPath();
+        return classes.get(number);
-        URL[] urls = new URL[]{new URL("jar:file:" + path + "!/")};
+    }
-
+    public void delClasses(){
-        URLClassLoader classLoader = URLClassLoader.newInstance(urls);
+        classes=new ArrayList();
-        JarFile jarFolder = new JarFile(jarLocation);
+    }
-        Enumeration jarEntityList = jarFolder.entries();
+}
-
-        while (jarEntityList.hasMoreElements()) {
-            JarEntry jarEntity = (JarEntry) jarEntityList.nextElement();
-            if (jarEntity.getName().endsWith(".class")) {
-                loadedClasses.add(classLoader.loadClass(jarEntity.getName().replace('/', '.').substring(0, jarEntity.getName().length() - 6)));
-            }
-        }
-        return loadedClasses;
-    }
-
-}

src/org/nwapw/abacus/plugin/Plugin.java

@@ -4,7 +4,6 @@ import org.nwapw.abacus.function.Function;
 import org.nwapw.abacus.function.Operator;
 
 import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -19,11 +18,11 @@ public abstract class Plugin {
     /**
      * A hash map of functions mapped to their string names.
      */
-    private Map<String, Function> functions;
+    private HashMap<String, Function> functions;
     /**
      * A hash map of operators mapped to their string names.
      */
-    private Map<String, Operator> operators;
+    private HashMap<String, Operator> operators;
     /**
      * The plugin manager in which to search for functions
      * not inside this package,

src/org/nwapw/abacus/plugin/PluginLoader.java

@@ -0,0 +1,106 @@
+package org.nwapw.abacus.plugin;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.jar.JarFile;
+
+/**
+ * A plugin loader, used to scan a directory for
+ * plugins and load them into classes that can then be
+ * used by the plugin manager.
+ */
+public class PluginLoader {
+
+    /**
+     * An internal class that represents a Jar file that
+     * has been founded, but not loaded.
+     */
+    private static final class PluginEntry {
+        String mainClass;
+        File jarPath;
+    }
+
+    /**
+     * The path which to search for plugins.
+     */
+    private File path;
+    /**
+     * The array of loaded plugin main classes.
+     */
+    private ArrayList<Class<?>> foundMainClasses;
+
+    /**
+     * Creates a new plugin loader at the given path.
+     * @param path the path which to search for plugins.
+     */
+    public PluginLoader(File path) {
+        this.path = path;
+    }
+
+    /**
+     * Loads all the plugin classes that have been found.
+     * @return the list of loaded classes.
+     * @throws IOException thrown when loading classes from URL fails.
+     * @throws ClassNotFoundException thrown when the class specified in plugin.properties is missing.
+     */
+    private ArrayList<Class<?>> loadPluginClasses() throws IOException, ClassNotFoundException {
+        ArrayList<Class<?>> foundMainClasses = new ArrayList<>();
+        for(PluginEntry entry : findPlugins()){
+            if(entry.mainClass == null) continue;
+            ClassLoader loader = URLClassLoader.newInstance(
+                    new URL[]{ entry.jarPath.toURI().toURL() },
+                    getClass().getClassLoader());
+            Class<?> loadedClass = loader.loadClass(entry.mainClass);
+            if(!Plugin.class.isAssignableFrom(loadedClass)) continue;
+            foundMainClasses.add(loadedClass);
+        }
+        return foundMainClasses;
+    }
+
+    /**
+     * Find all jars that have a plugin.properties file in the plugin folder.
+     * @return the list of all plugin entries, with their main class names and the jars files.
+     * @throws IOException thrown if reading the jar file fails
+     */
+    private ArrayList<PluginEntry> findPlugins() throws IOException {
+        ArrayList<PluginEntry> pluginEntries = new ArrayList<>();
+        File[] childFiles = path.listFiles();
+
+        if(childFiles == null) return pluginEntries;
+        for(File file : childFiles){
+            if(!file.isFile() || !file.getName().endsWith(".jar")) continue;
+            JarFile jarFile = new JarFile(file);
+            if(jarFile.getEntry("plugin.properties") == null) continue;
+            Properties properties = new Properties();
+            properties.load(jarFile.getInputStream(jarFile.getEntry("plugin.properties")));
+
+            PluginEntry entry = new PluginEntry();
+            entry.mainClass = properties.getProperty("mainClass");
+            entry.jarPath = file;
+            pluginEntries.add(entry);
+        }
+        return pluginEntries;
+    }
+
+    /**
+     * Loads all valid plugins and keeps track of them.
+     * @throws IOException thrown if loading from jar files fails.
+     * @throws ClassNotFoundException thrown if class specified in plugin.properties doesn't exist.
+     */
+    public void loadValidPlugins() throws IOException, ClassNotFoundException {
+        foundMainClasses = loadPluginClasses();
+    }
+
+    /**
+     * Gets the list of all the plugins that have last been loaded.
+     * @return the list of loaded class files.
+     */
+    public ArrayList<Class<?>> getFoundMainClasses() {
+        return foundMainClasses;
+    }
+
+}

src/org/nwapw/abacus/plugin/PluginManager.java

@@ -12,43 +12,38 @@ import java.util.*;
  */
 public class PluginManager {
 
-    /**
-     * List of classes loaded by this manager.
-     */
-    private Set<Class<?>> loadedPluginClasses;
     /**
      * A list of loaded plugins.
      */
-    private Set<Plugin> plugins;
+    private ArrayList<Plugin> plugins;
     /**
      * List of functions that have been cached,
      * that is, found in a plugin and returned.
      */
-    private Map<String, Function> cachedFunctions;
+    private HashMap<String, Function> cachedFunctions;
     /**
      * List of operators tha have been cached,
      * that is, found in a plugin and returned.
      */
-    private Map<String, Operator> cachedOperators;
+    private HashMap<String, Operator> cachedOperators;
     /**
      * List of all functions loaded by the plugins.
      */
-    private Set<String> allFunctions;
+    private HashSet<String> allFunctions;
     /**
      * List of all operators loaded by the plugins.
      */
-    private Set<String> allOperators;
+    private HashSet<String> allOperators;
     /**
      * The list of plugin listeners attached to this instance.
      */
-    private Set<PluginListener> listeners;
+    private HashSet<PluginListener> listeners;
 
     /**
      * Creates a new plugin manager.
      */
     public PluginManager(){
-        loadedPluginClasses = new HashSet<>();
+        plugins = new ArrayList<>();
-        plugins = new HashSet<>();
         cachedFunctions = new HashMap<>();
         cachedOperators = new HashMap<>();
         allFunctions = new HashSet<>();
@@ -109,9 +104,7 @@ public class PluginManager {
      * @param plugin the plugin to add.
      */
     public void addInstantiated(Plugin plugin){
-        if(loadedPluginClasses.contains(plugin.getClass())) return;
         plugins.add(plugin);
-        loadedPluginClasses.add(plugin.getClass());
     }
 
     /**
@@ -120,7 +113,7 @@ public class PluginManager {
      * @param newClass the new class to instantiate.
      */
     public void addClass(Class<?> newClass){
-        if(!Plugin.class.isAssignableFrom(newClass) || newClass == Plugin.class) return;
+        if(!Plugin.class.isAssignableFrom(newClass)) return;
         try {
             addInstantiated((Plugin) newClass.getConstructor(PluginManager.class).newInstance(this));
         } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
@@ -162,7 +155,7 @@ public class PluginManager {
      * Gets all the functions loaded by the Plugin Manager.
      * @return the set of all functions that were loaded.
      */
-    public Set<String> getAllFunctions() {
+    public HashSet<String> getAllFunctions() {
         return allFunctions;
     }
 
@@ -170,7 +163,7 @@ public class PluginManager {
      * Gets all the operators loaded by the Plugin Manager.
      * @return the set of all operators that were loaded.
      */
-    public Set<String> getAllOperators() {
+    public HashSet<String> getAllOperators() {
         return allOperators;
     }
 

src/org/nwapw/abacus/plugin/StandardPlugin.java

@@ -3,10 +3,12 @@ package org.nwapw.abacus.plugin;
 import org.nwapw.abacus.function.Function;
 import org.nwapw.abacus.function.Operator;
 import org.nwapw.abacus.function.OperatorAssociativity;
-import org.nwapw.abacus.function.OperatorType;
 import org.nwapw.abacus.number.NaiveNumber;
 import org.nwapw.abacus.number.NumberInterface;
 
+import javax.print.attribute.standard.MediaSize;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.function.BiFunction;
 
 /**
@@ -21,7 +23,7 @@ public class StandardPlugin extends Plugin {
 
     @Override
     public void onEnable() {
-        registerOperator("+", new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0, new Function() {
+        registerOperator("+", new Operator(OperatorAssociativity.LEFT, 0, new Function() {
             @Override
             protected boolean matchesParams(NumberInterface[] params) {
                 return params.length >= 1;
@@ -37,7 +39,7 @@ public class StandardPlugin extends Plugin {
             }
         }));
 
-        registerOperator("-", new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0, new Function() {
+        registerOperator("-", new Operator(OperatorAssociativity.LEFT, 0, new Function() {
             @Override
             protected boolean matchesParams(NumberInterface[] params) {
                 return params.length == 2;
@@ -49,7 +51,7 @@ public class StandardPlugin extends Plugin {
             }
         }));
 
-        registerOperator("*", new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX,1, new Function() {
+        registerOperator("*", new Operator(OperatorAssociativity.LEFT, 1, new Function() {
             @Override
             protected boolean matchesParams(NumberInterface[] params) {
                 return params.length >= 1;
@@ -65,7 +67,7 @@ public class StandardPlugin extends Plugin {
             }
         }));
 
-        registerOperator("/", new Operator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX,1, new Function() {
+        registerOperator("/", new Operator(OperatorAssociativity.LEFT, 1, new Function() {
             @Override
             protected boolean matchesParams(NumberInterface[] params) {
                 return params.length == 2;
@@ -77,7 +79,7 @@ public class StandardPlugin extends Plugin {
             }
         }));
 
-        registerOperator("^", new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2, new Function() {
+        registerOperator("^", new Operator(OperatorAssociativity.RIGHT, 2, new Function() {
             @Override
             protected boolean matchesParams(NumberInterface[] params) {
                 return params.length == 2;
@@ -89,7 +91,7 @@ public class StandardPlugin extends Plugin {
             }
         }));
 
-        registerOperator("!", new Operator(OperatorAssociativity.RIGHT, OperatorType.UNARY_POSTFIX, 0, new Function() {
+        registerFunction("!", new Function() {
             //private HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>> storedList = new HashMap<Class<? extends NumberInterface>, ArrayList<NumberInterface>>();
             @Override
             protected boolean matchesParams(NumberInterface[] params) {
@@ -114,7 +116,7 @@ public class StandardPlugin extends Plugin {
                     storedList.get(params[0].getClass()).add(NaiveNumber.ONE.promoteTo(params[0].getClass()));
                 }*/
             }
-        }));
+        });
 
         registerFunction("abs", new Function() {
             @Override
@@ -229,7 +231,7 @@ public class StandardPlugin extends Plugin {
 
             @Override
             protected NumberInterface applyInternal(NumberInterface[] params) {
-                return StandardPlugin.this.getOperator("^").getFunction().apply(params[0], ((new NaiveNumber(0.5)).promoteTo(params[0].getClass())));
+                return StandardPlugin.this.getFunction("pow").apply(params[0], (new NaiveNumber(0.5)));
             }
         });
     }
@@ -246,7 +248,7 @@ public class StandardPlugin extends Plugin {
      * @return the nth term of the series.
      */
     private NumberInterface getExpSeriesTerm(int n, NumberInterface x){
-        return x.intPow(n).divide(this.getOperator("!").getFunction().apply((new NaiveNumber(n)).promoteTo(x.getClass())));
+        return x.intPow(n).divide(this.getFunction("!").apply((new NaiveNumber(n)).promoteTo(x.getClass())));
     }
 
     /**

src/org/nwapw/abacus/tree/FunctionNode.java

@@ -1,7 +1,6 @@
 package org.nwapw.abacus.tree;
 
 import java.util.ArrayList;
-import java.util.List;
 
 /**
  * A node that represents a function call.
@@ -15,7 +14,7 @@ public class FunctionNode extends TreeNode {
     /**
      * The list of arguments to the function.
      */
-    private List<TreeNode> children;
+    private ArrayList<TreeNode> children;
 
     /**
      * Creates a function node with no function.

src/org/nwapw/abacus/tree/NumberNode.java

@@ -22,10 +22,19 @@ public class NumberNode extends TreeNode {
 
     /**
      * Creates a new number node with the given double value.
-     * @param newNumber the number for which to create a number node.
+     * @param value the value to use.
      */
-    public NumberNode(NumberInterface newNumber){
+    public NumberNode(double value){
-        this.number = newNumber;
+        number = new NaiveNumber(value);
+    }
+
+    /**
+     * Creates a new number node with the given string value, converted
+     * to a double.
+     * @param value the value.
+     */
+    public NumberNode(String value){
+        this(Double.parseDouble(value));
     }
 
     /**

src/org/nwapw/abacus/tree/NumberReducer.java

@@ -27,17 +27,12 @@ public class NumberReducer implements Reducer<NumberInterface> {
     public NumberInterface reduceNode(TreeNode node, Object... children) {
         if(node instanceof NumberNode) {
             return ((NumberNode) node).getNumber();
-        } else if(node instanceof BinaryInfixNode){
+        } else if(node instanceof OpNode){
             NumberInterface left = (NumberInterface) children[0];
             NumberInterface right = (NumberInterface) children[1];
-            Function function = manager.operatorFor(((BinaryInfixNode) node).getOperation()).getFunction();
+            Function function = manager.operatorFor(((OpNode) node).getOperation()).getFunction();
             if(function == null) return null;
             return function.apply(left, right);
-        } else if(node instanceof UnaryPrefixNode) {
-            NumberInterface child = (NumberInterface) children[0];
-            Function functionn = manager.operatorFor(((UnaryPrefixNode) node).getOperation()).getFunction();
-            if(functionn == null) return null;
-            return functionn.apply(child);
         } else if(node instanceof FunctionNode){
             NumberInterface[] convertedChildren = new NumberInterface[children.length];
             for(int i = 0; i < convertedChildren.length; i++){

src/org/nwapw/abacus/tree/OpNode.java

@@ -3,7 +3,7 @@ package org.nwapw.abacus.tree;
 /**
  * A tree node that represents an operation being applied to two operands.
  */
-public class BinaryInfixNode extends TreeNode {
+public class OpNode extends TreeNode {
 
     /**
      * The operation being applied.
@@ -18,14 +18,14 @@ public class BinaryInfixNode extends TreeNode {
      */
     private TreeNode right;
 
-    private BinaryInfixNode() {}
+    private OpNode() {}
 
     /**
      * Creates a new operation node with the given operation
      * and no child nodes.
      * @param operation the operation.
      */
-    public BinaryInfixNode(String operation){
+    public OpNode(String operation){
         this(operation, null, null);
     }
 
@@ -36,7 +36,7 @@ public class BinaryInfixNode extends TreeNode {
      * @param left the left node of the expression.
      * @param right the right node of the expression.
      */
-    public BinaryInfixNode(String operation, TreeNode left, TreeNode right){
+    public OpNode(String operation, TreeNode left, TreeNode right){
         this.operation = operation;
         this.left = left;
         this.right = right;

src/org/nwapw/abacus/tree/TreeBuilder.java

@@ -1,12 +1,9 @@
 package org.nwapw.abacus.tree;
 
 import org.nwapw.abacus.function.OperatorAssociativity;
-import org.nwapw.abacus.function.OperatorType;
 import org.nwapw.abacus.lexing.Lexer;
 import org.nwapw.abacus.lexing.pattern.Match;
 import org.nwapw.abacus.lexing.pattern.Pattern;
-import org.nwapw.abacus.number.NaiveNumber;
-import org.nwapw.abacus.number.PreciseNumber;
 
 import java.util.*;
 
@@ -22,15 +19,11 @@ public class TreeBuilder {
     /**
      * The map of operator precedences.
      */
-    private Map<String, Integer> precedenceMap;
+    private HashMap<String, Integer> precedenceMap;
     /**
      * The map of operator associativity.
      */
-    private Map<String, OperatorAssociativity> associativityMap;
+    private HashMap<String, OperatorAssociativity> associativityMap;
-    /**
-     * The map of operator types.
-     */
-    private Map<String, OperatorType> typeMap;
 
     /**
      * Comparator used to sort token types.
@@ -44,13 +37,12 @@ public class TreeBuilder {
         lexer = new Lexer<TokenType>(){{
             register(" ", TokenType.WHITESPACE);
             register(",", TokenType.COMMA);
-            register("[0-9]*(\\.[0-9]+)?", TokenType.NUM);
+            register("[0-9]+(\\.[0-9]+)?", TokenType.NUM);
             register("\\(", TokenType.OPEN_PARENTH);
             register("\\)", TokenType.CLOSE_PARENTH);
         }};
         precedenceMap = new HashMap<>();
         associativityMap = new HashMap<>();
-        typeMap = new HashMap<>();
     }
 
     /**
@@ -67,12 +59,10 @@ public class TreeBuilder {
      * @param precedence the precedence of the operator.
      * @param associativity the associativity of the operator.
      */
-    public void registerOperator(String operator, OperatorAssociativity associativity,
+    public void registerOperator(String operator, int precedence, OperatorAssociativity associativity){
-                                 OperatorType operatorType, int precedence){
         lexer.register(Pattern.sanitize(operator), TokenType.OP);
         precedenceMap.put(operator, precedence);
         associativityMap.put(operator, associativity);
-        typeMap.put(operator, operatorType);
     }
 
     /**
@@ -80,7 +70,7 @@ public class TreeBuilder {
      * @param string the string to tokenize.
      * @return the list of tokens produced.
      */
-    public List<Match<TokenType>> tokenize(String string){
+    public ArrayList<Match<TokenType>> tokenize(String string){
         return lexer.lexAll(string, 0, tokenSorter);
     }
 
@@ -90,7 +80,7 @@ public class TreeBuilder {
      * @param from the tokens to be rearranged.
      * @return the resulting list of rearranged tokens.
      */
-    public List<Match<TokenType>> intoPostfix(String source, List<Match<TokenType>> from){
+    public ArrayList<Match<TokenType>> intoPostfix(String source, ArrayList<Match<TokenType>> from){
         ArrayList<Match<TokenType>> output = new ArrayList<>();
         Stack<Match<TokenType>> tokenStack = new Stack<>();
         while(!from.isEmpty()){
@@ -103,15 +93,9 @@ public class TreeBuilder {
                 tokenStack.push(match);
             } else if(matchType == TokenType.OP){
                 String tokenString = source.substring(match.getFrom(), match.getTo());
-                OperatorType type = typeMap.get(tokenString);
                 int precedence = precedenceMap.get(tokenString);
                 OperatorAssociativity associativity = associativityMap.get(tokenString);
 
-                if(type == OperatorType.UNARY_POSTFIX){
-                    output.add(match);
-                    continue;
-                }
-
                 while(!tokenStack.empty()) {
                     Match<TokenType> otherMatch = tokenStack.peek();
                     TokenType otherMatchType = otherMatch.getType();
@@ -154,25 +138,17 @@ public class TreeBuilder {
      * @param matches the list of tokens from the source string.
      * @return the construct tree expression.
      */
-    public TreeNode fromStringRecursive(String source, List<Match<TokenType>> matches){
+    public TreeNode fromStringRecursive(String source, ArrayList<Match<TokenType>> matches){
         if(matches.size() == 0) return null;
         Match<TokenType> match = matches.remove(0);
         TokenType matchType = match.getType();
         if(matchType == TokenType.OP){
-            String operator = source.substring(match.getFrom(), match.getTo());
+            TreeNode right = fromStringRecursive(source, matches);
-            OperatorType type = typeMap.get(operator);
+            TreeNode left = fromStringRecursive(source, matches);
-            if(type == OperatorType.BINARY_INFIX){
+            if(left == null || right == null) return null;
-                TreeNode right = fromStringRecursive(source, matches);
+            else return new OpNode(source.substring(match.getFrom(), match.getTo()), left, right);
-                TreeNode left = fromStringRecursive(source, matches);
-                if(left == null || right == null) return null;
-                else return new BinaryInfixNode(operator, left, right);
-            } else {
-                TreeNode applyTo = fromStringRecursive(source, matches);
-                if(applyTo == null) return null;
-                else return new UnaryPrefixNode(operator, applyTo);
-            }
         } else if(matchType == TokenType.NUM){
-            return new NumberNode(new NaiveNumber(Double.parseDouble(source.substring(match.getFrom(), match.getTo()))));
+            return new NumberNode(Double.parseDouble(source.substring(match.getFrom(), match.getTo())));
         } else if(matchType == TokenType.FUNCTION){
             String functionName = source.substring(match.getFrom(), match.getTo());
             FunctionNode node = new FunctionNode(functionName);
@@ -194,7 +170,7 @@ public class TreeBuilder {
      * @return the resulting tree.
      */
     public TreeNode fromString(String string){
-        List<Match<TokenType>> matches = tokenize(string);
+        ArrayList<Match<TokenType>> matches = tokenize(string);
         if(matches == null) return null;
         matches.removeIf(m -> m.getType() == TokenType.WHITESPACE);
         matches = intoPostfix(string, matches);

src/org/nwapw/abacus/tree/UnaryPrefixNode.java

@@ -1,59 +0,0 @@
-package org.nwapw.abacus.tree;
-
-public class UnaryPrefixNode extends TreeNode {
-
-    /**
-     * The operation this node will apply.
-     */
-    private String operation;
-    /**
-     * The tree node to apply the operation to.
-     */
-    private TreeNode applyTo;
-
-    /**
-     * Creates a new node with the given operation and no child.
-     * @param operation the operation for this node.
-     */
-    public UnaryPrefixNode(String operation){
-        this(operation, null);
-    }
-
-    /**
-     * Creates a new node with the given operation and child.
-     * @param operation the operation for this node.
-     * @param applyTo the node to apply the function to.
-     */
-    public UnaryPrefixNode(String operation, TreeNode applyTo){
-        this.operation = operation;
-        this.applyTo = applyTo;
-    }
-
-    @Override
-    public <T> T reduce(Reducer<T> reducer) {
-        Object reducedChild = applyTo.reduce(reducer);
-        if(reducedChild == null) return null;
-        return reducer.reduceNode(this, reducedChild);
-    }
-
-    /**
-     * Gets the operation of this node.
-     * @return the operation this node performs.
-     */
-    public String getOperation() {
-        return operation;
-    }
-
-    /**
-     * Gets the node to which this node's operation applies.
-     * @return the tree node to which the operation will be applied.
-     */
-    public TreeNode getApplyTo() {
-        return applyTo;
-    }
-
-    @Override
-    public String toString() {
-        return "(" + (applyTo == null ? "null" : applyTo.toString()) + ")" + operation;
-    }
-}

src/org/nwapw/abacus/window/HistoryTableModel.java

@@ -6,7 +6,6 @@ import javax.swing.event.TableModelListener;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableModel;
 import java.util.ArrayList;
-import java.util.List;
 
 /**
  * A table model to store data about the history of inputs
@@ -58,7 +57,7 @@ public class HistoryTableModel extends AbstractTableModel {
     /**
      * The list of entries.
      */
-    List<HistoryEntry> entries;
+    ArrayList<HistoryEntry> entries;
 
     /**
      * Creates a new empty history table model

src/org/nwapw/abacus/window/Window.java

@@ -269,10 +269,7 @@ public class Window extends JFrame implements PluginListener {
         }
         for(String operator : manager.getAllOperators()){
             Operator operatorObject = manager.operatorFor(operator);
-            builder.registerOperator(operator,
+            builder.registerOperator(operator, operatorObject.getPrecedence(), operatorObject.getAssociativity());
-                    operatorObject.getAssociativity(),
-                    operatorObject.getType(),
-                    operatorObject.getPrecedence());
         }
     }