[Sandev-cvs] sand/platform/tools/build/generate/org/sandev/generator XMLPersisterGenerator.java, 1.10, 1.11

[Eric P. <th...@us...>]

Update of /cvsroot/sandev/sand/platform/tools/build/generate/org/sandev/generator
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12578

Modified Files:
	XMLPersisterGenerator.java 
Log Message:
Factored out backupAndOpenForWrite method for easier use by subclasses.


Index: XMLPersisterGenerator.java
===================================================================
RCS file: /cvsroot/sandev/sand/platform/tools/build/generate/org/sandev/generator/XMLPersisterGenerator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** XMLPersisterGenerator.java	30 Oct 2010 17:32:12 -0000	1.10
--- XMLPersisterGenerator.java	11 Jan 2011 22:46:07 -0000	1.11
***************
*** 565,579 ****
          out.println("            File readfile=new File(getFileName());");
          out.println("            if(writing) {");
!         out.println("                String backupname=getBackupFileName();");
!         out.println("                File backup=new File(backupname);");
!         out.println("                if(backup.exists()) {");
!         out.println("                    backup.delete(); }");
!         out.println("                backup=new File(backupname);  //reset");
!         out.println("                if(readfile.exists()) {");
!         out.println("                    readfile.renameTo(backup); }");
!         out.println("                readfile=new File(backupname);  //reset regardless exists or not");
!         out.println("                File rewrite=new File(getFileName());");
!         out.println("                FileWriter fw=new FileWriter(rewrite);");
!         out.println("                pw=new PrintWriter(fw); }");
          out.println("            if(readfile.exists()) {");
          out.println("                FileReader fr=new FileReader(readfile);");
--- 565,569 ----
          out.println("            File readfile=new File(getFileName());");
          out.println("            if(writing) {");
!         out.println("                readfile=backupAndOpenForWrite(readfile); }");
          out.println("            if(readfile.exists()) {");
          out.println("                FileReader fr=new FileReader(readfile);");
***************
*** 587,590 ****
--- 577,602 ----
          out.println("");
          out.println("    /**");
+         out.println("     * Delete any existing bak file, move the current file to bak,");
+         out.println("     * open for file write.");
+         out.println("     */");
+         out.println("    protected File backupAndOpenForWrite(File readfile)");
+         out.println("            throws IOException");
+         out.println("    {");
+         out.println("        String backupname=getBackupFileName();");
+         out.println("        File backup=new File(backupname);");
+         out.println("        if(backup.exists()) {");
+         out.println("            backup.delete(); }");
+         out.println("        backup=new File(backupname);  //reset");
+         out.println("        if(readfile.exists()) {");
+         out.println("            readfile.renameTo(backup); }");
+         out.println("        readfile=new File(backupname);  //reset regardless if exists or not");
+         out.println("        File rewrite=new File(getFileName());");
+         out.println("        FileWriter fw=new FileWriter(rewrite);");
+         out.println("        pw=new PrintWriter(fw);");
+         out.println("        return readfile;");
+         out.println("    }");
+         out.println("");
+         out.println("");
+         out.println("    /**");
          out.println("     * Close the files we are reading and writing.");
          out.println("     */");