--- a/src/horaris/HoraroTransporta.java	Sat Jan 13 01:06:33 2007 +0100
+++ b/src/horaris/HoraroTransporta.java	Sat Jan 13 15:27:30 2007 +0100
@@ -6,8 +6,8 @@
 import java.util.Vector;
 import java.lang.Exception;
 
-public class HoraroTransporta implements CommandListener, ItemStateListener
-
+public class HoraroTransporta
+	implements CommandListener, ItemStateListener, Ekrano
 {
 	private Graph radiko;
 	private Graph tagoj;
@@ -15,8 +15,6 @@
 	private Graph lokoj;
 	private Graph sencoj;
 
-	private Main main;
-
 	private Form myform;
 	private ChoiceGroup ftagoj;
 	private ChoiceGroup fsenco;
@@ -24,14 +22,16 @@
 	private ChoiceGroup ffino;
 	private Command cmd_sercxi;
 	private Command cmd_malantauxen;
+	
+	private Ekrano last;
 
 	private TimeList mytimelist;
 
 
-	public HoraroTransporta(Graph _radiko, Main _main) throws Exception
+	public HoraroTransporta(Graph _radiko, Ekrano _last) throws Exception
 	{
 		radiko = _radiko;
-		main = _main;
+		last = _last;
 
 		tagoj = radiko.getNode("Dies");
 		lokoj = radiko.getNode("Llocs");
@@ -77,7 +77,7 @@
 		myform.addCommand(cmd_malantauxen);
 		myform.setCommandListener(this);
 		myform.setItemStateListener(this);
-		main.display.setCurrent(myform);
+		Main.display.setCurrent(myform);
 	}
 
 	private void addTagoj(ChoiceGroup g)
@@ -219,12 +219,12 @@
 
 			if (t.size() > 0)
 			{
-				mytimelist = new TimeList(t,this, main);
+				mytimelist = new TimeList(t,this);
 				mytimelist.show();
 			}
 		} else if (c == cmd_malantauxen)
 		{
-			main.show();
+			last.show();
 		}
 	}
 

--- a/src/horaris/Main.java	Sat Jan 13 01:06:33 2007 +0100
+++ b/src/horaris/Main.java	Sat Jan 13 15:27:30 2007 +0100
@@ -8,7 +8,7 @@
 public class Main
 	extends MIDlet
 {
-	public Display display;
+	public static Display display;
 	private MainList mymainlist;
 
 	public Main()
@@ -16,19 +16,6 @@
 		display = Display.getDisplay(this);
 	}
 
-	/*
-	public void kreiHoraroekranon(Graph radiko)
-	{
-		int speco = Horaro.distingi(radiko);
-		if (speco == Horaro.TRANSPORTA)
-		{
-			horaro = new HoraroTransporta(radiko, display);
-		} else // CXEESTA
-		{
-		}
-	}
-	*/
-
 	public void show()
 	{
 		mymainlist.show();

--- a/src/horaris/MainList.java	Sat Jan 13 01:06:33 2007 +0100
+++ b/src/horaris/MainList.java	Sat Jan 13 15:27:30 2007 +0100
@@ -5,7 +5,7 @@
 
 import ogdl.*;
 
-public class MainList implements CommandListener
+public class MainList implements CommandListener, Ekrano
 {
 	private Graph list;
 	private List mylist;
@@ -91,7 +91,7 @@
 
 	private void newTransporta(Graph g) throws Exception
 	{
-		HoraroTransporta horaro = new HoraroTransporta(g, main);
+		HoraroTransporta horaro = new HoraroTransporta(g, this);
 	}
 
 	/*

--- a/src/horaris/TimeList.java	Sat Jan 13 01:06:33 2007 +0100
+++ b/src/horaris/TimeList.java	Sat Jan 13 15:27:30 2007 +0100
@@ -5,20 +5,18 @@
 
 import ogdl.*;
 
-public class TimeList implements CommandListener
+public class TimeList implements CommandListener, Ekrano
 {
 	private Graph list;
 	private List mylist;
 	private Command cmd_malantauxen;
-	private Main main;
 	private Vector vtempoj;
-	private HoraroTransporta horaro;
+	private Ekrano last;
 
-	public TimeList(Vector t, HoraroTransporta _horaro, Main _main)
+	public TimeList(Vector t, Ekrano _last)
 	{
 		vtempoj = t;
-		horaro = _horaro;
-		main = _main;
+		last = _last;
 	}
 
 	public void show()
@@ -32,15 +30,16 @@
 
 		mylist.addCommand(cmd_malantauxen);
 		mylist.setCommandListener(this);
-		main.display.setCurrent(mylist);
+		Main.display.setCurrent(mylist);
 	}
 
 	public void commandAction(Command c, Displayable d)
 	{
 		if (c == cmd_malantauxen)
 		{
-			horaro.show();
+			last.show();
+		} else if (c == List.SELECT_COMMAND)
+		{
 		}
 	}
-
 }