Permalink
Browse files

comment-out non-compiling code

  • Loading branch information...
1 parent 6d31060 commit 1209438f88a7af44ea2e78e543ca33e970d2b4b9 @ssi-appstatus ssi-appstatus committed Oct 7, 2012
Showing with 39 additions and 44 deletions.
  1. +0 −3 src/main/java/to/go/gro/groapplet/Fami.java
  2. +39 −41 src/main/java/to/go/gro/groapplet/GROapplet.java
@@ -9,8 +9,6 @@
import java.util.ArrayList;
import java.util.List;
-import nu.mine.mosher.core.Util;
-
public class Fami
{
private static final int BAR_HEIGHT = 4;
@@ -53,7 +51,6 @@ public void addChild(Indi indi)
public void calc(Graphics g)
{
- Util.unused(g);
if (husb == null && wife == null && rChild.size()==0)
return;
@@ -14,8 +14,6 @@
import javax.swing.JTextArea;
import javax.swing.ScrollPaneConstants;
import javax.swing.UIManager;
-import nu.mine.mosher.core.StringFieldizer;
-import nu.mine.mosher.core.StringFieldizer.Iter;
/**
* TODO
@@ -171,49 +169,49 @@ protected void readFrom(InputStream instream) throws IOException
String scIndi = br.readLine();
int cIndi = Integer.parseInt(scIndi);
- for (int i = 0; i < cIndi; ++i)
- {
- String slineIndi = br.readLine();
- StringFieldizer sf = new StringFieldizer(slineIndi);
- Iter it = sf.iterator();
- String id = it.next();
- int nid = Integer.parseInt(id.substring(1));
- String name = it.next();
- String birth = it.next();
- String death = it.next();
- String sx = it.next();
- double dx = Double.parseDouble(sx);
- int x = (int)Math.round(dx);
- String sy = it.next();
- double dy = Double.parseDouble(sy);
- int y = (int)Math.round(dy);
- Indi indi = new Indi(x, y, nid, name, birth, death);
- indis.add(indi);
- mapIdToIndi.put(id, indi);
- }
+// for (int i = 0; i < cIndi; ++i)
+// {
+// String slineIndi = br.readLine();
+// StringFieldizer sf = new StringFieldizer(slineIndi);
+// Iter it = sf.iterator();
+// String id = it.next();
+// int nid = Integer.parseInt(id.substring(1));
+// String name = it.next();
+// String birth = it.next();
+// String death = it.next();
+// String sx = it.next();
+// double dx = Double.parseDouble(sx);
+// int x = (int)Math.round(dx);
+// String sy = it.next();
+// double dy = Double.parseDouble(sy);
+// int y = (int)Math.round(dy);
+// Indi indi = new Indi(x, y, nid, name, birth, death);
+// indis.add(indi);
+// mapIdToIndi.put(id, indi);
+// }
FamiSet famis = new FamiSet();
String scFami = br.readLine();
int cFami = Integer.parseInt(scFami);
- for (int i = 0; i < cFami; ++i)
- {
- String slineIndi = br.readLine();
- StringFieldizer sf = new StringFieldizer(slineIndi);
- Iter it = sf.iterator();
- Fami fami = new Fami();
- String husb = it.next();
- fami.setHusb(mapIdToIndi.get(husb));
- String wife = it.next();
- fami.setWife(mapIdToIndi.get(wife));
- String sc = it.next();
- int c = Integer.parseInt(sc);
- for (int ic = 0; ic < c; ++ic)
- {
- String chil = it.next();
- fami.addChild(mapIdToIndi.get(chil));
- }
- famis.add(fami);
- }
+// for (int i = 0; i < cFami; ++i)
+// {
+// String slineIndi = br.readLine();
+// StringFieldizer sf = new StringFieldizer(slineIndi);
+// Iter it = sf.iterator();
+// Fami fami = new Fami();
+// String husb = it.next();
+// fami.setHusb(mapIdToIndi.get(husb));
+// String wife = it.next();
+// fami.setWife(mapIdToIndi.get(wife));
+// String sc = it.next();
+// int c = Integer.parseInt(sc);
+// for (int ic = 0; ic < c; ++ic)
+// {
+// String chil = it.next();
+// fami.addChild(mapIdToIndi.get(chil));
+// }
+// famis.add(fami);
+// }
fc = new FamilyChart(this,indis,famis);
}

0 comments on commit 1209438

Please sign in to comment.