litesoft
Diff Revisions
820
vs
821
for /trunk/Java/KeyHole/src/org/litesoft/aokeyhole/swing/mains/mementobeans/DirectoryPackageSubSystemPersister.java
|
@@ -3,7 +3,7 @@ |
3 |
3 |
|
import java.io.*; |
4 |
4 |
|
|
5 |
5 |
|
import org.litesoft.aokeyhole.persist.*; |
6 |
|
- |
import org.litesoft.core.util.*; |
|
6 |
+ |
import org.litesoft.core.typeutils.*; |
7 |
7 |
|
import org.litesoft.textfiledirectory.*; |
8 |
8 |
|
|
9 |
9 |
|
public class DirectoryPackageSubSystemPersister implements SubSystemPersister |
|
@@ -12,8 +12,8 @@ |
12 |
12 |
|
|
13 |
13 |
|
public DirectoryPackageSubSystemPersister( String pDirectory, String pPackage ) |
14 |
14 |
|
{ |
15 |
|
- |
pPackage = UtilsCommon.assertNotNullNotEmpty( "Package", pPackage ); |
16 |
|
- |
File zDirectory = new File( UtilsCommon.assertNotNullNotEmpty( "Directory", pDirectory ) ); |
|
15 |
+ |
pPackage = Strings.assertNotNullNotEmpty( "Package", pPackage ); |
|
16 |
+ |
File zDirectory = new File( Strings.assertNotNullNotEmpty( "Directory", pDirectory ) ); |
17 |
17 |
|
if ( !zDirectory.isDirectory() ) |
18 |
18 |
|
{ |
19 |
19 |
|
throw new IllegalArgumentException( "Not a Directory: " + pDirectory ); |
|
@@ -29,7 +29,7 @@ |
29 |
29 |
|
int zAt = pPackage.indexOf( '.' ); |
30 |
30 |
|
if ( (zAt < 1) || pPackage.endsWith( "." ) ) |
31 |
31 |
|
{ |
32 |
|
- |
if ( UtilsCommon.isAsciiIdentifier( pPackage ) ) |
|
32 |
+ |
if ( Strings.isAsciiIdentifier( pPackage ) ) |
33 |
33 |
|
{ |
34 |
34 |
|
return pPackage; |
35 |
35 |
|
} |
|
@@ -49,7 +49,7 @@ |
49 |
49 |
|
|
50 |
50 |
|
private String assertPackageFragmentIdentifier( String pPackage, int pFrom, String pIdentifierCandidate ) |
51 |
51 |
|
{ |
52 |
|
- |
if ( UtilsCommon.isAsciiIdentifier( pIdentifierCandidate ) ) |
|
52 |
+ |
if ( Strings.isAsciiIdentifier( pIdentifierCandidate ) ) |
53 |
53 |
|
{ |
54 |
54 |
|
return pIdentifierCandidate; |
55 |
55 |
|
} |