equal
deleted
inserted
replaced
544 try (InputStream in = jf.getInputStream(entry)) { |
544 try (InputStream in = jf.getInputStream(entry)) { |
545 BufferedReader reader |
545 BufferedReader reader |
546 = new BufferedReader(new InputStreamReader(in, "UTF-8")); |
546 = new BufferedReader(new InputStreamReader(in, "UTF-8")); |
547 String cn; |
547 String cn; |
548 while ((cn = nextLine(reader)) != null) { |
548 while ((cn = nextLine(reader)) != null) { |
549 if (cn.length() > 0) { |
549 if (!cn.isEmpty()) { |
550 String pn = packageName(cn); |
550 String pn = packageName(cn); |
551 if (!packages.contains(pn)) { |
551 if (!packages.contains(pn)) { |
552 String msg = "Provider class " + cn + " not in module"; |
552 String msg = "Provider class " + cn + " not in module"; |
553 throw new InvalidModuleDescriptorException(msg); |
553 throw new InvalidModuleDescriptorException(msg); |
554 } |
554 } |
597 |
597 |
598 // collapse repeating dots |
598 // collapse repeating dots |
599 mn = Patterns.REPEATING_DOTS.matcher(mn).replaceAll("."); |
599 mn = Patterns.REPEATING_DOTS.matcher(mn).replaceAll("."); |
600 |
600 |
601 // drop leading dots |
601 // drop leading dots |
602 if (mn.length() > 0 && mn.charAt(0) == '.') |
602 if (!mn.isEmpty() && mn.charAt(0) == '.') |
603 mn = Patterns.LEADING_DOTS.matcher(mn).replaceAll(""); |
603 mn = Patterns.LEADING_DOTS.matcher(mn).replaceAll(""); |
604 |
604 |
605 // drop trailing dots |
605 // drop trailing dots |
606 int len = mn.length(); |
606 int len = mn.length(); |
607 if (len > 0 && mn.charAt(len-1) == '.') |
607 if (len > 0 && mn.charAt(len-1) == '.') |