Project migrated from ant build to maven build

.classpath

@@ -1,10 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="lang"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.gitignore

@@ -1,6 +1,6 @@
 /.project
 /FBEditor.properties.xml
 /.settings
-/bin
 /build/*
 /.externalToolBuilders
+/target/

pom.xml

@@ -0,0 +1,80 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.github.olistudent</groupId>
+	<artifactId>FBEditor</artifactId>
+	<version>0.8.0-SNAPSHOT</version>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.15</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.2</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>3.2.4</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<createDependencyReducedPom>false</createDependencyReducedPom>
+							<transformers>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<manifestEntries>
+										<Main-Class>de.FBEditor.FBEdit</Main-Class>
+									</manifestEntries>
+								</transformer>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
+								</transformer>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+									<addHeader>false</addHeader>
+								</transformer>
+							</transformers>
+							<filters>
+								<filter>
+									<artifact>*:*</artifact>
+									<excludes>
+										<exclude>META-INF/MANIFEST.MF</exclude>
+										<exclude>META-INF/*.SF</exclude>
+										<exclude>META-INF/*.DSA</exclude>
+										<exclude>META-INF/*.RSA</exclude>
+									</excludes>
+								</filter>
+							</filters>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

src/de/FBEditor/FBEdit.java → src/main/java/de/FBEditor/FBEdit.java

@@ -16,6 +16,7 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import java.util.Vector;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -28,6 +29,7 @@
 import javax.swing.JPasswordField;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
+import javax.swing.JTextField;
 import javax.swing.KeyStroke;
 import javax.swing.UIManager; // Sorry nur für den Mac
 import javax.swing.event.DocumentListener;
@@ -77,7 +79,7 @@ public class FBEdit extends JFrame implements Runnable
 
 	private static final long serialVersionUID = 1L;
 	private static FBEdit INSTANCE = null;
-	private static FritzBoxFirmware firmware = null;
+	private static FritzBoxFirmware firmware;
 	private static JTextPane2 pane;
 	private String jFile = "";
 	private static String box_address = "";
@@ -96,22 +98,22 @@ public class FBEdit extends JFrame implements Runnable
 	private final CompoundUndoManager undoManager;
 	private static String progName = "Fritz!Box Export Editor";
 	private String fileName = "";
-	private boolean stoprequested = false;
+	private boolean stoprequested;
 	private static CutAndPastePopup cutAndPaste;
 	private ActionListen action;
 	private MyMenu myMenu;
 	private static boolean insertMode = true;
 
 	private static DocumentListener docListen;
-	private FindReplace findReplace = null;
+	private FindReplace findReplace;
 	private static JPopupMenu popup;
 	Thread thread = new Thread(this);
 
 	private static Vector<Locale> supported_languages;
 	private static ResourceBundle messages;
 	private static ResourceBundle en_messages;
 
-	private boolean macos = false; // 27.04.2018
+	private boolean macos; // 27.04.2018
 
 	public FBEdit() {
 
@@ -248,7 +250,7 @@ else if (os.contains("nix") || os.contains("aix") || os.contains("nux")){
 			e.printStackTrace();
 		}
 
-		if (!(loadProp)) {
+		if (!loadProp) {
 			getHost(true);
 			getPassword(true);
 			getUsername(true); // 25.06.2018
@@ -302,7 +304,7 @@ public void run() {
 			updateTitle();
 			myMenu.setstatusMsg(pane);
 			try {
-				Thread.sleep(200L);
+				TimeUnit.MILLISECONDS.sleep(200);
 			} catch (InterruptedException ex) {
 				Logger.getLogger(FBEdit.class.getName()).log(Level.SEVERE,
 						null, ex);
@@ -615,14 +617,7 @@ public static FBEdit getInstance() {
 		return INSTANCE;
 	}
 
-    private static void sleep(long millis) {
-        try {
-            Thread.sleep(millis);
-        } catch (InterruptedException ignored) {
-        }
-    }       
-
-	public static void main(String[] s) {
+    public static void main(String[] s) throws InterruptedException {
 		FBEdit fbedit = new FBEdit();
 
 		// Add document, window and key listener
@@ -642,7 +637,7 @@ public static void main(String[] s) {
 		fbedit.thread.start(); // Korrektur Statuszeile geht sonst nicht
 
 		//Debug.always("sleep: 0");
-		sleep(2000);
+		TimeUnit.SECONDS.sleep(2);
 		//Debug.always("sleep: 1");
 
 		makeNewConnection(true);