test/org/openjdk/jigsaw/_PublishedRepository.java
Print this page
*** 32,42 ****
import java.nio.file.*;
import org.openjdk.jigsaw.*;
import static java.lang.System.out;
import static java.nio.file.StandardOpenOption.*;
! import org.openjdk.jigsaw.Repository.ModuleType;
public class _PublishedRepository {
private static ModuleSystem ms = ModuleSystem.base();
--- 32,42 ----
import java.nio.file.*;
import org.openjdk.jigsaw.*;
import static java.lang.System.out;
import static java.nio.file.StandardOpenOption.*;
! import org.openjdk.jigsaw.Repository.ModuleFileType;
public class _PublishedRepository {
private static ModuleSystem ms = ModuleSystem.base();
*** 71,96 ****
return PublishedRepository.open(REPO, false);
}
static ModuleId toModuleId(Path p) {
String fn = p.getFileName().toString();
! if (fn.endsWith(ModuleType.JAR.getFileNameSuffix())) {
! return ms.parseModuleId(fn.replace(ModuleType.JAR.getFileNameSuffix(), ""));
} else {
! return ms.parseModuleId(fn.replace(ModuleType.JMOD.getFileNameSuffix(), ""));
}
}
static Path toModulePath(Path repo, ModuleId mid) {
! Path m = toModulePath(repo, mid, ModuleType.JAR);
if (m == null) {
! m = toModulePath(repo, mid, ModuleType.JMOD);
}
return m;
}
! private static Path toModulePath(Path repo, ModuleId mid, ModuleType type) {
Path m = repo.resolve(mid.toString() + type.getFileNameSuffix());
return m.toFile().exists() ? m : null;
}
static byte[] readStream(InputStream in)
--- 71,96 ----
return PublishedRepository.open(REPO, false);
}
static ModuleId toModuleId(Path p) {
String fn = p.getFileName().toString();
! if (fn.endsWith(ModuleFileType.JAR.getFileNameSuffix())) {
! return ms.parseModuleId(fn.replace(ModuleFileType.JAR.getFileNameSuffix(), ""));
} else {
! return ms.parseModuleId(fn.replace(ModuleFileType.JMOD.getFileNameSuffix(), ""));
}
}
static Path toModulePath(Path repo, ModuleId mid) {
! Path m = toModulePath(repo, mid, ModuleFileType.JAR);
if (m == null) {
! m = toModulePath(repo, mid, ModuleFileType.JMOD);
}
return m;
}
! private static Path toModulePath(Path repo, ModuleId mid, ModuleFileType type) {
Path m = repo.resolve(mid.toString() + type.getFileNameSuffix());
return m.toFile().exists() ? m : null;
}
static byte[] readStream(InputStream in)