Author: dsavage
Date: Sun Nov 29 13:46:18 2009
New Revision: 885227
URL: http://svn.apache.org/viewvc?rev=885227&view=rev
Log:
add rebuildDependencies method to be called by text project editor widget when
saved (fix for FELIX-1905)
Modified:
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilProjectEditorPart.java
Modified:
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
URL:
http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java?rev=885227&r1=885226&r2=885227&view=diff
==============================================================================
---
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
(original)
+++
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
Sun Nov 29 13:46:18 2009
@@ -109,9 +109,15 @@
{
SubMonitor progress = SubMonitor.convert( monitor, 100 );
- calculateUses();
-
bldProjectFile.setContents( buildContents(), IFile.KEEP_HISTORY,
progress.newChild( 10 ) );
+
+ rebuildDependencies(progress.newChild(90));
+ }
+
+ public void rebuildDependencies(IProgressMonitor monitor) throws
CoreException {
+ SubMonitor progress = SubMonitor.convert( monitor, 100 );
+
+ calculateUses();
IRepositoryManager manager = SigilCore.getRepositoryManager( this );
ResolutionConfig config = new ResolutionConfig(
ResolutionConfig.INCLUDE_OPTIONAL );
@@ -130,12 +136,11 @@
throw SigilCore.newCoreException( "Failed to synchronize
dependencies", e );
}
- progress.setWorkRemaining( 40 );
+ progress.setWorkRemaining( 30 );
- SigilCore.rebuildBundleDependencies( this, progress.newChild( 20 ) );
+ SigilCore.rebuildBundleDependencies( this, progress.newChild( 30 ) );
}
-
/**
* Returns the project custom preference pool.
* Project preferences may include custom encoding.
Modified:
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
URL:
http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java?rev=885227&r1=885226&r2=885227&view=diff
==============================================================================
---
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
(original)
+++
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
Sun Nov 29 13:46:18 2009
@@ -22,6 +22,7 @@
import java.util.Collection;
+
import org.apache.felix.sigil.config.IBldProject;
import org.apache.felix.sigil.core.BldCore;
import org.apache.felix.sigil.model.ICompoundModelElement;
@@ -72,6 +73,8 @@
* @throws CoreException
*/
void save( IProgressMonitor monitor ) throws CoreException;
+
+ void rebuildDependencies(IProgressMonitor monitor) throws CoreException;
/**
Modified:
felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilProjectEditorPart.java
URL:
http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilProjectEditorPart.java?rev=885227&r1=885226&r2=885227&view=diff
==============================================================================
---
felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilProjectEditorPart.java
(original)
+++
felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilProjectEditorPart.java
Sun Nov 29 13:46:18 2009
@@ -109,6 +109,7 @@
}
} );
project.setBundle( null );
+ project.rebuildDependencies(monitor);
}
else if ( isDirty() )
{
