From 7da3de20aa672783fb892d0e38ed2c3edd6ece01 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 8 Feb 2018 13:22:01 +0000
Subject: [PATCH] Util: Move RFC822Date from router to core for SusiMail

---
 .../java/src/net/i2p/router/update/NewsFetcher.java           | 2 +-
 .../java/src/net/i2p/router/update/UnsignedUpdateChecker.java | 2 +-
 .../java/src/net/i2p/router/update/UnsignedUpdateRunner.java  | 2 +-
 .../i2p/router => core/java/src/net/i2p}/util/RFC822Date.java | 4 ++--
 router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename {router/java/src/net/i2p/router => core/java/src/net/i2p}/util/RFC822Date.java (96%)

diff --git a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java
index 51e14a44e9..076aed8cbd 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java
@@ -40,7 +40,6 @@ import net.i2p.router.news.NewsEntry;
 import net.i2p.router.news.NewsManager;
 import net.i2p.router.news.NewsMetadata;
 import net.i2p.router.news.NewsXMLParser;
-import net.i2p.router.util.RFC822Date;
 import net.i2p.router.web.ConfigUpdateHandler;
 import net.i2p.router.web.NewsHelper;
 import net.i2p.update.*;
@@ -51,6 +50,7 @@ import net.i2p.util.EepGet;
 import net.i2p.util.FileUtil;
 import net.i2p.util.Log;
 import net.i2p.util.PortMapper;
+import net.i2p.util.RFC822Date;
 import net.i2p.util.ReusableGZIPInputStream;
 import net.i2p.util.SecureFile;
 import net.i2p.util.SecureFileOutputStream;
diff --git a/apps/routerconsole/java/src/net/i2p/router/update/UnsignedUpdateChecker.java b/apps/routerconsole/java/src/net/i2p/router/update/UnsignedUpdateChecker.java
index 02406e4189..2881fa4781 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/UnsignedUpdateChecker.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/UnsignedUpdateChecker.java
@@ -4,12 +4,12 @@ import java.net.URI;
 import java.util.List;
 
 import net.i2p.router.RouterContext;
-import net.i2p.router.util.RFC822Date;
 import net.i2p.router.web.ConfigUpdateHandler;
 import net.i2p.update.*;
 import net.i2p.util.EepHead;
 import net.i2p.util.Log;
 import net.i2p.util.PortMapper;
+import net.i2p.util.RFC822Date;
 import net.i2p.util.SystemVersion;
 
 /**
diff --git a/apps/routerconsole/java/src/net/i2p/router/update/UnsignedUpdateRunner.java b/apps/routerconsole/java/src/net/i2p/router/update/UnsignedUpdateRunner.java
index 5d2e097787..5cc6fdbc02 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/UnsignedUpdateRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/UnsignedUpdateRunner.java
@@ -5,12 +5,12 @@ import java.net.URI;
 import java.util.List;
 
 import net.i2p.router.RouterContext;
-import net.i2p.router.util.RFC822Date;
 import net.i2p.router.web.ConfigUpdateHandler;
 import static net.i2p.update.UpdateType.*;
 import net.i2p.util.EepGet;
 import net.i2p.util.Log;
 import net.i2p.util.PortMapper;
+import net.i2p.util.RFC822Date;
 
     
 /**
diff --git a/router/java/src/net/i2p/router/util/RFC822Date.java b/core/java/src/net/i2p/util/RFC822Date.java
similarity index 96%
rename from router/java/src/net/i2p/router/util/RFC822Date.java
rename to core/java/src/net/i2p/util/RFC822Date.java
index a61e86ef77..6202920956 100644
--- a/router/java/src/net/i2p/router/util/RFC822Date.java
+++ b/core/java/src/net/i2p/util/RFC822Date.java
@@ -1,4 +1,4 @@
-package net.i2p.router.util;
+package net.i2p.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -8,7 +8,7 @@ import java.util.TimeZone;
 
 /**
  *  Moved from NewsFetcher
- *  @since 0.8.5
+ *  @since 0.8.5; moved from net.i2p.router.util in 0.9.34
  */
 public abstract class RFC822Date {
 
diff --git a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
index 57e43d093e..f658900638 100644
--- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
+++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
@@ -27,12 +27,12 @@ import net.i2p.data.Hash;
 import net.i2p.router.RouterClock;
 import net.i2p.router.RouterContext;
 import net.i2p.router.util.EventLog;
-import net.i2p.router.util.RFC822Date;
 import net.i2p.util.EepGet;
 import net.i2p.util.FileUtil;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
 import net.i2p.util.PortMapper;
+import net.i2p.util.RFC822Date;
 import net.i2p.util.SecureDirectory;
 import net.i2p.util.SecureFileOutputStream;
 import net.i2p.util.SSLEepGet;