summaryrefslogtreecommitdiff
path: root/src/cuchaz/enigma/mapping/NameValidator.java
diff options
context:
space:
mode:
authorGravatar jeff2014-08-23 23:43:31 -0400
committerGravatar jeff2014-08-23 23:43:31 -0400
commit8fa1741b621644ef84a9395a4c395d4ff3a89207 (patch)
tree9cc054e2636dd13a32950ad68dba212275d33026 /src/cuchaz/enigma/mapping/NameValidator.java
parentadded export command with progress bar (diff)
downloadenigma-fork-8fa1741b621644ef84a9395a4c395d4ff3a89207.tar.gz
enigma-fork-8fa1741b621644ef84a9395a4c395d4ff3a89207.tar.xz
enigma-fork-8fa1741b621644ef84a9395a4c395d4ff3a89207.zip
moved all classes from the default package into a package called "default" so they can be properly imported by other classes
Diffstat (limited to 'src/cuchaz/enigma/mapping/NameValidator.java')
-rw-r--r--src/cuchaz/enigma/mapping/NameValidator.java8
1 files changed, 6 insertions, 2 deletions
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
59 { 59 {
60 if( name == null || !ClassPattern.matcher( name ).matches() || ReservedWords.contains( name ) ) 60 if( name == null || !ClassPattern.matcher( name ).matches() || ReservedWords.contains( name ) )
61 { 61 {
62 throw new IllegalNameException( name ); 62 throw new IllegalNameException( name, "This doesn't look like a legal class name" );
63 }
64 if( new ClassEntry( name ).getPackageName() == null )
65 {
66 throw new IllegalNameException( name, "Classes must be in a package" );
63 } 67 }
64 return Descriptor.toJvmName( name ); 68 return Descriptor.toJvmName( name );
65 } 69 }
@@ -68,7 +72,7 @@ public class NameValidator
68 { 72 {
69 if( name == null || !IdentifierPattern.matcher( name ).matches() || ReservedWords.contains( name ) ) 73 if( name == null || !IdentifierPattern.matcher( name ).matches() || ReservedWords.contains( name ) )
70 { 74 {
71 throw new IllegalNameException( name ); 75 throw new IllegalNameException( name, "This doesn't look like a legal identifier" );
72 } 76 }
73 return name; 77 return name;
74 } 78 }