Merge "Made method signatures more consistent" into xcodeprojreader/master

gebhardt · Gerrit Code Review · commit 213ee4deb959 · 2012-06-06T14:40:10.000+02:00
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBPlistParser.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBPlistParser.java
@@ -41,11 +41,17 @@
 
 import com.sap.prd.mobile.ios.mios.xcodeprojreader.Plist;
 
-// TODO unsupported element types: Date, Data, Integer, Real
+// TODO unsupported element types: Date, Data
 public class JAXBPlistParser
 {
   public Plist load(String projectFile) throws SAXException, ParserConfigurationException, FileNotFoundException,
         JAXBException
+  {
+    return load(new File(projectFile));
+  }
+
+  public Plist load(File projectFile) throws SAXException, ParserConfigurationException, FileNotFoundException,
+        JAXBException
   {
     InputSource project = new InputSource(new FileReader(projectFile));
     return unmarshallPlist(project);
@@ -95,12 +101,17 @@ public InputSource resolveEntity(String pid, String sid) throws SAXException
     return ss;
   }
 
-  public void save(Plist plist, String fileName) throws JAXBException
+  public void save(Plist plist, String projectFile) throws JAXBException
+  {
+    save(plist, new File(projectFile));
+  }
+
+  public void save(Plist plist, File projectFile) throws JAXBException
   {
-    marshallPlist(plist, fileName);
+    marshallPlist(plist, projectFile);
   }
 
-  private void marshallPlist(Plist plist, String projectFile) throws JAXBException
+  private void marshallPlist(Plist plist, File projectFile) throws JAXBException
   {
     JAXBContext ctx = JAXBContext.newInstance(com.sap.prd.mobile.ios.mios.xcodeprojreader.jaxb.JAXBPlist.class);
     Marshaller marshaller = ctx.createMarshaller();
@@ -110,13 +121,19 @@ private void marshallPlist(Plist plist, String projectFile) throws JAXBException
             "com.sun.xml.internal.bind.xmlHeaders",
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">");
     marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
-    marshaller.marshal(plist, new File(projectFile));
+    marshaller.marshal(plist, projectFile);
+  }
+
+  public void convert(String projectFile, String destinationProjectFile) throws IOException
+  {
+    convert(new File(projectFile), new File(destinationProjectFile));
   }
 
-  public void convert(String projectFile, File destinationProjectFile) throws IOException
+  public void convert(File projectFile, File destinationProjectFile) throws IOException
   {
     Process exec = Runtime.getRuntime().exec(
-          new String[] { "plutil", "-convert", "xml1", "-o", destinationProjectFile.getAbsolutePath(), projectFile });
+          new String[] { "plutil", "-convert", "xml1", "-o", destinationProjectFile.getAbsolutePath(),
+              projectFile.getAbsolutePath() });
     try
     {
       exec.waitFor();
diff --git a/src/test/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBPlistParserTest.java b/src/test/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBPlistParserTest.java
@@ -90,7 +90,7 @@ public void convertOpenStepToXML() throws Exception
     File xmlProj = File.createTempFile("project", ".pbxproj");
     xmlProj.deleteOnExit();
 
-    parser.convert(fileNameOpenStep, xmlProj);
+    parser.convert(fileNameOpenStep, xmlProj.getAbsolutePath());
     Plist plist = parser.load(xmlProj.getAbsolutePath());
     assertEquals("1.0", plist.getVersion());
   }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public void convertOpenStepToXML() throws Exception`
`90`	`90`	`File xmlProj = File.createTempFile("project", ".pbxproj");`
`91`	`91`	`xmlProj.deleteOnExit();`
`92`	`92`
`93`		`- parser.convert(fileNameOpenStep, xmlProj);`
	`93`	`+ parser.convert(fileNameOpenStep, xmlProj.getAbsolutePath());`
`94`	`94`	`Plist plist = parser.load(xmlProj.getAbsolutePath());`
`95`	`95`	`assertEquals("1.0", plist.getVersion());`
`96`	`96`	`}`