From 8fa1741b621644ef84a9395a4c395d4ff3a89207 Mon Sep 17 00:00:00 2001
From: jeff
Date: Sat, 23 Aug 2014 23:43:31 -0400
Subject: moved all classes from the default package into a package called
 "default" so they can be properly imported by other classes

---
 src/cuchaz/enigma/mapping/NameValidator.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/cuchaz/enigma/mapping/NameValidator.java')

diff --git a/src/cuchaz/enigma/mapping/NameValidator.java b/src/cuchaz/enigma/mapping/NameValidator.java
index a8421fa..6df893f 100644
--- a/src/cuchaz/enigma/mapping/NameValidator.java
+++ b/src/cuchaz/enigma/mapping/NameValidator.java
@@ -59,7 +59,11 @@ public class NameValidator
 	{
 		if( name == null || !ClassPattern.matcher( name ).matches() || ReservedWords.contains( name ) )
 		{
-			throw new IllegalNameException( name );
+			throw new IllegalNameException( name, "This doesn't look like a legal class name" );
+		}
+		if( new ClassEntry( name ).getPackageName() == null )
+		{
+			throw new IllegalNameException( name, "Classes must be in a package" );
 		}
 		return Descriptor.toJvmName( name );
 	}
@@ -68,7 +72,7 @@ public class NameValidator
 	{
 		if( name == null || !IdentifierPattern.matcher( name ).matches() || ReservedWords.contains( name ) )
 		{
-			throw new IllegalNameException( name );
+			throw new IllegalNameException( name, "This doesn't look like a legal identifier" );
 		}
 		return name;
 	}
-- 
cgit v1.2.3