From: Andreas Müller <a.mueller@bgbm.org>
Date: Wed, 5 Sep 2007 15:39:23 +0000 (+0000)
Subject: .
X-Git-Tag: rcp.ss-first-working-version~1293
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/a66e1079212656aebfd1d6b67e11cdf5c7fb12da

.
---

diff --git a/src/eu/etaxonomy/taxeditor/SimpleModel.java b/src/eu/etaxonomy/taxeditor/SimpleModel.java
index 7ae06792e..2ac8cd888 100644
--- a/src/eu/etaxonomy/taxeditor/SimpleModel.java
+++ b/src/eu/etaxonomy/taxeditor/SimpleModel.java
@@ -35,34 +35,39 @@ public class SimpleModel {
 		try {
 			//TODO Andreas
 			List<TaxonName> tnList = new ArrayList<TaxonName>();
-			TaxonName tn = new TaxonName();
 			CdmApplicationController app = new CdmApplicationController();
 			NameService ns = app.getNameService();
-			tnList.add(ns.getTaxonNameById(1));
-			tnList.add(ns.getTaxonNameById(4));
-			tnList.add(ns.getTaxonNameById(28));
-
+			tnList = ns.getAllNames();
+			
 			objects = new ArrayList();
-			NamedObject[] objects = {
-					new Name(tnList.get(0).getName(), tnList.get(0).getGenus(),tnList.get(0).getInfraSpecificEpithet()),
-					new Name(tnList.get(1).getName(), tnList.get(1).getGenus(),tnList.get(1).getInfraSpecificEpithet()),
-					new Name(tnList.get(2).getName(), tnList.get(2).getGenus(),tnList.get(2).getInfraSpecificEpithet()),
-					
-					new Name("Pilosella piloselloides (Vill.) Soják", "Pilosella", "piloselloides"),
-					new Name("Pilosella pavichii (Heuff.) Arv.-Touv.", "Pilosella", "pavichii"), 
-					new Name("Pilosella vahlii (Froel.) F. W. Schultz & Sch. Bip.", "Pilosella", "vahlii")  
-					/*new TypeOne(Messages.getString("SimpleModel.t1_i1"), 2, true, Messages.getString("SimpleModel.text1")), //$NON-NLS-1$ //$NON-NLS-2$
-					new TypeOne(Messages.getString("SimpleModel.t1_i2"), 1, false, Messages.getString("SimpleModel.text2")), //$NON-NLS-1$ //$NON-NLS-2$
-					new TypeOne(Messages.getString("SimpleModel.t1_i3"), 3, true, Messages.getString("SimpleModel.text3")), //$NON-NLS-1$ //$NON-NLS-2$
-					new TypeOne(Messages.getString("SimpleModel.t1_i4"), 0, false, Messages.getString("SimpleModel.text4")), //$NON-NLS-1$ //$NON-NLS-2$
-					new TypeOne(Messages.getString("SimpleModel.t1_i5"), 1, true, Messages.getString("SimpleModel.text5")), //$NON-NLS-1$ //$NON-NLS-2$
-					new TypeTwo(Messages.getString("SimpleModel.t2_i1"), false, true), //$NON-NLS-1$
-					new TypeTwo(Messages.getString("SimpleModel.t2_i2"), true, false)*/
-			}; //$NON-NLS-1$
-			add(objects, false);
+			for (TaxonName tn: tnList){
+				NamedObject[] objects = {
+						new Name(tn.getName(), tn.getGenus(),tn.getSpecificEpithet())
+				};
+						
+				
+//				NamedObject[] objects = {
+//						new Name(tnList.get(0).getName(), tnList.get(0).getGenus(),tnList.get(0).getInfraSpecificEpithet()),
+//						new Name(tnList.get(1).getName(), tnList.get(1).getGenus(),tnList.get(1).getInfraSpecificEpithet()),
+//						new Name(tnList.get(2).getName(), tnList.get(2).getGenus(),tnList.get(2).getInfraSpecificEpithet()),
+//						
+//						new Name("Pilosella piloselloides (Vill.) Soják", "Pilosella", "piloselloides"),
+//						new Name("Pilosella pavichii (Heuff.) Arv.-Touv.", "Pilosella", "pavichii"), 
+//						new Name("Pilosella vahlii (Froel.) F. W. Schultz & Sch. Bip.", "Pilosella", "vahlii")  
+//						/*new TypeOne(Messages.getString("SimpleModel.t1_i1"), 2, true, Messages.getString("SimpleModel.text1")), //$NON-NLS-1$ //$NON-NLS-2$
+//						new TypeOne(Messages.getString("SimpleModel.t1_i2"), 1, false, Messages.getString("SimpleModel.text2")), //$NON-NLS-1$ //$NON-NLS-2$
+//						new TypeOne(Messages.getString("SimpleModel.t1_i3"), 3, true, Messages.getString("SimpleModel.text3")), //$NON-NLS-1$ //$NON-NLS-2$
+//						new TypeOne(Messages.getString("SimpleModel.t1_i4"), 0, false, Messages.getString("SimpleModel.text4")), //$NON-NLS-1$ //$NON-NLS-2$
+//						new TypeOne(Messages.getString("SimpleModel.t1_i5"), 1, true, Messages.getString("SimpleModel.text5")), //$NON-NLS-1$ //$NON-NLS-2$
+//						new TypeTwo(Messages.getString("SimpleModel.t2_i1"), false, true), //$NON-NLS-1$
+//						new TypeTwo(Messages.getString("SimpleModel.t2_i2"), true, false)*/
+//				}; //$NON-NLS-1$
+				
+				
+				add(objects, false);
+			}
 		} catch (RuntimeException e) {
 			//logger.error("Error when initializing SimpleModel");
-			// TODO Auto-generated catch block
 			System.out.println(e.getMessage());
 			e.printStackTrace();
 		}