diff --git a/CHANGELOG.md b/CHANGELOG.md index 33b7aff..72eb6c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +Current +------- + +- Change project name to `ia-arcade` + 1.0 --- diff --git a/README.md b/README.md index 4b6b179..e16a49c 100755 --- a/README.md +++ b/README.md @@ -14,12 +14,6 @@ notes](https://github.com/TiBeN/ia-rcade#legal) below. ![preview](./doc/screenshot.png) -Watch `ia-rcade` in action with the following screencast made by [Geoff -Yuen](https://vimeo.com/user51410922): - -[![ia-rcade on OS X -demo](https://i.vimeocdn.com/video/567335844.jpg)](https://vimeo.com/163855518) - Prerequisites ------------- @@ -68,8 +62,8 @@ Installation - Install `ia-rcade` and make it executable: - $ sudo curl -fsSLo /usr/local/bin/ia-mame https://github.com/TiBeN/ia-mame/releases/download/1.0/ia-mame - $ sudo chmod +x /usr/local/bin/ia-mame + $ sudo curl -fsSLo /usr/local/bin/ia-rcade https://github.com/TiBeN/ia-mame/releases/download/1.1/ia-rcade + $ sudo chmod +x /usr/local/bin/ia-rcade - Tell `ia-rcade` where is your Mame executable by making it available on your \$PATH environment variable — its name must match @@ -83,7 +77,7 @@ Installation ### Windows - Download - [ia-mame.exe](https://github.com/TiBeN/ia-mame/releases/download/1.0/ia-mame.exe) + [ia-rcade.exe](https://github.com/TiBeN/ia-rcade/releases/download/1.1/ia-rcade.exe) and place it on the folder where is your mame.exe You can alternatively place it somewhere else and use the \$MAME\_EXEC @@ -104,7 +98,7 @@ The compilation requires `Maven`. $ cd /path/to/ia-rcade $ mvn package -The binary files `ia-mame` (Linux/OS X) and `ia-mame.exe` (Windows) and +The binary files `ia-rcade` (Linux/OS X) and `ia-rcade.exe` (Windows) and the executable jar are available on the `target` directory. Usage @@ -119,32 +113,25 @@ Mame executable which launches the game/system. ### Linux, Os X -Let's try `The King Of Fighters '98`. Simply type what you would have -typed with the original Mame to launch the game: - - $ ia-mame kof98 +Let's try `Galaxian`. Simply type what you would have typed with the original +Mame to launch the game: -![King Of Fighters 98 launched on Linux using -ia-rcade](./doc/screenshot3.png) + $ ia-rcade galaxian ### Windows -Let's try Columns on the Sega Master System. - -Open a console `cmd` then type: +Let's try Pacman. Open a console `cmd` then type: C:\> cd \path\to\mame - C:\> ia-mame.exe sms columns - -![Columns launched on Windows using ia-rcade](./doc/screenshot4.png) + C:\> ia-rcade.exe pacman ### Executable JAR Alternatively, the provided [executable -jar](https://github.com/TiBeN/ia-rcade/releases/download/1.0/ia-mame.jar) +jar](https://github.com/TiBeN/ia-rcade/releases/download/1.1/ia-rcade.jar) can be used directly: - $ java -jar ia-mame.jar sf2 + $ java -jar ia-rcade.jar sf2 ### Use a different rompath @@ -152,7 +139,7 @@ If you want to try `ia-rcade` using a different rompath than your Mame's default, you can use the original Mame option `-rompath` on the command-line. - $ ia-mame -rompath /tmp sms sonic + $ ia-rcade -rompath /tmp sms sonic ### Disable Mame execution @@ -161,7 +148,7 @@ It is possible to run `ia-rcade` without running Mame afterward using the rom file without execute the game. If the rom is already available, `ia-rcade` simply does nothing. - $ ia-mame -noexecmame sms sonic + $ ia-rcade -noexecmame sms sonic Known limitations ----------------- diff --git a/doc/screenshot.png b/doc/screenshot.png index 1998804..5d3877e 100644 Binary files a/doc/screenshot.png and b/doc/screenshot.png differ diff --git a/doc/screenshot2.png b/doc/screenshot2.png deleted file mode 100644 index 47de795..0000000 Binary files a/doc/screenshot2.png and /dev/null differ diff --git a/doc/screenshot3.png b/doc/screenshot3.png deleted file mode 100644 index 18cfe24..0000000 Binary files a/doc/screenshot3.png and /dev/null differ diff --git a/doc/screenshot4.png b/doc/screenshot4.png deleted file mode 100644 index cffb7cd..0000000 Binary files a/doc/screenshot4.png and /dev/null differ diff --git a/pom.xml b/pom.xml index e75436f..8e0306c 100755 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.tibennetwork - ia-mame + ia-rcade 1.0 jar - ia-mame - https://github.com/TiBeN/ia-mame + ia-rcade + https://github.com/TiBeN/ia-rcade UTF-8 1.8 @@ -25,7 +25,7 @@ maven-jar-plugin 2.3.2 - ia-mame + ia-rcade @@ -40,10 +40,10 @@ - org.tibennetwork.iamame.IaMame + org.tibennetwork.iarcade.IaRcade - iamame.debug + iarcade.debug 1 @@ -63,7 +63,7 @@ - org.tibennetwork.iamame.IaMame + org.tibennetwork.iarcade.IaRcade @@ -87,11 +87,11 @@ console - target/ia-mame.exe - target/ia-mame.jar - ia-mame + target/ia-rcade.exe + target/ia-rcade.jar + ia-rcade - org.tibennetwork.iamame.IaMame + org.tibennetwork.iarcade.IaRcade false anything @@ -101,13 +101,13 @@ 0.0.0.1 first - IaMame executable + ia-rcade executable github.com/TiBeN 0.0.${project.version} ${project.version} - IaMame - IaMame - ia-mame.exe + ia-rcade + ia-rcade + ia-rcade.exe @@ -119,7 +119,7 @@ really-executable-jar-maven-plugin 1.4.1 - ia-mame + ia-rcade diff --git a/src/assembly/release.xml b/src/assembly/release.xml index c59dc32..dc967e9 100644 --- a/src/assembly/release.xml +++ b/src/assembly/release.xml @@ -20,9 +20,9 @@ ${project.basedir}/target ${file.separator}bin - ia-mame - ia-mame.exe - ia-mame.jar + ia-rcade + ia-rcade.exe + ia-rcade.jar diff --git a/src/main/java/org/tibennetwork/iamame/CommandLineArguments.java b/src/main/java/org/tibennetwork/iarcade/CommandLineArguments.java similarity index 88% rename from src/main/java/org/tibennetwork/iamame/CommandLineArguments.java rename to src/main/java/org/tibennetwork/iarcade/CommandLineArguments.java index 4b77ba3..d9d7cbc 100755 --- a/src/main/java/org/tibennetwork/iamame/CommandLineArguments.java +++ b/src/main/java/org/tibennetwork/iarcade/CommandLineArguments.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame; +package org.tibennetwork.iarcade; import java.io.File; import java.io.IOException; @@ -12,16 +12,16 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.io.FilenameUtils; -import org.tibennetwork.iamame.mame.CommandLineOptions; -import org.tibennetwork.iamame.mame.InvalidMameArgumentsException; -import org.tibennetwork.iamame.mame.Machine; -import org.tibennetwork.iamame.mame.MachineDoesntExistException; -import org.tibennetwork.iamame.mame.MachineHasNoSoftwareListException; -import org.tibennetwork.iamame.mame.MachineRepository; -import org.tibennetwork.iamame.mame.MediaDevice; -import org.tibennetwork.iamame.mame.Software; -import org.tibennetwork.iamame.mame.SoftwareNotFoundInSoftwareListsException; -import org.tibennetwork.iamame.mame.SoftwareRepository; +import org.tibennetwork.iarcade.mame.CommandLineOptions; +import org.tibennetwork.iarcade.mame.InvalidMameArgumentsException; +import org.tibennetwork.iarcade.mame.Machine; +import org.tibennetwork.iarcade.mame.MachineDoesntExistException; +import org.tibennetwork.iarcade.mame.MachineHasNoSoftwareListException; +import org.tibennetwork.iarcade.mame.MachineRepository; +import org.tibennetwork.iarcade.mame.MediaDevice; +import org.tibennetwork.iarcade.mame.Software; +import org.tibennetwork.iarcade.mame.SoftwareNotFoundInSoftwareListsException; +import org.tibennetwork.iarcade.mame.SoftwareRepository; /** * Set of Mame command line arguments @@ -63,7 +63,7 @@ public boolean hasSoftwares () { /** * IaMmame specific options */ - private Options iaMameOptions; + private Options iaRcadeOptions; /** * Mame specific options @@ -77,7 +77,7 @@ public boolean hasSoftwares () { public CommandLineArguments (CommandLineOptions mameOptions, String[] rawArgs) throws InvalidMameArgumentsException { this.mameOptions = mameOptions; - this.iaMameOptions = buildIaMameOptions(); + this.iaRcadeOptions = buildIaRcadeOptions(); this.rawArgs = rawArgs; } @@ -112,9 +112,9 @@ public String[] getMameRawArgs () { optionsLoop: for (Option o: this.commandLine.getOptions()) { - // Discard IaMame options + // Discard ia-rcade options - for (Option ia: this.iaMameOptions.getOptions()) { + for (Option ia: this.iaRcadeOptions.getOptions()) { if (o.getOpt().equals(ia.getOpt())) { continue optionsLoop; } @@ -163,9 +163,9 @@ public String[] getMameOptionsRawArgs () { } } - // Discard IaMame options + // Discard ia-rcade options - for (Option ia: this.iaMameOptions.getOptions()) { + for (Option ia: this.iaRcadeOptions.getOptions()) { if (o.getOpt().equals(ia.getOpt())) { continue optionsLoop; } @@ -281,13 +281,13 @@ public ExtractedMachineAndSoftwares extractMachineAndSoftwares ( public void validate () throws InvalidMameArgumentsException { - // Merge IaMame and Mame options + // Merge ia-rcade and Mame options Options mergedOptions = new Options(); for (Option o: mameOptions.getAllOptions().getOptions()) { mergedOptions.addOption(o); } - for (Option o: iaMameOptions.getOptions()) { + for (Option o: iaRcadeOptions.getOptions()) { mergedOptions.addOption(o); } @@ -315,11 +315,11 @@ private boolean isRegularSoftwareFile (String name) { } /** - * Create Options bag for ia-mame specific options + * Create Options bag for ia-rcade specific options */ - private Options buildIaMameOptions () { + private Options buildIaRcadeOptions () { - // Build IaMame specific options + // Build ia-rcade specific options Options opts = new Options(); diff --git a/src/main/java/org/tibennetwork/iamame/IaMame.java b/src/main/java/org/tibennetwork/iarcade/IaRcade.java similarity index 68% rename from src/main/java/org/tibennetwork/iamame/IaMame.java rename to src/main/java/org/tibennetwork/iarcade/IaRcade.java index 2a708c1..986b958 100755 --- a/src/main/java/org/tibennetwork/iamame/IaMame.java +++ b/src/main/java/org/tibennetwork/iarcade/IaRcade.java @@ -1,29 +1,30 @@ -package org.tibennetwork.iamame; +package org.tibennetwork.iarcade; import java.io.File; import java.io.IOException; import java.net.URISyntaxException; import java.util.List; import java.util.Set; + import org.apache.commons.cli.ParseException; -import org.tibennetwork.iamame.CommandLineArguments.ExtractedMachineAndSoftwares; -import org.tibennetwork.iamame.internetarchive.FileNotFoundInCollectionException; -import org.tibennetwork.iamame.internetarchive.MessAndMameCollections; -import org.tibennetwork.iamame.internetarchive.NoWritableRomPathException; -import org.tibennetwork.iamame.mame.CommandLineOptions; -import org.tibennetwork.iamame.mame.CommandLineOptionsFactory; -import org.tibennetwork.iamame.mame.InvalidMameArgumentsException; -import org.tibennetwork.iamame.mame.Machine; -import org.tibennetwork.iamame.mame.MachineRepository; -import org.tibennetwork.iamame.mame.MameExecutionException; -import org.tibennetwork.iamame.mame.MameRuntime; -import org.tibennetwork.iamame.mame.MameRuntimeImpl; -import org.tibennetwork.iamame.mame.MameVersion; -import org.tibennetwork.iamame.mame.Software; -import org.tibennetwork.iamame.mame.SoftwareRepository; -import org.tibennetwork.iamame.mame.UnhandledMameVersionPatternException; - -public class IaMame { +import org.tibennetwork.iarcade.CommandLineArguments.ExtractedMachineAndSoftwares; +import org.tibennetwork.iarcade.internetarchive.FileNotFoundInCollectionException; +import org.tibennetwork.iarcade.internetarchive.MessAndMameCollections; +import org.tibennetwork.iarcade.internetarchive.NoWritableRomPathException; +import org.tibennetwork.iarcade.mame.CommandLineOptions; +import org.tibennetwork.iarcade.mame.CommandLineOptionsFactory; +import org.tibennetwork.iarcade.mame.InvalidMameArgumentsException; +import org.tibennetwork.iarcade.mame.Machine; +import org.tibennetwork.iarcade.mame.MachineRepository; +import org.tibennetwork.iarcade.mame.MameExecutionException; +import org.tibennetwork.iarcade.mame.MameRuntime; +import org.tibennetwork.iarcade.mame.MameRuntimeImpl; +import org.tibennetwork.iarcade.mame.MameVersion; +import org.tibennetwork.iarcade.mame.Software; +import org.tibennetwork.iarcade.mame.SoftwareRepository; +import org.tibennetwork.iarcade.mame.UnhandledMameVersionPatternException; + +public class IaRcade { public static void main(String[] args) { @@ -35,9 +36,9 @@ public static void main(String[] args) { // Search for Mame binary try { - mameBinary = IaMame.findMameBinary(); + mameBinary = IaRcade.findMameBinary(); } catch (MameBinaryNotFoundException e) { - IaMame.errorAndExit(e.getMessage()); + IaRcade.errorAndExit(e.getMessage()); } // Init MameRuntime @@ -46,7 +47,7 @@ public static void main(String[] args) { mame = new MameRuntimeImpl(mameBinary); - IaMame.info("Mame version: " + mame.getVersion()); + IaRcade.info("Mame version: " + mame.getVersion()); // Deduce mame command line options scheme @@ -54,7 +55,7 @@ public static void main(String[] args) { } catch (IOException | InterruptedException | ParseException | MameExecutionException | UnhandledMameVersionPatternException e) { - IaMame.errorAndExit( + IaRcade.errorAndExit( "An error occured while trying to execute Mame: " + e.getMessage()); } @@ -64,7 +65,7 @@ public static void main(String[] args) { mame.setDefaultOptions(cliArgs.getMameOptionsRawArgs()); downloadFilesIfNeeded(cliArgs, mame); } catch (InvalidMameArgumentsException e) { - IaMame.warn("An error occured while trying to parse command line: " + IaRcade.warn("An error occured while trying to parse command line: " + e.getMessage()); } @@ -74,7 +75,7 @@ public static void main(String[] args) { try { mame.execute(cliArgs.getMameRawArgs(), false); } catch (IOException | InterruptedException e) { - IaMame.errorAndExit( + IaRcade.errorAndExit( "An error occured while trying to execute Mame: " + e.getMessage()); } } @@ -88,11 +89,11 @@ public static String findMameBinary() throws MameBinaryNotFoundException { // Check the MAME_EXEC environment variable String mameExecEnvVar = System.getenv("MAME_EXEC"); - IaMame.debug(String.format("$MAME_EXEC: %s", mameExecEnvVar)); + IaRcade.debug(String.format("$MAME_EXEC: %s", mameExecEnvVar)); if (mameExecEnvVar != null) { File mameBinary = new File(mameExecEnvVar); if (mameBinary.exists() && mameBinary.canExecute()) { - IaMame + IaRcade .debug("MAME binary found on MAME_EXEC" + " environment variable"); return mameExecEnvVar; } @@ -107,20 +108,20 @@ public static String findMameBinary() throws MameBinaryNotFoundException { // containing jar. try { - containingJarPath = new File(IaMame.class.getProtectionDomain() + containingJarPath = new File(IaRcade.class.getProtectionDomain() .getCodeSource().getLocation().toURI().getPath()).getParent(); - IaMame.debug(String.format("IaMame directory: %s", containingJarPath)); + IaRcade.debug(String.format("ia-rcade directory: %s", containingJarPath)); } catch (URISyntaxException e) { // If entering in, its a bug. - IaMame.debug(e.getMessage()); + IaRcade.debug(e.getMessage()); } for (String b : possibleBinaryNames) { candidateMameBinaryPath = containingJarPath + File.separator + b; candidateMameBinary = new File(candidateMameBinaryPath); if (candidateMameBinary.exists() && candidateMameBinary.canExecute()) { - IaMame.debug(String.format( - "Mame binary found on the same directory than IaMame: %s", + IaRcade.debug(String.format( + "Mame binary found on the same directory than ia-rcade: %s", candidateMameBinaryPath)); return candidateMameBinaryPath; } @@ -128,14 +129,14 @@ public static String findMameBinary() throws MameBinaryNotFoundException { // Search for Mame binary on the PATH environment variable String pathEnvVar = System.getenv("PATH"); - IaMame.debug(String.format("$PATH: %s", pathEnvVar)); + IaRcade.debug(String.format("$PATH: %s", pathEnvVar)); for (String p : pathEnvVar.split(":")) { for (String b : possibleBinaryNames) { candidateMameBinaryPath = p + File.separator + b; candidateMameBinary = new File(candidateMameBinaryPath); if (candidateMameBinary.exists() && candidateMameBinary.canExecute()) { - IaMame.debug(String.format("Mame binary found on $PATH : %s", + IaRcade.debug(String.format("Mame binary found on $PATH : %s", candidateMameBinaryPath)); return candidateMameBinaryPath; } @@ -163,7 +164,7 @@ private static void downloadFilesIfNeeded(CommandLineArguments mameArgs, ems = mameArgs.extractMachineAndSoftwares(new MachineRepository(mame), new SoftwareRepository(mame)); } catch (IOException | InterruptedException e) { - IaMame.errorAndExit("An error occured " + e.getMessage()); + IaRcade.errorAndExit("An error occured " + e.getMessage()); } Machine machine = ems.getMachine(); @@ -175,10 +176,10 @@ private static void downloadFilesIfNeeded(CommandLineArguments mameArgs, romsPaths = mame.getRomsPaths(); writableRomPath = mame.getWritableRomPath(); } catch (IOException | InterruptedException | ParseException e) { - IaMame.errorAndExit( + IaRcade.errorAndExit( "An error occured while trying to execute Mame: " + e.getMessage()); } catch (NoWritableRomPathException e) { - IaMame.errorAndExit(e.getMessage()); + IaRcade.errorAndExit(e.getMessage()); } MameVersion version = mame.getVersion(); @@ -187,7 +188,7 @@ private static void downloadFilesIfNeeded(CommandLineArguments mameArgs, try { collections.download(machine, version, romsPaths, writableRomPath); } catch (FileNotFoundInCollectionException e) { - IaMame.warn(e.getMessage()); + IaRcade.warn(e.getMessage()); } if (ems.hasSoftwares()) { @@ -202,7 +203,7 @@ private static void downloadFilesIfNeeded(CommandLineArguments mameArgs, try { collections.download(software, version, romsPaths, writableRomPath); } catch (FileNotFoundInCollectionException e) { - IaMame.warn(e.getMessage()); + IaRcade.warn(e.getMessage()); } } @@ -212,23 +213,23 @@ private static void downloadFilesIfNeeded(CommandLineArguments mameArgs, } public static void errorAndExit(String message) { - System.err.println("[ia-mame error]: " + message); + System.err.println("[ia-rcade error]: " + message); System.exit(1); } public static void debug(String message) { - if (System.getProperties().containsKey("iamame.debug") - && System.getProperty("iamame.debug").equals("1")) { - System.err.println("[ia-mame debug]: " + message); + if (System.getProperties().containsKey("iarcade.debug") + && System.getProperty("iarcade.debug").equals("1")) { + System.err.println("[ia-rcade debug]: " + message); } } public static void warn(String message) { - System.err.println("[ia-mame warn]: " + message); + System.err.println("[ia-rcade warn]: " + message); } public static void info(String message) { - System.out.println("[ia-mame info]: " + message); + System.out.println("[ia-rcade info]: " + message); } } diff --git a/src/main/java/org/tibennetwork/iamame/MameBinaryNotFoundException.java b/src/main/java/org/tibennetwork/iarcade/MameBinaryNotFoundException.java similarity index 84% rename from src/main/java/org/tibennetwork/iamame/MameBinaryNotFoundException.java rename to src/main/java/org/tibennetwork/iarcade/MameBinaryNotFoundException.java index 37e70af..b8be521 100644 --- a/src/main/java/org/tibennetwork/iamame/MameBinaryNotFoundException.java +++ b/src/main/java/org/tibennetwork/iarcade/MameBinaryNotFoundException.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame; +package org.tibennetwork.iarcade; public class MameBinaryNotFoundException extends Exception { diff --git a/src/main/java/org/tibennetwork/iamame/PropertyNotSetException.java b/src/main/java/org/tibennetwork/iarcade/PropertyNotSetException.java similarity index 87% rename from src/main/java/org/tibennetwork/iamame/PropertyNotSetException.java rename to src/main/java/org/tibennetwork/iarcade/PropertyNotSetException.java index 9687fbb..7705be6 100755 --- a/src/main/java/org/tibennetwork/iamame/PropertyNotSetException.java +++ b/src/main/java/org/tibennetwork/iarcade/PropertyNotSetException.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame; +package org.tibennetwork.iarcade; public class PropertyNotSetException extends Exception { diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/Collection.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/Collection.java similarity index 95% rename from src/main/java/org/tibennetwork/iamame/internetarchive/Collection.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/Collection.java index 021816d..3b5634b 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/Collection.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/Collection.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/FileNotFoundInCollectionException.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/FileNotFoundInCollectionException.java similarity index 80% rename from src/main/java/org/tibennetwork/iamame/internetarchive/FileNotFoundInCollectionException.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/FileNotFoundInCollectionException.java index de3b713..3681cd5 100755 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/FileNotFoundInCollectionException.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/FileNotFoundInCollectionException.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; public class FileNotFoundInCollectionException extends Exception { diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/MachineChdSet.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/MachineChdSet.java similarity index 88% rename from src/main/java/org/tibennetwork/iamame/internetarchive/MachineChdSet.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/MachineChdSet.java index c1e4c80..f6d54ce 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/MachineChdSet.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/MachineChdSet.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.io.File; import java.io.InputStream; @@ -7,8 +7,8 @@ import java.util.TreeSet; import javax.xml.bind.JAXB; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.tibennetwork.iamame.IaMame; -import org.tibennetwork.iamame.mame.MameVersion; +import org.tibennetwork.iarcade.IaRcade; +import org.tibennetwork.iarcade.mame.MameVersion; public class MachineChdSet extends RomSet { @@ -47,8 +47,8 @@ public static MachineChdSet findBest(MameVersion version) { bestVersion = version; } else { bestVersion = versions.floor(version); - IaMame.warn("No archive.org machine CHD set matches your Mame version"); - IaMame.warn("Some files might not be available."); + IaRcade.warn("No archive.org machine CHD set matches your Mame version"); + IaRcade.warn("Some files might not be available."); } // Unmarshal MachineRomSet from XML data stored in classpath @@ -88,16 +88,16 @@ public void download(File writableRomPath, String machineName, builder = new StringBuilder("Found "); builder.append(chd.getName()); - IaMame.info(builder.toString()); + IaRcade.info(builder.toString()); builder = new StringBuilder("Collection: "); builder.append(col.getName()); - IaMame.info(builder.toString()); + IaRcade.info(builder.toString()); builder = new StringBuilder("URL: "); builder.append(col.getUrl()); - IaMame.info(builder.toString()); + IaRcade.info(builder.toString()); // Determine destination path diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/MachineChdSetFile.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/MachineChdSetFile.java similarity index 97% rename from src/main/java/org/tibennetwork/iamame/internetarchive/MachineChdSetFile.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/MachineChdSetFile.java index 85aabe0..1396978 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/MachineChdSetFile.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/MachineChdSetFile.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.net.URL; import java.net.URLDecoder; diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/MachineChdSetFileXmlAdapter.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/MachineChdSetFileXmlAdapter.java similarity index 91% rename from src/main/java/org/tibennetwork/iamame/internetarchive/MachineChdSetFileXmlAdapter.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/MachineChdSetFileXmlAdapter.java index 409ccdc..78704f7 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/MachineChdSetFileXmlAdapter.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/MachineChdSetFileXmlAdapter.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.util.ArrayList; import java.util.HashMap; @@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlAdapter; -import org.tibennetwork.iamame.internetarchive.MachineChdSetFileXmlAdapter.MachineChdSetFiles; +import org.tibennetwork.iarcade.internetarchive.MachineChdSetFileXmlAdapter.MachineChdSetFiles; public class MachineChdSetFileXmlAdapter extends XmlAdapter>> { diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/MachineRomSet.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/MachineRomSet.java similarity index 91% rename from src/main/java/org/tibennetwork/iamame/internetarchive/MachineRomSet.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/MachineRomSet.java index bd03da1..fc096f0 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/MachineRomSet.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/MachineRomSet.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.io.File; import java.io.InputStream; @@ -12,8 +12,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.tibennetwork.iamame.IaMame; -import org.tibennetwork.iamame.mame.MameVersion; +import org.tibennetwork.iarcade.IaRcade; +import org.tibennetwork.iarcade.mame.MameVersion; /** * A RomSet containing roms for emulated machines (arcade, console and device @@ -79,8 +79,8 @@ public static Iterator getRomSets(MameVersion version) { // No archive.org ROM set collection matches your Mame version ( if (!MachineRomSet.versions.contains(version)) { - IaMame.warn("No archive.org machine ROM set matches your Mame version"); - IaMame.warn("Some files might not be available."); + IaRcade.warn("No archive.org machine ROM set matches your Mame version"); + IaRcade.warn("Some files might not be available."); } final Iterator iter = @@ -123,16 +123,16 @@ public void download(File writableRomPath, String machineName) { builder = new StringBuilder("Found "); builder.append(file.getName()); - IaMame.info(builder.toString()); + IaRcade.info(builder.toString()); builder = new StringBuilder("Collection: "); builder.append(col.getName()); - IaMame.info(builder.toString()); + IaRcade.info(builder.toString()); builder = new StringBuilder("URL: "); builder.append(col.getUrl()); - IaMame.info(builder.toString()); + IaRcade.info(builder.toString()); // Determine destination path diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/MachineRomSetFile.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/MachineRomSetFile.java similarity index 97% rename from src/main/java/org/tibennetwork/iamame/internetarchive/MachineRomSetFile.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/MachineRomSetFile.java index d4babf2..26b2c46 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/MachineRomSetFile.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/MachineRomSetFile.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.net.URL; import java.net.URLDecoder; diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/MachineRomSetFileXmlAdapter.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/MachineRomSetFileXmlAdapter.java similarity index 89% rename from src/main/java/org/tibennetwork/iamame/internetarchive/MachineRomSetFileXmlAdapter.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/MachineRomSetFileXmlAdapter.java index b16a350..c62190f 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/MachineRomSetFileXmlAdapter.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/MachineRomSetFileXmlAdapter.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.util.ArrayList; import java.util.HashMap; @@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlAdapter; -import org.tibennetwork.iamame.internetarchive.MachineRomSetFileXmlAdapter.MachineRomSetFiles; +import org.tibennetwork.iarcade.internetarchive.MachineRomSetFileXmlAdapter.MachineRomSetFiles; /** * JAXB XmlAdapter that transform a XML list of MachineSetRomFiles into a diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/MessAndMameCollections.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/MessAndMameCollections.java similarity index 94% rename from src/main/java/org/tibennetwork/iamame/internetarchive/MessAndMameCollections.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/MessAndMameCollections.java index d25e81a..f210551 100755 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/MessAndMameCollections.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/MessAndMameCollections.java @@ -1,14 +1,13 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.io.File; import java.util.Iterator; import java.util.Set; - -import org.tibennetwork.iamame.mame.Machine; -import org.tibennetwork.iamame.mame.MameVersion; -import org.tibennetwork.iamame.mame.Software; -import org.tibennetwork.iamame.mame.SoftwareChdFile; -import org.tibennetwork.iamame.mame.SoftwareRomFile; +import org.tibennetwork.iarcade.mame.Machine; +import org.tibennetwork.iarcade.mame.MameVersion; +import org.tibennetwork.iarcade.mame.Software; +import org.tibennetwork.iarcade.mame.SoftwareChdFile; +import org.tibennetwork.iarcade.mame.SoftwareRomFile; /** * Main archive Mame romsets collections entry point diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/NoWritableRomPathException.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/NoWritableRomPathException.java similarity index 78% rename from src/main/java/org/tibennetwork/iamame/internetarchive/NoWritableRomPathException.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/NoWritableRomPathException.java index 7db0aad..e1f10a4 100755 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/NoWritableRomPathException.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/NoWritableRomPathException.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; public class NoWritableRomPathException extends Exception { diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/RomSet.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/RomSet.java similarity index 92% rename from src/main/java/org/tibennetwork/iamame/internetarchive/RomSet.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/RomSet.java index 8dde936..9de74d6 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/RomSet.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/RomSet.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.io.File; import java.io.FileOutputStream; @@ -7,10 +7,11 @@ import java.io.OutputStream; import java.net.URL; import java.util.Set; + import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; -import org.tibennetwork.iamame.IaMame; -import org.tibennetwork.iamame.mame.MameVersion; +import org.tibennetwork.iarcade.IaRcade; +import org.tibennetwork.iarcade.mame.MameVersion; /** * Base class for differents kins of Mame Romsets (ROMs, CHDs, softwarelist..) @@ -59,7 +60,7 @@ protected void downloadFile(URL url, String destPath, long size) { File dest = new File(destPath); - IaMame.debug("URL: " + url); + IaRcade.debug("URL: " + url); // Create containing directories if needed @@ -90,7 +91,7 @@ protected void downloadFile(URL url, String destPath, long size) { String destName = dest.getName(); String ellipsisedName = destName.length() > 18 ? destName.substring(0, 15) + "..." : destName; - String downloadPrefix = "[ia-mame info]: Downloading " + ellipsisedName; + String downloadPrefix = "[ia-rcade info]: Downloading " + ellipsisedName; while ((readBytes = urlStream.read(bytes)) != -1) { destStream.write(bytes, 0, readBytes); diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/RomSetXmlGenerator.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/RomSetXmlGenerator.java similarity index 98% rename from src/main/java/org/tibennetwork/iamame/internetarchive/RomSetXmlGenerator.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/RomSetXmlGenerator.java index 4ef40c9..bb4b671 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/RomSetXmlGenerator.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/RomSetXmlGenerator.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.io.BufferedReader; import java.io.FileReader; @@ -15,8 +15,8 @@ import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; -import org.tibennetwork.iamame.internetarchive.MachineRomSet.MachineRomSetFormat; -import org.tibennetwork.iamame.mame.MameVersion; +import org.tibennetwork.iarcade.internetarchive.MachineRomSet.MachineRomSetFormat; +import org.tibennetwork.iarcade.mame.MameVersion; /** * Generate XML RomSet files by scraping Internet Archive zipview content diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListChdSet.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListChdSet.java similarity index 88% rename from src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListChdSet.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListChdSet.java index d07d83d..ca71a7b 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListChdSet.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListChdSet.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.io.File; import java.io.InputStream; @@ -7,8 +7,8 @@ import java.util.TreeSet; import javax.xml.bind.JAXB; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.tibennetwork.iamame.IaMame; -import org.tibennetwork.iamame.mame.MameVersion; +import org.tibennetwork.iarcade.IaRcade; +import org.tibennetwork.iarcade.mame.MameVersion; public class SoftwareListChdSet extends RomSet { @@ -32,8 +32,8 @@ public static SoftwareListChdSet findBest(MameVersion version) { bestVersion = version; } else { bestVersion = versions.floor(version); - IaMame.warn("No archive.org softlist CHD set matches your Mame version"); - IaMame.warn("Some files might not be available."); + IaRcade.warn("No archive.org softlist CHD set matches your Mame version"); + IaRcade.warn("Some files might not be available."); } // Unmarshal SoftwareListChdSet from XML data stored in classpath @@ -92,16 +92,16 @@ public void download(File writableRomPath, String softwareList, builder = new StringBuilder("Found "); builder.append(chd.getName()); - IaMame.info(builder.toString()); + IaRcade.info(builder.toString()); builder = new StringBuilder("Collection: "); builder.append(col.getName()); - IaMame.info(builder.toString()); + IaRcade.info(builder.toString()); builder = new StringBuilder("URL: "); builder.append(col.getUrl()); - IaMame.info(builder.toString()); + IaRcade.info(builder.toString()); // Determine destination path diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListChdSetFile.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListChdSetFile.java similarity index 98% rename from src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListChdSetFile.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListChdSetFile.java index dd042cf..b3857a8 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListChdSetFile.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListChdSetFile.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.net.URL; import java.net.URLDecoder; diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListChdSetFileXmlAdapter.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListChdSetFileXmlAdapter.java similarity index 92% rename from src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListChdSetFileXmlAdapter.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListChdSetFileXmlAdapter.java index 7ce6d47..c51d512 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListChdSetFileXmlAdapter.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListChdSetFileXmlAdapter.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.util.ArrayList; import java.util.HashMap; @@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlAdapter; -import org.tibennetwork.iamame.internetarchive.SoftwareListChdSetFileXmlAdapter.SoftwareListChdSetFiles; +import org.tibennetwork.iarcade.internetarchive.SoftwareListChdSetFileXmlAdapter.SoftwareListChdSetFiles; public class SoftwareListChdSetFileXmlAdapter extends XmlAdapter>>> { diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListRomSet.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListRomSet.java similarity index 88% rename from src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListRomSet.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListRomSet.java index e28dcad..48a113b 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListRomSet.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListRomSet.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.io.File; import java.io.InputStream; @@ -8,9 +8,8 @@ import javax.xml.bind.JAXB; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -import org.tibennetwork.iamame.IaMame; -import org.tibennetwork.iamame.mame.MameVersion; +import org.tibennetwork.iarcade.IaRcade; +import org.tibennetwork.iarcade.mame.MameVersion; /** * A RomSet containing roms for softwares of emulated machines (cartridges, @@ -50,8 +49,8 @@ public static SoftwareListRomSet findBest(MameVersion version) { bestVersion = version; } else { bestVersion = versions.floor(version); - IaMame.warn("No archive.org softlist ROM set matches your Mame version"); - IaMame.warn("Some files might not be available."); + IaRcade.warn("No archive.org softlist ROM set matches your Mame version"); + IaRcade.warn("Some files might not be available."); } // Unmarshal MachineRomSet from XML data stored in classpath @@ -93,16 +92,16 @@ public void download(File writableRomPath, String listName, String name) { builder = new StringBuilder("Found "); builder.append(file.getName()); - IaMame.info(builder.toString()); + IaRcade.info(builder.toString()); builder = new StringBuilder("Collection: "); builder.append(col.getName()); - IaMame.info(builder.toString()); + IaRcade.info(builder.toString()); builder = new StringBuilder("URL: "); builder.append(col.getUrl()); - IaMame.info(builder.toString()); + IaRcade.info(builder.toString()); // Determine destination path diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListRomSetFile.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListRomSetFile.java similarity index 97% rename from src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListRomSetFile.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListRomSetFile.java index 8c44a40..b49c869 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListRomSetFile.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListRomSetFile.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.net.URL; import java.net.URLDecoder; diff --git a/src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListRomSetFileXmlAdapter.java b/src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListRomSetFileXmlAdapter.java similarity index 91% rename from src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListRomSetFileXmlAdapter.java rename to src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListRomSetFileXmlAdapter.java index 8d00974..2b85232 100644 --- a/src/main/java/org/tibennetwork/iamame/internetarchive/SoftwareListRomSetFileXmlAdapter.java +++ b/src/main/java/org/tibennetwork/iarcade/internetarchive/SoftwareListRomSetFileXmlAdapter.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.internetarchive; +package org.tibennetwork.iarcade.internetarchive; import java.util.ArrayList; import java.util.HashMap; @@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlAdapter; -import org.tibennetwork.iamame.internetarchive.SoftwareListRomSetFileXmlAdapter.SoftwareListRomSetFiles; +import org.tibennetwork.iarcade.internetarchive.SoftwareListRomSetFileXmlAdapter.SoftwareListRomSetFiles; public class SoftwareListRomSetFileXmlAdapter extends XmlAdapter>> { diff --git a/src/main/java/org/tibennetwork/iamame/mame/CommandLineOptions.java b/src/main/java/org/tibennetwork/iarcade/mame/CommandLineOptions.java similarity index 97% rename from src/main/java/org/tibennetwork/iamame/mame/CommandLineOptions.java rename to src/main/java/org/tibennetwork/iarcade/mame/CommandLineOptions.java index 3d56b0b..840fd45 100644 --- a/src/main/java/org/tibennetwork/iamame/mame/CommandLineOptions.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/CommandLineOptions.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; diff --git a/src/main/java/org/tibennetwork/iamame/mame/CommandLineOptionsFactory.java b/src/main/java/org/tibennetwork/iarcade/mame/CommandLineOptionsFactory.java similarity index 99% rename from src/main/java/org/tibennetwork/iamame/mame/CommandLineOptionsFactory.java rename to src/main/java/org/tibennetwork/iarcade/mame/CommandLineOptionsFactory.java index a845d34..e905929 100644 --- a/src/main/java/org/tibennetwork/iamame/mame/CommandLineOptionsFactory.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/CommandLineOptionsFactory.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/tibennetwork/iamame/mame/InvalidMameArgumentsException.java b/src/main/java/org/tibennetwork/iarcade/mame/InvalidMameArgumentsException.java similarity index 87% rename from src/main/java/org/tibennetwork/iamame/mame/InvalidMameArgumentsException.java rename to src/main/java/org/tibennetwork/iarcade/mame/InvalidMameArgumentsException.java index aead06f..2800beb 100755 --- a/src/main/java/org/tibennetwork/iamame/mame/InvalidMameArgumentsException.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/InvalidMameArgumentsException.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; /** * Exception related to given mame command diff --git a/src/main/java/org/tibennetwork/iamame/mame/Machine.java b/src/main/java/org/tibennetwork/iarcade/mame/Machine.java similarity index 98% rename from src/main/java/org/tibennetwork/iamame/mame/Machine.java rename to src/main/java/org/tibennetwork/iarcade/mame/Machine.java index 2ad4f9c..eaa4fd6 100755 --- a/src/main/java/org/tibennetwork/iamame/mame/Machine.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/Machine.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import java.io.File; import java.util.ArrayList; @@ -10,7 +10,7 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.tibennetwork.iamame.internetarchive.MachineRomSet.MachineRomSetFormat; +import org.tibennetwork.iarcade.internetarchive.MachineRomSet.MachineRomSetFormat; /** * Emulated System by Mame diff --git a/src/main/java/org/tibennetwork/iamame/mame/MachineDoesntExistException.java b/src/main/java/org/tibennetwork/iarcade/mame/MachineDoesntExistException.java similarity index 82% rename from src/main/java/org/tibennetwork/iamame/mame/MachineDoesntExistException.java rename to src/main/java/org/tibennetwork/iarcade/mame/MachineDoesntExistException.java index a3c5a6d..3b8e25a 100755 --- a/src/main/java/org/tibennetwork/iamame/mame/MachineDoesntExistException.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/MachineDoesntExistException.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; public class MachineDoesntExistException extends Exception { diff --git a/src/main/java/org/tibennetwork/iamame/mame/MachineHasNoSoftwareListException.java b/src/main/java/org/tibennetwork/iarcade/mame/MachineHasNoSoftwareListException.java similarity index 83% rename from src/main/java/org/tibennetwork/iamame/mame/MachineHasNoSoftwareListException.java rename to src/main/java/org/tibennetwork/iarcade/mame/MachineHasNoSoftwareListException.java index 2b32ec7..d71dc3e 100755 --- a/src/main/java/org/tibennetwork/iamame/mame/MachineHasNoSoftwareListException.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/MachineHasNoSoftwareListException.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; public class MachineHasNoSoftwareListException extends Exception { diff --git a/src/main/java/org/tibennetwork/iamame/mame/MachineRepository.java b/src/main/java/org/tibennetwork/iarcade/mame/MachineRepository.java similarity index 98% rename from src/main/java/org/tibennetwork/iamame/mame/MachineRepository.java rename to src/main/java/org/tibennetwork/iarcade/mame/MachineRepository.java index 62110f9..caf3a74 100755 --- a/src/main/java/org/tibennetwork/iamame/mame/MachineRepository.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/MachineRepository.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/tibennetwork/iamame/mame/MameExecutionException.java b/src/main/java/org/tibennetwork/iarcade/mame/MameExecutionException.java similarity index 82% rename from src/main/java/org/tibennetwork/iamame/mame/MameExecutionException.java rename to src/main/java/org/tibennetwork/iarcade/mame/MameExecutionException.java index 83247e9..d0cebc8 100755 --- a/src/main/java/org/tibennetwork/iamame/mame/MameExecutionException.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/MameExecutionException.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; public class MameExecutionException extends Exception { diff --git a/src/main/java/org/tibennetwork/iamame/mame/MameRuntime.java b/src/main/java/org/tibennetwork/iarcade/mame/MameRuntime.java similarity index 95% rename from src/main/java/org/tibennetwork/iamame/mame/MameRuntime.java rename to src/main/java/org/tibennetwork/iarcade/mame/MameRuntime.java index fa9ece6..370b976 100644 --- a/src/main/java/org/tibennetwork/iamame/mame/MameRuntime.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/MameRuntime.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import java.io.File; import java.io.IOException; @@ -7,7 +7,7 @@ import java.util.Set; import org.apache.commons.cli.ParseException; -import org.tibennetwork.iamame.internetarchive.NoWritableRomPathException; +import org.tibennetwork.iarcade.internetarchive.NoWritableRomPathException; public interface MameRuntime { diff --git a/src/main/java/org/tibennetwork/iamame/mame/MameRuntimeImpl.java b/src/main/java/org/tibennetwork/iarcade/mame/MameRuntimeImpl.java similarity index 96% rename from src/main/java/org/tibennetwork/iamame/mame/MameRuntimeImpl.java rename to src/main/java/org/tibennetwork/iarcade/mame/MameRuntimeImpl.java index b95d13d..7e08928 100755 --- a/src/main/java/org/tibennetwork/iamame/mame/MameRuntimeImpl.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/MameRuntimeImpl.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import java.io.BufferedReader; import java.io.File; @@ -14,8 +14,8 @@ import java.util.regex.Pattern; import org.apache.commons.cli.ParseException; -import org.tibennetwork.iamame.IaMame; -import org.tibennetwork.iamame.internetarchive.NoWritableRomPathException; +import org.tibennetwork.iarcade.IaRcade; +import org.tibennetwork.iarcade.internetarchive.NoWritableRomPathException; /** * Mame binary facade. @@ -53,7 +53,7 @@ public MameRuntimeImpl (String binPath) UnhandledMameVersionPatternException { this.binPath = binPath; this.binDirectory = new File(binPath).getParent(); - IaMame.debug(String.format( + IaRcade.debug(String.format( "Mame binary directory: %s", this.binDirectory)); this.getVersionFromBinary(); @@ -202,7 +202,7 @@ private Process initMameProcess ( } args.addAll(Arrays.asList(rawArgs)); - IaMame.debug("Executes Mame with: " + args); + IaRcade.debug("Executes Mame with: " + args); ProcessBuilder builder = new ProcessBuilder(args); if (inheritIO) { @@ -277,7 +277,7 @@ private void getRomsPathsFromBinary () dir = new File(dir.getAbsolutePath()); if(dir.isDirectory()) { - IaMame.debug("rompath found: " + dir); + IaRcade.debug("rompath found: " + dir); this.romsPaths.add(dir); } } diff --git a/src/main/java/org/tibennetwork/iamame/mame/MameVersion.java b/src/main/java/org/tibennetwork/iarcade/mame/MameVersion.java similarity index 98% rename from src/main/java/org/tibennetwork/iamame/mame/MameVersion.java rename to src/main/java/org/tibennetwork/iarcade/mame/MameVersion.java index 7a06473..cefa6c6 100644 --- a/src/main/java/org/tibennetwork/iamame/mame/MameVersion.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/MameVersion.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/org/tibennetwork/iamame/mame/MameVersionXmlAdapter.java b/src/main/java/org/tibennetwork/iarcade/mame/MameVersionXmlAdapter.java similarity index 91% rename from src/main/java/org/tibennetwork/iamame/mame/MameVersionXmlAdapter.java rename to src/main/java/org/tibennetwork/iarcade/mame/MameVersionXmlAdapter.java index d5478e7..3c15bb1 100644 --- a/src/main/java/org/tibennetwork/iamame/mame/MameVersionXmlAdapter.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/MameVersionXmlAdapter.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import javax.xml.bind.annotation.adapters.XmlAdapter; diff --git a/src/main/java/org/tibennetwork/iamame/mame/MediaDevice.java b/src/main/java/org/tibennetwork/iarcade/mame/MediaDevice.java similarity index 97% rename from src/main/java/org/tibennetwork/iamame/mame/MediaDevice.java rename to src/main/java/org/tibennetwork/iarcade/mame/MediaDevice.java index b1f7ecf..4f92a2b 100755 --- a/src/main/java/org/tibennetwork/iamame/mame/MediaDevice.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/MediaDevice.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/org/tibennetwork/iamame/mame/Software.java b/src/main/java/org/tibennetwork/iarcade/mame/Software.java similarity index 99% rename from src/main/java/org/tibennetwork/iamame/mame/Software.java rename to src/main/java/org/tibennetwork/iarcade/mame/Software.java index c2406c8..ff74236 100755 --- a/src/main/java/org/tibennetwork/iamame/mame/Software.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/Software.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import java.io.File; import java.util.ArrayList; diff --git a/src/main/java/org/tibennetwork/iamame/mame/SoftwareChdFile.java b/src/main/java/org/tibennetwork/iarcade/mame/SoftwareChdFile.java similarity index 97% rename from src/main/java/org/tibennetwork/iamame/mame/SoftwareChdFile.java rename to src/main/java/org/tibennetwork/iarcade/mame/SoftwareChdFile.java index 2b4d019..c18c444 100644 --- a/src/main/java/org/tibennetwork/iamame/mame/SoftwareChdFile.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/SoftwareChdFile.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import java.io.File; diff --git a/src/main/java/org/tibennetwork/iamame/mame/SoftwareList.java b/src/main/java/org/tibennetwork/iarcade/mame/SoftwareList.java similarity index 95% rename from src/main/java/org/tibennetwork/iamame/mame/SoftwareList.java rename to src/main/java/org/tibennetwork/iarcade/mame/SoftwareList.java index 940e4a0..5d60173 100755 --- a/src/main/java/org/tibennetwork/iamame/mame/SoftwareList.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/SoftwareList.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import java.util.List; diff --git a/src/main/java/org/tibennetwork/iamame/mame/SoftwareNotFoundInSoftwareListsException.java b/src/main/java/org/tibennetwork/iarcade/mame/SoftwareNotFoundInSoftwareListsException.java similarity index 84% rename from src/main/java/org/tibennetwork/iamame/mame/SoftwareNotFoundInSoftwareListsException.java rename to src/main/java/org/tibennetwork/iarcade/mame/SoftwareNotFoundInSoftwareListsException.java index 3235c47..3520c28 100755 --- a/src/main/java/org/tibennetwork/iamame/mame/SoftwareNotFoundInSoftwareListsException.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/SoftwareNotFoundInSoftwareListsException.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; public class SoftwareNotFoundInSoftwareListsException extends Exception { diff --git a/src/main/java/org/tibennetwork/iamame/mame/SoftwareRepository.java b/src/main/java/org/tibennetwork/iarcade/mame/SoftwareRepository.java similarity index 99% rename from src/main/java/org/tibennetwork/iamame/mame/SoftwareRepository.java rename to src/main/java/org/tibennetwork/iarcade/mame/SoftwareRepository.java index 23b2ca9..050b6bc 100755 --- a/src/main/java/org/tibennetwork/iamame/mame/SoftwareRepository.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/SoftwareRepository.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/tibennetwork/iamame/mame/SoftwareRomFile.java b/src/main/java/org/tibennetwork/iarcade/mame/SoftwareRomFile.java similarity index 97% rename from src/main/java/org/tibennetwork/iamame/mame/SoftwareRomFile.java rename to src/main/java/org/tibennetwork/iarcade/mame/SoftwareRomFile.java index fcc3ebc..2e020ce 100644 --- a/src/main/java/org/tibennetwork/iamame/mame/SoftwareRomFile.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/SoftwareRomFile.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import java.io.File; diff --git a/src/main/java/org/tibennetwork/iamame/mame/UnhandledMameVersionPatternException.java b/src/main/java/org/tibennetwork/iarcade/mame/UnhandledMameVersionPatternException.java similarity index 84% rename from src/main/java/org/tibennetwork/iamame/mame/UnhandledMameVersionPatternException.java rename to src/main/java/org/tibennetwork/iarcade/mame/UnhandledMameVersionPatternException.java index c3adaf2..cb962f5 100644 --- a/src/main/java/org/tibennetwork/iamame/mame/UnhandledMameVersionPatternException.java +++ b/src/main/java/org/tibennetwork/iarcade/mame/UnhandledMameVersionPatternException.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; public class UnhandledMameVersionPatternException extends Exception { diff --git a/src/test/java/org/tibennetwork/iamame/TestCommandLineArguments.java b/src/test/java/org/tibennetwork/iarcade/TestCommandLineArguments.java similarity index 91% rename from src/test/java/org/tibennetwork/iamame/TestCommandLineArguments.java rename to src/test/java/org/tibennetwork/iarcade/TestCommandLineArguments.java index d2d20bf..9ff468f 100644 --- a/src/test/java/org/tibennetwork/iamame/TestCommandLineArguments.java +++ b/src/test/java/org/tibennetwork/iarcade/TestCommandLineArguments.java @@ -1,10 +1,10 @@ -package org.tibennetwork.iamame; +package org.tibennetwork.iarcade; import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.CoreMatchers.not; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; import java.io.FileInputStream; import java.io.IOException; @@ -14,11 +14,11 @@ import java.util.List; import org.junit.Test; -import org.tibennetwork.iamame.mame.CommandLineOptions; -import org.tibennetwork.iamame.mame.CommandLineOptionsFactory; -import org.tibennetwork.iamame.mame.FakeMameRuntime; -import org.tibennetwork.iamame.mame.InvalidMameArgumentsException; -import org.tibennetwork.iamame.mame.MameExecutionException; +import org.tibennetwork.iarcade.mame.CommandLineOptions; +import org.tibennetwork.iarcade.mame.CommandLineOptionsFactory; +import org.tibennetwork.iarcade.mame.FakeMameRuntime; +import org.tibennetwork.iarcade.mame.InvalidMameArgumentsException; +import org.tibennetwork.iarcade.mame.MameExecutionException; public class TestCommandLineArguments { @@ -56,7 +56,7 @@ public void testGetMameOptionsRawArgsDoesntReturnMediaArgument () } @Test - public void testGetMameOptionsRawArgsDoesntReturnIaMameOptionArgument () + public void testGetMameOptionsRawArgsDoesntReturnIaRcadeOptionArgument () throws InvalidMameArgumentsException, IOException, InterruptedException, @@ -87,7 +87,7 @@ public void testGetMameOptionsRawArgsDoesntReturnIaMameOptionArgument () } @Test - public void testGetMameRawArgsDoesntReturnIaMameOptionArgument () + public void testGetMameRawArgsDoesntReturnIaRcadeOptionArgument () throws InvalidMameArgumentsException, IOException, InterruptedException, @@ -118,7 +118,7 @@ public void testGetMameRawArgsDoesntReturnIaMameOptionArgument () } @Test - public void testGetMameRawArgsDoesReturnIaMameNonOptionArgumentAndMediaTypes () + public void testGetMameRawArgsDoesReturnIaRcadeNonOptionArgumentAndMediaTypes () throws InvalidMameArgumentsException, IOException, InterruptedException, diff --git a/src/test/java/org/tibennetwork/iamame/TestTrash.java b/src/test/java/org/tibennetwork/iarcade/TestTrash.java similarity index 85% rename from src/test/java/org/tibennetwork/iamame/TestTrash.java rename to src/test/java/org/tibennetwork/iarcade/TestTrash.java index 8a4cb11..e4c2b2b 100644 --- a/src/test/java/org/tibennetwork/iamame/TestTrash.java +++ b/src/test/java/org/tibennetwork/iarcade/TestTrash.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame; +package org.tibennetwork.iarcade; import org.junit.Test; diff --git a/src/test/java/org/tibennetwork/iamame/mame/FakeMameRuntime.java b/src/test/java/org/tibennetwork/iarcade/mame/FakeMameRuntime.java similarity index 96% rename from src/test/java/org/tibennetwork/iamame/mame/FakeMameRuntime.java rename to src/test/java/org/tibennetwork/iarcade/mame/FakeMameRuntime.java index 9055806..94edbd2 100644 --- a/src/test/java/org/tibennetwork/iamame/mame/FakeMameRuntime.java +++ b/src/test/java/org/tibennetwork/iarcade/mame/FakeMameRuntime.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import java.io.BufferedReader; import java.io.File; @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; -import org.tibennetwork.iamame.internetarchive.NoWritableRomPathException; +import org.tibennetwork.iarcade.internetarchive.NoWritableRomPathException; /** * Fake MameRuntime which avoid the use of a real Mame process diff --git a/src/test/java/org/tibennetwork/iamame/mame/TestCommandLineOptionsFactory.java b/src/test/java/org/tibennetwork/iarcade/mame/TestCommandLineOptionsFactory.java similarity index 99% rename from src/test/java/org/tibennetwork/iamame/mame/TestCommandLineOptionsFactory.java rename to src/test/java/org/tibennetwork/iarcade/mame/TestCommandLineOptionsFactory.java index 08f43bf..c50ab71 100644 --- a/src/test/java/org/tibennetwork/iamame/mame/TestCommandLineOptionsFactory.java +++ b/src/test/java/org/tibennetwork/iarcade/mame/TestCommandLineOptionsFactory.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/org/tibennetwork/iamame/mame/TestMachine.java b/src/test/java/org/tibennetwork/iarcade/mame/TestMachine.java similarity index 98% rename from src/test/java/org/tibennetwork/iamame/mame/TestMachine.java rename to src/test/java/org/tibennetwork/iarcade/mame/TestMachine.java index 6da34c3..8ee6394 100644 --- a/src/test/java/org/tibennetwork/iamame/mame/TestMachine.java +++ b/src/test/java/org/tibennetwork/iarcade/mame/TestMachine.java @@ -1,7 +1,8 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -11,8 +12,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; + import org.junit.Test; -import org.tibennetwork.iamame.internetarchive.MachineRomSet.MachineRomSetFormat; +import org.tibennetwork.iarcade.internetarchive.MachineRomSet.MachineRomSetFormat; public class TestMachine { diff --git a/src/test/java/org/tibennetwork/iamame/mame/TestMachineRepository.java b/src/test/java/org/tibennetwork/iarcade/mame/TestMachineRepository.java similarity index 98% rename from src/test/java/org/tibennetwork/iamame/mame/TestMachineRepository.java rename to src/test/java/org/tibennetwork/iarcade/mame/TestMachineRepository.java index ee70459..230e5e2 100644 --- a/src/test/java/org/tibennetwork/iamame/mame/TestMachineRepository.java +++ b/src/test/java/org/tibennetwork/iarcade/mame/TestMachineRepository.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/src/test/java/org/tibennetwork/iamame/mame/TestMameVersion.java b/src/test/java/org/tibennetwork/iarcade/mame/TestMameVersion.java similarity index 98% rename from src/test/java/org/tibennetwork/iamame/mame/TestMameVersion.java rename to src/test/java/org/tibennetwork/iarcade/mame/TestMameVersion.java index 6767101..8ef0b2e 100644 --- a/src/test/java/org/tibennetwork/iamame/mame/TestMameVersion.java +++ b/src/test/java/org/tibennetwork/iarcade/mame/TestMameVersion.java @@ -1,4 +1,4 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/src/test/java/org/tibennetwork/iamame/mame/TestSoftware.java b/src/test/java/org/tibennetwork/iarcade/mame/TestSoftware.java similarity index 99% rename from src/test/java/org/tibennetwork/iamame/mame/TestSoftware.java rename to src/test/java/org/tibennetwork/iarcade/mame/TestSoftware.java index c5706d2..9282163 100644 --- a/src/test/java/org/tibennetwork/iamame/mame/TestSoftware.java +++ b/src/test/java/org/tibennetwork/iarcade/mame/TestSoftware.java @@ -1,7 +1,8 @@ -package org.tibennetwork.iamame.mame; +package org.tibennetwork.iarcade.mame; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; + import java.io.File; import java.io.FileInputStream; import java.io.InputStream; @@ -9,6 +10,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; + import org.junit.Test; public class TestSoftware {