Author: adrianocrestani Date: Tue Apr 22 12:25:07 2008 New Revision: 650622
URL: http://svn.apache.org/viewvc?rev=650622&view=rev Log: -updating Android test files on the sandbox Modified: incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/DexContributionProcessor.java Modified: incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/DexContributionProcessor.java URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/DexContributionProcessor.java?rev=650622&r1=650621&r2=650622&view=diff ============================================================================== --- incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/DexContributionProcessor.java (original) +++ incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/DexContributionProcessor.java Tue Apr 22 12:25:07 2008 @@ -28,58 +28,66 @@ public List<URI> getArtifacts(URL packageSourceURL, InputStream inputStream) throws ContributionException, IOException { - + ArrayList<URI> uris = new ArrayList<URI>(); DexResource res = new DexResource(packageSourceURL); - + URI[] contentFiles = res.getContentFiles(); - + for (URI uri : contentFiles) { String fileName = DexResource.getFile(uri.getPath()); URL url = uri.toURL(); - + if (fileName != null) { - + if (fileName.endsWith("_composite")) { - + url.openConnection(); try { - XMLStreamReader r = XMLInputFactory.newInstance().createXMLStreamReader(url.openStream()); - + XMLStreamReader r = XMLInputFactory.newInstance() + .createXMLStreamReader(url.openStream()); + while (r.hasNext()) { - + if (r.isStartElement()) { QName name = r.getName(); - - if ("implementation.java".equals(name.getLocalPart())) { + + if ("implementation.java".equals(name + .getLocalPart())) { int attributeCount = r.getAttributeCount(); - - for (int i = 0 ; i < attributeCount ; i++) { - - if (r.getAttributeLocalName(i).equals("class")) { - StringBuffer sb = new StringBuffer("dex://"); - sb.append(r.getAttributeValue(i).replace('.', '/')).append(".class"); - + + for (int i = 0; i < attributeCount; i++) { + + if (r.getAttributeLocalName(i).equals( + "class")) { + StringBuffer sb = new StringBuffer( + "dex://"); + sb.append( + r.getAttributeValue(i) + .replace('.', '/')) + .append(".class"); + try { - uris.add(new URI(sb.toString())); - } catch (URISyntaxException e) {} - + uris + .add(new URI(sb + .toString())); + } catch (URISyntaxException e) { + } + break; - + } - + } - + } - + } - + r.next(); - + } - - - + } catch (XMLStreamException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -87,24 +95,26 @@ // TODO Auto-generated catch block e1.printStackTrace(); } - - StringBuffer sb = new StringBuffer(url.getFile()); - sb.delete(sb.length() - 10, sb.length()).append(".composite"); - + + StringBuffer sb = new StringBuffer("dex://"); + sb.append(url.getHost()).append(url.getPath()); + sb.delete(sb.length() - 10, sb.length()).append( + ".composite"); + try { - uris.add(new URI(uri.toString())); + uris.add(new URI(sb.toString())); } catch (URISyntaxException e) { continue; } - + } - + } - + } - + return uris; - + } public String getPackageType() {
