You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ke...@apache.org on 2005/07/31 23:10:39 UTC
svn commit: r226695 -
/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWriter.java
Author: kenney
Date: Sun Jul 31 14:10:36 2005
New Revision: 226695
URL: http://svn.apache.org/viewcvs?rev=226695&view=rev
Log:
o When eclipse files are created in another location, add a link to the pom;
o Fixed some coding style errors;
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWriter.java
Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWriter.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWriter.java?rev=226695&r1=226694&r2=226695&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWriter.java (original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWriter.java Sun Jul 31 14:10:36 2005
@@ -167,6 +167,8 @@
{
writer.startElement( "linkedResources" );
+ addFileLink( writer, projectBaseDir, basedir, project.getFile() );
+
addSourceLinks( writer, projectBaseDir, basedir, executedProject.getCompileSourceRoots() );
addResourceLinks( writer, projectBaseDir, basedir, executedProject.getBuild().getResources() );
@@ -302,7 +304,9 @@
sourceRoot = toRelative( projectBaseDir, sourceRoot );
if (!projectBaseDir.equals(basedir))
- sourceRoot = sourceRoot.replaceAll("/", "-");
+ {
+ sourceRoot = sourceRoot.replaceAll( "/", "-" );
+ }
writer.addAttribute( "path", sourceRoot );
@@ -353,7 +357,9 @@
String resourceDir = resource.getDirectory();
resourceDir = toRelative( projectBaseDir, resourceDir );
if (!projectBaseDir.equals(basedir))
- resourceDir = resourceDir.replaceAll("/", "-");
+ {
+ resourceDir = resourceDir.replaceAll( "/", "-" );
+ }
writer.addAttribute( "path", resourceDir );
@@ -378,7 +384,7 @@
writer.startElement( "name" );
- writer.writeText( toRelative( projectBaseDir, sourceRoot ).replaceAll("/", "-") );
+ writer.writeText( toRelative( projectBaseDir, sourceRoot ).replaceAll( "/", "-" ) );
writer.endElement(); // name
@@ -411,7 +417,7 @@
writer.startElement( "name" );
- writer.writeText( toRelative( projectBaseDir, resourceDir ).replaceAll("/", "-") );
+ writer.writeText( toRelative( projectBaseDir, resourceDir ).replaceAll( "/", "-" ) );
writer.endElement(); // name
@@ -432,6 +438,38 @@
}
}
+ private void addFileLink( XMLWriter writer, File projectBaseDir, File basedir, File file )
+ {
+ if ( file.isFile() )
+ {
+ writer.startElement( "link" );
+
+ writer.startElement( "name" );
+
+ writer.writeText( toRelative( projectBaseDir, file.toString() ).replaceAll( "/", "-" ) );
+
+ writer.endElement(); // name
+
+ writer.startElement( "type" );
+
+ writer.writeText( "1" );
+
+ writer.endElement(); // type
+
+ writer.startElement( "location" );
+
+ writer.writeText( file.toString() );
+
+ writer.endElement(); // location
+
+ writer.endElement(); // link
+ }
+ else
+ {
+ log.warn( "Not adding a file link to " + file + "; it is not a file" );
+ }
+ }
+
/**
*
* @param writer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org