You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ds...@apache.org on 2010/02/17 17:43:35 UTC
svn commit: r911065 - in /felix/trunk/sigil/eclipse:
core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourcesDialogHelper.java
Author: dsavage
Date: Wed Feb 17 16:43:35 2010
New Revision: 911065
URL: http://svn.apache.org/viewvc?rev=911065&view=rev
Log:
Change API for checking if packages are part of bundle - use package fragments vs roots to improve performance
Modified:
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/util/ResourcesDialogHelper.java
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=911065&r1=911064&r2=911065&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 Wed Feb 17 16:43:35 2010
@@ -34,7 +34,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.JavaModelException;
import org.osgi.framework.Version;
import org.osgi.service.prefs.Preferences;
@@ -116,7 +116,7 @@
boolean isInClasspath( ISigilBundle bundle );
- boolean isInBundleClasspath( IPackageFragmentRoot root ) throws JavaModelException;
+ boolean isInBundleClasspath( IPackageFragment root ) throws JavaModelException;
IPath findOutputLocation() throws CoreException;
Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourcesDialogHelper.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourcesDialogHelper.java?rev=911065&r1=911064&r2=911065&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourcesDialogHelper.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourcesDialogHelper.java Wed Feb 17 16:43:35 2010
@@ -21,6 +21,7 @@
import java.util.ArrayList;
+
import java.util.Collection;
import java.util.Comparator;
import java.util.HashSet;
@@ -44,7 +45,6 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.ITypeRoot;
import org.eclipse.jdt.core.JavaModelException;
@@ -71,9 +71,9 @@
try
{
for ( IJavaElement e : JavaHelper.findTypes( project.getJavaModel(),
- IJavaElement.PACKAGE_FRAGMENT_ROOT ) )
+ IJavaElement.PACKAGE_FRAGMENT ) )
{
- IPackageFragmentRoot root = ( IPackageFragmentRoot ) e;
+ IPackageFragment root = ( IPackageFragment ) e;
if ( project.isInBundleClasspath( root ) )
{
for ( IJavaElement e1 : JavaHelper.findTypes( root, IJavaElement.COMPILATION_UNIT,
@@ -235,19 +235,16 @@
{
ArrayList<IPackageFragment> list = new ArrayList<IPackageFragment>( UPDATE_BATCH_SIZE );
for ( IJavaElement e : JavaHelper.findTypes( project.getJavaModel(),
- IJavaElement.PACKAGE_FRAGMENT_ROOT ) )
+ IJavaElement.PACKAGE_FRAGMENT ) )
{
- IPackageFragmentRoot root = ( IPackageFragmentRoot ) e;
+ IPackageFragment root = ( IPackageFragment ) e;
if ( project.isInBundleClasspath( root ) )
{
- for ( IJavaElement e1 : JavaHelper.findTypes( root, IJavaElement.PACKAGE_FRAGMENT ) )
+ list.add( root );
+ if ( list.size() >= UPDATE_BATCH_SIZE )
{
- list.add( ( IPackageFragment ) e1 );
- if ( list.size() >= UPDATE_BATCH_SIZE )
- {
- dialog.addElements( list );
- list.clear();
- }
+ dialog.addElements( list );
+ list.clear();
}
}
}