Reorganize package structure and introduce maven.

.gitignore

@@ -4,4 +4,5 @@
 .project
 .settings/
 bin/
+target/
 

pom.xml

@@ -0,0 +1,52 @@
+<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 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>bdsup2sub</groupId>
+    <artifactId>bdsup2sub</artifactId>
+    <packaging>jar</packaging>
+    <version>5.0-SNAPSHOT</version>
+    <name>bdsup2sub.BDSup2Sub</name>
+    <url>https://github.com/mjuhasz/bdsup2sub.BDSup2Sub</url>
+
+
+    <properties>
+        <main.class>bdsup2sub.BDSup2Sub</main.class>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>${main.class}</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

src/BDSup2Sub.java → src/main/java/bdsup2sub/BDSup2Sub.java

@@ -1,8 +1,10 @@
-import deadbeef.core.*;
-import deadbeef.gui.MainFrame;
-import deadbeef.tools.Props;
-import deadbeef.utils.FilenameUtils;
-import deadbeef.utils.ToolBox;
+package bdsup2sub;
+
+import bdsup2sub.core.*;
+import bdsup2sub.gui.MainFrame;
+import bdsup2sub.tools.Props;
+import bdsup2sub.utils.FilenameUtils;
+import bdsup2sub.utils.ToolBox;
 
 import javax.swing.*;
 import java.awt.*;
@@ -16,7 +18,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static deadbeef.core.Constants.*;
+import static bdsup2sub.core.Constants.*;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/bitmap/Bitmap.java → src/main/java/bdsup2sub/bitmap/Bitmap.java

@@ -1,15 +1,15 @@
-package deadbeef.bitmap;
+package bdsup2sub.bitmap;
 
-import deadbeef.core.Core;
-import deadbeef.filters.Filter;
-import deadbeef.filters.FilterOp;
-import deadbeef.tools.QuantizeFilter;
+import bdsup2sub.core.Core;
+import bdsup2sub.filters.Filter;
+import bdsup2sub.filters.FilterOp;
+import bdsup2sub.tools.QuantizeFilter;
 
 import java.awt.image.*;
 import java.util.Arrays;
 import java.util.HashMap;
 
-import static deadbeef.bitmap.ColorSpaceUtils.RGB2YCbCr;
+import static bdsup2sub.bitmap.ColorSpaceUtils.RGB2YCbCr;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/bitmap/BitmapBounds.java → src/main/java/bdsup2sub/bitmap/BitmapBounds.java

@@ -1,4 +1,4 @@
-package deadbeef.bitmap;
+package bdsup2sub.bitmap;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/bitmap/BitmapWithPalette.java → src/main/java/bdsup2sub/bitmap/BitmapWithPalette.java

@@ -1,4 +1,4 @@
-package deadbeef.bitmap;
+package bdsup2sub.bitmap;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/bitmap/ColorSpaceUtils.java → src/main/java/bdsup2sub/bitmap/ColorSpaceUtils.java

