Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1960 - in development/laboratory/ide/eclipse/TransitPlugin: . lib src/net/dpml/ide/eclipse/plugins/magic

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: peter AT neubauer.se
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1960 - in development/laboratory/ide/eclipse/TransitPlugin: . lib src/net/dpml/ide/eclipse/plugins/magic
  • Date: Sun, 06 Mar 2005 18:07:59 -0500

Author: peter AT neubauer.se
Date: Sun Mar 6 04:00:24 2005
New Revision: 1960

Modified:
development/laboratory/ide/eclipse/TransitPlugin/.classpath

development/laboratory/ide/eclipse/TransitPlugin/lib/dpml-ide-common-magic-SNAPSHOT.jar

development/laboratory/ide/eclipse/TransitPlugin/src/net/dpml/ide/eclipse/plugins/magic/IndexActionDelegate.java

development/laboratory/ide/eclipse/TransitPlugin/src/net/dpml/ide/eclipse/plugins/magic/MagicContainer.java
Log:
now handling output folders correctly


Modified: development/laboratory/ide/eclipse/TransitPlugin/.classpath
==============================================================================
--- development/laboratory/ide/eclipse/TransitPlugin/.classpath (original)
+++ development/laboratory/ide/eclipse/TransitPlugin/.classpath Sun Mar 6
04:00:24 2005
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib"
path="lib/dpml-ide-common-magic-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib"
path="lib/dpml-magic-core-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib"
path="lib/dpml-transit-main.jar"/>
- <classpathentry exported="true" kind="lib"
path="lib/dpml-transit-tools.jar"/>
- <classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry exported="true"
sourcepath="/ide-common/magic/src/main" kind="lib"
path="lib/dpml-ide-common-magic-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib"
path="lib/dpml-magic-core-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib"
path="lib/dpml-transit-main.jar"/>
+ <classpathentry exported="true" kind="lib"
path="lib/dpml-transit-tools.jar"/>
+ <classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>

Modified:
development/laboratory/ide/eclipse/TransitPlugin/lib/dpml-ide-common-magic-SNAPSHOT.jar
==============================================================================
Binary files. No diff available.

Modified:
development/laboratory/ide/eclipse/TransitPlugin/src/net/dpml/ide/eclipse/plugins/magic/IndexActionDelegate.java
==============================================================================
---
development/laboratory/ide/eclipse/TransitPlugin/src/net/dpml/ide/eclipse/plugins/magic/IndexActionDelegate.java
(original)
+++
development/laboratory/ide/eclipse/TransitPlugin/src/net/dpml/ide/eclipse/plugins/magic/IndexActionDelegate.java
Sun Mar 6 04:00:24 2005
@@ -31,6 +31,7 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.core.ClasspathEntry;
import org.eclipse.jdt.internal.core.JavaProject;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
@@ -160,7 +161,7 @@
}// = proj;
try
{
- javaProject.setRawClasspath(sourcePath,
proj.getFullPath().append(new Path("bin")), null);
+ javaProject.setRawClasspath(sourcePath, null);
}
catch ( JavaModelException e )
{
@@ -170,14 +171,26 @@
}
private void collectSources( IdeProjectDefinition project, TreeMap
collectedSources )
{
- IPath basePath = new Path(project.getBasePath());
- IPath main = basePath.append("src/main");
- IPath test = basePath.append("src/test");
- IPath java = basePath.append("src/java");
- if (proj.exists(main))
+ IPath projectPath = new Path(project.getFullBaseDir().toString());
+ IPath absoluteProjectPath =
ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(projectPath).getFullPath();
+ IPath main = absoluteProjectPath.append("src/main");
+ IPath test = absoluteProjectPath.append("src/test");
+ IPath java = absoluteProjectPath.append("src/java");
+ if (proj.exists(main.removeFirstSegments(1)))
{
- IPath source =
proj.getFullPath().append(proj.getFile(main).getProjectRelativePath());
-
collectedSources.put(main.toString(),JavaCore.newSourceEntry(source));
+ //IPath source =
proj.getFullPath().append(proj.getFile(main).getProjectRelativePath());
+ IPath out = absoluteProjectPath.append("target/classes");
+
collectedSources.put(main.toString(),JavaCore.newSourceEntry(main,
ClasspathEntry.INCLUDE_ALL, out ));
+ }
+ if (proj.exists(test.removeFirstSegments(1)))
+ {
+ IPath out = absoluteProjectPath.append("target/test-classes");
+
collectedSources.put(test.toString(),JavaCore.newSourceEntry(test,
ClasspathEntry.INCLUDE_ALL, out ));
+ }
+ if (proj.exists(java.removeFirstSegments(1)))
+ {
+ IPath out = absoluteProjectPath.append("target/classes");
+
collectedSources.put(test.toString(),JavaCore.newSourceEntry(java,
ClasspathEntry.INCLUDE_ALL, out ));
}
}
}

Modified:
development/laboratory/ide/eclipse/TransitPlugin/src/net/dpml/ide/eclipse/plugins/magic/MagicContainer.java
==============================================================================
---
development/laboratory/ide/eclipse/TransitPlugin/src/net/dpml/ide/eclipse/plugins/magic/MagicContainer.java
(original)
+++
development/laboratory/ide/eclipse/TransitPlugin/src/net/dpml/ide/eclipse/plugins/magic/MagicContainer.java
Sun Mar 6 04:00:24 2005
@@ -135,7 +135,7 @@
IdeProjectDefinition project = projects[i];
try
{
- String basedir =
project.getFullBaseFile().getCanonicalPath();
+ String basedir = project.getFullBaseDir().getCanonicalPath();
}
catch ( IOException e )
{



  • svn commit: r1960 - in development/laboratory/ide/eclipse/TransitPlugin: . lib src/net/dpml/ide/eclipse/plugins/magic, peter, 03/06/2005

Archive powered by MHonArc 2.6.24.

Top of Page