Changeset 319

Timestamp:

01/31/2011 11:37:49 PM (2 years ago)

Author:

qoncept

Message:

Eclipse is puking, I need to re-check out the whole project. I think.

Location:

branches/dev_xmlmerge

Files:

• settings.xml (added)
• src/com/romraider/maps/Rom.java (modified) (1 diff)
• src/com/romraider/metadata/AbstractTableMetadata.java (modified) (1 diff)
• src/com/romraider/metadata/RomMetadataHandler.java (modified) (1 diff)
• src/com/romraider/metadata/RomMetadataIndex.java (modified) (1 diff)
• src/com/romraider/metadata/RomMetadataIndexBuilder.java (modified) (4 diffs)
• src/com/romraider/metadata/ScalingMetadata.java (added)
• src/com/romraider/metadata/ScalingMetadataList.java (added)
• src/com/romraider/metadata/TableMetadataList.java (added)
• src/com/romraider/metadata/exception (added)
• src/com/romraider/metadata/exception/RomNotFoundException.java (moved) (moved from branches/dev_xmlmerge/src/com/romraider/metadata/RomNotFoundException.java) (1 diff)
• src/com/romraider/metadata/exception/ScalingNotFoundException.java (added)
• src/com/romraider/metadata/exception/TableNotFoundException.java (moved) (moved from branches/dev_xmlmerge/src/com/romraider/xml/TableNotFoundException.java) (1 diff)
• src/com/romraider/xml/DOMRomMetadataUnmarshaller.java (modified) (1 diff)
• src/com/romraider/xml/DOMRomUnmarshaller.java (modified) (1 diff)
• xmlmerge.properties (added)

branches/dev_xmlmerge/src/com/romraider/maps/Rom.java

@@ -22 +22 @@
 import com.romraider.editor.ecu.ECUEditor;
 import com.romraider.logger.ecu.ui.handler.table.TableUpdateHandler;
+import com.romraider.metadata.exception.TableNotFoundException;
 import com.romraider.swing.JProgressPane;
-import com.romraider.xml.TableNotFoundException;
 import org.apache.log4j.Logger;
 import javax.swing.JOptionPane;

branches/dev_xmlmerge/src/com/romraider/metadata/AbstractTableMetadata.java

@@ -3 +3 @@
 public abstract class AbstractTableMetadata {
 
+        private String name;
+        
+        public String getName() {
+                return this.name;
+        }
+        
+        public void setName(String name) {
+                this.name = name;
+        }
 }

branches/dev_xmlmerge/src/com/romraider/metadata/RomMetadataHandler.java

@@ -10 +10 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+
+import com.romraider.metadata.exception.RomNotFoundException;
 import com.romraider.xml.DOMRomMetadataRefactorUtil;
 import com.romraider.xml.DOMRomMetadataUnmarshaller;

branches/dev_xmlmerge/src/com/romraider/metadata/RomMetadataIndex.java

@@ -1 +1 @@
 package com.romraider.metadata;
+
+import com.romraider.metadata.exception.RomNotFoundException;
 
 

branches/dev_xmlmerge/src/com/romraider/metadata/RomMetadataIndexBuilder.java

@@ -1 +1 @@
 package com.romraider.metadata;
 
-import java.io.BufferedWriter;
-
-import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
-import javax.management.modelmbean.XMLParseException;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-import ch.elca.el4j.services.xmlmerge.XmlMerge;
-import ch.elca.el4j.services.xmlmerge.merge.DefaultXmlMerge;
-import com.romraider.maps.Rom;
-import com.romraider.swing.JProgressPane;
 import com.romraider.util.FileListing;
 import com.romraider.xml.DOMRomMetadataUnmarshaller;
@@ -40 +24 @@
                                                         
                                 try {
-                                        romVector.addAll(DOMRomMetadataUnmarshaller.unmarshallRomIDIndex(f));
+                                        //romVector.addAll(DOMRomMetadataUnmarshaller.unmarshallRomIDIndex(f));
                                         
                                 } catch (Exception x) {
@@ -67 +51 @@
                 
                 
-                /*long time1 = System.currentTimeMillis();
+                long time1 = System.currentTimeMillis();
                 try {
                         
@@ -76 +60 @@
                         System.out.println(romIndex.size() + " index built in " + (time2 - time1) + "ms");
                                 
-                        RomMetadataHandler.getMetadata(input, romIndex);*/
-                        
-                        
-                        
-                        /*InputSource src1 = new InputSource(new FileInputStream(new File("c:\\users\\owner\\desktop\\16BITBASE.xml")));
-                        DOMParser parser = new DOMParser();
-                        parser.parse(src1);
-                        Document root1 = parser.getDocument();
-                        
-                        InputSource src2 = new InputSource(new FileInputStream(new File("c:\\users\\owner\\desktop\\A4TF400E.xml")));
-                        parser.parse(src2);     
-                        Document root2 = parser.getDocument();
-                        
-                        Document[] docs = new Document[] {root1, root2};
-                        
-                        XmlMerge merge = new DefaultXmlMerge();
-                        Document mergedDoc = merge.merge(docs);
-
-                    File output = new File("c:\\users\\owner\\desktop\\new.xml");       
-                FileOutputStream fos = new FileOutputStream(output);
-                OutputFormat of = new OutputFormat("XML", "ISO-8859-1", true);
-                of.setIndent(1);
-                of.setIndenting(true);
-                
-                try {
-                    XMLSerializer serializer = new XMLSerializer(fos, of);
-                    serializer.serialize(mergedDoc);
-                    fos.flush();
-                } finally {
-                    fos.close();
-                }
-
+                        RomMetadataHandler.getMetadata(input, romIndex);
 
 
                 } catch (Exception e) {
                         e.printStackTrace();
-                }*/
+                }
                 
         }

branches/dev_xmlmerge/src/com/romraider/metadata/exception/RomNotFoundException.java

@@ -1 @@
-package com.romraider.metadata;
+package com.romraider.metadata.exception;
 
 public class RomNotFoundException extends Exception {

branches/dev_xmlmerge/src/com/romraider/metadata/exception/TableNotFoundException.java

@@ -18 +18 @@
  */
 
-package com.romraider.xml;
+package com.romraider.metadata.exception;
 
 public final class TableNotFoundException extends Exception {

branches/dev_xmlmerge/src/com/romraider/xml/DOMRomMetadataUnmarshaller.java

@@ -13 +13 @@
 import org.xml.sax.SAXException;
 import com.romraider.metadata.RomIndexID;
+import com.romraider.metadata.RomMetadata;
 import com.sun.org.apache.xerces.internal.parsers.DOMParser;
 
 public class DOMRomMetadataUnmarshaller {
+        
+        private RomMetadata r;
+        
+        public DOMRomMetadataUnmarshaller() {
+                r = new RomMetadata();
+        }
 
-        public static Vector<RomIndexID> unmarshallRomIDIndex(File file) throws SAXException, IOException {
+        public Vector<RomIndexID> unmarshallRomIDIndex(File file) throws SAXException, IOException {
                 
                 Vector<RomIndexID> romVector = new Vector<RomIndexID>();

branches/dev_xmlmerge/src/com/romraider/xml/DOMRomUnmarshaller.java

@@ -33 +33 @@
 import com.romraider.maps.Table3D;
 import com.romraider.maps.TableSwitch;
+import com.romraider.metadata.exception.TableNotFoundException;
 import com.romraider.swing.DebugPanel;
 import com.romraider.swing.JProgressPane;