@@ -1,4 +1,4 @@
-package deadbeef.bitmap;
+package bdsup2sub.bitmap;
 
 public final class ColorSpaceUtils {
 

src/deadbeef/bitmap/ErasePatch.java → src/main/java/bdsup2sub/bitmap/ErasePatch.java

@@ -1,4 +1,4 @@
-package deadbeef.bitmap;
+package bdsup2sub.bitmap;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/bitmap/Palette.java → src/main/java/bdsup2sub/bitmap/Palette.java

@@ -1,11 +1,11 @@
-package deadbeef.bitmap;
+package bdsup2sub.bitmap;
 
 import java.awt.*;
 import java.awt.image.ColorModel;
 import java.awt.image.IndexColorModel;
 import java.util.Arrays;
 
-import static deadbeef.bitmap.ColorSpaceUtils.RGB2YCbCr;
+import static bdsup2sub.bitmap.ColorSpaceUtils.RGB2YCbCr;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/core/CaptionMoveModeX.java → src/main/java/bdsup2sub/core/CaptionMoveModeX.java

@@ -1,4 +1,4 @@
-package deadbeef.core;
+package bdsup2sub.core;
 
 public enum CaptionMoveModeX {
     KEEP_POSITION,

src/deadbeef/core/CaptionMoveModeY.java → src/main/java/bdsup2sub/core/CaptionMoveModeY.java

@@ -1,4 +1,4 @@
-package deadbeef.core;
+package bdsup2sub.core;
 
 public enum CaptionMoveModeY {
     KEEP_POSITION,

src/deadbeef/core/Constants.java → src/main/java/bdsup2sub/core/Constants.java

@@ -1,6 +1,6 @@
-package deadbeef.core;
+package bdsup2sub.core;
 
-import deadbeef.bitmap.Palette;
+import bdsup2sub.bitmap.Palette;
 
 public class Constants {
 

src/deadbeef/core/Core.java → src/main/java/bdsup2sub/core/Core.java

@@ -1,17 +1,17 @@
-package deadbeef.core;
-
-import deadbeef.bitmap.Bitmap;
-import deadbeef.bitmap.BitmapWithPalette;
-import deadbeef.bitmap.ErasePatch;
-import deadbeef.bitmap.Palette;
-import deadbeef.filters.*;
-import deadbeef.gui.MainFrame;
-import deadbeef.gui.Progress;
-import deadbeef.supstream.*;
-import deadbeef.tools.EnhancedPngEncoder;
-import deadbeef.tools.Props;
-import deadbeef.utils.FilenameUtils;
-import deadbeef.utils.ToolBox;
+package bdsup2sub.core;
+
+import bdsup2sub.bitmap.Bitmap;
+import bdsup2sub.bitmap.BitmapWithPalette;
+import bdsup2sub.bitmap.ErasePatch;
+import bdsup2sub.bitmap.Palette;
+import bdsup2sub.filters.*;
+import bdsup2sub.gui.MainFrame;
+import bdsup2sub.gui.Progress;
+import bdsup2sub.supstream.*;
+import bdsup2sub.tools.EnhancedPngEncoder;
+import bdsup2sub.tools.Props;
+import bdsup2sub.utils.FilenameUtils;
+import bdsup2sub.utils.ToolBox;
 
 import javax.swing.*;
 import java.awt.image.BufferedImage;
@@ -20,8 +20,8 @@
 import java.net.URLDecoder;
 import java.util.ArrayList;
 
-import static deadbeef.core.Constants.*;
-import static deadbeef.utils.TimeUtils.ptsToTimeStr;
+import static bdsup2sub.core.Constants.*;
+import static bdsup2sub.utils.TimeUtils.ptsToTimeStr;
 
 /**
  * This class contains the core functionality of BDSup2Sub.<br>

src/deadbeef/core/CoreException.java → src/main/java/bdsup2sub/core/CoreException.java

@@ -1,4 +1,4 @@
-package deadbeef.core;
+package bdsup2sub.core;
 
 
 /*

src/deadbeef/core/CoreThreadState.java → src/main/java/bdsup2sub/core/CoreThreadState.java

@@ -1,4 +1,4 @@
-package deadbeef.core;
+package bdsup2sub.core;
 
 public enum CoreThreadState {
     INACTIVE,

src/deadbeef/core/ForcedFlagState.java → src/main/java/bdsup2sub/core/ForcedFlagState.java

@@ -1,4 +1,4 @@
-package deadbeef.core;
+package bdsup2sub.core;
 
 public enum ForcedFlagState {
     KEEP,

src/deadbeef/core/Framerate.java → src/main/java/bdsup2sub/core/Framerate.java

@@ -1,4 +1,4 @@
-package deadbeef.core;
+package bdsup2sub.core;
 
 public enum Framerate {
     FPS_23_976(24000.0/1001), //24p

src/deadbeef/core/InputMode.java → src/main/java/bdsup2sub/core/InputMode.java

@@ -1,4 +1,4 @@
-package deadbeef.core;
+package bdsup2sub.core;
 
 public enum InputMode {
     /** DVD SUB/IDX (VobSub) stream */

src/deadbeef/core/OutputMode.java → src/main/java/bdsup2sub/core/OutputMode.java

@@ -1,4 +1,4 @@
-package deadbeef.core;
+package bdsup2sub.core;
 
 public enum OutputMode {
     /** DVD SUB/IDX (VobSub) stream */

src/deadbeef/core/PaletteMode.java → src/main/java/bdsup2sub/core/PaletteMode.java

@@ -1,4 +1,4 @@
-package deadbeef.core;
+package bdsup2sub.core;
 
 public enum PaletteMode {
     KEEP_EXISTING {

src/deadbeef/core/Resolution.java → src/main/java/bdsup2sub/core/Resolution.java

@@ -1,4 +1,4 @@
-package deadbeef.core;
+package bdsup2sub.core;
 
 public enum Resolution {
     NTSC {

src/deadbeef/core/ScalingFilter.java → src/main/java/bdsup2sub/core/ScalingFilter.java

@@ -1,4 +1,4 @@
-package deadbeef.core;
+package bdsup2sub.core;
 
 public enum ScalingFilter {
     BILINEAR {

src/deadbeef/core/StreamID.java → src/main/java/bdsup2sub/core/StreamID.java

@@ -1,4 +1,4 @@
-package deadbeef.core;
+package bdsup2sub.core;
 
 public enum StreamID {
     /** Blu-Ray SUP stream */

src/deadbeef/filters/BSplineFilter.java → src/main/java/bdsup2sub/filters/BSplineFilter.java

@@ -1,4 +1,4 @@
-package deadbeef.filters;
+package bdsup2sub.filters;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/filters/BellFilter.java → src/main/java/bdsup2sub/filters/BellFilter.java

@@ -1,4 +1,4 @@
-package deadbeef.filters;
+package bdsup2sub.filters;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/filters/BiCubicFilter.java → src/main/java/bdsup2sub/filters/BiCubicFilter.java

@@ -1,4 +1,4 @@
-package deadbeef.filters;
+package bdsup2sub.filters;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/filters/Filter.java → src/main/java/bdsup2sub/filters/Filter.java

@@ -1,4 +1,4 @@
-package deadbeef.filters;
+package bdsup2sub.filters;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/filters/FilterOp.java → src/main/java/bdsup2sub/filters/FilterOp.java

@@ -1,7 +1,7 @@
-package deadbeef.filters;
+package bdsup2sub.filters;
 
-import deadbeef.bitmap.Bitmap;
-import deadbeef.bitmap.Palette;
+import bdsup2sub.bitmap.Bitmap;
+import bdsup2sub.bitmap.Palette;
 
 /*
  * Copyright 2009 Morten Nobel-Joergensen / Volker Oth (0xdeadbeef)

src/deadbeef/filters/HermiteFilter.java → src/main/java/bdsup2sub/filters/HermiteFilter.java

@@ -1,4 +1,4 @@
-package deadbeef.filters;
+package bdsup2sub.filters;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/filters/Lanczos3Filter.java → src/main/java/bdsup2sub/filters/Lanczos3Filter.java

@@ -1,4 +1,4 @@
-package deadbeef.filters;
+package bdsup2sub.filters;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/filters/MitchellFilter.java → src/main/java/bdsup2sub/filters/MitchellFilter.java

@@ -1,4 +1,4 @@
-package deadbeef.filters;
+package bdsup2sub.filters;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/filters/TriangleFilter.java → src/main/java/bdsup2sub/filters/TriangleFilter.java

@@ -1,4 +1,4 @@
-package deadbeef.filters;
+package bdsup2sub.filters;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/gui/ColorDialog.java → src/main/java/bdsup2sub/gui/ColorDialog.java

@@ -1,19 +1,19 @@
-package deadbeef.gui;
+package bdsup2sub.gui;
 
 
-import deadbeef.core.CoreException;
-import deadbeef.tools.Props;
-import deadbeef.utils.FilenameUtils;
-import deadbeef.utils.ToolBox;
+import bdsup2sub.core.CoreException;
+import bdsup2sub.tools.Props;
+import bdsup2sub.utils.FilenameUtils;
+import bdsup2sub.utils.ToolBox;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.BufferedImage;
 import java.io.File;
 
-import static deadbeef.core.Constants.APP_NAME_AND_VERSION;
-import static deadbeef.gui.GuiUtils.centerRelativeToParent;
+import static bdsup2sub.core.Constants.APP_NAME_AND_VERSION;
+import static bdsup2sub.gui.GuiUtils.centerRelativeToParent;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)

src/deadbeef/gui/ConversionDialog.java → src/main/java/bdsup2sub/gui/ConversionDialog.java

@@ -1,10 +1,10 @@
-package deadbeef.gui;
+package bdsup2sub.gui;
 
 
-import deadbeef.core.Core;
-import deadbeef.core.ForcedFlagState;
-import deadbeef.core.Resolution;
-import deadbeef.utils.ToolBox;
+import bdsup2sub.core.Core;
+import bdsup2sub.core.ForcedFlagState;
+import bdsup2sub.core.Resolution;
+import bdsup2sub.utils.ToolBox;
 
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
@@ -13,7 +13,7 @@
 import java.awt.*;
 import java.awt.event.*;
 
-import static deadbeef.gui.GuiUtils.centerRelativeToParent;
+import static bdsup2sub.gui.GuiUtils.centerRelativeToParent;
 
 /*
  * Copyright 2009 Volker Oth (0xdeadbeef)