Author: simoneg
Date: Sat Aug 29 15:06:21 2009
New Revision: 809144
URL: http://svn.apache.org/viewvc?rev=809144&view=rev
Log:
LABS-423 : consider also resources folders
Modified:
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java
Modified:
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java?rev=809144&r1=809143&r2=809144&view=diff
==============================================================================
---
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java
(original)
+++
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java
Sat Aug 29 15:06:21 2009
@@ -464,37 +464,13 @@
// Create src/main/java and src/test/java
try {
IClasspathEntry[] nrc = null;
- IClasspathEntry nse = null;
// src/test/java
- IFolder srctestjavafld =
project.getFolder("src/test/java");
- if (!srctestjavafld.exists()) {
- MFileUtils.createEntire(srctestjavafld, true,
true, null);
- }
-
- if ((nse = isOnClasspath(prj, "src/test/java")) !=
null) {
- nrc = removeFromClasspath(prj, nrc, nse);
- }
- nse = JavaCore
- .newSourceEntry(
- srctestjavafld.getFullPath(),
- new IPath[] {},
- outtest.getFullPath());
- nrc = addToClasspath(prj, nrc, nse);
-
+ nrc = sourceFolder(nrc, prj, "src/test/java", outtest);
+ nrc = sourceFolder(nrc, prj, "src/test/resources",
outtest);
// src/main/java
- IFolder srcmainjavafld =
project.getFolder("src/main/java");
- if (!srcmainjavafld.exists()) {
- MFileUtils.createEntire(srcmainjavafld, true,
true, null);
- }
-
- if ((nse = isOnClasspath(prj, "src/main/java")) !=
null) {
- nrc = removeFromClasspath(prj, nrc, nse);
- }
- nse = JavaCore.newSourceEntry(srcmainjavafld
- .getFullPath());
- nrc = addToClasspath(prj, nrc, nse);
-
+ nrc = sourceFolder(nrc, prj, "src/main/java", null);
+ nrc = sourceFolder(nrc, prj, "src/main/resources",
null);
// sort it
if (nrc != null) {
sortClasspath(nrc);
@@ -507,6 +483,30 @@
+ private static IClasspathEntry[] sourceFolder(IClasspathEntry[] nrc,
IJavaProject prj,
+ String srcfolder, IFolder outtest) throws CoreException
{
+ IClasspathEntry nse = null;
+ IFolder srctestjavafld = prj.getProject().getFolder(srcfolder);
+ if (!srctestjavafld.exists()) {
+ MFileUtils.createEntire(srctestjavafld, true, true,
null);
+ }
+
+ if ((nse = isOnClasspath(prj, srcfolder)) != null) {
+ nrc = removeFromClasspath(prj, nrc, nse);
+ }
+ if (outtest == null) {
+ nse =
JavaCore.newSourceEntry(srctestjavafld.getFullPath());
+ } else {
+ nse = JavaCore
+ .newSourceEntry(
+ srctestjavafld.getFullPath(),
+ new IPath[] {},
+ outtest.getFullPath());
+ }
+ nrc = addToClasspath(prj, nrc, nse);
+ return nrc;
+ }
+
/**
* Creates the magmalnk- linked source folders pointing to unzipped
* sources of magma projects present on the maven dependencies.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
