Subversion Repositories SmartDukaan

Rev

Rev 8819 | Rev 9338 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8819 Rev 8832
Line 86... Line 86...
86 
	public Map<String,String> readFedExPickupOrdersMap(List<Order> ordersList){
 86 
	public Map<String,String> readFedExPickupOrdersMap(List<Order> ordersList){
87 
		log.info("Into Method to Read Fedex Pickup Orders.... "+ ordersList.size());
 87 
		log.info("Into Method to Read Fedex Pickup Orders.... "+ ordersList.size());
88 
		Map<String,String> fedexPickupOrdersMap= new HashMap<String,String>();
 88 
		Map<String,String> fedexPickupOrdersMap= new HashMap<String,String>();
89 
		for(Order ord: ordersList){
 89 
		for(Order ord: ordersList){
90 
			String awbNumber= ord.getAirwaybill_no();
 90 
			String awbNumber= ord.getAirwaybill_no();
- 
 
 91 
			System.out.println("Order Id.... "+ord.getId()+".....Airwaybill No..... "+awbNumber);
91 
			TrackReply trackreply = TrackWebServiceClient.getTrackingUpdates(awbNumber, clientDetails, waDetails, endPointAddress);
 92 
			TrackReply trackreply = TrackWebServiceClient.getTrackingUpdates(awbNumber, clientDetails, waDetails, endPointAddress);
92 
			if(trackreply!=null){
 93 
			if(trackreply!=null){
93 
				log.info("Successfully get Fedex Pickup Orders Reply");
 94 
				log.info("Successfully get Fedex Pickup Orders Reply");
94 
				TrackDetail[] trackDetails=trackreply.getTrackDetails();
 95 
				TrackDetail[] trackDetails=trackreply.getTrackDetails();
95 
				SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd");
 96 
				SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd");
96 
				SimpleDateFormat timeformat = new SimpleDateFormat("HH:mm:ss");
 97 
				SimpleDateFormat timeformat = new SimpleDateFormat("HH:mm:ss");
97 
trackDetailsLoop:for (int i=0; i< trackDetails.length; i++) {
 98 
trackDetailsLoop:for (int i=0; i< trackDetails.length; i++) {
98 
					TrackEvent trackEvents[]= trackDetails[i].getEvents();
 99 
					TrackEvent trackEvents[]= trackDetails[i].getEvents();
- 
 
 100 
					if(trackEvents!=null && trackEvents.length > 0){
99 
					for(TrackEvent te : trackEvents){
 101 
						for(TrackEvent te : trackEvents){
100 
						if("PU".equalsIgnoreCase(te.getEventType())){
 102 
							if("PU".equalsIgnoreCase(te.getEventType())){
101 
							fedexPickupOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime()));
 103 
								fedexPickupOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime()));
102 
							break trackDetailsLoop;
 104 
								break trackDetailsLoop;
103 
						}
105 
							}
- 
 
 106 
						}
104 
					}
 107 
					}
105 
				}
 108 
				}
106 
			}
 109 
			}
107 
		}
 110 
		}
108 
		log.info("Read Fedex Pickup Orders");
 111 
		log.info("Read Fedex Pickup Orders");
