曾谨 / EssaAuto

Commit 0571f51449aa0ff0956e74c38245ae4c41e4f2b2

Authored by zengjin
1 parent 46c08699

增加swing新增开发商品

Showing 2 changed files with 152 additions and 144 deletions   Show diff stats
Inline Side-by-side
src/main/java/com/essa/framework/SuitesEnum.java
  Show/Hide comments   View file @0571f51
@@ -18,7 +18,8 @@ public enum SuitesEnum { @@ -18,7 +18,8 @@ public enum SuitesEnum {
18 PRODUCT_INQUIRY("PRODUCT_INQUIRY","productInquiry.xml","成品询价(正常)"), 18 PRODUCT_INQUIRY("PRODUCT_INQUIRY","productInquiry.xml","成品询价(正常)"),
19 ACTIVITY_SEND_PO("ACTIVITY_SEND_PO","activitySendPO.xml","生成PO(活动)"), 19 ACTIVITY_SEND_PO("ACTIVITY_SEND_PO","activitySendPO.xml","生成PO(活动)"),
20 SEND_PO("SEND_PO","sendPO.xml","生成PO(正常)"), 20 SEND_PO("SEND_PO","sendPO.xml","生成PO(正常)"),
21 - PO_INQUIRY("PO_INQUIRY","POInquiry.xml","PO询价") 21 + PO_INQUIRY("PO_INQUIRY","POInquiry.xml","PO询价"),
  22 + ADD_DEV_GOODS("ADD_DEV_GOODS","addDevGoods.xml","新增开发商品");
22 ; 23 ;
23 24
24 /** 25 /**
src/main/java/swing/SwingMain.java
  Show/Hide comments   View file @0571f51
@@ -201,6 +201,7 @@ public class SwingMain { @@ -201,6 +201,7 @@ public class SwingMain {
201 POnum.setBounds(25, 5, 68, 25); 201 POnum.setBounds(25, 5, 68, 25);
202 POInquiry.add(POnum); 202 POInquiry.add(POnum);
203 203
  204 +
204 // po单号文本值 205 // po单号文本值
205 po = new JTextField(); 206 po = new JTextField();
206 po.setBounds(90, 6, 110, 25); 207 po.setBounds(90, 6, 110, 25);
@@ -239,23 +240,23 @@ public class SwingMain { @@ -239,23 +240,23 @@ public class SwingMain {
239 //场景选择，插入对应的值，并打印在日志上 240 //场景选择，插入对应的值，并打印在日志上
240 final JComboBox selectSystem = new JComboBox<String>(); 241 final JComboBox selectSystem = new JComboBox<String>();
241 selectSystem.setBounds(102, 51, 114, 20); 242 selectSystem.setBounds(102, 51, 114, 20);
242 - selectSystem.addActionListener(new ActionListener() {  
243 - public void actionPerformed(ActionEvent e) {  
244 - if ("SIT".equals((String) selectSystem.getSelectedItem())) {  
245 - Model.setEnv("SIT");  
246 - ja.append(getCurrentTime() + "已选择环境：SIT\r\n");  
247 - } else if ("DIT".equals((String) selectSystem.getSelectedItem())) {  
248 - Model.setEnv("DIT");  
249 - ja.append(getCurrentTime() + "已选择环境：DIT\r\n");  
250 - } else if ("HOTFIX".equals((String) selectSystem.getSelectedItem())) {  
251 - Model.setEnv("HOTFIX");  
252 - ja.append(getCurrentTime() + "已选择环境：HOTFIX\r\n");  
253 - } else if ("UAT".equals((String) selectSystem.getSelectedItem())) {  
254 - Model.setEnv("UAT");  
255 - ja.append(getCurrentTime() + "已选择环境：UAT\r\n");  
256 - }  
257 - }  
258 - }); 243 +// selectSystem.addActionListener(new ActionListener() {
  244 +// public void actionPerformed(ActionEvent e) {
  245 +// if ("SIT".equals((String) selectSystem.getSelectedItem())) {
  246 +// Model.setEnv("SIT");
  247 +// ja.append(getCurrentTime() + "已选择环境：SIT\r\n");
  248 +// } else if ("DIT".equals((String) selectSystem.getSelectedItem())) {
  249 +// Model.setEnv("DIT");
  250 +// ja.append(getCurrentTime() + "已选择环境：DIT\r\n");
  251 +// } else if ("HOTFIX".equals((String) selectSystem.getSelectedItem())) {
  252 +// Model.setEnv("HOTFIX");
  253 +// ja.append(getCurrentTime() + "已选择环境：HOTFIX\r\n");
  254 +// } else if ("UAT".equals((String) selectSystem.getSelectedItem())) {
  255 +// Model.setEnv("UAT");
  256 +// ja.append(getCurrentTime() + "已选择环境：UAT\r\n");
  257 +// }
  258 +// }
  259 +// });
259 selectSystem.setFont(new Font("微软雅黑", Font.PLAIN, 14)); 260 selectSystem.setFont(new Font("微软雅黑", Font.PLAIN, 14));
260 for (EnvEnum envEnum : EnvEnum.values()) { 261 for (EnvEnum envEnum : EnvEnum.values()) {
261 selectSystem.addItem(envEnum.getCode()); 262 selectSystem.addItem(envEnum.getCode());
@@ -299,52 +300,59 @@ public class SwingMain { @@ -299,52 +300,59 @@ public class SwingMain {
299 ToCart.setVisible(false); 300 ToCart.setVisible(false);
300 POInquiry.setVisible(false); 301 POInquiry.setVisible(false);
301 register.setVisible(false); 302 register.setVisible(false);
302 - if ("新增原厂商品".equals((String) selectScene.getSelectedItem())) {  
303 - process.setText(  
304 - "<html><body>新增原厂商品场景流程:<br>1.商品建档<br>2.更新商品图片<br>3.审核商品<br>4.检查商品库，验证是否新增成功<br>PS：以上均由账号（linxun）操作<br><br></body></html>");  
305 - addOriginal.setVisible(true);  
306 - ja.append(getCurrentTime() + "已选择场景：新增原厂商品\r\n");  
307 - } else if ("新增市场商品".equals((String) selectScene.getSelectedItem())) {  
308 - process.setText("<html><body>新增市场商品场景流程：<br>" + "1.指定采购商编号(默认:RUS00833)<br>"  
309 - + "2.使用账号（maomeixiang)对指定采购商进行市场商品建档并选择审核人为\"邢昌勇\"<br>"  
310 - + "3.使用账号（xingchangyong）对市场商品审核<br></body></html>");  
311 - addOriginal.setVisible(true);  
312 - addMarket.setVisible(true);  
313 - ja.append(getCurrentTime() + "已选择场景：新增市场商品\r\n");  
314 - } else if ("发布团购".equals((String) selectScene.getSelectedItem())) {  
315 - ja.append(getCurrentTime() + "已选择场景：发布团购，运行过程中将会打开关闭浏览器2次！\r\n");  
316 - process.setText(  
317 - "<html><body>发布团购场景流程：<br><font color=\"red\">1.先执行新增原厂商品流程，生成一个原厂SKU</font><br>2.使用账号（linrong）为新增的SKU分配类目经理<br>3.团购设置中添加该SKU，并发布团购，验证团购发布结果</body></html>");  
318 - addOriginal.setVisible(true);  
319 - } else if ("采购商注册".equals((String) selectScene.getSelectedItem())) {  
320 - register.setVisible(true);  
321 - ja.append(getCurrentTime() + "已选择场景：采购商注册，运行过程中将会打开关闭浏览器2次！\r\n");  
322 - process.setText(  
323 - "<html><body>采购商注册流程：<br>1.使用账号（admin）在bpms后台生成一个邀请码<br>2.采购商平台填写注册信息，并填入上一步生成的邀请码<br>PS:新账号密码默认为：essa123<br><br><br></body></html>");  
324 - } else if ("添加SKU至购物车".equals((String) selectScene.getSelectedItem())) {  
325 - ToCart.setVisible(true);  
326 - ja.append(getCurrentTime() + "已选择场景：添加SKU至购物车\r\n");  
327 - process.setText(  
328 - "<html><body>添加SKU至购物车流程：<br>1.Buyer平台根据填入的采购<br>商信息进行登录操作<br>2.若未填写商品编号，将从数<br>据库随机查出一个符合要求的<br>sku添加至购物车<br><br><br></body></html>");  
329 - } else if ("成品询价".equals((String) selectScene.getSelectedItem())) {  
330 - ToCart.setVisible(true);  
331 - ja.append(getCurrentTime() + "已选择场景：成品询价，将重启浏览器多次\r\n");  
332 - process.setText(  
333 - "<html><body>成品询价流程：<br>1.Buyer平台根据填入的采购<br>商信息加入sku，若未填写sku<br>编号，将随机从数据库获取符<br>合要求的sku<br>2.bpms后台登录账号（chenhong）对该sku进行成<br>品询价审核<br></body></html>");  
334 - } else if ("生成PO".equals((String) selectScene.getSelectedItem())) {  
335 - ToCart.setVisible(true);  
336 - ja.append(getCurrentTime() + "已选择场景：生成PO，将重启浏览器多次\r\n");  
337 - process.setText(  
338 - "<html><body>生成PO流程：<br>1.采购商平台加入商品至购物车<br>2.bpms后台登录账号（chenhong）对该sku进行成品询价审核<br>3.再次登录采购商平台，进行拼柜、设置唛头、贴纸和提交PO操作</body></html>");  
339 - } else if ("PO询价".equals((String) selectScene.getSelectedItem())) {  
340 - POInquiry.setVisible(true);  
341 - ja.append(getCurrentTime() + "已选择场景：PO询价\r\n");  
342 - process.setText("<html><body>PO询价使用介绍：<br>1.填入需要询价的PO单号<br>2.工具将对该PO单号循环进行询价，直到所有商品均询价完成<br>3.如果运行过程中出现询价异常等弹框，手工关闭弹窗后脚本仍会继续执行之后的操作</body></html>"); 303 + switch ((String)selectScene.getSelectedItem()){
  304 + default:
  305 + process.setText(
  306 + "<html><body>新增原厂商品场景流程:<br>1.商品建档<br>2.更新商品图片<br>3.审核商品<br>4.检查商品库，验证是否新增成功<br>PS：以上均由账号（linxun）操作<br><br></body></html>");
  307 + addOriginal.setVisible(true);
  308 + ja.append(getCurrentTime() + "已选择场景：新增原厂商品\r\n");
  309 + break;
  310 + case "新增市场商品":
  311 + process.setText("<html><body>新增市场商品场景流程：<br>" + "1.指定采购商编号(默认:RUS00833)<br>"
  312 + + "2.使用账号（maomeixiang)对指定采购商进行市场商品建档并选择审核人为\"邢昌勇\"<br>"
  313 + + "3.使用账号（xingchangyong）对市场商品审核<br></body></html>");
  314 + addOriginal.setVisible(true);
  315 + addMarket.setVisible(true);
  316 + ja.append(getCurrentTime() + "已选择场景：新增市场商品\r\n");
  317 + break;
  318 + case "发布团购":
  319 + ja.append(getCurrentTime() + "已选择场景：发布团购，运行过程中将会打开关闭浏览器2次！\r\n");
  320 + process.setText(
  321 + "<html><body>发布团购场景流程：<br><font color=\"red\">1.先执行新增原厂商品流程，生成一个原厂SKU</font><br>2.使用账号（linrong）为新增的SKU分配类目经理<br>3.团购设置中添加该SKU，并发布团购，验证团购发布结果</body></html>");
  322 + addOriginal.setVisible(true);
  323 + break;
  324 + case "采购商注册":
  325 + register.setVisible(true);
  326 + ja.append(getCurrentTime() + "已选择场景：采购商注册，运行过程中将会打开关闭浏览器2次！\r\n");
  327 + process.setText(
  328 + "<html><body>采购商注册流程：<br>1.使用账号（admin）在bpms后台生成一个邀请码<br>2.采购商平台填写注册信息，并填入上一步生成的邀请码<br>PS:新账号密码默认为：essa123<br><br><br></body></html>");
  329 + break;
  330 + case "成品询价":
  331 + ToCart.setVisible(true);
  332 + ja.append(getCurrentTime() + "已选择场景：成品询价，将重启浏览器多次\r\n");
  333 + process.setText(
  334 + "<html><body>成品询价流程：<br>1.Buyer平台根据填入的采购<br>商信息加入sku，若未填写sku<br>编号，将随机从数据库获取符<br>合要求的sku<br>2.bpms后台登录账号（chenhong）对该sku进行成<br>品询价审核<br></body></html>");
  335 + break;
  336 + case "生成PO":
  337 + ToCart.setVisible(true);
  338 + ja.append(getCurrentTime() + "已选择场景：生成PO，将重启浏览器多次\r\n");
  339 + process.setText(
  340 + "<html><body>生成PO流程：<br>1.采购商平台加入商品至购物车<br>2.bpms后台登录账号（chenhong）对该sku进行成品询价审核<br>3.再次登录采购商平台，进行拼柜、设置唛头、贴纸和提交PO操作</body></html>");
  341 + break;
  342 + case "PO询价":
  343 + POInquiry.setVisible(true);
  344 + ja.append(getCurrentTime() + "已选择场景：PO询价\r\n");
  345 + process.setText("<html><body>PO询价使用介绍：<br>1.填入需要询价的PO单号<br>2.工具将对该PO单号循环进行询价，直到所有商品均询价完成<br>3.如果运行过程中出现询价异常等弹框，手工关闭弹窗后脚本仍会继续执行之后的操作</body></html>");
  346 + break;
  347 + case "新增开发商品":
  348 + addOriginal.setVisible(true);
  349 + ja.append(getCurrentTime() + "已选择场景：新增开发商品\r\n");
  350 + break;
343 } 351 }
344 } 352 }
345 }); 353 });
346 selectScene.setModel( 354 selectScene.setModel(
347 - new DefaultComboBoxModel(new String[] { "新增原厂商品", "新增市场商品", "发布团购", "采购商注册", "成品询价", "生成PO", "PO询价" })); 355 + new DefaultComboBoxModel(new String[] { "新增原厂商品", "新增市场商品", "发布团购", "采购商注册", "成品询价", "生成PO", "PO询价","新增开发商品" }));
348 frmvBy.getContentPane().add(selectScene); 356 frmvBy.getContentPane().add(selectScene);
349 357
350 JLabel label_3 = new JLabel("供应商名称："); 358 JLabel label_3 = new JLabel("供应商名称：");
@@ -563,94 +571,93 @@ public class SwingMain { @@ -563,94 +571,93 @@ public class SwingMain {
563 BrowserEngine.setInit(Environment, Browser); 571 BrowserEngine.setInit(Environment, Browser);
564 TestNG testNG = new TestNG(); 572 TestNG testNG = new TestNG();
565 List<String> suites = new ArrayList<String>(); 573 List<String> suites = new ArrayList<String>();
566 - if (Scene == "新增原厂商品") {  
567 - AddOriginalGoodsPage.setSupplierName(supplierName.getText());  
568 -// UpdatePicPage.setPicPath(picPath.getText());  
569 - Model.setPicPath(picPath.getText());  
570 - suites.add(SuitesEnum.ADD_ORIGINAL_GOODS.getSuiteName());  
571 -// suites.add(".\\resources\\suites\\addOriginalGoods.xml");// 图形界面  
572 - } else if (Scene == "新增市场商品") {  
573 - Model.setBuyerNo(buyerNo2.getText());  
574 - Model.setPicPath(picPath.getText());  
575 - Model.setSupplierName(supplierName.getText());  
576 - suites.add(SuitesEnum.ADD_MARKET_GOODS.getSuiteName());  
577 -// suites.add(".\\resources\\suites\\addMarketGoods.xml");// 图形界面  
578 - } else if (Scene == "发布团购") {  
579 - AddOriginalGoodsPage.setSupplierName(supplierName.getText());  
580 -// UpdatePicPage.setPicPath(picPath.getText());  
581 - Model.setPicPath(picPath.getText());  
582 - suites.add(SuitesEnum.PUBLISH_GROUP_PURCHASE.getSuiteName());  
583 -// suites.add(".\\resources\\suites\\publishGroupPurchase.xml");// 图形界面  
584 - } else if (Scene == "采购商注册") {  
585 - if (!(registerAccount.getText().equals("")  
586 - || registerAccount.getText().equals("若不填写将自动生成"))) {  
587 - Model.setEmail(registerAccount.getText());  
588 - }  
589 - suites.add(SuitesEnum.BUYER_REGISTER.getSuiteName());  
590 -// suites.add(".\\resources\\suites\\buyerRegister.xml");// 图形界面  
591 - } else if (Scene == "添加SKU至购物车") {// 暂时舍弃  
592 - Model.setBuyerAccount(account.getText());  
593 - Model.setBuyerPassword(password.getText());  
594 - Model.setSkuNo(SkuNo.getText());  
595 - suites.add(SuitesEnum.ADD_SKU_TO_CART.getSuiteName());  
596 -// suites.add(".\\resources\\suites\\addSkuToCart.xml");  
597 - } else if (Scene == "成品询价") {  
598 - Model.setBuyerAccount(account.getText());  
599 - Model.setBuyerPassword(password.getText());  
600 - Model.setSkuNo(SkuNo.getText());  
601 - if (Model.getIsactivity() == 1) {  
602 - suites.add(SuitesEnum.ACTIVITY_INQUIRY.getSuiteName());  
603 -// suites.add(".\\resources\\suites\\activityInquiry.xml");  
604 - }else {  
605 - suites.add(SuitesEnum.PRODUCT_INQUIRY.getSuiteName());  
606 -// suites.add(".\\resources\\suites\\productInquiry.xml");  
607 - }  
608 - } else if (Scene == "生成PO") {  
609 - Model.setBuyerAccount(account.getText());  
610 - Model.setBuyerPassword(password.getText());  
611 - Model.setSkuNo(SkuNo.getText());  
612 - if (Model.getIsactivity() == 1) {  
613 - suites.add(SuitesEnum.ACTIVITY_SEND_PO.getSuiteName());  
614 -// suites.add(".\\resources\\suites\\activitySendPO.xml");  
615 - }else {  
616 - suites.add(SuitesEnum.SEND_PO.getSuiteName());  
617 -// suites.add(".\\resources\\suites\\sendPO.xml");  
618 - }  
619 - } else if (Scene == "PO询价") {  
620 - Model.setPoNum(po.getText());  
621 - suites.add(SuitesEnum.PO_INQUIRY.getSuiteName());  
622 -// suites.add(".\\resources\\suites\\POInquiry.xml"); 574 + switch (Scene){
  575 +
  576 + case "新增市场商品":
  577 + Model.setBuyerNo(buyerNo2.getText());
  578 + Model.setPicPath(picPath.getText());
  579 + Model.setSupplierName(supplierName.getText());
  580 + suites.add(SuitesEnum.ADD_MARKET_GOODS.getSuiteName());
  581 + break;
  582 + case "发布团购":
  583 + AddOriginalGoodsPage.setSupplierName(supplierName.getText());
  584 + Model.setPicPath(picPath.getText());
  585 + suites.add(SuitesEnum.PUBLISH_GROUP_PURCHASE.getSuiteName());
  586 + break;
  587 + case "采购商注册":
  588 + if (!(registerAccount.getText().equals("")
  589 + || registerAccount.getText().equals("若不填写将自动生成"))) {
  590 + Model.setEmail(registerAccount.getText());
  591 + }
  592 + suites.add(SuitesEnum.BUYER_REGISTER.getSuiteName());
  593 + break;
  594 + case "成品询价":
  595 + Model.setBuyerAccount(account.getText());
  596 + Model.setBuyerPassword(password.getText());
  597 + Model.setSkuNo(SkuNo.getText());
  598 + if (Model.getIsactivity() == 1) {
  599 + suites.add(SuitesEnum.ACTIVITY_INQUIRY.getSuiteName());
  600 + }else {
  601 + suites.add(SuitesEnum.PRODUCT_INQUIRY.getSuiteName());
  602 + }
  603 + break;
  604 + case "生成PO":
  605 + Model.setBuyerAccount(account.getText());
  606 + Model.setBuyerPassword(password.getText());
  607 + Model.setSkuNo(SkuNo.getText());
  608 + if (Model.getIsactivity() == 1) {
  609 + suites.add(SuitesEnum.ACTIVITY_SEND_PO.getSuiteName());
  610 + }else {
  611 + suites.add(SuitesEnum.SEND_PO.getSuiteName());
  612 + }
  613 + break;
  614 + case "PO询价":
  615 + Model.setPoNum(po.getText());
  616 + suites.add(SuitesEnum.PO_INQUIRY.getSuiteName());
  617 + break;
  618 + default : //默认新增原厂商品
  619 + AddOriginalGoodsPage.setSupplierName(supplierName.getText());
  620 + Model.setPicPath(picPath.getText());
  621 + suites.add(SuitesEnum.ADD_ORIGINAL_GOODS.getSuiteName());
  622 + break;
  623 + case "新增开发商品":
  624 + Model.setPicPath(picPath.getText());
  625 + suites.add(SuitesEnum.ADD_DEV_GOODS.getSuiteName());
623 } 626 }
624 testNG.setTestSuites(suites); 627 testNG.setTestSuites(suites);
625 testNG.run(); 628 testNG.run();
626 ja.append(getCurrentTime() + "=======" + Scene + "场景,执行完毕！=======\r\n"); 629 ja.append(getCurrentTime() + "=======" + Scene + "场景,执行完毕！=======\r\n");
627 - if (Scene == "新增原厂商品" || Scene == "新增市场商品" || Scene == "发布团购") {  
628 - no = Model.getSkuNo();  
629 - if (no != null) {  
630 - ja.append(getCurrentTime() + "SKU商品编号：" + no + "\r\n");  
631 - } else {  
632 - ja.append(getCurrentTime()  
633 - + "程序执行失败了！\r\n你可查看目录中test-output/index.html的测试报告，或者查看Log中的执行日志检查原因\r\n");  
634 - }  
635 - } else if (Scene == "采购商注册") {  
636 - String code = Model.getInvateCode();  
637 - String email = Model.getEmail();  
638 - if (code != null && email != null) {  
639 - ja.append(getCurrentTime() + "生成的邀请码：" + Model.getInvateCode() + "\r\n");  
640 - ja.append(getCurrentTime() + "新采购商邮箱：" + Model.getEmail() + "\r\n");  
641 - } else {  
642 - ja.append(getCurrentTime()  
643 - + "程序执行失败了！\r\n你可以分析目录中test-output/index.html的测试报告，或者查看目录中Log文件夹生成的执行日志\r\n");  
644 - }  
645 - } else if (Scene == "添加SKU至购物车") {  
646 - ja.append(getCurrentTime() + "所选采购商账号：" + Model.getBuyerAccount() + "\r\n");  
647 - ja.append(getCurrentTime() + "添加的SKU编号为：" + Model.getSkuNo() + "\r\n");  
648 - } else if (Scene == "成品询价") {  
649 - ja.append(getCurrentTime() + "采购商账号：" + Model.getBuyerAccount() + "\r\n");  
650 - ja.append(getCurrentTime() + "SKU编号：" + Model.getSkuNo() + "\r\n");  
651 - } else if (Scene == "生成PO") {  
652 - ja.append(getCurrentTime() + "采购商账号：" + Model.getBuyerAccount() + "\r\n");  
653 - ja.append(getCurrentTime() + "PO单号：" + Model.getPoNum() + "\r\n"); 630 + switch (Scene){
  631 + default: //默认新增原厂商品
  632 + case "新增市场商品":
  633 + case "发布团购":
  634 + no = Model.getSkuNo();
  635 + if (no != null) {
  636 + ja.append(getCurrentTime() + "SKU商品编号：" + no + "\r\n");
  637 + } else {
  638 + ja.append(getCurrentTime()
  639 + + "程序执行失败了！\r\n");
  640 + }
  641 + break;
  642 + case "采购商注册":
  643 + String code = Model.getInvateCode();
  644 + String email = Model.getEmail();
  645 + if (code != null && email != null) {
  646 + ja.append(getCurrentTime() + "生成的邀请码：" + Model.getInvateCode() + "\r\n");
  647 + ja.append(getCurrentTime() + "新采购商邮箱：" + Model.getEmail() + "\r\n");
  648 + } else {
  649 + ja.append(getCurrentTime()
  650 + + "程序执行失败了！\r\n");
  651 + }
  652 + break;
  653 + case "成品询价":
  654 + ja.append(getCurrentTime() + "采购商账号：" + Model.getBuyerAccount() + "\r\n");
  655 + ja.append(getCurrentTime() + "SKU编号：" + Model.getSkuNo() + "\r\n");
  656 + break;
  657 + case "生成PO":
  658 + ja.append(getCurrentTime() + "采购商账号：" + Model.getBuyerAccount() + "\r\n");
  659 + ja.append(getCurrentTime() + "PO单号：" + Model.getPoNum() + "\r\n");
  660 + break;
654 } 661 }
655 return null; 662 return null;
656 } 663 }