From a83bbfd5c510367a194073b1db132022cacf65ed Mon Sep 17 00:00:00 2001 From: jeff Date: Tue, 30 Sep 2014 00:25:36 -0400 Subject: fixed nasty issue with renaming inner classes, but alas, more bugs remain --- src/cuchaz/enigma/mapping/NameValidator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 9adf1ac..c6ae596 100644 --- a/src/cuchaz/enigma/mapping/NameValidator.java +++ b/src/cuchaz/enigma/mapping/NameValidator.java @@ -55,7 +55,7 @@ public class NameValidator ClassPattern = Pattern.compile( String.format( "^(%s(\\.|/))*(%s)$", identifierRegex, identifierRegex ) ); } - public static String validateClassName( String name ) + public static String validateClassName( String name, boolean packageRequired ) { if( name == null ) { @@ -65,9 +65,9 @@ public class NameValidator { throw new IllegalNameException( name, "This doesn't look like a legal class name" ); } - if( new ClassEntry( name ).getPackageName() == null ) + if( packageRequired && new ClassEntry( name ).getPackageName() == null ) { - throw new IllegalNameException( name, "Classes must be in a package" ); + throw new IllegalNameException( name, "Class must be in a package" ); } return Descriptor.toJvmName( name ); } -- cgit v1.2.3