Line 112... Line 115...
112 
	public Map<String,String> readFedExReachedDestinationOrdersMap(List<Order> ordersList){
 115 
	public Map<String,String> readFedExReachedDestinationOrdersMap(List<Order> ordersList){
113 
		log.info("Into Method to Read Fedex Reached Destination Orders.... "+ ordersList.size());
 116 
		log.info("Into Method to Read Fedex Reached Destination Orders.... "+ ordersList.size());
114 
		Map<String,String> fedexReachedDestinationOrdersMap= new HashMap<String,String>();
 117 
		Map<String,String> fedexReachedDestinationOrdersMap= new HashMap<String,String>();
115 
		for(Order ord: ordersList){
 118 
		for(Order ord: ordersList){
116 
			String awbNumber= ord.getAirwaybill_no();
 119 
			String awbNumber= ord.getAirwaybill_no();
- 
 
 120 
			System.out.println("Order Id.... "+ord.getId()+".....Airwaybill No..... "+awbNumber);
117 
			TrackReply trackreply = TrackWebServiceClient.getTrackingUpdates(awbNumber, clientDetails, waDetails, endPointAddress);
 121 
			TrackReply trackreply = TrackWebServiceClient.getTrackingUpdates(awbNumber, clientDetails, waDetails, endPointAddress);
118 
			if(trackreply!=null){
 122 
			if(trackreply!=null){
119 
				log.info("Successfully get Fedex Reached Destination Orders");
 123 
				log.info("Successfully get Fedex Reached Destination Orders");
120 
				TrackDetail[] trackDetails=trackreply.getTrackDetails();
 124 
				TrackDetail[] trackDetails=trackreply.getTrackDetails();
121 
				SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd");
 125 
				SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd");
122 
				SimpleDateFormat timeformat = new SimpleDateFormat("HH:mm:ss");
 126 
				SimpleDateFormat timeformat = new SimpleDateFormat("HH:mm:ss");
123 
trackDetailsLoop:for (int i=0; i< trackDetails.length; i++) {
 127 
trackDetailsLoop:for (int i=0; i< trackDetails.length; i++) {
124 
					TrackEvent trackEvents[]= trackDetails[i].getEvents();
 128 
					TrackEvent trackEvents[]= trackDetails[i].getEvents();
- 
 
 129 
					if(trackEvents!=null && trackEvents.length > 0){
125 
					for(TrackEvent te : trackEvents){
 130 
						for(TrackEvent te : trackEvents){
126 
						if("AR".equalsIgnoreCase(te.getEventType())){
 131 
							if("AR".equalsIgnoreCase(te.getEventType())){
127 
							fedexReachedDestinationOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime()));
 132 
								fedexReachedDestinationOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime()));
128 
							break trackDetailsLoop;
 133 
								break trackDetailsLoop;
129 
						}
134 
							}
- 
 
 135 
						}
130 
					}
 136 
					}
131 
				}
 137 
				}
132 
			}
 138 
			}
133 
		}
 139 
		}
134 
		log.info("Read Fedex Reached Destination Orders");
 140 
		log.info("Read Fedex Reached Destination Orders");
