Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1971 - development/laboratory/ide/idea-plugin/magic/src/main/net/dpml/ide/idea/plugin/magic

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: herzog AT raffael.ch
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1971 - development/laboratory/ide/idea-plugin/magic/src/main/net/dpml/ide/idea/plugin/magic
  • Date: Mon, 07 Mar 2005 22:05:10 -0500

Author: herzog AT raffael.ch
Date: Mon Mar 7 22:05:10 2005
New Revision: 1971

Modified:

development/laboratory/ide/idea-plugin/magic/src/main/net/dpml/ide/idea/plugin/magic/ProjectBuilder.java
Log:
Adopted Peter's changes.

Modified:
development/laboratory/ide/idea-plugin/magic/src/main/net/dpml/ide/idea/plugin/magic/ProjectBuilder.java
==============================================================================
---
development/laboratory/ide/idea-plugin/magic/src/main/net/dpml/ide/idea/plugin/magic/ProjectBuilder.java
(original)
+++
development/laboratory/ide/idea-plugin/magic/src/main/net/dpml/ide/idea/plugin/magic/ProjectBuilder.java
Mon Mar 7 22:05:10 2005
@@ -238,6 +238,7 @@
while (iter.hasNext()) {
File f = (File) iter.next();
progress.setText2("Parsing file " + f + "...");
+ log.info("Parsing file "+f);
index.loadIndex(f);
currentProgress += progressStep;
progress.setFraction(currentProgress);
@@ -337,7 +338,7 @@
rootModels.add(rootModel);

ContentEntry[] contentEntries = rootModel.getContentEntries();
- File moduleRootFile = project.getFullBaseFile();
+ File moduleRootFile = project.getFullBaseDir();
VirtualFile contentFile =
LocalFileSystem.getInstance().findFileByIoFile(moduleRootFile);
ContentEntry mainContent = null;
for ( int i = 0; i < contentEntries.length; i++ ) {
@@ -397,7 +398,7 @@
if ( !foundTest && testFile != null ) {
mainContent.addSourceFolder(testFile, true);
}
- String basedir =
project.getFullBaseFile().getCanonicalFile().toURI().toString();
+ String basedir =
project.getFullBaseDir().getCanonicalFile().toURI().toString();
rootModel.setCompilerOutputPath(basedir+"/target/classes");

rootModel.setCompilerOutputPathForTests(basedir+"/target/test-classes");

@@ -531,7 +532,7 @@
IdeProjectDefinition project = projects[i];
addMessage(Message.MSG_INFO, "Checking project " +
project.getName());
Module module = null;
- String basedir = project.getFullBaseFile().getCanonicalPath();
+ String basedir = project.getFullBaseDir().getCanonicalPath();
File moduleFile = (File)moduleFiles.get(basedir);
if ( moduleFile == null ) {
addMessage(Message.MSG_WARNING, "No IDEA module found in
directory " + basedir);



  • svn commit: r1971 - development/laboratory/ide/idea-plugin/magic/src/main/net/dpml/ide/idea/plugin/magic, herzog, 03/07/2005

Archive powered by MHonArc 2.6.24.

Top of Page