Commit 90d0ea72 authored by Ryan Kavanagh's avatar Ryan Kavanagh

Merge commit 'upstream/0.9.9'

parents 7247c819 b92e7235
File deleted
File deleted
File deleted
......@@ -10,7 +10,7 @@ CRON-o-Meter is an open source nutrition tracker. All files, unless otherwise sp
and are distributed under the terms of the Common Public License Version
1.0 (see the file LICENSE.txt).
The file lib/usda_sr23.jar is based on a data files downloaded from the
The file lib/usda_sr24.jar is based on a data files downloaded from the
US Department of Agriculture's website. According to the USDA's FAQ
[http://www.ars.usda.gov/Main/docs.htm?docid=6233#copyright]:
......
......@@ -63,23 +63,7 @@
<exe4j projectfile="release/windows/cronometer.exe4j"/>
</target>
<target name="signalljars" depends="cronometer.jar,docs.jar" description="generate the signed jar package" >
<input message="Enter certificate password for signing:" addproperty="cert_pwd" />
<signjar jar="${lib}/cronometer.jar" keystore="release/jws" alias="spaz.ca" storepass="${cert_pwd}"/>
<signjar jar="${lib}/swingx-0.9.3.jar" keystore="release/jws" alias="spaz.ca" storepass="${cert_pwd}"/>
<signjar jar="${lib}/jcommon-1.0.10.jar" keystore="release/jws" alias="spaz.ca" storepass="${cert_pwd}"/>
<signjar jar="${lib}/jfreechart-1.0.6.jar" keystore="release/jws" alias="spaz.ca" storepass="${cert_pwd}"/>
<signjar jar="${lib}/docs.jar" keystore="release/jws" alias="spaz.ca" storepass="${cert_pwd}"/>
<signjar jar="${lib}/crdb_005.jar" keystore="release/jws" alias="spaz.ca" storepass="${cert_pwd}"/>
<signjar jar="${lib}/usda_sr23.jar" keystore="release/jws" alias="spaz.ca" storepass="${cert_pwd}"/>
</target>
<target name="signsomejars" depends="cronometer.jar,docs.jar" description="generate the signed jar package" >
<input message="Enter certificate password for signing:" addproperty="cert_pwd" />
<signjar jar="${lib}/docs.jar" keystore="release/jws" alias="spaz.ca" storepass="${cert_pwd}"/>
<signjar jar="${lib}/cronometer.jar" keystore="release/jws" alias="spaz.ca" storepass="${cert_pwd}"/>
</target>
</project>
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -23,7 +23,7 @@
<h3>Food Datasources</h3>
<a href="http://www.ars.usda.gov/Services/docs.htm?docid=8964">
USDA National Nutrient Database for Standard Reference - Release 22</a> (USDA sr22)
USDA National Nutrient Database for Standard Reference - Release 24</a> (USDA sr24)
<h3>Open Source Libraries</h3>
......@@ -49,7 +49,7 @@ USDA National Nutrient Database for Standard Reference - Release 22</a> (USDA sr
<tr>
<td>SwingX</td>
<td><a href="http://swinglabs.org/">http://swinglabs.org/</a></td>
<td>0.9.3</td>
<td>1.6.2</td>
<td><a href="http://www.gnu.org/licenses/lgpl.html">LGPL</a></td>
</tr>
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -8,6 +8,12 @@
<body>
<h1>CRON-o-Meter Release Notes</h1>
<h2>What's new in Version 0.9.9?</h2>
<ul>
<li>Updated to USDA sr24</li>
<li>Upgraded to Swingx 1.6.2</li>
</ul>
<h2>What's new in Version 0.9.8?</h2>
<ul>
<li>Updated to USDA sr23</li>
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -14,6 +14,7 @@ as a web application at <a href="http://cronometer.com/">http://cronometer.com/<
<h2>Why switch to cronometer.com?</h2>
<ul>
<li>Access your food diary from any web browser</li>
<li>Track on-the-go with the iPhone or Android app</li>
<li>Easily share your foods, recipes, and progress with others</li>
<li>A larger and growing food database</li>
<li>More detailed charts and graphs</li>
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -43,8 +43,8 @@ import com.apple.mrj.MRJQuitHandler;
public class CRONOMETER extends JFrame implements TaskListener, MRJQuitHandler, MRJAboutHandler, ClipboardOwner {
public static final String TITLE = "CRON-o-Meter";
public static final String VERSION = "0.9.8.1";
public static final int BUILD = 18;
public static final String VERSION = "0.9.9";
public static final int BUILD = 19;
public static JFrame mainFrame = null;
private static Clipboard clipboard = new Clipboard ("CRON-o-Meter");
......@@ -104,7 +104,7 @@ public class CRONOMETER extends JFrame implements TaskListener, MRJQuitHandler,
UserManager.getCurrentUser().doFirstRun(getMainPanel());
TargetEditor.setDefaultTargets(new DRITargetModel(), UserManager.getCurrentUser());
} else {
if (UserManager.getUserManager().getLastBuild() < 17) {
if (UserManager.getUserManager().getLastBuild() < 19) {
doShowCronometerDotCom();
} else if (UserManager.getUserManager().getLastBuild() < BUILD) {
doShowReleaseNotes();
......
......@@ -20,7 +20,6 @@ import org.w3c.dom.*;
import sun.misc.BASE64Encoder;
import ca.spaz.cron.datasource.Datasources;
import ca.spaz.cron.datasource.FoodProxy;
import ca.spaz.cron.foods.Recipe;
import ca.spaz.cron.metrics.Metric;
import ca.spaz.cron.user.User;
import ca.spaz.cron.user.UserManager;
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -12,11 +12,11 @@ public class USDAFoods extends JarXMLFoodDataSource {
public String getZipFileName() {
return "usda_sr23.jar";
return "usda_sr24.jar";
}
public String getBaseName() {
return "usda_sr23";
return "usda_sr24";
}
public String getName() {
......
File mode changed from 100755 to 100644
......@@ -45,7 +45,7 @@ public class USDAImporter implements Task {
private URL getFoodSourceURL() {
URL url = null;
try {
url = new URL("http://www.nal.usda.gov/fnic/foodcomp/Data/SR23/dnload/sr23.zip");
url = new URL("http://www.nal.usda.gov/fnic/foodcomp/Data/SR24/dnload/sr24.zip");
} catch (MalformedURLException e) {
Logger.error("getFoodSourceURL()", e);
}
......@@ -81,7 +81,7 @@ public class USDAImporter implements Task {
*/
public void run() {
abort = false;
curTask = "Importing USDA sr23";
curTask = "Importing USDA sr24";
if (null == sourceURL && null == sourceStream) {
return;
}
......@@ -104,7 +104,7 @@ public class USDAImporter implements Task {
// Indicate that it aborted, somehow.
return;
}
File tempFile = new File("sr23.zip");
File tempFile = new File("sr24.zip");
// if (!downloadFile(sourceURL, tempFile, DOWNLOAD_PROGRESS_PORTION)) {
// return; // Indicate failure.
// }
......@@ -271,7 +271,7 @@ public class USDAImporter implements Task {
try {
Food f = (Food)iter.next();
fixOmegaFats(f);
File file = new File("usda_sr23/"+f.getSourceUID()+".xml");
File file = new File("usda_sr24/"+f.getSourceUID()+".xml");
PrintStream ps = new PrintStream(
new BufferedOutputStream(new FileOutputStream(file)));
f.writeXML(ps, false);
......@@ -286,7 +286,7 @@ public class USDAImporter implements Task {
private void writeFoodsIndex() {
try {
File file = new File("usda_sr23/foods.index");
File file = new File("usda_sr24/foods.index");
PrintStream ps = new PrintStream(
new BufferedOutputStream(new FileOutputStream(file)));
Iterator iter = foods.values().iterator();
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
This diff is collapsed.
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
This diff is collapsed.
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
This diff is collapsed.
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment