Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 75853 invoked from network); 7 Sep 2010 13:52:14 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 7 Sep 2010 13:52:14 -0000 Received: (qmail 66123 invoked by uid 500); 7 Sep 2010 13:52:13 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 66046 invoked by uid 500); 7 Sep 2010 13:52:12 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 66036 invoked by uid 99); 7 Sep 2010 13:52:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Sep 2010 13:52:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Sep 2010 13:52:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EFDA0238897A; Tue, 7 Sep 2010 13:51:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r993364 - /felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java Date: Tue, 07 Sep 2010 13:51:50 -0000 To: commits@felix.apache.org From: dsavage@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100907135150.EFDA0238897A@eris.apache.org> Author: dsavage Date: Tue Sep 7 13:51:50 2010 New Revision: 993364 URL: http://svn.apache.org/viewvc?rev=993364&view=rev Log: fix for FELIX-2583 - use java model vs resources to find package names Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java?rev=993364&r1=993363&r2=993364&view=diff ============================================================================== --- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java (original) +++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java Tue Sep 7 13:51:50 2010 @@ -39,10 +39,14 @@ import org.eclipse.core.resources.IResou import org.eclipse.core.resources.IResourceDeltaVisitor; import org.eclipse.core.resources.IResourceVisitor; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.core.runtime.content.IContentTypeManager; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IPackageFragment; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaCore; public class WorkspaceRepository extends AbstractBundleRepository implements IResourceChangeListener { @@ -88,7 +92,7 @@ public class WorkspaceRepository extends for (IPackageExport pe : bundle.getBundleInfo().getExports()) { - final String packagePath = pe.getPackageName().replace('.', '/'); + final String packagePath = pe.getPackageName(); if (!packages.contains(packagePath)) { bundle.getBundleInfo().removeExport(pe); @@ -116,10 +120,9 @@ public class WorkspaceRepository extends IContentType ct = contentTypeManager.findContentTypeFor(f.getName()); if (ct != null && ct.isKindOf(javaContentType)) { - IPath p = f.getProjectRelativePath(); - p = p.removeLastSegments(1); - p = p.removeFirstSegments(1); - packages.add(p.toString()); + ICompilationUnit cu = (ICompilationUnit) JavaCore.create(f); + IPackageFragment pf = (IPackageFragment) cu.getAncestor(IJavaElement.PACKAGE_FRAGMENT); + packages.add(pf.getElementName()); } }