Change maven artifact name to DarknetChat. Make package and import ch…

…anges to finish up renaming.
OveTomash84 · Jul 25, 2011 · 327881b · 327881b
1 parent efb370c
commit 327881b
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>plugins</groupId>
-	<artifactId>N2NChat</artifactId>
+	<artifactId>DarknetChat</artifactId>
 	<version>0.0.1</version>
 	<dependencies>
 		<dependency>
@@ -49,7 +49,7 @@
 				<configuration>
 					<archive>
 						<manifestEntries>
-							<Plugin-Main-Class>plugins.N2NChat.N2NChatPlugin</Plugin-Main-Class>
+							<Plugin-Main-Class>plugins.N2NChat.core.N2NChatPlugin</Plugin-Main-Class>
 						</manifestEntries>
 					</archive>
 				</configuration>
@@ -67,7 +67,7 @@
 					</archiverConfig>
 					<archive>
 						<manifestEntries>
-							<Plugin-Main-Class>plugins.N2NChat.N2NChatPlugin</Plugin-Main-Class>
+							<Plugin-Main-Class>plugins.N2NChat.core.N2NChatPlugin</Plugin-Main-Class>
 						</manifestEntries>
 					</archive>
 				</configuration>

diff --git a/src/main/java/plugins/N2NChat/core/ByteArray.java b/src/main/java/plugins/N2NChat/core/ByteArray.java
@@ -1,4 +1,4 @@
-package plugins.N2NChat;
+package plugins.N2NChat.core;
 
 import java.util.Arrays;
 

diff --git a/src/main/java/plugins/N2NChat/core/ChatRoom.java b/src/main/java/plugins/N2NChat/core/ChatRoom.java
@@ -1,4 +1,4 @@
-package plugins.N2NChat;
+package plugins.N2NChat.core;
 
 import freenet.l10n.PluginL10n;
 import freenet.node.DarknetPeerNode;
@@ -7,15 +7,14 @@
 import freenet.support.Logger;
 import freenet.support.SimpleFieldSet;
 
-import java.awt.*;
+import java.awt.Color;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * The ChatRoom class keeps track of what has been said in a chat room, parses new messages, formats them, and is

diff --git a/.../java/plugins/N2NChat/webui/HSLColor.java → ...n/java/plugins/N2NChat/core/HSLColor.java b/.../java/plugins/N2NChat/webui/HSLColor.java → ...n/java/plugins/N2NChat/core/HSLColor.java
@@ -1,4 +1,4 @@
-package plugins.N2NChat;
+package plugins.N2NChat.core;
 
 import java.awt.*;
 // Code from http://tips4java.wordpress.com/2009/07/05/hsl-color/

diff --git a/src/main/java/plugins/N2NChat/core/N2NChatPlugin.java b/src/main/java/plugins/N2NChat/core/N2NChatPlugin.java
@@ -13,9 +13,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package plugins.N2NChat;
+package plugins.N2NChat.core;
 
-import freenet.client.filter.ContentFilter;
 import freenet.clients.http.*;
 import freenet.l10n.BaseL10n.LANGUAGE;
 import freenet.l10n.PluginL10n;
@@ -28,16 +27,13 @@
 import freenet.support.IllegalBase64Exception;
 import freenet.support.Logger;
 import freenet.support.SimpleFieldSet;
-import freenet.support.api.HTTPRequest;
-import freenet.support.io.Closer;
 
-import javax.xml.soap.Node;
-import java.io.ByteArrayOutputStream;
+import plugins.N2NChat.webui.DisplayChatToadlet;
+import plugins.N2NChat.webui.MainPageToadlet;
+import plugins.N2NChat.webui.StaticResourceToadlet;
+
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import java.net.URLConnection;
-import java.net.URI;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;

diff --git a/src/main/java/plugins/N2NChat/webui/DisplayChatToadlet.java b/src/main/java/plugins/N2NChat/webui/DisplayChatToadlet.java
@@ -1,4 +1,4 @@
-package plugins.N2NChat;
+package plugins.N2NChat.webui;
 
 import freenet.clients.http.*;
 import freenet.l10n.NodeL10n;
@@ -12,11 +12,14 @@
 import freenet.support.MultiValueTable;
 import freenet.support.api.HTTPRequest;
 
+import plugins.N2NChat.core.ByteArray;
+import plugins.N2NChat.core.ChatRoom;
+import plugins.N2NChat.core.N2NChatPlugin;
+
 import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 
 public class DisplayChatToadlet extends Toadlet implements LinkEnabledCallback {
 

diff --git a/src/main/java/plugins/N2NChat/webui/MainPageToadlet.java b/src/main/java/plugins/N2NChat/webui/MainPageToadlet.java
@@ -1,16 +1,18 @@
-package plugins.N2NChat;
+package plugins.N2NChat.webui;
 
 import freenet.clients.http.*;
 import freenet.l10n.NodeL10n;
 import freenet.l10n.PluginL10n;
-import freenet.node.DarknetPeerNode;
 import freenet.node.Node;
 import freenet.node.NodeClientCore;
 import freenet.pluginmanager.PluginRespirator;
 import freenet.support.HTMLNode;
 import freenet.support.MultiValueTable;
 import freenet.support.api.HTTPRequest;
 
+import plugins.N2NChat.core.N2NChatPlugin;
+import plugins.N2NChat.core.ChatRoom;
+
 import java.io.IOException;
 import java.net.URI;
 import java.util.HashMap;

diff --git a/src/main/java/plugins/N2NChat/webui/StaticResourceToadlet.java b/src/main/java/plugins/N2NChat/webui/StaticResourceToadlet.java
@@ -1,4 +1,4 @@
-package plugins.N2NChat;
+package plugins.N2NChat.webui;
 
 import freenet.client.filter.ContentFilter;
 import freenet.clients.http.RedirectException;
@@ -10,11 +10,9 @@
 import freenet.support.io.Closer;
 import org.apache.commons.io.IOUtils;
 
-import javax.tools.JavaCompiler;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.FileNameMap;
 import java.net.URI;
 import java.net.URLConnection;
 

diff --git a/src/test/java/plugins/N2NChat/ByteArrayTest.java b/src/test/java/plugins/N2NChat/ByteArrayTest.java
@@ -1,4 +1,4 @@
-package plugins.N2NChat;
+package plugins.N2NChat.core;
 
 import junit.framework.TestCase;