From c1e8944e70b0a2a6f075025f0577759466e540f2 Mon Sep 17 00:00:00 2001
From: jlanuti <jlanuti>
Date: Thu, 18 Jan 2007 16:15:51 +0000
Subject: [PATCH] Fixes for usage scan adopter breakages
---
.../wtp/releng/tools/component/CodeCoverageScanner.java | 4 +++-
.../tools/component/api/violation/APIViolationScanner.java | 7 ++++++-
.../component/api/violation/NonAPIDependencyScanner.java | 7 ++++++-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/CodeCoverageScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/CodeCoverageScanner.java
index e496dccd1..31ca3f091 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/CodeCoverageScanner.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/CodeCoverageScanner.java
@@ -385,6 +385,8 @@ public class CodeCoverageScanner implements ILocationVisitor
private class TRCXMLHandler extends DefaultHandler
{
+ private static final String DOT = "."; //$NON-NLS-1$
+ private static final String FORWARD_SLASH = "/"; //$NON-NLS-1$
private final String CLASS_DEF = "classDef";
private final String METHOD_DEF = "methodDef";
private final String METHOD_COUNT = "methodCount";
@@ -400,7 +402,7 @@ public class CodeCoverageScanner implements ILocationVisitor
{
String id = attributes.getValue("classId");
String name = attributes.getValue("name");
- classId2Name.put(id, name);
+ classId2Name.put(id, name.replaceAll(FORWARD_SLASH, DOT));
}
else if (elementName.equals(METHOD_DEF) || qName.equals(METHOD_DEF))
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/APIViolationScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/APIViolationScanner.java
index ef71ef87c..2c234beee 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/APIViolationScanner.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/APIViolationScanner.java
@@ -149,8 +149,13 @@ public class APIViolationScanner implements IClassVisitor
// Collect component.xml files
for (Iterator i = api.iterator(); i.hasNext();)
{
- ILocation apiLocation = Location.createLocation(new File((String)i.next()));
+ String locationString = (String)i.next();
+ ILocation apiLocation = Location.createLocation(new File(locationString));
ComponentXMLVisitor compXMLVisitor = new ComponentXMLVisitor();
+ if (apiLocation == null) {
+ System.out.println("ERROR - Can't find location at: "+locationString);
+ continue;
+ }
apiLocation.accept(compXMLVisitor);
for (Iterator it = compXMLVisitor.getCompXMLs().iterator(); it.hasNext();)
{
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/NonAPIDependencyScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/NonAPIDependencyScanner.java
index 1e958b5e6..54780bd2e 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/NonAPIDependencyScanner.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/violation/NonAPIDependencyScanner.java
@@ -184,8 +184,13 @@ public class NonAPIDependencyScanner implements ILocationVisitor
{
for (Iterator i = locations.iterator(); i.hasNext();)
{
- ILocation apiLocation = Location.createLocation(new File((String)i.next()));
+ String locationString = (String)i.next();
+ ILocation apiLocation = Location.createLocation(new File(locationString));
ComponentXMLVisitor compXMLVisitor = new ComponentXMLVisitor();
+ if (apiLocation == null) {
+ System.out.println("ERROR - Can't find location at: "+locationString);
+ continue;
+ }
apiLocation.accept(compXMLVisitor);
for (Iterator it = compXMLVisitor.getCompXMLs().iterator(); it.hasNext();)
{
--
GitLab