Line 138... Line 144...
138 
	public Map<String,String> readFedExDeliveredOrdersMap(List<Order> ordersList){
 144 
	public Map<String,String> readFedExDeliveredOrdersMap(List<Order> ordersList){
139 
		log.info("Into Method to Read Fedex Delivered Orders.... "+ ordersList.size());
 145 
		log.info("Into Method to Read Fedex Delivered Orders.... "+ ordersList.size());
140 
		Map<String,String> fedexDeliveredOrdersMap= new HashMap<String,String>();
 146 
		Map<String,String> fedexDeliveredOrdersMap= new HashMap<String,String>();
141 
		for(Order ord: ordersList){
 147 
		for(Order ord: ordersList){
142 
			String awbNumber= ord.getAirwaybill_no();
 148 
			String awbNumber= ord.getAirwaybill_no();
- 
 
 149 
			System.out.println("Order Id.... "+ord.getId()+".....Airwaybill No..... "+awbNumber);
143 
			TrackReply trackreply = TrackWebServiceClient.getTrackingUpdates(awbNumber, clientDetails, waDetails, endPointAddress);
 150 
			TrackReply trackreply = TrackWebServiceClient.getTrackingUpdates(awbNumber, clientDetails, waDetails, endPointAddress);
144 
			if(trackreply!=null){
 151 
			if(trackreply!=null){
145 
				log.info("Successfully get Fedex Delivered Orders");
 152 
				log.info("Successfully get Fedex Delivered Orders");
146 
				TrackDetail[] trackDetails=trackreply.getTrackDetails();
 153 
				TrackDetail[] trackDetails=trackreply.getTrackDetails();
147 
				SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd");
 154 
				SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd");
148 
				SimpleDateFormat timeformat = new SimpleDateFormat("HH:mm:ss");
 155 
				SimpleDateFormat timeformat = new SimpleDateFormat("HH:mm:ss");
149 
trackDetailsLoop:for (int i=0; i< trackDetails.length; i++) {
 156 
trackDetailsLoop:for (int i=0; i< trackDetails.length; i++) {
150 
					TrackEvent trackEvents[]= trackDetails[i].getEvents();
 157 
					TrackEvent trackEvents[]= trackDetails[i].getEvents();
- 
 
 158 
					if(trackEvents!=null && trackEvents.length > 0){
151 
					for(TrackEvent te : trackEvents){
 159 
						for(TrackEvent te : trackEvents){
152 
						if("DL".equalsIgnoreCase(te.getEventType())){
 160 
							if("DL".equalsIgnoreCase(te.getEventType())){
153 
							if(trackDetails[i].getDeliverySignatureName()!=null && !trackDetails[i].getDeliverySignatureName().isEmpty()){
 161 
								if(trackDetails[i].getDeliverySignatureName()!=null && !trackDetails[i].getDeliverySignatureName().isEmpty()){
154 
								fedexDeliveredOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime())+"|"+trackDetails[i].getDeliverySignatureName());
 162 
									fedexDeliveredOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime())+"|"+trackDetails[i].getDeliverySignatureName());
155 
							}
 163 
								}
156 
							else{
 164 
								else{
157 
								fedexDeliveredOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime())+"|"+ord.getCustomer_name());
 165 
									fedexDeliveredOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime())+"|"+ord.getCustomer_name());
158 
							}
 166 
								}
159 
							break trackDetailsLoop;
 167 
								break trackDetailsLoop;
160 
						}
168 
							}
- 
 
 169 
						}
161 
					}
 170 
					}
162 
				}
 171 
				}
163 
			}
 172 
			}
164 
		}
 173 
		}
165 
		log.info("Read Fedex Delivered Orders");
 174 
		log.info("Read Fedex Delivered Orders");
Line 169... Line 178...
169 
	public Map<String,String> readFedExReturnedOrdersMap(List<Order> ordersList){
 178 
	public Map<String,String> readFedExReturnedOrdersMap(List<Order> ordersList){
170 
		log.info("Into Method to Read Fedex Returned Orders.... "+ ordersList.size());
 179 
		log.info("Into Method to Read Fedex Returned Orders.... "+ ordersList.size());
171 
		Map<String,String> fedexReturnedOrdersMap= new HashMap<String,String>();
 180 
		Map<String,String> fedexReturnedOrdersMap= new HashMap<String,String>();
172 
		for(Order ord: ordersList){
 181 
		for(Order ord: ordersList){
173 
			String awbNumber= ord.getAirwaybill_no();
 182 
			String awbNumber= ord.getAirwaybill_no();
- 
 
 183 
			System.out.println("Order Id.... "+ord.getId()+".....Airwaybill No..... "+awbNumber);
174 
			TrackReply trackreply = TrackWebServiceClient.getTrackingUpdates(awbNumber, clientDetails, waDetails, endPointAddress);
 184 
			TrackReply trackreply = TrackWebServiceClient.getTrackingUpdates(awbNumber, clientDetails, waDetails, endPointAddress);
175 
			if(trackreply!=null){
 185 
			if(trackreply!=null){
176 
				log.info("Successfully get Fedex Returned Orders");
 186 
				log.info("Successfully get Fedex Returned Orders");
177 
				TrackDetail[] trackDetails=trackreply.getTrackDetails();
 187 
				TrackDetail[] trackDetails=trackreply.getTrackDetails();
178 
				SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd");
 188 
				SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd");
179 
				SimpleDateFormat timeformat = new SimpleDateFormat("HH:mm:ss");
 189 
				SimpleDateFormat timeformat = new SimpleDateFormat("HH:mm:ss");
180 
trackDetailsLoop:for (int i=0; i< trackDetails.length; i++) {
 190 
trackDetailsLoop:for (int i=0; i< trackDetails.length; i++) {
181 
					TrackEvent trackEvents[]= trackDetails[i].getEvents();
 191 
					TrackEvent trackEvents[]= trackDetails[i].getEvents();
- 
 
 192 
					if(trackEvents!=null && trackEvents.length > 0){
182 
					for(TrackEvent te : trackEvents){
 193 
						for(TrackEvent te : trackEvents){
183 
						if("RS".equalsIgnoreCase(te.getEventType())){
 194 
							if("RS".equalsIgnoreCase(te.getEventType())){
184 
							fedexReturnedOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime())+"|"+te.getEventDescription());
 195 
								fedexReturnedOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime())+"|"+te.getEventDescription());
185 
							break trackDetailsLoop;
 196 
								break trackDetailsLoop;
- 
 
 197 
							}
186 
						}
 198 
						}
187 
					}
 199 
					}
188 
				}
 200 
				}
189 
			}
 201 
			}
