Formatting and organizing imports

This commit is contained in:
Maschell 2019-04-26 16:44:57 +02:00
parent c1f6272476
commit 3eb299d3a1
12 changed files with 11 additions and 17 deletions

View File

@ -25,7 +25,6 @@ import java.util.stream.Stream;
import de.mas.wiiu.jnus.entities.TMD;
import de.mas.wiiu.jnus.entities.Ticket;
import de.mas.wiiu.jnus.entities.content.Content;
import de.mas.wiiu.jnus.entities.fst.FST;
import de.mas.wiiu.jnus.entities.fst.FSTEntry;
import de.mas.wiiu.jnus.interfaces.NUSDataProvider;

View File

@ -25,6 +25,7 @@ public final class NUSTitleLoaderLocalBackup {
private NUSTitleLoaderLocalBackup() {
}
public static NUSTitle loadNUSTitle(String inputPath, short titleVersion, Ticket ticket) throws Exception {
NUSTitleConfig config = new NUSTitleConfig();

View File

@ -104,7 +104,7 @@ public final class TMD {
public static TMD parseTMD(File tmd) throws IOException, ParseException {
if (tmd == null || !tmd.exists()) {
log.info("TMD input file null or doesn't exist.");
throw new IOException("TMD input file null or doesn't exist.");
throw new IOException("TMD input file null or doesn't exist.");
}
return parseTMD(Files.readAllBytes(tmd.toPath()));
}
@ -145,7 +145,7 @@ public final class TMD {
buffer.position(0x184);
long systemVersion = buffer.getLong();
long titleID = buffer.getLong();
if((titleID & 0x0005000000000000L) != 0x0005000000000000L) {
if ((titleID & 0x0005000000000000L) != 0x0005000000000000L) {
throw new ParseException("Invalid TMD file. This is not a Wii U TMD", 0);
}
int titleType = buffer.getInt();

View File

@ -18,16 +18,12 @@ package de.mas.wiiu.jnus.entities.content;
import java.nio.ByteBuffer;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import de.mas.wiiu.jnus.Settings;
import de.mas.wiiu.jnus.entities.fst.FSTEntry;
import de.mas.wiiu.jnus.utils.Utils;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.java.Log;
/**

View File

@ -56,8 +56,8 @@ public class NUSDataProviderFST implements NUSDataProvider {
@Override
public Optional<byte[]> getContentH3Hash(Content content) throws IOException {
Optional<byte[]> res = h3Hashes.get(content.getID());
if(res == null) {
res =readFileByFilename(base, String.format("%08X%s", content.getID(), Settings.H3_EXTENTION));
if (res == null) {
res = readFileByFilename(base, String.format("%08X%s", content.getID(), Settings.H3_EXTENTION));
h3Hashes.put(content.getID(), res);
}
return res;

View File

@ -26,7 +26,6 @@ import de.mas.wiiu.jnus.entities.fst.FST;
import de.mas.wiiu.jnus.utils.StreamUtils;
public interface NUSDataProvider {
default public byte[] readContent(Content content, long offset, int size) throws IOException {
return StreamUtils.getBytesFromStream(readContentAsStream(content, offset, size), size);
}

View File

@ -34,8 +34,8 @@ public final class StreamUtils {
}
/**
* Tries to read a given amount of bytes from a stream and return them as
* a byte array. Closes the inputs stream on success AND failure.
* Tries to read a given amount of bytes from a stream and return them as a byte array. Closes the inputs stream on success AND failure.
*
* @param in
* @param size
* @return

View File

@ -23,7 +23,6 @@ import java.net.URL;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import de.mas.wiiu.jnus.Settings;