X-Git-Url: https://satomichan.jp/gitweb/?p=nucalgen;a=blobdiff_plain;f=nucalgen%2Fsrc%2Fmain%2Fjava%2Fjp%2Fsatomichan%2Fnucalgen%2FNutritionColumn.java;fp=nucalgen%2Fsrc%2Fmain%2Fjava%2Fjp%2Fsatomichan%2Fnucalgen%2FNutritionColumn.java;h=0ad1d69422d6c1b6e1b3cb553f226950ee7bd4ac;hp=34d7ee32a709036449bbe0154dca40042a945bc8;hb=bcdb2cb3b4097c8bf9d661e888e0ea56b258a730;hpb=288847d89d13ec0b30a06370505c148b08ed3d55

diff --git a/nucalgen/src/main/java/jp/satomichan/nucalgen/NutritionColumn.java b/nucalgen/src/main/java/jp/satomichan/nucalgen/NutritionColumn.java
index 34d7ee3..0ad1d69 100644
--- a/nucalgen/src/main/java/jp/satomichan/nucalgen/NutritionColumn.java
+++ b/nucalgen/src/main/java/jp/satomichan/nucalgen/NutritionColumn.java
@@ -2,7 +2,9 @@ package jp.satomichan.nucalgen;
 
 public class NutritionColumn {
 	private String name;
+	private String table;
 	private String dispName;
+	private String formula;
 	private String format;
 	private String unit;
 	private boolean useRawValue;
@@ -18,6 +20,14 @@ public class NutritionColumn {
 		this.name = name;
 	}
 
+	public String getTable() {
+		return table;
+	}
+
+	public void setTable(String table) {
+		this.table = table;
+	}
+
 	public void setName(Object name) {
 		this.name = (String) name;
 	}
@@ -32,6 +42,15 @@ public class NutritionColumn {
 	}
 
 
+	public String getFormula() {
+		return formula;
+	}
+
+	public void setFormula(String fomula) {
+		this.formula = fomula;
+	}
+
+
 	public String getFormat() {
 		return format;
 	}