Merge pull request #40 from terminal2/refactoring

Refactoring
terminal2 · Sep 30, 2022 · 913e770 · 913e770
2 parents 0df89fd + c9527fe
commit 913e770
Show file tree

Hide file tree

Showing 18 changed files with 215 additions and 450 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,8 +11,18 @@ apply plugin: 'idea'
 apply plugin: 'java-library'
 apply plugin: "com.vanniktech.maven.publish"
 
+def javaTargetVersion = 11
+
+sourceCompatibility = javaTargetVersion
+
+subprojects {
+ tasks.withType(JavaCompile.class) {
+ options.release = javaTargetVersion
+ }
+}
+
 dependencies {
- compile 'org.slf4j:slf4j-api:1.7.32'
+ api 'org.slf4j:slf4j-api:1.7.32'
 
  // Use JUnit test framework
  testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
@@ -24,9 +34,8 @@ repositories {
  mavenLocal()
 }
 
-compileJava {
- sourceCompatibility = 11
- targetCompatibility = 11
+tasks.withType(JavaCompile.class) {
+ options.release = javaTargetVersion
 }
 
 test {

diff --git a/example/.gitignore b/example/.gitignore
diff --git a/example/gradle/wrapper/gradle-wrapper.jar b/example/gradle/wrapper/gradle-wrapper.jar
diff --git a/example/gradle/wrapper/gradle-wrapper.properties b/example/gradle/wrapper/gradle-wrapper.properties
diff --git a/example/gradlew b/example/gradlew
diff --git a/example/gradlew.bat b/example/gradlew.bat
diff --git a/example/build.gradle → examples/gui/build.gradle b/example/build.gradle → examples/gui/build.gradle
@@ -8,5 +8,5 @@ repositories {
 }
 
 dependencies {
- compile ('aero.t2s:mode-s:0.2.5-SNAPSHOT')
+ implementation project(':')
 }
diff --git a/example/src/main/java/example/Demo.java → examples/gui/src/main/java/example/Demo.java b/example/src/main/java/example/Demo.java → examples/gui/src/main/java/example/Demo.java
@@ -1,18 +1,18 @@
 package example;
 
-import aero.t2s.modes.ModeS;
-import aero.t2s.modes.Track;
-import example.flight.FlightFrame;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.swing.*;
-
 import java.awt.*;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
+import javax.swing.*;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import aero.t2s.modes.ModeS;
+import aero.t2s.modes.Track;
+import example.flight.FlightFrame;
 
 /*
  * ButtonDemo.java requires the following files:

diff --git a/...e/src/main/java/example/FlightsTable.java → ...i/src/main/java/example/FlightsTable.java b/...e/src/main/java/example/FlightsTable.java → ...i/src/main/java/example/FlightsTable.java
@@ -1,9 +1,9 @@
 package example;
 
-import aero.t2s.modes.Track;
-
-import javax.swing.table.AbstractTableModel;
 import java.util.List;
+import javax.swing.table.AbstractTableModel;
+
+import aero.t2s.modes.Track;
 
 class FlightsTable extends AbstractTableModel {
  private static String[] columns = {

diff --git a/...main/java/example/flight/FlightFrame.form → ...main/java/example/flight/FlightFrame.form b/...main/java/example/flight/FlightFrame.form → ...main/java/example/flight/FlightFrame.form
diff --git a/...main/java/example/flight/FlightFrame.java → ...main/java/example/flight/FlightFrame.java b/...main/java/example/flight/FlightFrame.java → ...main/java/example/flight/FlightFrame.java
@@ -1,12 +1,11 @@
 package example.flight;
 
-import aero.t2s.modes.Track;
-import aero.t2s.modes.constants.Hazard;
-
-import javax.swing.*;
-import javax.swing.table.AbstractTableModel;
 import java.util.Timer;
 import java.util.TimerTask;
+import javax.swing.*;
+
+import aero.t2s.modes.Track;
+import aero.t2s.modes.constants.Hazard;
 
 public class FlightFrame extends JFrame {
  java.util.Timer timer = new Timer();