diff --git a/.gitignore b/.gitignore index 3a0bf28..46f2acc 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ hs_err_pid* #Other idea.png +old/ diff --git a/pom.xml b/pom.xml index 8c8ede9..97f880a 100755 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - com.morce.zejfseis4 + zejfseis4 ZejfSeis4 0.0.1-SNAPSHOT diff --git a/src/main/java/com/morce/zejfseis4/client/ZejfCReader.java b/src/main/java/zejfseis4/client/ZejfCReader.java similarity index 98% rename from src/main/java/com/morce/zejfseis4/client/ZejfCReader.java rename to src/main/java/zejfseis4/client/ZejfCReader.java index 55a934e..6a03f11 100755 --- a/src/main/java/com/morce/zejfseis4/client/ZejfCReader.java +++ b/src/main/java/zejfseis4/client/ZejfCReader.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.client; +package zejfseis4.client; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/morce/zejfseis4/client/ZejfClient.java b/src/main/java/zejfseis4/client/ZejfClient.java similarity index 94% rename from src/main/java/com/morce/zejfseis4/client/ZejfClient.java rename to src/main/java/zejfseis4/client/ZejfClient.java index 08fb87e..391eeb2 100755 --- a/src/main/java/com/morce/zejfseis4/client/ZejfClient.java +++ b/src/main/java/zejfseis4/client/ZejfClient.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.client; +package zejfseis4.client; import java.io.IOException; import java.net.InetSocketAddress; @@ -10,12 +10,12 @@ import org.tinylog.Logger; -import com.morce.zejfseis4.data.DataHour; -import com.morce.zejfseis4.data.SimpleLog; -import com.morce.zejfseis4.exception.FatalIOException; -import com.morce.zejfseis4.exception.IncompatibleServerException; -import com.morce.zejfseis4.exception.RuntimeApplicationException; -import com.morce.zejfseis4.main.ZejfSeis4; +import zejfseis4.data.DataHour; +import zejfseis4.data.SimpleLog; +import zejfseis4.exception.FatalIOException; +import zejfseis4.exception.IncompatibleServerException; +import zejfseis4.exception.RuntimeApplicationException; +import zejfseis4.main.ZejfSeis4; public class ZejfClient { diff --git a/src/main/java/com/morce/zejfseis4/data/DataHour.java b/src/main/java/zejfseis4/data/DataHour.java similarity index 93% rename from src/main/java/com/morce/zejfseis4/data/DataHour.java rename to src/main/java/zejfseis4/data/DataHour.java index 096bb74..3a906c5 100755 --- a/src/main/java/com/morce/zejfseis4/data/DataHour.java +++ b/src/main/java/zejfseis4/data/DataHour.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.data; +package zejfseis4.data; import java.io.Serializable; import java.util.Calendar; diff --git a/src/main/java/com/morce/zejfseis4/data/DataManager.java b/src/main/java/zejfseis4/data/DataManager.java similarity index 98% rename from src/main/java/com/morce/zejfseis4/data/DataManager.java rename to src/main/java/zejfseis4/data/DataManager.java index 50d7958..d625433 100755 --- a/src/main/java/com/morce/zejfseis4/data/DataManager.java +++ b/src/main/java/zejfseis4/data/DataManager.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.data; +package zejfseis4.data; import java.io.File; import java.io.FileInputStream; @@ -17,9 +17,9 @@ import org.tinylog.Logger; -import com.morce.zejfseis4.exception.FatalIOException; -import com.morce.zejfseis4.exception.TooBigIntervalException; -import com.morce.zejfseis4.main.ZejfSeis4; +import zejfseis4.exception.FatalIOException; +import zejfseis4.exception.TooBigIntervalException; +import zejfseis4.main.ZejfSeis4; public class DataManager { diff --git a/src/main/java/com/morce/zejfseis4/data/DataRequest.java b/src/main/java/zejfseis4/data/DataRequest.java similarity index 97% rename from src/main/java/com/morce/zejfseis4/data/DataRequest.java rename to src/main/java/zejfseis4/data/DataRequest.java index 7c15b38..2a628c3 100755 --- a/src/main/java/com/morce/zejfseis4/data/DataRequest.java +++ b/src/main/java/zejfseis4/data/DataRequest.java @@ -1,16 +1,15 @@ -package com.morce.zejfseis4.data; +package zejfseis4.data; import java.util.Queue; import java.util.concurrent.Semaphore; import org.tinylog.Logger; -import com.morce.zejfseis4.exception.FatalIOException; -import com.morce.zejfseis4.exception.TooBigIntervalException; -import com.morce.zejfseis4.main.Settings; -import com.morce.zejfseis4.main.ZejfSeis4; - import uk.me.berndporr.iirj.Butterworth; +import zejfseis4.exception.FatalIOException; +import zejfseis4.exception.TooBigIntervalException; +import zejfseis4.main.Settings; +import zejfseis4.main.ZejfSeis4; public class DataRequest { diff --git a/src/main/java/com/morce/zejfseis4/data/Log.java b/src/main/java/zejfseis4/data/Log.java similarity index 93% rename from src/main/java/com/morce/zejfseis4/data/Log.java rename to src/main/java/zejfseis4/data/Log.java index 9691d49..544d0d4 100644 --- a/src/main/java/com/morce/zejfseis4/data/Log.java +++ b/src/main/java/zejfseis4/data/Log.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.data; +package zejfseis4.data; public class Log { diff --git a/src/main/java/com/morce/zejfseis4/data/SimpleLog.java b/src/main/java/zejfseis4/data/SimpleLog.java similarity index 60% rename from src/main/java/com/morce/zejfseis4/data/SimpleLog.java rename to src/main/java/zejfseis4/data/SimpleLog.java index 8689774..394dfa1 100755 --- a/src/main/java/com/morce/zejfseis4/data/SimpleLog.java +++ b/src/main/java/zejfseis4/data/SimpleLog.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.data; +package zejfseis4.data; public record SimpleLog(long time, int value) { diff --git a/src/main/java/com/morce/zejfseis4/events/CatalogueEvent.java b/src/main/java/zejfseis4/events/CatalogueEvent.java similarity index 90% rename from src/main/java/com/morce/zejfseis4/events/CatalogueEvent.java rename to src/main/java/zejfseis4/events/CatalogueEvent.java index b54a763..d91b2c1 100755 --- a/src/main/java/com/morce/zejfseis4/events/CatalogueEvent.java +++ b/src/main/java/zejfseis4/events/CatalogueEvent.java @@ -1,6 +1,6 @@ -package com.morce.zejfseis4.events; +package zejfseis4.events; -import com.morce.zejfseis4.utils.GeoUtils; +import zejfseis4.utils.GeoUtils; public class CatalogueEvent extends Event { diff --git a/src/main/java/com/morce/zejfseis4/events/DetectionStatus.java b/src/main/java/zejfseis4/events/DetectionStatus.java similarity index 88% rename from src/main/java/com/morce/zejfseis4/events/DetectionStatus.java rename to src/main/java/zejfseis4/events/DetectionStatus.java index db998ef..61aba1e 100755 --- a/src/main/java/com/morce/zejfseis4/events/DetectionStatus.java +++ b/src/main/java/zejfseis4/events/DetectionStatus.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.events; +package zejfseis4.events; public enum DetectionStatus { diff --git a/src/main/java/com/morce/zejfseis4/events/Event.java b/src/main/java/zejfseis4/events/Event.java similarity index 95% rename from src/main/java/com/morce/zejfseis4/events/Event.java rename to src/main/java/zejfseis4/events/Event.java index 9550bd5..3e3045c 100755 --- a/src/main/java/com/morce/zejfseis4/events/Event.java +++ b/src/main/java/zejfseis4/events/Event.java @@ -1,11 +1,11 @@ -package com.morce.zejfseis4.events; +package zejfseis4.events; import java.io.Serializable; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; -import com.morce.zejfseis4.utils.GeoUtils; +import zejfseis4.utils.GeoUtils; public abstract class Event implements Serializable { diff --git a/src/main/java/com/morce/zejfseis4/events/EventDistance.java b/src/main/java/zejfseis4/events/EventDistance.java similarity index 96% rename from src/main/java/com/morce/zejfseis4/events/EventDistance.java rename to src/main/java/zejfseis4/events/EventDistance.java index 4dce12a..c2797cb 100755 --- a/src/main/java/com/morce/zejfseis4/events/EventDistance.java +++ b/src/main/java/zejfseis4/events/EventDistance.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.events; +package zejfseis4.events; import java.awt.Color; diff --git a/src/main/java/com/morce/zejfseis4/events/EventManager.java b/src/main/java/zejfseis4/events/EventManager.java similarity index 96% rename from src/main/java/com/morce/zejfseis4/events/EventManager.java rename to src/main/java/zejfseis4/events/EventManager.java index 15d1cac..b780b67 100755 --- a/src/main/java/com/morce/zejfseis4/events/EventManager.java +++ b/src/main/java/zejfseis4/events/EventManager.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.events; +package zejfseis4.events; import java.io.File; import java.io.FileInputStream; @@ -12,9 +12,9 @@ import org.tinylog.Logger; -import com.morce.zejfseis4.data.DataManager; -import com.morce.zejfseis4.exception.FatalIOException; -import com.morce.zejfseis4.main.ZejfSeis4; +import zejfseis4.data.DataManager; +import zejfseis4.exception.FatalIOException; +import zejfseis4.main.ZejfSeis4; public class EventManager { diff --git a/src/main/java/com/morce/zejfseis4/events/EventMonth.java b/src/main/java/zejfseis4/events/EventMonth.java similarity index 96% rename from src/main/java/com/morce/zejfseis4/events/EventMonth.java rename to src/main/java/zejfseis4/events/EventMonth.java index 0e7e978..61ffe1b 100755 --- a/src/main/java/com/morce/zejfseis4/events/EventMonth.java +++ b/src/main/java/zejfseis4/events/EventMonth.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.events; +package zejfseis4.events; import java.io.File; import java.io.Serializable; diff --git a/src/main/java/com/morce/zejfseis4/events/FDSNDownloader.java b/src/main/java/zejfseis4/events/FDSNDownloader.java similarity index 97% rename from src/main/java/com/morce/zejfseis4/events/FDSNDownloader.java rename to src/main/java/zejfseis4/events/FDSNDownloader.java index 9dfe3dd..76ecc4d 100755 --- a/src/main/java/com/morce/zejfseis4/events/FDSNDownloader.java +++ b/src/main/java/zejfseis4/events/FDSNDownloader.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.events; +package zejfseis4.events; import java.io.BufferedReader; import java.io.DataInputStream; @@ -23,9 +23,9 @@ import org.json.JSONObject; import org.tinylog.Logger; -import com.morce.zejfseis4.exception.FatalIOException; -import com.morce.zejfseis4.main.ZejfSeis4; -import com.morce.zejfseis4.utils.NamedThreadFactory; +import zejfseis4.exception.FatalIOException; +import zejfseis4.main.ZejfSeis4; +import zejfseis4.utils.NamedThreadFactory; public class FDSNDownloader { diff --git a/src/main/java/com/morce/zejfseis4/events/Intensity.java b/src/main/java/zejfseis4/events/Intensity.java similarity index 97% rename from src/main/java/com/morce/zejfseis4/events/Intensity.java rename to src/main/java/zejfseis4/events/Intensity.java index 579b7b9..64cab35 100755 --- a/src/main/java/com/morce/zejfseis4/events/Intensity.java +++ b/src/main/java/zejfseis4/events/Intensity.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.events; +package zejfseis4.events; import java.awt.Color; diff --git a/src/main/java/com/morce/zejfseis4/events/ManualEvent.java b/src/main/java/zejfseis4/events/ManualEvent.java similarity index 95% rename from src/main/java/com/morce/zejfseis4/events/ManualEvent.java rename to src/main/java/zejfseis4/events/ManualEvent.java index eb4fc57..98cc541 100755 --- a/src/main/java/com/morce/zejfseis4/events/ManualEvent.java +++ b/src/main/java/zejfseis4/events/ManualEvent.java @@ -1,6 +1,6 @@ -package com.morce.zejfseis4.events; +package zejfseis4.events; -import com.morce.zejfseis4.utils.TravelTimeTable; +import zejfseis4.utils.TravelTimeTable; public class ManualEvent extends Event { diff --git a/src/main/java/com/morce/zejfseis4/exception/ApplicationErrorHandler.java b/src/main/java/zejfseis4/exception/ApplicationErrorHandler.java similarity index 89% rename from src/main/java/com/morce/zejfseis4/exception/ApplicationErrorHandler.java rename to src/main/java/zejfseis4/exception/ApplicationErrorHandler.java index 73ad81a..84fc3b3 100644 --- a/src/main/java/com/morce/zejfseis4/exception/ApplicationErrorHandler.java +++ b/src/main/java/zejfseis4/exception/ApplicationErrorHandler.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.exception; +package zejfseis4.exception; import java.awt.Component; import java.io.PrintWriter; @@ -11,11 +11,11 @@ import org.tinylog.Logger; -import com.morce.zejfseis4.main.ZejfSeis4; -import com.morce.zejfseis4.ui.ZejfSeisFrame; -import com.morce.zejfseis4.ui.action.CloseAction; -import com.morce.zejfseis4.ui.action.IgnoreAction; -import com.morce.zejfseis4.ui.action.TerminateAction; +import zejfseis4.main.ZejfSeis4; +import zejfseis4.ui.ZejfSeisFrame; +import zejfseis4.ui.action.CloseAction; +import zejfseis4.ui.action.IgnoreAction; +import zejfseis4.ui.action.TerminateAction; public class ApplicationErrorHandler implements Thread.UncaughtExceptionHandler { diff --git a/src/main/java/com/morce/zejfseis4/exception/ApplicationException.java b/src/main/java/zejfseis4/exception/ApplicationException.java similarity index 84% rename from src/main/java/com/morce/zejfseis4/exception/ApplicationException.java rename to src/main/java/zejfseis4/exception/ApplicationException.java index b7f8522..6b4a341 100644 --- a/src/main/java/com/morce/zejfseis4/exception/ApplicationException.java +++ b/src/main/java/zejfseis4/exception/ApplicationException.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.exception; +package zejfseis4.exception; /** * Interface for exceptions with error message displayable to user diff --git a/src/main/java/com/morce/zejfseis4/exception/FatalApplicationException.java b/src/main/java/zejfseis4/exception/FatalApplicationException.java similarity index 90% rename from src/main/java/com/morce/zejfseis4/exception/FatalApplicationException.java rename to src/main/java/zejfseis4/exception/FatalApplicationException.java index 7354447..3fe54fb 100644 --- a/src/main/java/com/morce/zejfseis4/exception/FatalApplicationException.java +++ b/src/main/java/zejfseis4/exception/FatalApplicationException.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.exception; +package zejfseis4.exception; public class FatalApplicationException extends Exception implements FatalError { diff --git a/src/main/java/com/morce/zejfseis4/exception/FatalError.java b/src/main/java/zejfseis4/exception/FatalError.java similarity index 61% rename from src/main/java/com/morce/zejfseis4/exception/FatalError.java rename to src/main/java/zejfseis4/exception/FatalError.java index 1e1dfc2..0837e71 100644 --- a/src/main/java/com/morce/zejfseis4/exception/FatalError.java +++ b/src/main/java/zejfseis4/exception/FatalError.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.exception; +package zejfseis4.exception; public interface FatalError extends ApplicationException{ diff --git a/src/main/java/com/morce/zejfseis4/exception/FatalIOException.java b/src/main/java/zejfseis4/exception/FatalIOException.java similarity index 87% rename from src/main/java/com/morce/zejfseis4/exception/FatalIOException.java rename to src/main/java/zejfseis4/exception/FatalIOException.java index b1fb7b6..49a97b7 100644 --- a/src/main/java/com/morce/zejfseis4/exception/FatalIOException.java +++ b/src/main/java/zejfseis4/exception/FatalIOException.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.exception; +package zejfseis4.exception; public class FatalIOException extends FatalApplicationException{ diff --git a/src/main/java/com/morce/zejfseis4/exception/IncompatibleServerException.java b/src/main/java/zejfseis4/exception/IncompatibleServerException.java similarity index 86% rename from src/main/java/com/morce/zejfseis4/exception/IncompatibleServerException.java rename to src/main/java/zejfseis4/exception/IncompatibleServerException.java index a577b87..2ca4005 100755 --- a/src/main/java/com/morce/zejfseis4/exception/IncompatibleServerException.java +++ b/src/main/java/zejfseis4/exception/IncompatibleServerException.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.exception; +package zejfseis4.exception; public class IncompatibleServerException extends RuntimeApplicationException { diff --git a/src/main/java/com/morce/zejfseis4/exception/RuntimeApplicationException.java b/src/main/java/zejfseis4/exception/RuntimeApplicationException.java similarity index 96% rename from src/main/java/com/morce/zejfseis4/exception/RuntimeApplicationException.java rename to src/main/java/zejfseis4/exception/RuntimeApplicationException.java index 0634305..bbebbd4 100644 --- a/src/main/java/com/morce/zejfseis4/exception/RuntimeApplicationException.java +++ b/src/main/java/zejfseis4/exception/RuntimeApplicationException.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.exception; +package zejfseis4.exception; public class RuntimeApplicationException extends RuntimeException implements ApplicationException { diff --git a/src/main/java/com/morce/zejfseis4/exception/TooBigIntervalException.java b/src/main/java/zejfseis4/exception/TooBigIntervalException.java similarity index 83% rename from src/main/java/com/morce/zejfseis4/exception/TooBigIntervalException.java rename to src/main/java/zejfseis4/exception/TooBigIntervalException.java index fd4fb54..d48fbae 100644 --- a/src/main/java/com/morce/zejfseis4/exception/TooBigIntervalException.java +++ b/src/main/java/zejfseis4/exception/TooBigIntervalException.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.exception; +package zejfseis4.exception; public class TooBigIntervalException extends RuntimeApplicationException { diff --git a/src/main/java/com/morce/zejfseis4/main/Main.java b/src/main/java/zejfseis4/main/Main.java similarity index 72% rename from src/main/java/com/morce/zejfseis4/main/Main.java rename to src/main/java/zejfseis4/main/Main.java index fcaab30..7841e4b 100755 --- a/src/main/java/com/morce/zejfseis4/main/Main.java +++ b/src/main/java/zejfseis4/main/Main.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.main; +package zejfseis4.main; public class Main { diff --git a/src/main/java/com/morce/zejfseis4/main/Settings.java b/src/main/java/zejfseis4/main/Settings.java similarity index 95% rename from src/main/java/com/morce/zejfseis4/main/Settings.java rename to src/main/java/zejfseis4/main/Settings.java index 2574003..0af4904 100755 --- a/src/main/java/com/morce/zejfseis4/main/Settings.java +++ b/src/main/java/zejfseis4/main/Settings.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.main; +package zejfseis4.main; import java.io.File; import java.io.FileInputStream; @@ -7,7 +7,7 @@ import java.util.Arrays; import java.util.Properties; -import com.morce.zejfseis4.exception.FatalIOException; +import zejfseis4.exception.FatalIOException; public class Settings { diff --git a/src/main/java/com/morce/zejfseis4/main/ZejfSeis4.java b/src/main/java/zejfseis4/main/ZejfSeis4.java similarity index 84% rename from src/main/java/com/morce/zejfseis4/main/ZejfSeis4.java rename to src/main/java/zejfseis4/main/ZejfSeis4.java index dae4ba8..14970e2 100755 --- a/src/main/java/com/morce/zejfseis4/main/ZejfSeis4.java +++ b/src/main/java/zejfseis4/main/ZejfSeis4.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.main; +package zejfseis4.main; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; @@ -8,14 +8,14 @@ import org.tinylog.Logger; -import com.morce.zejfseis4.client.ZejfClient; -import com.morce.zejfseis4.data.DataManager; -import com.morce.zejfseis4.events.EventManager; -import com.morce.zejfseis4.exception.ApplicationErrorHandler; -import com.morce.zejfseis4.exception.FatalIOException; -import com.morce.zejfseis4.exception.RuntimeApplicationException; -import com.morce.zejfseis4.scale.Scales; -import com.morce.zejfseis4.ui.ZejfSeisFrame; +import zejfseis4.client.ZejfClient; +import zejfseis4.data.DataManager; +import zejfseis4.events.EventManager; +import zejfseis4.exception.ApplicationErrorHandler; +import zejfseis4.exception.FatalIOException; +import zejfseis4.exception.RuntimeApplicationException; +import zejfseis4.scale.Scales; +import zejfseis4.ui.ZejfSeisFrame; public class ZejfSeis4 { diff --git a/src/main/java/com/morce/zejfseis4/scale/Scale.java b/src/main/java/zejfseis4/scale/Scale.java similarity index 96% rename from src/main/java/com/morce/zejfseis4/scale/Scale.java rename to src/main/java/zejfseis4/scale/Scale.java index 82a3167..2000c65 100644 --- a/src/main/java/com/morce/zejfseis4/scale/Scale.java +++ b/src/main/java/zejfseis4/scale/Scale.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.scale; +package zejfseis4.scale; import java.awt.Color; import java.awt.image.BufferedImage; diff --git a/src/main/java/com/morce/zejfseis4/scale/ScaleRange.java b/src/main/java/zejfseis4/scale/ScaleRange.java similarity index 94% rename from src/main/java/com/morce/zejfseis4/scale/ScaleRange.java rename to src/main/java/zejfseis4/scale/ScaleRange.java index 6150f7a..f11b4de 100644 --- a/src/main/java/com/morce/zejfseis4/scale/ScaleRange.java +++ b/src/main/java/zejfseis4/scale/ScaleRange.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.scale; +package zejfseis4.scale; import java.awt.Color; diff --git a/src/main/java/com/morce/zejfseis4/scale/Scales.java b/src/main/java/zejfseis4/scale/Scales.java similarity index 92% rename from src/main/java/com/morce/zejfseis4/scale/Scales.java rename to src/main/java/zejfseis4/scale/Scales.java index c870ddf..3d172e1 100644 --- a/src/main/java/com/morce/zejfseis4/scale/Scales.java +++ b/src/main/java/zejfseis4/scale/Scales.java @@ -1,8 +1,8 @@ -package com.morce.zejfseis4.scale; +package zejfseis4.scale; import java.io.IOException; -import com.morce.zejfseis4.exception.FatalIOException; +import zejfseis4.exception.FatalIOException; public class Scales { diff --git a/src/main/java/com/morce/zejfseis4/scale/scale1.png b/src/main/java/zejfseis4/scale/scale1.png similarity index 100% rename from src/main/java/com/morce/zejfseis4/scale/scale1.png rename to src/main/java/zejfseis4/scale/scale1.png diff --git a/src/main/java/com/morce/zejfseis4/scale/scale2.png b/src/main/java/zejfseis4/scale/scale2.png similarity index 100% rename from src/main/java/com/morce/zejfseis4/scale/scale2.png rename to src/main/java/zejfseis4/scale/scale2.png diff --git a/src/main/java/com/morce/zejfseis4/ui/DataExplorer.java b/src/main/java/zejfseis4/ui/DataExplorer.java similarity index 92% rename from src/main/java/com/morce/zejfseis4/ui/DataExplorer.java rename to src/main/java/zejfseis4/ui/DataExplorer.java index 26af0e2..5cb6328 100644 --- a/src/main/java/com/morce/zejfseis4/ui/DataExplorer.java +++ b/src/main/java/zejfseis4/ui/DataExplorer.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui; +package zejfseis4.ui; import java.awt.BorderLayout; import java.awt.Dimension; @@ -11,9 +11,9 @@ import javax.swing.JFrame; import javax.swing.JPanel; -import com.morce.zejfseis4.events.ManualEvent; -import com.morce.zejfseis4.exception.FatalIOException; -import com.morce.zejfseis4.main.ZejfSeis4; +import zejfseis4.events.ManualEvent; +import zejfseis4.exception.FatalIOException; +import zejfseis4.main.ZejfSeis4; public class DataExplorer extends JFrame { diff --git a/src/main/java/com/morce/zejfseis4/ui/DataExplorerPanel.java b/src/main/java/zejfseis4/ui/DataExplorerPanel.java similarity index 95% rename from src/main/java/com/morce/zejfseis4/ui/DataExplorerPanel.java rename to src/main/java/zejfseis4/ui/DataExplorerPanel.java index 3ba1b38..28191fa 100755 --- a/src/main/java/com/morce/zejfseis4/ui/DataExplorerPanel.java +++ b/src/main/java/zejfseis4/ui/DataExplorerPanel.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui; +package zejfseis4.ui; import java.awt.BasicStroke; import java.awt.Color; @@ -19,14 +19,13 @@ import java.util.Calendar; import java.util.Locale; -import com.morce.zejfseis4.data.DataRequest; -import com.morce.zejfseis4.events.Intensity; -import com.morce.zejfseis4.main.Settings; -import com.morce.zejfseis4.main.ZejfSeis4; -import com.morce.zejfseis4.scale.Scales; -import com.morce.zejfseis4.utils.TravelTimeTable; - import edu.emory.mathcs.jtransforms.fft.DoubleFFT_1D; +import zejfseis4.data.DataRequest; +import zejfseis4.events.Intensity; +import zejfseis4.main.Settings; +import zejfseis4.main.ZejfSeis4; +import zejfseis4.scale.Scales; +import zejfseis4.utils.TravelTimeTable; public class DataExplorerPanel extends DataRequestPanel { diff --git a/src/main/java/com/morce/zejfseis4/ui/DataRequestPanel.java b/src/main/java/zejfseis4/ui/DataRequestPanel.java similarity index 94% rename from src/main/java/com/morce/zejfseis4/ui/DataRequestPanel.java rename to src/main/java/zejfseis4/ui/DataRequestPanel.java index 1e96bd3..25107ee 100644 --- a/src/main/java/com/morce/zejfseis4/ui/DataRequestPanel.java +++ b/src/main/java/zejfseis4/ui/DataRequestPanel.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui; +package zejfseis4.ui; import java.awt.Graphics2D; import java.awt.GraphicsConfiguration; @@ -9,9 +9,9 @@ import javax.swing.JPanel; -import com.morce.zejfseis4.data.DataRequest; -import com.morce.zejfseis4.main.Settings; -import com.morce.zejfseis4.main.ZejfSeis4; +import zejfseis4.data.DataRequest; +import zejfseis4.main.Settings; +import zejfseis4.main.ZejfSeis4; public abstract class DataRequestPanel extends JPanel { diff --git a/src/main/java/com/morce/zejfseis4/ui/DefaultFilter.java b/src/main/java/zejfseis4/ui/DefaultFilter.java similarity index 68% rename from src/main/java/com/morce/zejfseis4/ui/DefaultFilter.java rename to src/main/java/zejfseis4/ui/DefaultFilter.java index 33cc71d..6201586 100644 --- a/src/main/java/com/morce/zejfseis4/ui/DefaultFilter.java +++ b/src/main/java/zejfseis4/ui/DefaultFilter.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui; +package zejfseis4.ui; public record DefaultFilter(String name, double max, double min) { diff --git a/src/main/java/com/morce/zejfseis4/ui/DrumTab.java b/src/main/java/zejfseis4/ui/DrumTab.java similarity index 94% rename from src/main/java/com/morce/zejfseis4/ui/DrumTab.java rename to src/main/java/zejfseis4/ui/DrumTab.java index 0984463..67f2752 100755 --- a/src/main/java/com/morce/zejfseis4/ui/DrumTab.java +++ b/src/main/java/zejfseis4/ui/DrumTab.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui; +package zejfseis4.ui; import java.awt.BorderLayout; import java.awt.Color; @@ -31,11 +31,11 @@ import javax.swing.SwingUtilities; import javax.swing.border.EtchedBorder; -import com.morce.zejfseis4.data.DataRequest; -import com.morce.zejfseis4.exception.RuntimeApplicationException; -import com.morce.zejfseis4.main.Settings; -import com.morce.zejfseis4.main.ZejfSeis4; -import com.morce.zejfseis4.utils.NamedThreadFactory; +import zejfseis4.data.DataRequest; +import zejfseis4.exception.RuntimeApplicationException; +import zejfseis4.main.Settings; +import zejfseis4.main.ZejfSeis4; +import zejfseis4.utils.NamedThreadFactory; public class DrumTab extends DataRequestPanel { diff --git a/src/main/java/com/morce/zejfseis4/ui/EventExplorer.java b/src/main/java/zejfseis4/ui/EventExplorer.java similarity index 95% rename from src/main/java/com/morce/zejfseis4/ui/EventExplorer.java rename to src/main/java/zejfseis4/ui/EventExplorer.java index eb465af..084229b 100755 --- a/src/main/java/com/morce/zejfseis4/ui/EventExplorer.java +++ b/src/main/java/zejfseis4/ui/EventExplorer.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui; +package zejfseis4.ui; import java.awt.BorderLayout; import java.awt.Dimension; @@ -23,14 +23,14 @@ import javax.swing.JPanel; import javax.swing.JTextField; -import com.morce.zejfseis4.events.CatalogueEvent; -import com.morce.zejfseis4.events.DetectionStatus; -import com.morce.zejfseis4.events.Event; -import com.morce.zejfseis4.events.ManualEvent; -import com.morce.zejfseis4.exception.FatalIOException; -import com.morce.zejfseis4.exception.FatalApplicationException; -import com.morce.zejfseis4.main.ZejfSeis4; -import com.morce.zejfseis4.utils.TravelTimeTable; +import zejfseis4.events.CatalogueEvent; +import zejfseis4.events.DetectionStatus; +import zejfseis4.events.Event; +import zejfseis4.events.ManualEvent; +import zejfseis4.exception.FatalApplicationException; +import zejfseis4.exception.FatalIOException; +import zejfseis4.main.ZejfSeis4; +import zejfseis4.utils.TravelTimeTable; public class EventExplorer extends JFrame { diff --git a/src/main/java/com/morce/zejfseis4/ui/EventsTab.java b/src/main/java/zejfseis4/ui/EventsTab.java similarity index 94% rename from src/main/java/com/morce/zejfseis4/ui/EventsTab.java rename to src/main/java/zejfseis4/ui/EventsTab.java index 162b9c8..6e5c99e 100644 --- a/src/main/java/com/morce/zejfseis4/ui/EventsTab.java +++ b/src/main/java/zejfseis4/ui/EventsTab.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui; +package zejfseis4.ui; import java.awt.BorderLayout; import java.awt.Color; @@ -32,14 +32,14 @@ import org.tinylog.Logger; -import com.morce.zejfseis4.data.DataManager; -import com.morce.zejfseis4.events.DetectionStatus; -import com.morce.zejfseis4.events.Event; -import com.morce.zejfseis4.events.EventMonth; -import com.morce.zejfseis4.exception.FatalIOException; -import com.morce.zejfseis4.main.ZejfSeis4; -import com.morce.zejfseis4.ui.action.EditEventAction; -import com.morce.zejfseis4.ui.model.EventTableModel; +import zejfseis4.data.DataManager; +import zejfseis4.events.DetectionStatus; +import zejfseis4.events.Event; +import zejfseis4.events.EventMonth; +import zejfseis4.exception.FatalIOException; +import zejfseis4.main.ZejfSeis4; +import zejfseis4.ui.action.EditEventAction; +import zejfseis4.ui.model.EventTableModel; public class EventsTab extends JPanel { diff --git a/src/main/java/com/morce/zejfseis4/ui/RealtimeGraphPanel.java b/src/main/java/zejfseis4/ui/RealtimeGraphPanel.java similarity index 96% rename from src/main/java/com/morce/zejfseis4/ui/RealtimeGraphPanel.java rename to src/main/java/zejfseis4/ui/RealtimeGraphPanel.java index a0030c6..063e9ea 100644 --- a/src/main/java/com/morce/zejfseis4/ui/RealtimeGraphPanel.java +++ b/src/main/java/zejfseis4/ui/RealtimeGraphPanel.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui; +package zejfseis4.ui; import java.awt.BasicStroke; import java.awt.Color; @@ -17,11 +17,11 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.morce.zejfseis4.data.DataRequest; -import com.morce.zejfseis4.events.Intensity; -import com.morce.zejfseis4.main.Settings; -import com.morce.zejfseis4.main.ZejfSeis4; -import com.morce.zejfseis4.utils.NamedThreadFactory; +import zejfseis4.data.DataRequest; +import zejfseis4.events.Intensity; +import zejfseis4.main.Settings; +import zejfseis4.main.ZejfSeis4; +import zejfseis4.utils.NamedThreadFactory; public class RealtimeGraphPanel extends DataRequestPanel { diff --git a/src/main/java/com/morce/zejfseis4/ui/RealtimeTab.java b/src/main/java/zejfseis4/ui/RealtimeTab.java similarity index 97% rename from src/main/java/com/morce/zejfseis4/ui/RealtimeTab.java rename to src/main/java/zejfseis4/ui/RealtimeTab.java index daa20b5..3c66e14 100644 --- a/src/main/java/com/morce/zejfseis4/ui/RealtimeTab.java +++ b/src/main/java/zejfseis4/ui/RealtimeTab.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui; +package zejfseis4.ui; import java.awt.Color; import java.awt.Dimension; diff --git a/src/main/java/com/morce/zejfseis4/ui/SpectrogramPanel.java b/src/main/java/zejfseis4/ui/SpectrogramPanel.java similarity index 97% rename from src/main/java/com/morce/zejfseis4/ui/SpectrogramPanel.java rename to src/main/java/zejfseis4/ui/SpectrogramPanel.java index 9ec581f..5927b5f 100644 --- a/src/main/java/com/morce/zejfseis4/ui/SpectrogramPanel.java +++ b/src/main/java/zejfseis4/ui/SpectrogramPanel.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui; +package zejfseis4.ui; import java.awt.BasicStroke; import java.awt.Color; @@ -16,13 +16,12 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.morce.zejfseis4.data.DataRequest; -import com.morce.zejfseis4.main.Settings; -import com.morce.zejfseis4.main.ZejfSeis4; -import com.morce.zejfseis4.scale.Scales; -import com.morce.zejfseis4.utils.NamedThreadFactory; - import edu.emory.mathcs.jtransforms.fft.DoubleFFT_1D; +import zejfseis4.data.DataRequest; +import zejfseis4.main.Settings; +import zejfseis4.main.ZejfSeis4; +import zejfseis4.scale.Scales; +import zejfseis4.utils.NamedThreadFactory; public class SpectrogramPanel extends DataRequestPanel { diff --git a/src/main/java/com/morce/zejfseis4/ui/ZejfSeisFrame.java b/src/main/java/zejfseis4/ui/ZejfSeisFrame.java similarity index 94% rename from src/main/java/com/morce/zejfseis4/ui/ZejfSeisFrame.java rename to src/main/java/zejfseis4/ui/ZejfSeisFrame.java index 9e8324a..fa6f286 100755 --- a/src/main/java/com/morce/zejfseis4/ui/ZejfSeisFrame.java +++ b/src/main/java/zejfseis4/ui/ZejfSeisFrame.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui; +package zejfseis4.ui; import java.awt.BorderLayout; import java.awt.Dimension; @@ -25,11 +25,11 @@ import javax.swing.SpringLayout; import javax.swing.border.EmptyBorder; -import com.morce.zejfseis4.exception.FatalIOException; -import com.morce.zejfseis4.exception.RuntimeApplicationException; -import com.morce.zejfseis4.main.Settings; -import com.morce.zejfseis4.main.ZejfSeis4; -import com.morce.zejfseis4.utils.SpringUtilities; +import zejfseis4.exception.FatalIOException; +import zejfseis4.exception.RuntimeApplicationException; +import zejfseis4.main.Settings; +import zejfseis4.main.ZejfSeis4; +import zejfseis4.utils.SpringUtilities; public class ZejfSeisFrame extends JFrame { @@ -39,7 +39,7 @@ public class ZejfSeisFrame extends JFrame { private String status; private Semaphore semaphore; - private com.morce.zejfseis4.ui.RealtimeTab realtimeTab; + private zejfseis4.ui.RealtimeTab realtimeTab; private DrumTab drumTab; private EventsTab eventsTab; diff --git a/src/main/java/com/morce/zejfseis4/ui/action/CloseAction.java b/src/main/java/zejfseis4/ui/action/CloseAction.java similarity index 94% rename from src/main/java/com/morce/zejfseis4/ui/action/CloseAction.java rename to src/main/java/zejfseis4/ui/action/CloseAction.java index 6984be9..2eb5690 100644 --- a/src/main/java/com/morce/zejfseis4/ui/action/CloseAction.java +++ b/src/main/java/zejfseis4/ui/action/CloseAction.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui.action; +package zejfseis4.ui.action; import java.awt.Window; import java.awt.event.ActionEvent; diff --git a/src/main/java/com/morce/zejfseis4/ui/action/EditEventAction.java b/src/main/java/zejfseis4/ui/action/EditEventAction.java similarity index 84% rename from src/main/java/com/morce/zejfseis4/ui/action/EditEventAction.java rename to src/main/java/zejfseis4/ui/action/EditEventAction.java index 3678743..b3ac69d 100644 --- a/src/main/java/com/morce/zejfseis4/ui/action/EditEventAction.java +++ b/src/main/java/zejfseis4/ui/action/EditEventAction.java @@ -1,13 +1,13 @@ -package com.morce.zejfseis4.ui.action; +package zejfseis4.ui.action; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.JTable; -import com.morce.zejfseis4.events.Event; -import com.morce.zejfseis4.ui.EventExplorer; -import com.morce.zejfseis4.ui.model.EventTableModel; +import zejfseis4.events.Event; +import zejfseis4.ui.EventExplorer; +import zejfseis4.ui.model.EventTableModel; public class EditEventAction extends AbstractAction { diff --git a/src/main/java/com/morce/zejfseis4/ui/action/IgnoreAction.java b/src/main/java/zejfseis4/ui/action/IgnoreAction.java similarity index 94% rename from src/main/java/com/morce/zejfseis4/ui/action/IgnoreAction.java rename to src/main/java/zejfseis4/ui/action/IgnoreAction.java index 5df1e6f..6cdcdbb 100644 --- a/src/main/java/com/morce/zejfseis4/ui/action/IgnoreAction.java +++ b/src/main/java/zejfseis4/ui/action/IgnoreAction.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui.action; +package zejfseis4.ui.action; import java.awt.Component; import java.awt.Window; diff --git a/src/main/java/com/morce/zejfseis4/ui/action/TerminateAction.java b/src/main/java/zejfseis4/ui/action/TerminateAction.java similarity index 93% rename from src/main/java/com/morce/zejfseis4/ui/action/TerminateAction.java rename to src/main/java/zejfseis4/ui/action/TerminateAction.java index df83d2e..4f7296f 100644 --- a/src/main/java/com/morce/zejfseis4/ui/action/TerminateAction.java +++ b/src/main/java/zejfseis4/ui/action/TerminateAction.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui.action; +package zejfseis4.ui.action; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; diff --git a/src/main/java/com/morce/zejfseis4/ui/icon.png b/src/main/java/zejfseis4/ui/icon.png similarity index 100% rename from src/main/java/com/morce/zejfseis4/ui/icon.png rename to src/main/java/zejfseis4/ui/icon.png diff --git a/src/main/java/com/morce/zejfseis4/ui/model/Column.java b/src/main/java/zejfseis4/ui/model/Column.java similarity index 96% rename from src/main/java/com/morce/zejfseis4/ui/model/Column.java rename to src/main/java/zejfseis4/ui/model/Column.java index 8bcdff6..2624b22 100644 --- a/src/main/java/com/morce/zejfseis4/ui/model/Column.java +++ b/src/main/java/zejfseis4/ui/model/Column.java @@ -1,10 +1,10 @@ -package com.morce.zejfseis4.ui.model; +package zejfseis4.ui.model; import java.util.Objects; import java.util.function.BiConsumer; import java.util.function.Function; -import com.morce.zejfseis4.ui.renderer.TableCellRendererAdapter; +import zejfseis4.ui.renderer.TableCellRendererAdapter; abstract class Column { diff --git a/src/main/java/com/morce/zejfseis4/ui/model/EventTableModel.java b/src/main/java/zejfseis4/ui/model/EventTableModel.java similarity index 74% rename from src/main/java/com/morce/zejfseis4/ui/model/EventTableModel.java rename to src/main/java/zejfseis4/ui/model/EventTableModel.java index 38bb776..3b8e60c 100644 --- a/src/main/java/com/morce/zejfseis4/ui/model/EventTableModel.java +++ b/src/main/java/zejfseis4/ui/model/EventTableModel.java @@ -1,23 +1,23 @@ -package com.morce.zejfseis4.ui.model; +package zejfseis4.ui.model; import java.time.LocalDateTime; import java.util.List; import javax.swing.SwingConstants; -import com.morce.zejfseis4.events.DetectionStatus; -import com.morce.zejfseis4.events.Event; -import com.morce.zejfseis4.events.EventDistance; -import com.morce.zejfseis4.scale.Scales; -import com.morce.zejfseis4.ui.renderer.DetectableRenderer; -import com.morce.zejfseis4.ui.renderer.DetectedRenderer; -import com.morce.zejfseis4.ui.renderer.EventDistanceRenderer; -import com.morce.zejfseis4.ui.renderer.IntensityRenderer; -import com.morce.zejfseis4.ui.renderer.LocalDateRenderer; -import com.morce.zejfseis4.ui.renderer.MagnitudeRenderer; -import com.morce.zejfseis4.ui.renderer.NameRenderer; -import com.morce.zejfseis4.ui.renderer.ScaleRenderer; -import com.morce.zejfseis4.ui.renderer.TableCellRendererAdapter; +import zejfseis4.events.DetectionStatus; +import zejfseis4.events.Event; +import zejfseis4.events.EventDistance; +import zejfseis4.scale.Scales; +import zejfseis4.ui.renderer.DetectableRenderer; +import zejfseis4.ui.renderer.DetectedRenderer; +import zejfseis4.ui.renderer.EventDistanceRenderer; +import zejfseis4.ui.renderer.IntensityRenderer; +import zejfseis4.ui.renderer.LocalDateRenderer; +import zejfseis4.ui.renderer.MagnitudeRenderer; +import zejfseis4.ui.renderer.NameRenderer; +import zejfseis4.ui.renderer.ScaleRenderer; +import zejfseis4.ui.renderer.TableCellRendererAdapter; public class EventTableModel extends FilterableTableModel { diff --git a/src/main/java/com/morce/zejfseis4/ui/model/FilterableTableModel.java b/src/main/java/zejfseis4/ui/model/FilterableTableModel.java similarity index 97% rename from src/main/java/com/morce/zejfseis4/ui/model/FilterableTableModel.java rename to src/main/java/zejfseis4/ui/model/FilterableTableModel.java index 751175e..2b1184e 100644 --- a/src/main/java/com/morce/zejfseis4/ui/model/FilterableTableModel.java +++ b/src/main/java/zejfseis4/ui/model/FilterableTableModel.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui.model; +package zejfseis4.ui.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/morce/zejfseis4/ui/renderer/DetectableRenderer.java b/src/main/java/zejfseis4/ui/renderer/DetectableRenderer.java similarity index 70% rename from src/main/java/com/morce/zejfseis4/ui/renderer/DetectableRenderer.java rename to src/main/java/zejfseis4/ui/renderer/DetectableRenderer.java index 037d026..c528fdf 100644 --- a/src/main/java/com/morce/zejfseis4/ui/renderer/DetectableRenderer.java +++ b/src/main/java/zejfseis4/ui/renderer/DetectableRenderer.java @@ -1,7 +1,7 @@ -package com.morce.zejfseis4.ui.renderer; +package zejfseis4.ui.renderer; -import com.morce.zejfseis4.events.Event; -import com.morce.zejfseis4.scale.Scales; +import zejfseis4.events.Event; +import zejfseis4.scale.Scales; public class DetectableRenderer extends ScaleRenderer { diff --git a/src/main/java/com/morce/zejfseis4/ui/renderer/DetectedRenderer.java b/src/main/java/zejfseis4/ui/renderer/DetectedRenderer.java similarity index 85% rename from src/main/java/com/morce/zejfseis4/ui/renderer/DetectedRenderer.java rename to src/main/java/zejfseis4/ui/renderer/DetectedRenderer.java index 8cdb8ad..e90d405 100644 --- a/src/main/java/com/morce/zejfseis4/ui/renderer/DetectedRenderer.java +++ b/src/main/java/zejfseis4/ui/renderer/DetectedRenderer.java @@ -1,9 +1,9 @@ -package com.morce.zejfseis4.ui.renderer; +package zejfseis4.ui.renderer; import java.awt.Color; -import com.morce.zejfseis4.events.DetectionStatus; -import com.morce.zejfseis4.events.Event; +import zejfseis4.events.DetectionStatus; +import zejfseis4.events.Event; public class DetectedRenderer extends TableCellRendererAdapter { diff --git a/src/main/java/com/morce/zejfseis4/ui/renderer/EventDistanceRenderer.java b/src/main/java/zejfseis4/ui/renderer/EventDistanceRenderer.java similarity index 74% rename from src/main/java/com/morce/zejfseis4/ui/renderer/EventDistanceRenderer.java rename to src/main/java/zejfseis4/ui/renderer/EventDistanceRenderer.java index e50e5cf..4ebad38 100644 --- a/src/main/java/com/morce/zejfseis4/ui/renderer/EventDistanceRenderer.java +++ b/src/main/java/zejfseis4/ui/renderer/EventDistanceRenderer.java @@ -1,9 +1,9 @@ -package com.morce.zejfseis4.ui.renderer; +package zejfseis4.ui.renderer; import java.awt.Color; -import com.morce.zejfseis4.events.Event; -import com.morce.zejfseis4.events.EventDistance; +import zejfseis4.events.Event; +import zejfseis4.events.EventDistance; public class EventDistanceRenderer extends TableCellRendererAdapter { diff --git a/src/main/java/com/morce/zejfseis4/ui/renderer/IntensityRenderer.java b/src/main/java/zejfseis4/ui/renderer/IntensityRenderer.java similarity index 77% rename from src/main/java/com/morce/zejfseis4/ui/renderer/IntensityRenderer.java rename to src/main/java/zejfseis4/ui/renderer/IntensityRenderer.java index 3ed8f15..1fc23dd 100644 --- a/src/main/java/com/morce/zejfseis4/ui/renderer/IntensityRenderer.java +++ b/src/main/java/zejfseis4/ui/renderer/IntensityRenderer.java @@ -1,10 +1,10 @@ -package com.morce.zejfseis4.ui.renderer; +package zejfseis4.ui.renderer; import java.awt.Color; -import com.morce.zejfseis4.events.DetectionStatus; -import com.morce.zejfseis4.events.Event; -import com.morce.zejfseis4.events.Intensity; +import zejfseis4.events.DetectionStatus; +import zejfseis4.events.Event; +import zejfseis4.events.Intensity; public class IntensityRenderer extends TableCellRendererAdapter { diff --git a/src/main/java/com/morce/zejfseis4/ui/renderer/LocalDateRenderer.java b/src/main/java/zejfseis4/ui/renderer/LocalDateRenderer.java similarity index 92% rename from src/main/java/com/morce/zejfseis4/ui/renderer/LocalDateRenderer.java rename to src/main/java/zejfseis4/ui/renderer/LocalDateRenderer.java index 3a07377..1c295e9 100644 --- a/src/main/java/com/morce/zejfseis4/ui/renderer/LocalDateRenderer.java +++ b/src/main/java/zejfseis4/ui/renderer/LocalDateRenderer.java @@ -1,10 +1,10 @@ -package com.morce.zejfseis4.ui.renderer; +package zejfseis4.ui.renderer; import java.awt.Color; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import com.morce.zejfseis4.events.Event; +import zejfseis4.events.Event; public class LocalDateRenderer extends TableCellRendererAdapter { diff --git a/src/main/java/com/morce/zejfseis4/ui/renderer/MagnitudeRenderer.java b/src/main/java/zejfseis4/ui/renderer/MagnitudeRenderer.java similarity index 72% rename from src/main/java/com/morce/zejfseis4/ui/renderer/MagnitudeRenderer.java rename to src/main/java/zejfseis4/ui/renderer/MagnitudeRenderer.java index 35279dc..52d4642 100644 --- a/src/main/java/com/morce/zejfseis4/ui/renderer/MagnitudeRenderer.java +++ b/src/main/java/zejfseis4/ui/renderer/MagnitudeRenderer.java @@ -1,7 +1,7 @@ -package com.morce.zejfseis4.ui.renderer; +package zejfseis4.ui.renderer; -import com.morce.zejfseis4.events.Event; -import com.morce.zejfseis4.scale.Scales; +import zejfseis4.events.Event; +import zejfseis4.scale.Scales; public class MagnitudeRenderer extends ScaleRenderer { diff --git a/src/main/java/com/morce/zejfseis4/ui/renderer/NameRenderer.java b/src/main/java/zejfseis4/ui/renderer/NameRenderer.java similarity index 91% rename from src/main/java/com/morce/zejfseis4/ui/renderer/NameRenderer.java rename to src/main/java/zejfseis4/ui/renderer/NameRenderer.java index 57dba91..4c8c86c 100644 --- a/src/main/java/com/morce/zejfseis4/ui/renderer/NameRenderer.java +++ b/src/main/java/zejfseis4/ui/renderer/NameRenderer.java @@ -1,8 +1,8 @@ -package com.morce.zejfseis4.ui.renderer; +package zejfseis4.ui.renderer; import java.awt.Color; -import com.morce.zejfseis4.events.Event; +import zejfseis4.events.Event; public class NameRenderer extends TableCellRendererAdapter { diff --git a/src/main/java/com/morce/zejfseis4/ui/renderer/ScaleRenderer.java b/src/main/java/zejfseis4/ui/renderer/ScaleRenderer.java similarity index 87% rename from src/main/java/com/morce/zejfseis4/ui/renderer/ScaleRenderer.java rename to src/main/java/zejfseis4/ui/renderer/ScaleRenderer.java index 2291bac..df19079 100644 --- a/src/main/java/com/morce/zejfseis4/ui/renderer/ScaleRenderer.java +++ b/src/main/java/zejfseis4/ui/renderer/ScaleRenderer.java @@ -1,9 +1,9 @@ -package com.morce.zejfseis4.ui.renderer; +package zejfseis4.ui.renderer; import java.awt.Color; -import com.morce.zejfseis4.events.Event; -import com.morce.zejfseis4.scale.Scale; +import zejfseis4.events.Event; +import zejfseis4.scale.Scale; public class ScaleRenderer extends TableCellRendererAdapter { diff --git a/src/main/java/com/morce/zejfseis4/ui/renderer/TableCellRendererAdapter.java b/src/main/java/zejfseis4/ui/renderer/TableCellRendererAdapter.java similarity index 93% rename from src/main/java/com/morce/zejfseis4/ui/renderer/TableCellRendererAdapter.java rename to src/main/java/zejfseis4/ui/renderer/TableCellRendererAdapter.java index 4212816..c9bf33d 100644 --- a/src/main/java/com/morce/zejfseis4/ui/renderer/TableCellRendererAdapter.java +++ b/src/main/java/zejfseis4/ui/renderer/TableCellRendererAdapter.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.ui.renderer; +package zejfseis4.ui.renderer; import java.awt.Color; import java.awt.Component; @@ -7,7 +7,7 @@ import javax.swing.SwingConstants; import javax.swing.table.DefaultTableCellRenderer; -import com.morce.zejfseis4.ui.model.FilterableTableModel; +import zejfseis4.ui.model.FilterableTableModel; public class TableCellRendererAdapter extends DefaultTableCellRenderer { diff --git a/src/main/java/com/morce/zejfseis4/utils/GeoUtils.java b/src/main/java/zejfseis4/utils/GeoUtils.java similarity index 96% rename from src/main/java/com/morce/zejfseis4/utils/GeoUtils.java rename to src/main/java/zejfseis4/utils/GeoUtils.java index 0f39382..e799044 100755 --- a/src/main/java/com/morce/zejfseis4/utils/GeoUtils.java +++ b/src/main/java/zejfseis4/utils/GeoUtils.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.utils; +package zejfseis4.utils; public interface GeoUtils { public static final double EARTH_CIRCUMFERENCE = 40082; diff --git a/src/main/java/com/morce/zejfseis4/utils/Multithread.java b/src/main/java/zejfseis4/utils/Multithread.java similarity index 96% rename from src/main/java/com/morce/zejfseis4/utils/Multithread.java rename to src/main/java/zejfseis4/utils/Multithread.java index ad781eb..0c6bab0 100644 --- a/src/main/java/com/morce/zejfseis4/utils/Multithread.java +++ b/src/main/java/zejfseis4/utils/Multithread.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.utils; +package zejfseis4.utils; public abstract class Multithread { diff --git a/src/main/java/com/morce/zejfseis4/utils/NamedThreadFactory.java b/src/main/java/zejfseis4/utils/NamedThreadFactory.java similarity index 89% rename from src/main/java/com/morce/zejfseis4/utils/NamedThreadFactory.java rename to src/main/java/zejfseis4/utils/NamedThreadFactory.java index ec395d1..97388d4 100755 --- a/src/main/java/com/morce/zejfseis4/utils/NamedThreadFactory.java +++ b/src/main/java/zejfseis4/utils/NamedThreadFactory.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.utils; +package zejfseis4.utils; import java.util.concurrent.ThreadFactory; diff --git a/src/main/java/com/morce/zejfseis4/utils/SpringUtilities.java b/src/main/java/zejfseis4/utils/SpringUtilities.java similarity index 97% rename from src/main/java/com/morce/zejfseis4/utils/SpringUtilities.java rename to src/main/java/zejfseis4/utils/SpringUtilities.java index 4905c41..9104a27 100755 --- a/src/main/java/com/morce/zejfseis4/utils/SpringUtilities.java +++ b/src/main/java/zejfseis4/utils/SpringUtilities.java @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.morce.zejfseis4.utils; +package zejfseis4.utils; import javax.swing.*; import javax.swing.SpringLayout; diff --git a/src/main/java/com/morce/zejfseis4/utils/TravelTimeTable.java b/src/main/java/zejfseis4/utils/TravelTimeTable.java similarity index 99% rename from src/main/java/com/morce/zejfseis4/utils/TravelTimeTable.java rename to src/main/java/zejfseis4/utils/TravelTimeTable.java index 4a9ca14..377c774 100755 --- a/src/main/java/com/morce/zejfseis4/utils/TravelTimeTable.java +++ b/src/main/java/zejfseis4/utils/TravelTimeTable.java @@ -1,4 +1,4 @@ -package com.morce.zejfseis4.utils; +package zejfseis4.utils; import java.util.ArrayList;