diff options
| author | 2014-09-30 00:25:36 -0400 | |
|---|---|---|
| committer | 2014-09-30 00:25:36 -0400 | |
| commit | a83bbfd5c510367a194073b1db132022cacf65ed (patch) | |
| tree | abfd7520b79ef1e64b7430bd81e75a30353b7f14 /src/cuchaz/enigma/mapping/NameValidator.java | |
| parent | fixed recognition of static initializer tokens (diff) | |
| download | enigma-fork-a83bbfd5c510367a194073b1db132022cacf65ed.tar.gz enigma-fork-a83bbfd5c510367a194073b1db132022cacf65ed.tar.xz enigma-fork-a83bbfd5c510367a194073b1db132022cacf65ed.zip | |
fixed nasty issue with renaming inner classes, but alas, more bugs remain
Diffstat (limited to 'src/cuchaz/enigma/mapping/NameValidator.java')
| -rw-r--r-- | src/cuchaz/enigma/mapping/NameValidator.java | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
| 55 | ClassPattern = Pattern.compile( String.format( "^(%s(\\.|/))*(%s)$", identifierRegex, identifierRegex ) ); | 55 | ClassPattern = Pattern.compile( String.format( "^(%s(\\.|/))*(%s)$", identifierRegex, identifierRegex ) ); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | public static String validateClassName( String name ) | 58 | public static String validateClassName( String name, boolean packageRequired ) |
| 59 | { | 59 | { |
| 60 | if( name == null ) | 60 | if( name == null ) |
| 61 | { | 61 | { |
| @@ -65,9 +65,9 @@ public class NameValidator | |||
| 65 | { | 65 | { |
| 66 | throw new IllegalNameException( name, "This doesn't look like a legal class name" ); | 66 | throw new IllegalNameException( name, "This doesn't look like a legal class name" ); |
| 67 | } | 67 | } |
| 68 | if( new ClassEntry( name ).getPackageName() == null ) | 68 | if( packageRequired && new ClassEntry( name ).getPackageName() == null ) |
| 69 | { | 69 | { |
| 70 | throw new IllegalNameException( name, "Classes must be in a package" ); | 70 | throw new IllegalNameException( name, "Class must be in a package" ); |
| 71 | } | 71 | } |
| 72 | return Descriptor.toJvmName( name ); | 72 | return Descriptor.toJvmName( name ); |
| 73 | } | 73 | } |