From: <ni...@us...> - 2007-02-18 23:26:40
|
Revision: 6861 http://svn.sourceforge.net/jmol/?rev=6861&view=rev Author: nicove Date: 2007-02-18 15:26:37 -0800 (Sun, 18 Feb 2007) Log Message: ----------- Fah Modified Paths: -------------- trunk/Jmol-FAH/build.xml Added Paths: ----------- trunk/Jmol-FAH/src/org/jmol/fah/Jmol-FAH.properties Modified: trunk/Jmol-FAH/build.xml =================================================================== --- trunk/Jmol-FAH/build.xml 2007-02-18 10:45:40 UTC (rev 6860) +++ trunk/Jmol-FAH/build.xml 2007-02-18 23:26:37 UTC (rev 6861) @@ -32,7 +32,7 @@ <target name="dist" depends="init,jar"> <mkdir dir="${dist.dir}" /> - <zip zipfile="${dist.dir}/JmolFah.zip"> + <zip zipfile="${dist.dir}/JmolFah-${JmolFAH.Version}.zip"> <fileset dir="${build.dir}"> <include name="JmolFah.jar" /> </fileset> @@ -67,6 +67,7 @@ <target name="init" id="init"> <tstamp/> <delete dir="${build.dir}" /> + <property file="${src.dir}/org/jmol/fah/Jmol-FAH.properties" prefix="JmolFAH" /> </target> </project> Added: trunk/Jmol-FAH/src/org/jmol/fah/Jmol-FAH.properties =================================================================== --- trunk/Jmol-FAH/src/org/jmol/fah/Jmol-FAH.properties (rev 0) +++ trunk/Jmol-FAH/src/org/jmol/fah/Jmol-FAH.properties 2007-02-18 23:26:37 UTC (rev 6861) @@ -0,0 +1,6 @@ +# Properties for Jmol-FAH. + +# +# Version +# +Version=0.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2007-07-31 10:09:27
|
Revision: 8024 http://jmol.svn.sourceforge.net/jmol/?rev=8024&view=rev Author: nicove Date: 2007-07-31 03:09:23 -0700 (Tue, 31 Jul 2007) Log Message: ----------- Folding@Home Modified Paths: -------------- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java Added Paths: ----------- trunk/Jmol-FAH/projects/p2617.xyz.gz Added: trunk/Jmol-FAH/projects/p2617.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p2617.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java =================================================================== --- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2007-07-30 16:30:20 UTC (rev 8023) +++ trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2007-07-31 10:09:23 UTC (rev 8024) @@ -603,6 +603,8 @@ if (core != null) { if ("AMBER".equalsIgnoreCase(core)) { info._fciCore = CoreType.AMBER; + } else if ("DB".equalsIgnoreCase(core)) { + info._fciCore = CoreType.DGROMACSB; } else if ("DGROMACS".equalsIgnoreCase(core)) { info._fciCore = CoreType.DGROMACS; } else if ("GBGROMACS".equalsIgnoreCase(core)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2007-08-13 06:21:18
|
Revision: 8067 http://jmol.svn.sourceforge.net/jmol/?rev=8067&view=rev Author: nicove Date: 2007-08-12 23:21:14 -0700 (Sun, 12 Aug 2007) Log Message: ----------- Folding@Home Modified Paths: -------------- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java Added Paths: ----------- trunk/Jmol-FAH/projects/p3687.xyz.gz Added: trunk/Jmol-FAH/projects/p3687.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p3687.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java =================================================================== --- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2007-08-13 05:56:01 UTC (rev 8066) +++ trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2007-08-13 06:21:14 UTC (rev 8067) @@ -603,7 +603,7 @@ if (core != null) { if ("AMBER".equalsIgnoreCase(core)) { info._fciCore = CoreType.AMBER; - } else if ("DB".equalsIgnoreCase(core)) { + } else if ("DGROMACSB".equalsIgnoreCase(core)) { info._fciCore = CoreType.DGROMACSB; } else if ("DGROMACS".equalsIgnoreCase(core)) { info._fciCore = CoreType.DGROMACS; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-03-01 23:19:28
|
Revision: 9042 http://jmol.svn.sourceforge.net/jmol/?rev=9042&view=rev Author: nicove Date: 2008-03-01 15:19:26 -0800 (Sat, 01 Mar 2008) Log Message: ----------- Folding@Home Modified Paths: -------------- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java Added Paths: ----------- trunk/Jmol-FAH/projects/p2169.xyz.gz trunk/Jmol-FAH/projects/p4402.xyz.gz Added: trunk/Jmol-FAH/projects/p2169.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p2169.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Jmol-FAH/projects/p4402.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4402.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java =================================================================== --- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2008-03-01 20:44:34 UTC (rev 9041) +++ trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2008-03-01 23:19:26 UTC (rev 9042) @@ -1312,8 +1312,15 @@ if ((info._psFrames != null) && (!info._psFrames.equals(info._staticFrames))) { different = true; } - if ((info._psName != null) && (!info._psName.equals(info._staticName))) { - different = true; + if ((info._psName != null) && + (!info._psName.equals(info._staticName))) { + if ((info._psName.indexOf('_') == info._psName.length() - 1) && + (info._staticName != null) && + (info._staticName.startsWith(info._psName))) { + // + } else { + different = true; + } } if ((info._psPreferred != null) && (!info._psPreferred.equals(info._staticPreferred))) { different = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-03-25 17:39:10
|
Revision: 9198 http://jmol.svn.sourceforge.net/jmol/?rev=9198&view=rev Author: nicove Date: 2008-03-25 10:38:58 -0700 (Tue, 25 Mar 2008) Log Message: ----------- Folding@Home Modified Paths: -------------- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java Added Paths: ----------- trunk/Jmol-FAH/projects/p3440.xyz.gz trunk/Jmol-FAH/projects/p4412.xyz.gz Added: trunk/Jmol-FAH/projects/p3440.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p3440.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Jmol-FAH/projects/p4412.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4412.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java =================================================================== --- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2008-03-25 15:39:40 UTC (rev 9197) +++ trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2008-03-25 17:38:58 UTC (rev 9198) @@ -611,6 +611,8 @@ info._fciCore = CoreType.GBGROMACS; } else if ("GC".equalsIgnoreCase(core)) { info._fciCore = CoreType.GROCVS; + } else if ("GROCVS".equalsIgnoreCase(core)) { + info._fciCore = CoreType.GROCVS; } else if ("GROGPU".equalsIgnoreCase(core)) { info._fciCore = CoreType.GROGPU; } else if ("GROMACS".equalsIgnoreCase(core)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-04-20 09:48:44
|
Revision: 9287 http://jmol.svn.sourceforge.net/jmol/?rev=9287&view=rev Author: nicove Date: 2008-04-20 02:48:40 -0700 (Sun, 20 Apr 2008) Log Message: ----------- Folding@Home Modified Paths: -------------- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java Added Paths: ----------- trunk/Jmol-FAH/projects/p4512.xyz.gz Added: trunk/Jmol-FAH/projects/p4512.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4512.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java =================================================================== --- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2008-04-19 18:54:09 UTC (rev 9286) +++ trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2008-04-20 09:48:40 UTC (rev 9287) @@ -611,6 +611,8 @@ info._fciCore = CoreType.GBGROMACS; } else if ("GC".equalsIgnoreCase(core)) { info._fciCore = CoreType.GROCVS; + } else if ("GG2".equalsIgnoreCase(core)) { + info._fciCore = CoreType.GROGPU2; } else if ("GROCVS".equalsIgnoreCase(core)) { info._fciCore = CoreType.GROCVS; } else if ("GROGPU".equalsIgnoreCase(core)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-04-27 10:00:01
|
Revision: 9318 http://jmol.svn.sourceforge.net/jmol/?rev=9318&view=rev Author: nicove Date: 2008-04-27 02:59:57 -0700 (Sun, 27 Apr 2008) Log Message: ----------- Folding@Home Modified Paths: -------------- trunk/Jmol-FAH/src/org/jmol/fah/CoreType.java Added Paths: ----------- trunk/Jmol-FAH/projects/p4516.xyz.gz trunk/Jmol-FAH/projects/p4518.xyz.gz Added: trunk/Jmol-FAH/projects/p4516.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4516.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Jmol-FAH/projects/p4518.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4518.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Jmol-FAH/src/org/jmol/fah/CoreType.java =================================================================== --- trunk/Jmol-FAH/src/org/jmol/fah/CoreType.java 2008-04-27 03:33:48 UTC (rev 9317) +++ trunk/Jmol-FAH/src/org/jmol/fah/CoreType.java 2008-04-27 09:59:57 UTC (rev 9318) @@ -50,6 +50,9 @@ if (code.equalsIgnoreCase(DGROMACSB._code)) { return DGROMACSB; } + if (code.equalsIgnoreCase(DGROMACSC._code)) { + return DGROMACSC; + } if (code.equalsIgnoreCase(GBGROMACS._code)) { return GBGROMACS; } @@ -107,6 +110,9 @@ if (name.equalsIgnoreCase(DGROMACSB._name)) { return DGROMACSB; } + if (name.equalsIgnoreCase(DGROMACSC._name)) { + return DGROMACSC; + } if (name.equalsIgnoreCase(GBGROMACS._name)) { return GBGROMACS; } @@ -171,6 +177,7 @@ static public final CoreType AMBER = new CoreType("Amber", "A", true); //$NON-NLS-1$ //$NON-NLS-2$ static public final CoreType DGROMACS = new CoreType("DGromacs", "DG", true); //$NON-NLS-1$ //$NON-NLS-2$ static public final CoreType DGROMACSB = new CoreType("DGromacsB", "DB", true); //$NON-NLS-1$ //$NON-NLS-2$ + static public final CoreType DGROMACSC = new CoreType("DGromacsC", "DC", true); //$NON-NLS-1$ //$NON-NLS-2$ static public final CoreType GBGROMACS = new CoreType("GBGromacs", "GB", true); //$NON-NLS-1$ //$NON-NLS-2$ static public final CoreType GROCVS = new CoreType("GroCVS", "GC", false); //$NON-NLS-1$ //$NON-NLS-2$ static public final CoreType GROGPU = new CoreType("GroGPU", "GG", false); //$NON-NLS-1$ //$NON-NLS-2$ @@ -193,7 +200,7 @@ * * @param name Name of core * @param code Letter code of core - * @param hasFile Flad indicating the present of a current.xyz file + * @param hasFile Flag indicating the present of a current.xyz file */ private CoreType(String name, String code, boolean hasFile) { this._name = name; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-04-27 12:12:56
|
Revision: 9322 http://jmol.svn.sourceforge.net/jmol/?rev=9322&view=rev Author: nicove Date: 2008-04-27 05:12:50 -0700 (Sun, 27 Apr 2008) Log Message: ----------- Folding@Home Modified Paths: -------------- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java Added Paths: ----------- trunk/Jmol-FAH/projects/p3855.xyz.gz Added: trunk/Jmol-FAH/projects/p3855.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p3855.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java =================================================================== --- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2008-04-27 10:32:51 UTC (rev 9321) +++ trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2008-04-27 12:12:50 UTC (rev 9322) @@ -603,6 +603,8 @@ if (core != null) { if ("AMBER".equalsIgnoreCase(core)) { info._fciCore = CoreType.AMBER; + } else if ("DC".equalsIgnoreCase(core)) { + info._fciCore = CoreType.DGROMACSC; } else if ("DGROMACSB".equalsIgnoreCase(core)) { info._fciCore = CoreType.DGROMACSB; } else if ("DGROMACS".equalsIgnoreCase(core)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-05-06 17:48:32
|
Revision: 9363 http://jmol.svn.sourceforge.net/jmol/?rev=9363&view=rev Author: nicove Date: 2008-05-06 10:48:30 -0700 (Tue, 06 May 2008) Log Message: ----------- Folding@Home Modified Paths: -------------- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java Added Paths: ----------- trunk/Jmol-FAH/projects/p2170.xyz.gz trunk/Jmol-FAH/projects/p4525.xyz.gz Added: trunk/Jmol-FAH/projects/p2170.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p2170.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Jmol-FAH/projects/p4525.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4525.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java =================================================================== --- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2008-05-06 14:31:17 UTC (rev 9362) +++ trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2008-05-06 17:48:30 UTC (rev 9363) @@ -605,10 +605,12 @@ info._fciCore = CoreType.AMBER; } else if ("DC".equalsIgnoreCase(core)) { info._fciCore = CoreType.DGROMACSC; + } else if ("DGROMACS".equalsIgnoreCase(core)) { + info._fciCore = CoreType.DGROMACS; } else if ("DGROMACSB".equalsIgnoreCase(core)) { info._fciCore = CoreType.DGROMACSB; - } else if ("DGROMACS".equalsIgnoreCase(core)) { - info._fciCore = CoreType.DGROMACS; + } else if ("DGROMACSC".equalsIgnoreCase(core)) { + info._fciCore = CoreType.DGROMACSC; } else if ("GBGROMACS".equalsIgnoreCase(core)) { info._fciCore = CoreType.GBGROMACS; } else if ("GC".equalsIgnoreCase(core)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-05-14 10:15:13
|
Revision: 9376 http://jmol.svn.sourceforge.net/jmol/?rev=9376&view=rev Author: nicove Date: 2008-05-14 03:15:09 -0700 (Wed, 14 May 2008) Log Message: ----------- Folding@Home Modified Paths: -------------- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java Added Paths: ----------- trunk/Jmol-FAH/projects/p1732.xyz.gz trunk/Jmol-FAH/projects/p1735.xyz.gz trunk/Jmol-FAH/projects/p4531.xyz.gz trunk/Jmol-FAH/projects/p4532.xyz.gz trunk/Jmol-FAH/projects/p4533.xyz.gz Added: trunk/Jmol-FAH/projects/p1732.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p1732.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Jmol-FAH/projects/p1735.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p1735.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Jmol-FAH/projects/p4531.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4531.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Jmol-FAH/projects/p4532.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4532.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Jmol-FAH/projects/p4533.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4533.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java =================================================================== --- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2008-05-13 21:25:02 UTC (rev 9375) +++ trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2008-05-14 10:15:09 UTC (rev 9376) @@ -534,10 +534,10 @@ factory.setNamespaceAware(true); try { - //Load document + //Load document InputStream stream = null; if (_local == true) { - stream = new FileInputStream("project-summary.xml"); //$NON-NLS-1$ + stream = new FileInputStream("project-summary.xml"); //$NON-NLS-1$ } else { StringBuffer urlName = new StringBuffer(); urlName.append("http://fci.fatalerrorgroup.com/xml-data/"); //$NON-NLS-1$ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-05-25 08:52:38
|
Revision: 9425 http://jmol.svn.sourceforge.net/jmol/?rev=9425&view=rev Author: nicove Date: 2008-05-25 01:52:28 -0700 (Sun, 25 May 2008) Log Message: ----------- Folding@Home Modified Paths: -------------- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java Added Paths: ----------- trunk/Jmol-FAH/projects/p4541.xyz.gz trunk/Jmol-FAH/projects/p4542.xyz.gz trunk/Jmol-FAH/projects/p4543.xyz.gz trunk/Jmol-FAH/projects/p4544.xyz.gz trunk/Jmol-FAH/projects/p4545.xyz.gz trunk/Jmol-FAH/projects/p4546.xyz.gz trunk/Jmol-FAH/projects/p4550.xyz.gz Property Changed: ---------------- trunk/Jmol-FAH/ Property changes on: trunk/Jmol-FAH ___________________________________________________________________ Name: svn:ignore - bin ProjectInfo.txt build + bin ProjectInfo.txt build fci-data.xml Added: trunk/Jmol-FAH/projects/p4541.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4541.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Jmol-FAH/projects/p4542.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4542.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Jmol-FAH/projects/p4543.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4543.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Jmol-FAH/projects/p4544.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4544.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Jmol-FAH/projects/p4545.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4545.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Jmol-FAH/projects/p4546.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4546.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Jmol-FAH/projects/p4550.xyz.gz =================================================================== (Binary files differ) Property changes on: trunk/Jmol-FAH/projects/p4550.xyz.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java =================================================================== --- trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2008-05-25 05:16:08 UTC (rev 9424) +++ trunk/Jmol-FAH/src/org/jmol/fah/ProjectInformation.java 2008-05-25 08:52:28 UTC (rev 9425) @@ -25,17 +25,22 @@ package org.jmol.fah; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStream; import java.io.Reader; import java.net.MalformedURLException; import java.net.URL; +import java.net.URLConnection; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.Vector; @@ -231,6 +236,75 @@ } /** + * Update a local file from an URL. + * + * @param file Local file. + * @param url URL. + */ + private void updateFileFromUrl(File file, URL url) { + if ((file == null) || (url == null)) { + return; + } + OutputStream output = null; + InputStream input = null; + try { + + System.out.print("Updating " + file.getName() + " from " + url.toExternalForm() + ": "); + // Get last-modified times of the URL + URLConnection connection = url.openConnection(); + if (connection == null) { + System.out.println("Unable to access URL"); + return; + } + long urlTime = connection.getLastModified(); + if (urlTime == 0) { + System.out.println("Unable to retrieve last-modified information"); + return; + } + + // Get last-modified time of the file + long fileTime = file.lastModified(); + if (fileTime >= urlTime) { + System.out.println("File already up to date"); + return; + } + + // Retrieve the file + File tmpFile = new File(file.getParentFile(), file.getName() + ".tmp"); + output = new BufferedOutputStream(new FileOutputStream(tmpFile)); + input = new BufferedInputStream(connection.getInputStream()); + int data; + while ((data = input.read()) != -1) { + output.write(data); + } + input.close(); + output.close(); + + // Manage local file + file.delete(); + tmpFile.renameTo(file); + System.out.println("File updated"); + } catch (IOException e) { + System.out.println("Error " + e.getMessage()); + } finally { + if (input != null) { + try { + input.close(); + } catch (IOException e) { + // + } + } + if (output != null) { + try { + output.close(); + } catch (IOException e) { + // + } + } + } + } + + /** * Add information from emprotz.dat */ private void addEMInformation() { @@ -534,21 +608,15 @@ factory.setNamespaceAware(true); try { + // Retrieve distant file + File localFile = new File("fci-data.xml"); + URL distantUrl = new URL("http://fci.fatalerrorgroup.com/xml-data/project-summary.xml"); + if (_local == false) { + updateFileFromUrl(localFile, distantUrl); + } + //Load document - InputStream stream = null; - if (_local == true) { - stream = new FileInputStream("project-summary.xml"); //$NON-NLS-1$ - } else { - StringBuffer urlName = new StringBuffer(); - urlName.append("http://fci.fatalerrorgroup.com/xml-data/"); //$NON-NLS-1$ - urlName.append("project-summary.xml"); //$NON-NLS-1$ - try { - URL url = new URL(urlName.toString()); - stream = url.openStream(); - } catch (MalformedURLException mue) { - mue.printStackTrace(); - } - } + InputStream stream = new FileInputStream(localFile); DocumentBuilder builder = factory.newDocumentBuilder(); Document document = builder.parse(stream); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |