You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/12/16 11:34:47 UTC
svn commit: r727012 - in /maven/mercury/trunk:
mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/
mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/
mercury-repo/mercury-repo-cache-fs/src/main/java/o...
Author: hboutemy
Date: Tue Dec 16 02:34:44 2008
New Revision: 727012
URL: http://svn.apache.org/viewvc?rev=727012&view=rev
Log:
renamed _lang constants to LANG and _log to LOG (previous changes lost when merging)
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java?rev=727012&r1=727011&r2=727012&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java Tue Dec 16 02:34:44 2008
@@ -40,7 +40,7 @@
public class Config
extends AbstractDataType
{
- private static final Language _lang = new DefaultLanguage( Config.class );
+ private static final Language LANG = new DefaultLanguage( Config.class );
Collection<Repo> _repos;
@@ -73,7 +73,7 @@
{
File cf = new File( a._certfile );
if( ! cf.exists() )
- throw new BuildException( _lang.getMessage( "config.no.cert.file", a._certfile ) );
+ throw new BuildException( LANG.getMessage( "config.no.cert.file", a._certfile ) );
try
{
@@ -252,14 +252,14 @@
Auth au = null;
if( _auths == null )
- throw new BuildException( _lang.getMessage( "config.no.auths", _authid ) );
+ throw new BuildException( LANG.getMessage( "config.no.auths", _authid ) );
for( Auth a : _auths )
if( _authid.equals( a.getId() ) )
au = a;
if( au == null )
- throw new BuildException( _lang.getMessage( "config.no.auth.for.id", _authid ) );
+ throw new BuildException( LANG.getMessage( "config.no.auth.for.id", _authid ) );
Credentials serverCred = createCredentials( au );
@@ -271,14 +271,14 @@
Auth au = null;
if( _auths == null )
- throw new BuildException( _lang.getMessage( "config.no.proxy.auths", _proxyauthid ) );
+ throw new BuildException( LANG.getMessage( "config.no.proxy.auths", _proxyauthid ) );
for( Auth a : _auths )
if( _proxyauthid.equals( a.getId() ) )
au = a;
if( au == null )
- throw new BuildException( _lang.getMessage( "config.no.proxy.auth.for.id", _proxyauthid ) );
+ throw new BuildException( LANG.getMessage( "config.no.proxy.auth.for.id", _proxyauthid ) );
Credentials proxyCred = createCredentials( au );
@@ -360,17 +360,17 @@
throws BuildException
{
if( _type == null )
- throw new BuildException( _lang.getMessage( "config.repo.verifier.no.type" ) );
+ throw new BuildException( LANG.getMessage( "config.repo.verifier.no.type" ) );
if( _properties == null || _properties.isEmpty() )
- throw new BuildException( _lang.getMessage( "config.repo.verifier.no.properties", _type ) );
+ throw new BuildException( LANG.getMessage( "config.repo.verifier.no.properties", _type ) );
if( PGP.equals( _type ) )
{
String keyRing = _properties.get( "keyring" );
if( keyRing == null )
- throw new BuildException( _lang.getMessage( "config.repo.verifier.pgp.no.keyring" ) );
+ throw new BuildException( LANG.getMessage( "config.repo.verifier.pgp.no.keyring" ) );
String pass = _properties.get( "pass" );
@@ -395,7 +395,7 @@
String keyId = _properties.get( "key" );
if( keyId == null || keyId.length() != 16 )
- throw new BuildException( _lang.getMessage( "config.repo.verifier.pgp.bad.keyid", keyId, keyRing ) );
+ throw new BuildException( LANG.getMessage( "config.repo.verifier.pgp.bad.keyid", keyId, keyRing ) );
try
{
@@ -420,7 +420,7 @@
return fac;
}
- throw new BuildException( _lang.getMessage( "config.repo.verifier.bad.type", _type ) );
+ throw new BuildException( LANG.getMessage( "config.repo.verifier.bad.type", _type ) );
}
}
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java?rev=727012&r1=727011&r2=727012&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java Tue Dec 16 02:34:44 2008
@@ -24,10 +24,10 @@
public class WriteTask
extends AbstractAntTask
{
- private static final Language _lang = new DefaultLanguage( WriteTask.class );
+ private static final Language LANG = new DefaultLanguage( WriteTask.class );
- public static final String TASK_NAME = _lang.getMessage( "write.task.name" );
- public static final String TASK_DESC = _lang.getMessage( "write.task.desc" );
+ public static final String TASK_NAME = LANG.getMessage( "write.task.name" );
+ public static final String TASK_DESC = LANG.getMessage( "write.task.desc" );
private String _repoid;
private String _file;
@@ -82,7 +82,7 @@
{
if( _repoid == null )
{
- throwIfEnabled( _lang.getMessage( "write.repo.id.mandatory" ) );
+ throwIfEnabled( LANG.getMessage( "write.repo.id.mandatory" ) );
return;
}
@@ -90,13 +90,13 @@
if( repo == null )
{
- throwIfEnabled( _lang.getMessage( "write.repo.not.found", _repoid ) );
+ throwIfEnabled( LANG.getMessage( "write.repo.not.found", _repoid ) );
return;
}
if( _file == null )
{
- throwIfEnabled( _lang.getMessage( "write.file.mandatory" ) );
+ throwIfEnabled( LANG.getMessage( "write.file.mandatory" ) );
return;
}
@@ -104,25 +104,25 @@
if( !file.exists() )
{
- throwIfEnabled( _lang.getMessage( "write.file.not.found", _file, _repoid ) );
+ throwIfEnabled( LANG.getMessage( "write.file.not.found", _file, _repoid ) );
return;
}
if( Util.isEmpty( _name ) && Util.isEmpty( _pom ) )
{
- throwIfEnabled( _lang.getMessage( "write.no.name.no.pom", _file, _repoid ) );
+ throwIfEnabled( LANG.getMessage( "write.no.name.no.pom", _file, _repoid ) );
return;
}
if( !Util.isEmpty( _name ) && !Util.isEmpty( _pom ) )
{
- throwIfEnabled( _lang.getMessage( "write.no.name.no.pom", _file, _repoid ) );
+ throwIfEnabled( LANG.getMessage( "write.no.name.no.pom", _file, _repoid ) );
return;
}
if( !Util.isEmpty( _pom ) )
{
- throwIfEnabled( _lang.getMessage( "write.pom.not.supported", _file, _repoid ) );
+ throwIfEnabled( LANG.getMessage( "write.pom.not.supported", _file, _repoid ) );
return;
}
@@ -157,7 +157,7 @@
}
else
{
- throwIfEnabled( _lang.getMessage( "write.pom.not.supported", _file, _repoid ) );
+ throwIfEnabled( LANG.getMessage( "write.pom.not.supported", _file, _repoid ) );
return;
}
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java?rev=727012&r1=727011&r2=727012&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java Tue Dec 16 02:34:44 2008
@@ -59,8 +59,8 @@
{
public static final ArtifactMetadata DUMMY_ROOT = new ArtifactMetadata("__fake:__fake:1.0");
- private static final Language _lang = new DefaultLanguage(DependencyTreeBuilder.class);
- private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( DependencyTreeBuilder.class );
+ private static final Language LANG = new DefaultLanguage(DependencyTreeBuilder.class);
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( DependencyTreeBuilder.class );
private Collection<MetadataTreeArtifactFilter> _filters;
private List<Comparator<MetadataTreeNode>> _comparators;
@@ -158,7 +158,7 @@
throws MetadataTreeException
{
if( Util.isEmpty( startMDs ) )
- throw new MetadataTreeException( _lang.getMessage( "empty.md.collection") );
+ throw new MetadataTreeException( LANG.getMessage( "empty.md.collection") );
List<MetadataTreeNode> deps = new ArrayList<MetadataTreeNode>( startMDs.size() );
@@ -203,7 +203,7 @@
mr = _reader.readDependencies( nodeMD );
if( mr == null )
- throw new MetadataTreeException( _lang.getMessage( "artifact.md.not.found", nodeMD.toString() ) );
+ throw new MetadataTreeException( LANG.getMessage( "artifact.md.not.found", nodeMD.toString() ) );
MetadataTreeNode node = new MetadataTreeNode( mr, parent, nodeQuery );
@@ -233,8 +233,8 @@
for( ArtifactBasicMetadata md : dependencies )
{
-if( _log.isDebugEnabled() )
- _log.debug("node "+nodeQuery+", dep "+md );
+if( LOG.isDebugEnabled() )
+ LOG.debug("node "+nodeQuery+", dep "+md );
List<ArtifactBasicMetadata> versions = expandedDeps.get( md );
if( versions == null || versions.size() < 1 )
@@ -370,7 +370,7 @@
throws MetadataTreeException
{
if( root == null )
- throw new MetadataTreeException(_lang.getMessage( "empty.tree" ));
+ throw new MetadataTreeException(LANG.getMessage( "empty.tree" ));
try
{
@@ -393,7 +393,7 @@
throws MetadataTreeException
{
if( root == null )
- throw new MetadataTreeException(_lang.getMessage( "empty.tree" ));
+ throw new MetadataTreeException(LANG.getMessage( "empty.tree" ));
try
{
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java?rev=727012&r1=727011&r2=727012&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java Tue Dec 16 02:34:44 2008
@@ -62,7 +62,7 @@
public static final String EVENT_UPDATE_GAV = "update.gav";
public static final String EVENT_SAVE_RAW = "save.raw";
- private static final Language _lang = new DefaultLanguage( RepositoryGAVMetadata.class );
+ private static final Language LANG = new DefaultLanguage( RepositoryGAVMetadata.class );
static volatile Map<String, MetadataCacheFs> fsCaches = Collections.synchronizedMap( new HashMap<String, MetadataCacheFs>(2) );
@@ -93,7 +93,7 @@
if( root == null
|| ( root.exists() && root.isFile() )
)
- throw new IllegalArgumentException( _lang.getMessage( "bad.root.file", root == null ? "null" : root.getAbsolutePath() ) );
+ throw new IllegalArgumentException( LANG.getMessage( "bad.root.file", root == null ? "null" : root.getAbsolutePath() ) );
String key = root.getCanonicalPath();
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java?rev=727012&r1=727011&r2=727012&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java Tue Dec 16 02:34:44 2008
@@ -91,8 +91,8 @@
/** minimum # of queue elements to consider parallelization */
private static int MIN_PARALLEL = 5;
- private static final Language _lang = new DefaultLanguage( VirtualRepositoryReader.class );
- private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( VirtualRepositoryReader.class );
+ private static final Language LANG = new DefaultLanguage( VirtualRepositoryReader.class );
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( VirtualRepositoryReader.class );
//----------------------------------------------------------------------------------------------------------------------------
private List<Repository> _repositories = new ArrayList<Repository>(8);
@@ -310,7 +310,7 @@
}
catch( VersionException e )
{
- throw new RepositoryException( _lang.getMessage( "query.element.bad.version", key.toString(), e.getMessage() ) );
+ throw new RepositoryException( LANG.getMessage( "query.element.bad.version", key.toString(), e.getMessage() ) );
}
if( keyVersionRange.isSingleton() )
@@ -498,7 +498,7 @@
List<ArtifactBasicMetadata> rejects = buckets == null ? null : buckets.get( RepositoryReader.NULL_READER );
if( buckets == null )
- throw new RepositoryException( _lang.getMessage( "internal.error.sorting.query", query.toString() ) );
+ throw new RepositoryException( LANG.getMessage( "internal.error.sorting.query", query.toString() ) );
init();
@@ -522,7 +522,7 @@
ArtifactResults rrRes = rr.readArtifacts( rrQuery );
if( rrRes.hasExceptions() )
- throw new RepositoryException( _lang.getMessage( "error.reading.existing.artifact", rrRes.getExceptions().toString(), rr.getRepository().getId() ) );
+ throw new RepositoryException( LANG.getMessage( "error.reading.existing.artifact", rrRes.getExceptions().toString(), rr.getRepository().getId() ) );
if( rrRes.hasResults() )
for( ArtifactBasicMetadata bm : rrRes.getResults().keySet() )
@@ -620,8 +620,8 @@
public byte[] readMetadata( ArtifactBasicMetadata bmd )
throws MetadataReaderException
{
- if( _log.isDebugEnabled() )
- _log.debug( "Asking for pom: "+bmd);
+ if( LOG.isDebugEnabled() )
+ LOG.debug( "Asking for pom: "+bmd);
return readRawData( bmd, "", "pom" );
}
@@ -635,8 +635,8 @@
GenericEvent event = null;
String eventTag = null;
- if( _log.isDebugEnabled() )
- _log.debug( "request for "+bmd+", classifier="+classifier+", type="+type );
+ if( LOG.isDebugEnabled() )
+ LOG.debug( "request for "+bmd+", classifier="+classifier+", type="+type );
if( bmd == null )
throw new IllegalArgumentException("null bmd supplied");
@@ -666,8 +666,8 @@
byte [] res = null;
Quality vq = new Quality( bmd.getVersion() );
- if( _log.isDebugEnabled() )
- _log.debug( "quality calculated as "+vq.getQuality() == null ? "null" :vq.getQuality().name() );
+ if( LOG.isDebugEnabled() )
+ LOG.debug( "quality calculated as "+vq.getQuality() == null ? "null" :vq.getQuality().name() );
if( Quality.SNAPSHOT_QUALITY.equals( vq ) )
{
@@ -679,10 +679,10 @@
ArtifactBasicResults vRes = readVersions( query );
if( Util.isEmpty( vRes ) )
{
- if( _log.isDebugEnabled() )
- _log.debug( "no snapshots found - throw exception" );
+ if( LOG.isDebugEnabled() )
+ LOG.debug( "no snapshots found - throw exception" );
- throw new MetadataReaderException( _lang.getMessage( "no.snapshots", bmd.toString(), classifier, type ) );
+ throw new MetadataReaderException( LANG.getMessage( "no.snapshots", bmd.toString(), classifier, type ) );
}
@@ -697,10 +697,10 @@
}
else
{
- if( _log.isDebugEnabled() )
- _log.debug( "no snapshots found - throw exception" );
+ if( LOG.isDebugEnabled() )
+ LOG.debug( "no snapshots found - throw exception" );
- throw new MetadataReaderException( _lang.getMessage( "no.snapshots", bmd.toString(), classifier, type ) );
+ throw new MetadataReaderException( LANG.getMessage( "no.snapshots", bmd.toString(), classifier, type ) );
}
}
catch( Exception e )
@@ -721,8 +721,8 @@
res = rr.readRawData( bmdQuery, classifier, type );
if( res != null )
{
- if( _log.isDebugEnabled() )
- _log.debug( bmdQuery+" found in "+rr.getRepository().getServer() );
+ if( LOG.isDebugEnabled() )
+ LOG.debug( bmdQuery+" found in "+rr.getRepository().getServer() );
if( _eventManager != null )
eventRead.setInfo( eventRead.getInfo() );
@@ -743,8 +743,8 @@
}
}
- if( _log.isDebugEnabled() )
- _log.debug( "no data found, returning null" );
+ if( LOG.isDebugEnabled() )
+ LOG.debug( "no data found, returning null" );
return null;
}
Modified: maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java?rev=727012&r1=727011&r2=727012&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java (original)
+++ maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java Tue Dec 16 02:34:44 2008
@@ -83,8 +83,8 @@
public static final int K = 1024;
public static final int DEFAULT_BUFFER_SIZE = 10 * K;
//---------------------------------------------------------------------------------------------------------------
- private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( FileUtil.class );
- private static final Language _lang = new DefaultLanguage( FileUtil.class );
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( FileUtil.class );
+ private static final Language LANG = new DefaultLanguage( FileUtil.class );
private static final OverlappingFileLockException FILE_LOCKED = new OverlappingFileLockException();
//---------------------------------------------------------------------------------------------------------------
@@ -169,7 +169,7 @@
int len = (int)file.length();
if( len == 0 )
{
- _log.info( _lang.getMessage( "reading.empty.file", file.getAbsolutePath() ) );
+ LOG.info( LANG.getMessage( "reading.empty.file", file.getAbsolutePath() ) );
return null;
}
@@ -217,13 +217,13 @@
}
catch( IOException e )
{
- throw new FileUtilException( _lang.getMessage( "cannot.read.signature.file", sigFileName, e.getMessage() ) );
+ throw new FileUtilException( LANG.getMessage( "cannot.read.signature.file", sigFileName, e.getMessage() ) );
}
vs.add( sv );
}
else if( ! sv.getAttributes().isLenient() )
{
- throw new FileUtilException( _lang.getMessage( "no.signature.file", ext, sigFileName ) );
+ throw new FileUtilException( LANG.getMessage( "no.signature.file", ext, sigFileName ) );
}
// otherwise ignore absence of signature file, if verifier is lenient
}
@@ -267,7 +267,7 @@
else
{
if( !sv.getAttributes().isLenient() )
- throw new StreamVerifierException( _lang.getMessage( "signature.failed", sv.getAttributes().getExtension(), fileName ) );
+ throw new StreamVerifierException( LANG.getMessage( "signature.failed", sv.getAttributes().getExtension(), fileName ) );
}
}
}
@@ -537,7 +537,7 @@
if( !sf.exists() )
{
if( force )
- throw new StreamVerifierException( _lang.getMessage( "no.mandatory.signature", f.getAbsolutePath(), sf.getAbsolutePath() ) );
+ throw new StreamVerifierException( LANG.getMessage( "no.mandatory.signature", f.getAbsolutePath(), sf.getAbsolutePath() ) );
else
continue;
}
@@ -581,7 +581,7 @@
if( fl != null )
{
- throw new StreamVerifierException( _lang.getMessage( "file.failed.verification", f.getAbsolutePath(), fl.toString() ) );
+ throw new StreamVerifierException( LANG.getMessage( "file.failed.verification", f.getAbsolutePath(), fl.toString() ) );
}
}
finally
@@ -595,35 +595,35 @@
public static void main( String[] args )
throws IOException, StreamObserverException
{
- Option sign = new Option( "sign", _lang.getMessage( "option.sign" ) );
- Option verify = new Option( "verify", _lang.getMessage( "option.verify" ) );
+ Option sign = new Option( "sign", LANG.getMessage( "option.sign" ) );
+ Option verify = new Option( "verify", LANG.getMessage( "option.verify" ) );
OptionGroup cmd = new OptionGroup();
cmd.addOption( sign );
cmd.addOption( verify );
- Option recurce = new Option( "r", _lang.getMessage( "option.r" ) );
- Option force = new Option( "force", _lang.getMessage( "option.force" ) );
+ Option recurce = new Option( "r", LANG.getMessage( "option.r" ) );
+ Option force = new Option( "force", LANG.getMessage( "option.force" ) );
OptionGroup sig = new OptionGroup();
- Option sha1 = new Option( "sha1", _lang.getMessage( "option.sha1" ) );
- Option pgp = new Option( "pgp", _lang.getMessage( "option.pgp" ) );
+ Option sha1 = new Option( "sha1", LANG.getMessage( "option.sha1" ) );
+ Option pgp = new Option( "pgp", LANG.getMessage( "option.pgp" ) );
sig.addOption( sha1 );
sig.addOption( pgp );
Option keyring = OptionBuilder.withArgName( "file" )
.hasArg()
.withType( java.io.File.class )
- .withDescription( _lang.getMessage( "option.keyring" ) )
+ .withDescription( LANG.getMessage( "option.keyring" ) )
.create( "keyring" )
;
Option keyid = OptionBuilder.withArgName( "hexstring" )
.hasArg()
- .withDescription( _lang.getMessage( "option.keyid" ) )
+ .withDescription( LANG.getMessage( "option.keyid" ) )
.create( "keyid" )
;
Option keypass = OptionBuilder.withArgName( "string" )
.hasArg()
- .withDescription( _lang.getMessage( "option.keypass" ) )
+ .withDescription( LANG.getMessage( "option.keypass" ) )
.create( "keypass" )
;
@@ -688,7 +688,7 @@
}
else
{
- System.err.println( _lang.getMessage( "bad.pgp.args" ) );
+ System.err.println( LANG.getMessage( "bad.pgp.args" ) );
return;
}
}
@@ -727,12 +727,12 @@
f = new File( fName );
if( ! f.exists() )
{
- System.out.println( _lang.getMessage( "file.not.exists", fName ) );
+ System.out.println( LANG.getMessage( "file.not.exists", fName ) );
continue;
}
if( f.isDirectory() && ! recurse )
{
- System.out.println( _lang.getMessage( "file.is.directory", fName ) );
+ System.out.println( LANG.getMessage( "file.is.directory", fName ) );
continue;
}
if( sign )
@@ -765,14 +765,14 @@
try{ Thread.sleep( 1l ); } catch( InterruptedException e ){}
df.mkdirs();
exists = df.exists();
- _log.info( _lang.getMessage( "had.to.create.directory", dir, exists + "" ) );
+ LOG.info( LANG.getMessage( "had.to.create.directory", dir, exists + "" ) );
}
if( !exists )
- throw new IOException( _lang.getMessage( "cannot.create.directory", dir ) );
+ throw new IOException( LANG.getMessage( "cannot.create.directory", dir ) );
if( !df.isDirectory() )
- throw new IOException( _lang.getMessage( "file.is.not.directory", dir, df.exists() + "", df.isDirectory() + "", df.isFile() + "" ) );
+ throw new IOException( LANG.getMessage( "file.is.not.directory", dir, df.exists() + "", df.isDirectory() + "", df.isFile() + "" ) );
File lockFile = new File( dir,LOCK_FILE );
@@ -823,14 +823,14 @@
try{ Thread.sleep( 1l ); } catch( InterruptedException e ){}
df.mkdirs();
exists = df.exists();
- _log.info( _lang.getMessage( "had.to.create.directory", dir, exists + "" ) );
+ LOG.info( LANG.getMessage( "had.to.create.directory", dir, exists + "" ) );
}
if( !exists )
- throw new IOException( _lang.getMessage( "cannot.create.directory", dir ) );
+ throw new IOException( LANG.getMessage( "cannot.create.directory", dir ) );
if( !df.isDirectory() )
- throw new IOException( _lang.getMessage( "file.is.not.directory", dir, df.exists() + "", df.isDirectory() + "", df.isFile() + "" ) );
+ throw new IOException( LANG.getMessage( "file.is.not.directory", dir, df.exists() + "", df.isDirectory() + "", df.isFile() + "" ) );
File lockFile = new File( dir,LOCK_FILE );
if( !lockFile.exists() )
@@ -867,7 +867,7 @@
{
File df = new File( dir );
if( !df.isDirectory() )
- throw new IOException( _lang.getMessage( "file.is.not.directory", dir ) );
+ throw new IOException( LANG.getMessage( "file.is.not.directory", dir ) );
File lock = new File( dir,LOCK_FILE );
if( lock.exists() )
@@ -875,7 +875,7 @@
}
catch( IOException e )
{
- _log.error( e.getMessage() );
+ LOG.error( e.getMessage() );
}
}
//---------------------------------------------------------------------------------------------------------------
@@ -931,7 +931,7 @@
public static int depth( File file )
{
if( file == null || !file.exists() )
- throw new IllegalArgumentException( _lang.getMessage( "file.not.exists.error", file == null ? "null" : file.getAbsolutePath() ) );
+ throw new IllegalArgumentException( LANG.getMessage( "file.not.exists.error", file == null ? "null" : file.getAbsolutePath() ) );
if( file.isFile() )
return 0;