rusefi
/
RomRaider
mirror of https://github.com/rusefi/RomRaider.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed compile error 

git-svn-id: http://svn.3splooges.com/romraider-arch/trunk@420 d2e2e1cd-ba16-0410-be16-b7c4453c7c2d
This commit is contained in:
kascade 2007-01-12 13:40:23 +00:00
parent deab248cd4
commit 91e1747a4d
1 changed files with 53 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/enginuity/newmaps/definition/index/IndexBuilder.java
View File

@ -23,6 +23,7 @@ package enginuity.newmaps.definition.index;
import enginuity.newmaps.definition.RomDefinitionHandler;
import enginuity.newmaps.xml.SaxParserFactory;
import static enginuity.util.MD5Checksum.getMD5Checksum;
import enginuity.util.exception.NameableNotFoundException;
import org.xml.sax.SAXParseException;
@ -30,16 +31,10 @@ import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.ObjectOutputStream;
<<<<<<< .mine
import static enginuity.util.MD5Checksum.getMD5Checksum;
import enginuity.util.exception.NameableNotFoundException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Iterator;
import org.xml.sax.SAXParseException;
=======
>>>>>>> .r417
public class IndexBuilder {
@ -66,7 +61,7 @@ public class IndexBuilder {
private void traverse(File file) {
if (file.isDirectory()) {
String[] children = file.list();
for (int i=0; i<children.length; i++) {
for (int i = 0; i < children.length; i++) {
traverse(new File(file, children[i]));
}
} else {
@ -137,7 +132,7 @@ public class IndexBuilder {
// If no exceptions, iterate through index checking checksums
Iterator it = index.iterator();
while (it.hasNext()) {
IndexItem item = (IndexItem)it.next();
IndexItem item = (IndexItem) it.next();
try {
if (!item.getChecksum().equalsIgnoreCase(getMD5Checksum(item.getFile().getAbsolutePath()))) {
@ -154,7 +149,7 @@ public class IndexBuilder {
public static Index getIndex(File dir) {
try {
ObjectInputStream ois = new ObjectInputStream(new FileInputStream(dir.getAbsoluteFile() + "/" + IndexBuilder.INDEX_FILE_NAME));
return (Index)ois.readObject();
return (Index) ois.readObject();
} catch (Exception ex) {
return new Index();
}
@ -172,7 +167,7 @@ public class IndexBuilder {
int i = 0;
long time = 0;
while (it.hasNext()) {
IndexItem item = (IndexItem)it.next();
IndexItem item = (IndexItem) it.next();
System.out.println("Adding " + item.getFile() + " (#" + ++i + ")");
InputStream inputStream1 = new BufferedInputStream(new FileInputStream(item.getFile()));
long start = System.currentTimeMillis();