You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2007/12/29 23:15:27 UTC
svn commit: r607480 - in
/maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver:
ManifestSection.java MavenArchiveConfiguration.java MavenArchiver.java
PomPropertiesUtil.java
Author: olamy
Date: Sat Dec 29 14:15:26 2007
New Revision: 607480
URL: http://svn.apache.org/viewvc?rev=607480&view=rev
Log:
format code (fix some checkstyle issues).
Modified:
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/ManifestSection.java
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
Modified: maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/ManifestSection.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/ManifestSection.java?rev=607480&r1=607479&r2=607480&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/ManifestSection.java (original)
+++ maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/ManifestSection.java Sat Dec 29 14:15:26 2007
@@ -26,17 +26,20 @@
*
* @version $Id$
*/
-public class ManifestSection {
+public class ManifestSection
+{
private String name = null;
private Map manifestEntries = new HashMap();
- public void setName( String name ) {
+ public void setName( String name )
+ {
this.name = name;
}
- public String getName() {
+ public String getName()
+ {
return name;
}
Modified: maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java?rev=607480&r1=607479&r2=607480&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java (original)
+++ maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java Sat Dec 29 14:15:26 2007
@@ -126,19 +126,23 @@
return manifestEntries;
}
- public void addManifestSection( ManifestSection section ) {
+ public void addManifestSection( ManifestSection section )
+ {
manifestSections.add( section );
}
- public void addManifestSections( List list ) {
+ public void addManifestSections( List list )
+ {
manifestSections.addAll( list );
}
- public boolean isManifestSectionsEmpty() {
+ public boolean isManifestSectionsEmpty()
+ {
return manifestSections.isEmpty();
}
- public List getManifestSections() {
+ public List getManifestSections()
+ {
return manifestSections;
}
Modified: maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java?rev=607480&r1=607479&r2=607480&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java (original)
+++ maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java Sat Dec 29 14:15:26 2007
@@ -66,7 +66,7 @@
{
String key = (String) iter.next();
String value = (String) entries.get( key );
- Manifest.Attribute attr = manifest.getMainSection().getAttribute(key);
+ Manifest.Attribute attr = manifest.getMainSection().getAttribute( key );
if ( key.equals( "Class-Path" ) && attr != null )
{
// Merge the user-supplied Class-Path value with the programmatically
@@ -407,8 +407,8 @@
archiver.setForced( forced );
if ( !archiveConfiguration.isForced() && archiver.isSupportingForced() )
{
- // Should issue a warning here, but how do we get a logger?
- //getLog().warn( "Forced build is disabled, but disabling the forced mode isn't supported by the archiver." );
+ // TODO Should issue a warning here, but how do we get a logger?
+ // TODO getLog().warn( "Forced build is disabled, but disabling the forced mode isn't supported by the archiver." );
}
// create archive
@@ -416,7 +416,7 @@
}
- private Artifact findArtifactWithFile(Set artifacts, File file)
+ private Artifact findArtifactWithFile( Set artifacts, File file )
{
for ( Iterator iterator = artifacts.iterator(); iterator.hasNext(); )
{
Modified: maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java?rev=607480&r1=607479&r2=607480&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java (original)
+++ maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java Sat Dec 29 14:15:26 2007
@@ -51,7 +51,8 @@
}
Properties fileProps = new Properties();
InputStream istream = null;
- try {
+ try
+ {
istream = new FileInputStream( file );
fileProps.load( istream );
istream.close();
@@ -97,8 +98,9 @@
/**
* Creates the pom.properties file.
*/
- public void createPomProperties( MavenProject project, Archiver archiver, File pomPropertiesFile, boolean forceCreation )
- throws ArchiverException, IOException
+ public void createPomProperties( MavenProject project, Archiver archiver, File pomPropertiesFile,
+ boolean forceCreation )
+ throws ArchiverException, IOException
{
final String artifactId = project.getArtifactId();
final String groupId = project.getGroupId();