Use ES6 Modules (#2132)

1 files changed, 12 insertions, 14 deletions

diff --git a/lib/compilers/java.js b/lib/compilers/java.js
index 9453c5581..140532af8 100644
--- a/lib/compilers/java.js
+++ b/lib/compilers/java.js
@@ -22,14 +22,17 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-const BaseCompiler = require('../base-compiler'),
-    argumentParsers = require('./argument-parsers'),
-    fs = require('fs-extra'),
-    utils = require('../utils'),
-    path = require('path'),
-    logger = require('../logger').logger;
-
-class JavaCompiler extends BaseCompiler {
+import path from 'path';
+
+import fs from 'fs-extra';
+
+import { BaseCompiler } from '../base-compiler';
+import { logger } from '../logger';
+import * as utils from '../utils';
+
+import { JavaParser } from './argument-parsers';
+
+export class JavaCompiler extends BaseCompiler {
     static get key() { return 'java'; }
 
     constructor(compilerInfo, env) {
@@ -90,9 +93,8 @@ class JavaCompiler extends BaseCompiler {
         ];
     }
 
-
     getArgumentParser() {
-        return argumentParsers.Java;
+        return JavaParser;
     }
 
     getOutputFilename(dirPath) {
@@ -194,7 +196,6 @@ class JavaCompiler extends BaseCompiler {
             };
             methods.push(method);
 
-
             for (const codeLineCandidate of utils.splitLines(codeAndLineNumberTable)) {
                 // Match
                 //       1: invokespecial #1                  // Method java/lang/Object."<init>":()V
@@ -212,7 +213,6 @@ class JavaCompiler extends BaseCompiler {
                 }
             }
 
-
             let lineRegex = /line\s*(\d+):\s*(\d+)/g;
             let m;
             let currentInstr = 0;
@@ -275,5 +275,3 @@ class JavaCompiler extends BaseCompiler {
         };
     }
 }
-
-module.exports = JavaCompiler;