190 
		}
 202 
		}
Line 195... Line 207...
195 
	public Map<String,String> readFedExUnDeliveredOrdersMap(List<Order> ordersList){
 207 
	public Map<String,String> readFedExUnDeliveredOrdersMap(List<Order> ordersList){
196 
		log.info("Into Method to Read Fedex Undelivered Orders.... "+ ordersList.size());
 208 
		log.info("Into Method to Read Fedex Undelivered Orders.... "+ ordersList.size());
197 
		Map<String,String> fedexUnDeliveredOrdersMap= new HashMap<String,String>();
 209 
		Map<String,String> fedexUnDeliveredOrdersMap= new HashMap<String,String>();
198 
		orderLoop:for(Order ord: ordersList){
 210 
		orderLoop:for(Order ord: ordersList){
199 
			String awbNumber= ord.getAirwaybill_no();
 211 
			String awbNumber= ord.getAirwaybill_no();
- 
 
 212 
			System.out.println("Order Id.... "+ord.getId()+".....Airwaybill No..... "+awbNumber);
200 
			TrackReply trackreply = TrackWebServiceClient.getTrackingUpdates(awbNumber, clientDetails, waDetails, endPointAddress);
 213 
			TrackReply trackreply = TrackWebServiceClient.getTrackingUpdates(awbNumber, clientDetails, waDetails, endPointAddress);
201 
			if(trackreply!=null){
 214 
			if(trackreply!=null){
202 
				log.info("Successfully Get Fedex Undelivered Orders");
 215 
				log.info("Successfully Get Fedex Undelivered Orders");
203 
				TrackDetail[] trackDetails=trackreply.getTrackDetails();
 216 
				TrackDetail[] trackDetails=trackreply.getTrackDetails();
204 
trackDetailsLoop:for (int i=0; i< trackDetails.length; i++) {
 217 
trackDetailsLoop:for (int i=0; i< trackDetails.length; i++) {
205 
					TrackEvent trackEvents[]= trackDetails[i].getEvents();
 218 
					TrackEvent trackEvents[]= trackDetails[i].getEvents();
- 
 
 219 
					if(trackEvents!=null && trackEvents.length > 0){
206 
					for(TrackEvent tevent : trackEvents){
 220 
						for(TrackEvent tevent : trackEvents){
207 
						if("DL".equalsIgnoreCase(tevent.getEventType())){
 221 
							if("DL".equalsIgnoreCase(tevent.getEventType())){
208 
							continue orderLoop;
 222 
								continue orderLoop;
- 
 
 223 
							}
209 
						}
 224 
						}
210 
					}
 - 
 
211 
					for(TrackEvent te : trackEvents){
 225 
						for(TrackEvent te : trackEvents){
212 
						if("DE".equalsIgnoreCase(te.getEventType())){
 226 
							if("DE".equalsIgnoreCase(te.getEventType())){
213 
							fedexUnDeliveredOrdersMap.put(awbNumber, te.getEventDescription());
 227 
								fedexUnDeliveredOrdersMap.put(awbNumber, te.getEventDescription());
214 
							break trackDetailsLoop;
 228 
								break trackDetailsLoop;
- 
 
 229 
							}
215 
						}
 230 
						}
216 
					}
 231 
					}
217 
				}
 232 
				}
218 
			}
 233 
			}
219 
		}
 234 
		}
Line 224... Line 239...
224 
	public Map<String,String> readFedExFirstDeliveryAttemptedOrdersMap(List<Order> ordersList){
 239 
	public Map<String,String> readFedExFirstDeliveryAttemptedOrdersMap(List<Order> ordersList){
225 
		log.info("Into Method to Read Fedex First Delivery Attempted Orders.... "+ ordersList.size());
 240 
		log.info("Into Method to Read Fedex First Delivery Attempted Orders.... "+ ordersList.size());
226 
		Map<String,String> fedexFirstDeliveryAttemptedOrdersMap= new HashMap<String,String>();
 241 
		Map<String,String> fedexFirstDeliveryAttemptedOrdersMap= new HashMap<String,String>();
227 
		for(Order ord: ordersList){
 242 
		for(Order ord: ordersList){
228 
			String awbNumber= ord.getAirwaybill_no();
 243 
			String awbNumber= ord.getAirwaybill_no();
- 
 
 244 
			System.out.println("Order Id.... "+ord.getId()+".....Airwaybill No..... "+awbNumber);
229 
			TrackReply trackreply = TrackWebServiceClient.getTrackingUpdates(awbNumber, clientDetails, waDetails, endPointAddress);
 245 
			TrackReply trackreply = TrackWebServiceClient.getTrackingUpdates(awbNumber, clientDetails, waDetails, endPointAddress);
230 
			if(trackreply!=null){
 246 
			if(trackreply!=null){
231 
				log.info("Successfully get Fedex First Delivery Attempted Orders");
 247 
				log.info("Successfully get Fedex First Delivery Attempted Orders");
232 
				TrackDetail[] trackDetails=trackreply.getTrackDetails();
 248 
				TrackDetail[] trackDetails=trackreply.getTrackDetails();
233 
				SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd");
 249 
				SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd");
234 
				SimpleDateFormat timeformat = new SimpleDateFormat("HH:mm:ss");
 250 
				SimpleDateFormat timeformat = new SimpleDateFormat("HH:mm:ss");
235 
trackDeatilsLoop:for (int i=0; i< trackDetails.length; i++) {
 251 
trackDeatilsLoop:for (int i=0; i< trackDetails.length; i++) {
236 
					TrackEvent trackEvents[]= trackDetails[i].getEvents();
 252 
					TrackEvent trackEvents[]= trackDetails[i].getEvents();
- 
 
 253 
					if(trackEvents!=null && trackEvents.length > 0){
237 
					for(TrackEvent te : trackEvents){
 254 
						for(TrackEvent te : trackEvents){
238 
						if("OD".equalsIgnoreCase(te.getEventType())){
 255 
							if("OD".equalsIgnoreCase(te.getEventType())){
239 
							if(te.getStatusExceptionCode()!=null){
 256 
								if(te.getStatusExceptionCode()!=null){
240 
								fedexFirstDeliveryAttemptedOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime())+"|"+te.getStatusExceptionDescription());
 257 
									fedexFirstDeliveryAttemptedOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime())+"|"+te.getStatusExceptionDescription());
- 
 
 258 
								}
- 
 
 259 
								else{
- 
 
 260 
									fedexFirstDeliveryAttemptedOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime())+"|"+te.getEventDescription());
- 
 
 261 
								}
- 
 
 262 
								break trackDeatilsLoop;
241 
							}
 263 
							}
242 
							else{
 264 
							else if("DE".equalsIgnoreCase(te.getEventType())){
243 
								fedexFirstDeliveryAttemptedOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime())+"|"+te.getEventDescription());
 265 
								fedexFirstDeliveryAttemptedOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime())+"|"+te.getEventDescription());
- 
 
 266 
								break trackDeatilsLoop;
244 
							}
 267 
							}
245 
							break trackDeatilsLoop;
 - 
 
246 
						}
 - 
 
247 
						else if("DE".equalsIgnoreCase(te.getEventType())){
 - 
 
248 
							fedexFirstDeliveryAttemptedOrdersMap.put(awbNumber, dateformat.format(te.getTimestamp().getTime())+" "+timeformat.format(te.getTimestamp().getTime())+"|"+te.getEventDescription());
 - 
 
249 
							break trackDeatilsLoop;
 - 
 
250 
						}
 268 
						}
251 
					}
 269 
					}
