| |
@@ -17,7 +17,7 @@ |
| 17 |
17 |
|
|
| 18 |
18 |
|
public static File findDirectory( String pStartingPath, String pSubPath ) |
| 19 |
19 |
|
{ |
| 20 |
|
- |
Utils.assertNotNull( "StartingPath", pStartingPath ); |
| |
20 |
+ |
Objects.assertNotNull( "StartingPath", pStartingPath ); |
| 21 |
21 |
|
pSubPath = Utils.assertNotNullNotEmpty( "SubPath", pSubPath ); |
| 22 |
22 |
|
|
| 23 |
23 |
|
File target = locateDirectory( pStartingPath, pSubPath, justTheLastName( pSubPath ) + ".path" ); |
| |
@@ -70,7 +70,7 @@ |
| 70 |
70 |
|
public static void checkDirectoryable( File pExpectedDir ) |
| 71 |
71 |
|
throws FileSystemException |
| 72 |
72 |
|
{ |
| 73 |
|
- |
Utils.assertNotNull( "ExpectedDir", pExpectedDir ); |
| |
73 |
+ |
Objects.assertNotNull( "ExpectedDir", pExpectedDir ); |
| 74 |
74 |
|
if ( !pExpectedDir.isDirectory() && pExpectedDir.exists() ) |
| 75 |
75 |
|
{ |
| 76 |
76 |
|
throw new FileSystemException( "Exists, but is Not a Directory: " + pExpectedDir.getAbsolutePath() ); |
| |
@@ -80,7 +80,7 @@ |
| 80 |
80 |
|
public static File insureParentDirectory( File pExpectedFile ) |
| 81 |
81 |
|
throws FileSystemException |
| 82 |
82 |
|
{ |
| 83 |
|
- |
Utils.assertNotNull( "ExpectedFile", pExpectedFile ); |
| |
83 |
+ |
Objects.assertNotNull( "ExpectedFile", pExpectedFile ); |
| 84 |
84 |
|
File zParentFile = pExpectedFile.getParentFile(); |
| 85 |
85 |
|
if ( zParentFile != null ) |
| 86 |
86 |
|
{ |
| |
@@ -92,7 +92,7 @@ |
| 92 |
92 |
|
public static File insureDirectory( File pExpectedDir ) |
| 93 |
93 |
|
throws FileSystemException |
| 94 |
94 |
|
{ |
| 95 |
|
- |
Utils.assertNotNull( "ExpectedDir", pExpectedDir ); |
| |
95 |
+ |
Objects.assertNotNull( "ExpectedDir", pExpectedDir ); |
| 96 |
96 |
|
if ( !pExpectedDir.isDirectory() ) |
| 97 |
97 |
|
{ |
| 98 |
98 |
|
if ( pExpectedDir.exists() ) |
| |
@@ -126,8 +126,8 @@ |
| 126 |
126 |
|
public static void moveFile( File pSourceFile, File pTargetFile ) |
| 127 |
127 |
|
throws FileSystemException |
| 128 |
128 |
|
{ |
| 129 |
|
- |
Utils.assertNotNull( "SourceFile", pSourceFile ); |
| 130 |
|
- |
Utils.assertNotNull( "TargetFile", pTargetFile ); |
| |
129 |
+ |
Objects.assertNotNull( "SourceFile", pSourceFile ); |
| |
130 |
+ |
Objects.assertNotNull( "TargetFile", pTargetFile ); |
| 131 |
131 |
|
Throwable zProblem = null; |
| 132 |
132 |
|
try |
| 133 |
133 |
|
{ |
| |
@@ -153,7 +153,7 @@ |
| 153 |
153 |
|
public static void deleteIfExists( File pDirectory ) |
| 154 |
154 |
|
throws FileSystemException |
| 155 |
155 |
|
{ |
| 156 |
|
- |
Utils.assertNotNull( "Directory", pDirectory ); |
| |
156 |
+ |
Objects.assertNotNull( "Directory", pDirectory ); |
| 157 |
157 |
|
if ( pDirectory.isDirectory() ) |
| 158 |
158 |
|
{ |
| 159 |
159 |
|
LowLevelDeleteAllEntries( pDirectory ); |
| |
@@ -168,7 +168,7 @@ |
| 168 |
168 |
|
public static void deleteAllEntries( File pDirectory ) |
| 169 |
169 |
|
throws FileSystemException |
| 170 |
170 |
|
{ |
| 171 |
|
- |
Utils.assertNotNull( "Directory", pDirectory ); |
| |
171 |
+ |
Objects.assertNotNull( "Directory", pDirectory ); |
| 172 |
172 |
|
if ( pDirectory.isDirectory() ) |
| 173 |
173 |
|
{ |
| 174 |
174 |
|
LowLevelDeleteAllEntries( pDirectory ); |
View this file contents
View the full history
Commits for