[Jais-checkins] jaisteam/src/jais/communication VisualEvent.java,1.15,1.16 SenseBodyEvent.java,1.10,
Status: Beta
Brought to you by:
maestrodd
Update of /cvsroot/jais/jaisteam/src/jais/communication
In directory usw-pr-cvs1:/tmp/cvs-serv15661/communication
Modified Files:
VisualEvent.java SenseBodyEvent.java InitialEvent.java
HearEvent.java Communication.java
Log Message:
many many cahnges ;) version 1.01 is ready !
Index: VisualEvent.java
===================================================================
RCS file: /cvsroot/jais/jaisteam/src/jais/communication/VisualEvent.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** VisualEvent.java 8 Jul 2002 07:17:57 -0000 1.15
--- VisualEvent.java 15 Jul 2002 09:27:23 -0000 1.16
***************
*** 16,20 ****
public class VisualEvent extends Event
{
! private static Logger logger=Logger.getLogger("jais.communication"); //get our logger
// names and types of the different obj who can appear in the See message
public static final String[] OBJ_NAME_STRINGS = {"p","b","g","f","l","B","F","G","P"};
--- 16,20 ----
public class VisualEvent extends Event
{
! // private static Logger logger=Logger.getLogger("jais.communication"); //get our logger
// names and types of the different obj who can appear in the See message
public static final String[] OBJ_NAME_STRINGS = {"p","b","g","f","l","B","F","G","P"};
***************
*** 474,478 ****
break;
default:
! logger.info("Could not determine type of object");
} // end of switch object name
} // end of while
--- 474,478 ----
break;
default:
! // logger.info("Could not determine type of object");
} // end of switch object name
} // end of while
***************
*** 481,486 ****
catch (Exception e)
{
! logger.info("Error parsing see message :"+e.getMessage());
! logger.debug("Message to parse was discarded:"+m_message);
return;
}
--- 481,486 ----
catch (Exception e)
{
! // logger.info("Error parsing see message :"+e.getMessage());
! // logger.debug("Message to parse was discarded:"+m_message);
return;
}
Index: SenseBodyEvent.java
===================================================================
RCS file: /cvsroot/jais/jaisteam/src/jais/communication/SenseBodyEvent.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SenseBodyEvent.java 13 Jul 2002 20:29:24 -0000 1.10
--- SenseBodyEvent.java 15 Jul 2002 09:27:23 -0000 1.11
***************
*** 15,19 ****
public class SenseBodyEvent extends Event
{
! private static Logger logger=Logger.getLogger("jais.communication"); //get our logger
/**
--- 15,19 ----
public class SenseBodyEvent extends Event
{
! // private static Logger logger=Logger.getLogger("jais.communication"); //get our logger
/**
***************
*** 92,96 ****
catch(Exception e)
{
! logger.info("Error parsing see message :"+e.getMessage());
}
}
--- 92,96 ----
catch(Exception e)
{
! // logger.info("Error parsing see message :"+e.getMessage());
}
}
Index: InitialEvent.java
===================================================================
RCS file: /cvsroot/jais/jaisteam/src/jais/communication/InitialEvent.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** InitialEvent.java 8 Jul 2002 00:16:16 -0000 1.11
--- InitialEvent.java 15 Jul 2002 09:27:23 -0000 1.12
***************
*** 17,21 ****
{
private InitInfo m_initInfo;
! private static Logger logger=Logger.getLogger("jais.communication"); //get our logger
private StringTokenizer m_tokenizer;
public static final String[] INITIAL_TYPE_STRINGS = {
--- 17,21 ----
{
private InitInfo m_initInfo;
! // private static Logger logger=Logger.getLogger("jais.communication"); //get our logger
private StringTokenizer m_tokenizer;
public static final String[] INITIAL_TYPE_STRINGS = {
***************
*** 306,315 ****
break;
default:
! logger.info("Could not determine type of object");
}
} // end of try
catch(Exception e)
{
! logger.info("Error parsing see message :"+e.getMessage());
}
}
--- 306,315 ----
break;
default:
! // logger.info("Could not determine type of object");
}
} // end of try
catch(Exception e)
{
! // logger.info("Error parsing see message :"+e.getMessage());
}
}
Index: HearEvent.java
===================================================================
RCS file: /cvsroot/jais/jaisteam/src/jais/communication/HearEvent.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** HearEvent.java 8 Jul 2002 07:17:57 -0000 1.14
--- HearEvent.java 15 Jul 2002 09:27:23 -0000 1.15
***************
*** 15,19 ****
public class HearEvent extends Event
{
! private static Logger logger=Logger.getLogger("jais.communication"); //get our logger
/**
--- 15,19 ----
public class HearEvent extends Event
{
! // private static Logger logger=Logger.getLogger("jais.communication"); //get our logger
/**
***************
*** 46,50 ****
l_tokenizer.nextToken(); // first token 'hear'
l_hear_info.m_time = Integer.parseInt(l_tokenizer.nextToken()); // then element time
-
//then finding out who sends the message:referee,online_coach_right,online_coach_left,self
l_token = l_tokenizer.nextToken();
--- 46,49 ----
***************
*** 57,61 ****
}
l_hear_info.m_sender = l_sender; // set the sender
-
// when the sender is determined, one of the 4 following sender-parsers is called
switch(l_sender)
--- 56,59 ----
***************
*** 104,108 ****
catch (Exception e)
{
! logger.info("Error parsing hear information, while parsing String:" + m_message + " exception :" +e.getMessage());
}
}
--- 102,106 ----
catch (Exception e)
{
! // logger.info("Error parsing hear information, while parsing String:" + m_message + " exception :" +e.getMessage());
}
}
Index: Communication.java
===================================================================
RCS file: /cvsroot/jais/jaisteam/src/jais/communication/Communication.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Communication.java 14 Jul 2002 14:01:23 -0000 1.31
--- Communication.java 15 Jul 2002 09:27:23 -0000 1.32
***************
*** 60,66 ****
{
this.setName("Communication"+f_playerNumber);
! logger.info("Succ. instan. Commun.!?");
! logger.info("1 Server name is: "+f_serverName);
! logger.info("2 Server port is: "+f_serverPort);
m_jais = f_jais;
m_serverName = f_serverName;
--- 60,66 ----
{
this.setName("Communication"+f_playerNumber);
! //logger.info("Succ. instan. Commun.!?");
! //logger.info("1 Server name is: "+f_serverName);
! //logger.info("2 Server port is: "+f_serverPort);
m_jais = f_jais;
m_serverName = f_serverName;
***************
*** 74,78 ****
try
{
! logger.info("Bind socket to a port...");
// set datagram socket and bind it to a port
this.m_socket = new DatagramSocket();
--- 74,78 ----
try
{
! //logger.info("Bind socket to a port...");
// set datagram socket and bind it to a port
this.m_socket = new DatagramSocket();
***************
*** 82,98 ****
this.m_serverPort = m_serverPort;
m_socket.setSoTimeout(m_timeoutAfter);
! logger.info("2 Server port: "+ this.m_serverPort);
! logger.info("The resolved server address is: "+this.m_serverAddress);
! logger.info("Binded socket to a port!");
}
catch (SocketException se)
{
! logger.info("Could not bind socket to a port! "+se.getMessage());
throw(new xCommunication("Could not bind socket to a port!"));
}
catch (UnknownHostException uhe)
{
! logger.info("The choosen host is not reachable!"+uhe.getMessage()
! +" serverport: "+this.m_serverPort);
throw(new xCommunication("The choosen host is not reachable: '"
+this.m_serverAddress+"'"));
--- 82,98 ----
this.m_serverPort = m_serverPort;
m_socket.setSoTimeout(m_timeoutAfter);
! //logger.info("2 Server port: "+ this.m_serverPort);
! //logger.info("The resolved server address is: "+this.m_serverAddress);
! //logger.info("Binded socket to a port!");
}
catch (SocketException se)
{
! //logger.info("Could not bind socket to a port! "+se.getMessage());
throw(new xCommunication("Could not bind socket to a port!"));
}
catch (UnknownHostException uhe)
{
! //logger.info("The choosen host is not reachable!"+uhe.getMessage()
! // +" serverport: "+this.m_serverPort);
throw(new xCommunication("The choosen host is not reachable: '"
+this.m_serverAddress+"'"));
***************
*** 124,131 ****
l_goalieSpaceHolder = "(goalie)";
}
! logger.info("Connecting to server...");
sendMessageToServer("(init " + m_teamName + " (version 7.0) "
+ l_goalieSpaceHolder + ")");
! logger.info("Waiting for data from server...");
// to prevent a little server/client 'crash' while init. a whole team
receiveDataFromServer();
--- 124,131 ----
l_goalieSpaceHolder = "(goalie)";
}
! //logger.info("Connecting to server...");
sendMessageToServer("(init " + m_teamName + " (version 7.0) "
+ l_goalieSpaceHolder + ")");
! //logger.info("Waiting for data from server...");
// to prevent a little server/client 'crash' while init. a whole team
receiveDataFromServer();
***************
*** 139,144 ****
public void reconnectToServer(int f_playerNumber) throws xCommunication
{
! logger.info("Starting to reconnect to server...");
! logger.info("Reconnecting to server...");
sendMessageToServer("(reconnect " + m_teamName + " " + f_playerNumber + ")");
}
--- 139,144 ----
public void reconnectToServer(int f_playerNumber) throws xCommunication
{
! //logger.info("Starting to reconnect to server...");
! //logger.info("Reconnecting to server...");
sendMessageToServer("(reconnect " + m_teamName + " " + f_playerNumber + ")");
}
***************
*** 156,160 ****
if(m_connectedToServer==true)
{
! logger.info("Disconnecting from server... Bye from Commu.");
//from now it is shure: we want to disconnect
--- 156,160 ----
if(m_connectedToServer==true)
{
! //logger.info("Disconnecting from server... Bye from Commu.");
//from now it is shure: we want to disconnect
***************
*** 169,174 ****
catch (Exception ex)
{
! logger.info("Could not min. socket time out for disconnection: "
! +ex.getMessage());
}
--- 169,174 ----
catch (Exception ex)
{
! //logger.info("Could not min. socket time out for disconnection: "
! // +ex.getMessage());
}
***************
*** 179,184 ****
else
{
! logger.info("Bye from Communication: Jais was not connected to"
! +" the server (no server data received/not regularly connected)!");
}
//close the opended socket
--- 179,184 ----
else
{
! //logger.info("Bye from Communication: Jais was not connected to"
! //+" the server (no server data received/not regularly connected)!");
}
//close the opended socket
***************
*** 208,217 ****
try
{
! //logger.fatal("Server Message is: "+m_stuffToSendToServer + " time:" +System.currentTimeMillis() );
// init buffer
byte[] l_buffer = new byte[1024];
// m_stuffToSendToServer -> byte field
l_buffer = m_stuffToSendToServer.getBytes();
! logger.info("3 Server port is: "+m_serverPort);
// creat new datagram packet
DatagramPacket l_packet = new DatagramPacket(l_buffer,
--- 208,217 ----
try
{
! // logger.fatal("Server Message is: "+m_stuffToSendToServer + " time:" +System.currentTimeMillis() );
// init buffer
byte[] l_buffer = new byte[1024];
// m_stuffToSendToServer -> byte field
l_buffer = m_stuffToSendToServer.getBytes();
! //logger.info("3 Server port is: "+m_serverPort);
// creat new datagram packet
DatagramPacket l_packet = new DatagramPacket(l_buffer,
***************
*** 224,231 ****
catch (IOException ioe)
{
! logger.info("Error while reading from socket: "+ioe.getMessage());
throw(new xCommunication("(socket error) Could not send data to server!"));
}
! logger.info("...Succeeded to send data to server!");
}
--- 224,231 ----
catch (IOException ioe)
{
! //logger.info("Error while reading from socket: "+ioe.getMessage());
throw(new xCommunication("(socket error) Could not send data to server!"));
}
! //logger.info("...Succeeded to send data to server!");
}
***************
*** 283,287 ****
catch (xCommunication xCom)
{
! logger.info("Could not send catchBall action! "+xCom.getMessage());
throw(new xCommunication("Could not send catchBall action!"));
}
--- 283,287 ----
catch (xCommunication xCom)
{
! //logger.info("Could not send catchBall action! "+xCom.getMessage());
throw(new xCommunication("Could not send catchBall action!"));
}
***************
*** 308,312 ****
catch (xCommunication xCom)
{
! logger.info("Could not send dash action! "+xCom.getMessage());
throw(new xCommunication("Could not send dash action!"));
}
--- 308,312 ----
catch (xCommunication xCom)
{
! //logger.info("Could not send dash action! "+xCom.getMessage());
throw(new xCommunication("Could not send dash action!"));
}
***************
*** 333,337 ****
catch (xCommunication xCom)
{
! logger.info("Could not send kick action! "+xCom.getMessage());
throw(new xCommunication("Could not send kick action!"));
}
--- 333,337 ----
catch (xCommunication xCom)
{
! //logger.info("Could not send kick action! "+xCom.getMessage());
throw(new xCommunication("Could not send kick action!"));
}
***************
*** 357,361 ****
catch (xCommunication xCom)
{
! logger.info("Could not send turn neck action! "+xCom.getMessage());
throw(new xCommunication("Could not send turn neck action!"));
}
--- 357,361 ----
catch (xCommunication xCom)
{
! //logger.info("Could not send turn neck action! "+xCom.getMessage());
throw(new xCommunication("Could not send turn neck action!"));
}
***************
*** 381,385 ****
catch (xCommunication xCom)
{
! logger.info("Could not send move action! "+xCom.getMessage());
throw(new xCommunication("Could not send move action!"));
}
--- 381,385 ----
catch (xCommunication xCom)
{
! //logger.info("Could not send move action! "+xCom.getMessage());
throw(new xCommunication("Could not send move action!"));
}
***************
*** 404,408 ****
catch (xCommunication xCom)
{
! logger.info("Could not send turn action! "+xCom.getMessage());
throw(new xCommunication("Could not send turn action!"));
}
--- 404,408 ----
catch (xCommunication xCom)
{
! //logger.info("Could not send turn action! "+xCom.getMessage());
throw(new xCommunication("Could not send turn action!"));
}
***************
*** 427,431 ****
catch (xCommunication xCom)
{
! logger.info("Could not send say action! "+xCom.getMessage());
throw(new xCommunication("Could not send say action!"));
}
--- 427,431 ----
catch (xCommunication xCom)
{
! //logger.info("Could not send say action! "+xCom.getMessage());
throw(new xCommunication("Could not send say action!"));
}
***************
*** 454,458 ****
catch (xCommunication xCom)
{
! logger.info("Could not send change view action! "+xCom.getMessage());
throw(new xCommunication("Could not send change view action!"));
}
--- 454,458 ----
catch (xCommunication xCom)
{
! //logger.info("Could not send change view action! "+xCom.getMessage());
throw(new xCommunication("Could not send change view action!"));
}
***************
*** 496,500 ****
{
//info for the first time:
! logger.info("Connected to server...(received something)");
//for the first time: set m_connectedToServer=true
--- 496,500 ----
{
//info for the first time:
! //logger.info("Connected to server...(received something)");
//for the first time: set m_connectedToServer=true
***************
*** 503,508 ****
}
! logger.info("Received server Mess.: '"+m_receivedMessageFromServer+"'");
! logger.info("Lenght of server Message: '"+m_receivedMessageFromServer.length()+"'");
m_timeoutCounter=5; //reset our timeoutcounter if we receive a message
//check for incoming message type
--- 503,508 ----
}
! //logger.info("Received server Mess.: '"+m_receivedMessageFromServer+"'");
! //logger.info("Lenght of server Message: '"+m_receivedMessageFromServer.length()+"'");
m_timeoutCounter=5; //reset our timeoutcounter if we receive a message
//check for incoming message type
***************
*** 516,522 ****
if(m_disconnectCommand==false)
{
! logger.info("Timeout while reading from socket: "+ioe.getMessage());
! logger.info("Jais tried "+m_timeoutAfter+"ms to receive data "+
! "from server...exiting communication!");
if(m_connectedToServer)
{
--- 516,522 ----
if(m_disconnectCommand==false)
{
! //logger.info("Timeout while reading from socket: "+ioe.getMessage());
! //logger.info("Jais tried "+m_timeoutAfter+"ms to receive data "+
! //"from server...exiting communication!");
if(m_connectedToServer)
{
***************
*** 547,551 ****
if (m_receivedMessageFromServer.startsWith("(sense"))
{
! // logger.fatal("Sense_Body event detected..." + System.currentTimeMillis()+"*******************");
SenseBodyEvent newSenseBodyEvent = new SenseBodyEvent(m_receivedMessageFromServer);
m_jais.onSenseBody(newSenseBodyEvent);
--- 547,551 ----
if (m_receivedMessageFromServer.startsWith("(sense"))
{
! // //logger.fatal("Sense_Body event detected..." + System.currentTimeMillis()+"*******************");
SenseBodyEvent newSenseBodyEvent = new SenseBodyEvent(m_receivedMessageFromServer);
m_jais.onSenseBody(newSenseBodyEvent);
***************
*** 554,558 ****
else if (m_receivedMessageFromServer.startsWith("(see"))
{
! // logger.fatal("Visual event detected..."+System.currentTimeMillis()+"*******************");
VisualEvent newVisualEvent = new VisualEvent(m_receivedMessageFromServer);
m_jais.onSee(newVisualEvent);
--- 554,558 ----
else if (m_receivedMessageFromServer.startsWith("(see"))
{
! // //logger.fatal("Visual event detected..."+System.currentTimeMillis()+"*******************");
VisualEvent newVisualEvent = new VisualEvent(m_receivedMessageFromServer);
m_jais.onSee(newVisualEvent);
***************
*** 561,565 ****
else if (m_receivedMessageFromServer.startsWith("(hear"))
{
! logger.info("Hear event detected...");
HearEvent newHearEvent = new HearEvent(m_receivedMessageFromServer);
m_jais.onHear(newHearEvent);
--- 561,565 ----
else if (m_receivedMessageFromServer.startsWith("(hear"))
{
! //logger.info("Hear event detected...");
HearEvent newHearEvent = new HearEvent(m_receivedMessageFromServer);
m_jais.onHear(newHearEvent);
***************
*** 568,572 ****
else if (m_receivedMessageFromServer.startsWith("(init"))
{
! logger.info("Init event detected...");
InitialEvent newInitialEvent = new InitialEvent(m_receivedMessageFromServer);
m_jais.onInitialEvent(newInitialEvent);
--- 568,572 ----
else if (m_receivedMessageFromServer.startsWith("(init"))
{
! //logger.info("Init event detected...");
InitialEvent newInitialEvent = new InitialEvent(m_receivedMessageFromServer);
m_jais.onInitialEvent(newInitialEvent);
***************
*** 575,579 ****
else if (m_receivedMessageFromServer.startsWith("(server"))
{
! logger.info("Detected server params...");
InitialEvent newInitialEvent = new InitialEvent(m_receivedMessageFromServer);
}
--- 575,579 ----
else if (m_receivedMessageFromServer.startsWith("(server"))
{
! //logger.info("Detected server params...");
InitialEvent newInitialEvent = new InitialEvent(m_receivedMessageFromServer);
}
***************
*** 581,585 ****
else if (m_receivedMessageFromServer.startsWith("(player") )
{
! logger.debug("Detected player params...");
InitialEvent newInitialEvent = new InitialEvent(m_receivedMessageFromServer);
}
--- 581,585 ----
else if (m_receivedMessageFromServer.startsWith("(player") )
{
! //logger.debug("Detected player params...");
InitialEvent newInitialEvent = new InitialEvent(m_receivedMessageFromServer);
}
***************
*** 588,595 ****
else if (m_receivedMessageFromServer.startsWith("(error unknown"))
{
! logger.warn("Error message from server side as reaction on "
! +"client control command: '"+m_receivedMessageFromServer+"'!");
! logger.warn("The last recently sent message to server from Jais has been: "
! +m_stuffToSendToServer);
}
// check if new message has been an error mess. as reaction on
--- 588,595 ----
else if (m_receivedMessageFromServer.startsWith("(error unknown"))
{
! //logger.warn("Error message from server side as reaction on "
! // +"client control command: '"+m_receivedMessageFromServer+"'!");
! //logger.warn("The last recently sent message to server from Jais has been: "
! // +m_stuffToSendToServer);
}
// check if new message has been an error mess. as reaction on
***************
*** 597,604 ****
else if (m_receivedMessageFromServer.startsWith("(error illegal"))
{
! logger.warn("Error message from server side as reaction on "
! +"client control command: '"+m_receivedMessageFromServer+"'!");
! logger.warn("The last recently sent message to server from Jais has been: "
! +m_stuffToSendToServer);
}
// check if new message has been an error mess. as reaction on
--- 597,604 ----
else if (m_receivedMessageFromServer.startsWith("(error illegal"))
{
! //logger.warn("Error message from server side as reaction on "
! // +"client control command: '"+m_receivedMessageFromServer+"'!");
! //logger.warn("The last recently sent message to server from Jais has been: "
! // +m_stuffToSendToServer);
}
// check if new message has been an error mess. as reaction on
***************
*** 606,615 ****
else if (m_receivedMessageFromServer.startsWith("(error no_more_team_or_player_or_goalie"))
{
! logger.fatal("Error message from server side as reaction on "
! +"init command (because e.g. team name given away: '"
! +m_receivedMessageFromServer+"'!");
! logger.fatal("The last recently sent message to server from Jais has been: "
! +m_stuffToSendToServer);
//received something but haven't been regularly connected
--- 606,615 ----
else if (m_receivedMessageFromServer.startsWith("(error no_more_team_or_player_or_goalie"))
{
! //logger.fatal("Error message from server side as reaction on "
! // +"init command (because e.g. team name given away: '"
! // +m_receivedMessageFromServer+"'!");
! //logger.fatal("The last recently sent message to server from Jais has been: "
! // +m_stuffToSendToServer);
//received something but haven't been regularly connected
***************
*** 623,630 ****
else if (m_receivedMessageFromServer.startsWith("(error no_more_team_or_player"))
{
! logger.fatal("Error message from server side as reaction on "
! +"reconnect command: '"+m_receivedMessageFromServer+"'!");
! logger.fatal("The last recently sent message to server from Jais has been: "
! +m_stuffToSendToServer);
//received something but haven't been regularly connected
--- 623,630 ----
else if (m_receivedMessageFromServer.startsWith("(error no_more_team_or_player"))
{
! //logger.fatal("Error message from server side as reaction on "
! // +"reconnect command: '"+m_receivedMessageFromServer+"'!");
! //logger.fatal("The last recently sent message to server from Jais has been: "
! // +m_stuffToSendToServer);
//received something but haven't been regularly connected
***************
*** 638,645 ****
else if (m_receivedMessageFromServer.startsWith("(error reconnect"))
{
! logger.fatal("Error message from server side as reaction on "
! +"reconnect command: '"+m_receivedMessageFromServer+"'!");
! logger.fatal("The last recently sent message to server from Jais has been: "
! +m_stuffToSendToServer);
//received something but haven't been regularly connected
--- 638,645 ----
else if (m_receivedMessageFromServer.startsWith("(error reconnect"))
{
! //logger.fatal("Error message from server side as reaction on "
! // +"reconnect command: '"+m_receivedMessageFromServer+"'!");
! //logger.fatal("The last recently sent message to server from Jais has been: "
! // +m_stuffToSendToServer);
//received something but haven't been regularly connected
***************
*** 652,659 ****
else
{
! logger.info("Unknown server message received! ...but going on. Message was: "
! + m_receivedMessageFromServer);
! logger.info("The last recently sent message to server from Jais has been: "
! +m_stuffToSendToServer);
}
}
--- 652,659 ----
else
{
! //logger.info("Unknown server message received! ...but going on. Message was: "
! // + m_receivedMessageFromServer);
! //logger.info("The last recently sent message to server from Jais has been: "
! // +m_stuffToSendToServer);
}
}
***************
*** 684,688 ****
public void finalize()
{
! logger.info("Ok, closing my socket!");
}
}
--- 684,688 ----
public void finalize()
{
! //logger.info("Ok, closing my socket!");
}
}
|