252 
				}
 270 
				}
253 
			}
 271 
			}
254 
		}
 272 
		}
Line 263... Line 281...
263 
			TrackDetail[] trackDetails=trackreply.getTrackDetails();
 281 
			TrackDetail[] trackDetails=trackreply.getTrackDetails();
264 
			SimpleDateFormat dateformat = new SimpleDateFormat("dd-MMM-yyyy");
 282 
			SimpleDateFormat dateformat = new SimpleDateFormat("dd-MMM-yyyy");
265 
			SimpleDateFormat timeformat = new SimpleDateFormat("HH:mm:ss");
 283 
			SimpleDateFormat timeformat = new SimpleDateFormat("HH:mm:ss");
266 
			for (int i=0; i< trackDetails.length; i++) {
 284 
			for (int i=0; i< trackDetails.length; i++) {
267 
				TrackEvent trackEvents[]= trackDetails[i].getEvents();
 285 
				TrackEvent trackEvents[]= trackDetails[i].getEvents();
- 
 
 286 
				if(trackEvents!=null && trackEvents.length > 0){
268 
				for(TrackEvent te : trackEvents){
 287 
					for(TrackEvent te : trackEvents){
269 
					ShipmentUpdate shipUpdate = new ShipmentUpdate();
 288 
						ShipmentUpdate shipUpdate = new ShipmentUpdate();
270 
					if(te.getAddress()!=null){
 289 
						if(te.getAddress()!=null){
271 
						if(te.getAddress().getCity()!=null){
 290 
							if(te.getAddress().getCity()!=null){
272 
							shipUpdate.city= te.getAddress().getCity();
 291 
								shipUpdate.city= te.getAddress().getCity();
- 
 
 292 
							}
- 
 
 293 
							else{
- 
 
 294 
								shipUpdate.city="Unknown";
- 
 
 295 
							}
273 
						}
 296 
						}
274 
						else{
 297 
						else{
275 
							shipUpdate.city="Unknown";
 298 
							shipUpdate.city="Unknown";
276 
						}
 299 
						}
- 
 
 300 
						shipUpdate.date= dateformat.format(te.getTimestamp().getTime());
- 
 
 301 
						shipUpdate.time= timeformat.format(te.getTimestamp().getTime());
- 
 
 302 
						shipUpdate.description= te.getEventDescription();
- 
 
 303 
						updates.add(shipUpdate);
277 
					}
 304 
					}
278 
					else{
 - 
 
279 
						shipUpdate.city="Unknown";
 - 
 
280 
					}
 305 
				}
281 
					shipUpdate.date= dateformat.format(te.getTimestamp().getTime());
 - 
 
282 
					shipUpdate.time= timeformat.format(te.getTimestamp().getTime());
 - 
 
283 
					shipUpdate.description= te.getEventDescription();
 - 
 
284 
					updates.add(shipUpdate);
 - 
 
285 
				}
- 
 
286 
			}
 306 
			}
287 
			return updates;
 307 
			return updates;
288 
		}
 308 
		}
289 
		else{
 309 
		else{
290 
			return null;
 310 
			return null;