svnno****@sourc*****
svnno****@sourc*****
2007年 7月 23日 (月) 09:01:23 JST
Revision: 335
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=335
Author: takeharu
Date: 2007-07-23 09:01:23 +0900 (Mon, 23 Jul 2007)
Log Message:
-----------
Modified Paths:
--------------
pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditAction.java
pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListAction.java
pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerService.java
pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/impl/ManufacturerServiceImpl.java
-------------- next part --------------
Modified: pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditAction.java
===================================================================
--- pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditAction.java 2007-07-23 00:00:52 UTC (rev 334)
+++ pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditAction.java 2007-07-23 00:01:23 UTC (rev 335)
@@ -26,7 +26,7 @@
dxo.convert(info, manufacturerEditPage);
}
}else {
-
+ manufacturerEditPage.setMode("insert");
}
return null;
}
Modified: pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListAction.java
===================================================================
--- pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListAction.java 2007-07-23 00:00:52 UTC (rev 334)
+++ pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListAction.java 2007-07-23 00:01:23 UTC (rev 335)
@@ -65,7 +65,7 @@
System.out.println("prerender");
// List list = getMockList();
// makerListPage.setManufacturerItems(list);
- List list = manufacturerService.getManufacturesList();
+ List list = manufacturerService.getManufacturesInfoList();
List mapList = new ArrayList();
if(list.size() > 0) {
dxo.convert(list, mapList);
Modified: pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerService.java
===================================================================
--- pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerService.java 2007-07-23 00:00:52 UTC (rev 334)
+++ pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerService.java 2007-07-23 00:01:23 UTC (rev 335)
@@ -4,6 +4,7 @@
import java.util.List;
import jp.sf.pal.pompei.allcommon.Entity;
+import jp.sf.pal.pompei.exentity.Manufacturers;
import jp.sf.pal.pompei.exentity.ManufacturersInfo;
/**
@@ -24,8 +25,11 @@
* メーカーの一覧を取得します。
* @return
*/
- List<Entity> getManufacturesList();
+ List<Entity> getManufacturesInfoList();
+
+ List<Manufacturers> getManufacturesList();
+
/**
* メーカーを追加します。
* @param m
Modified: pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/impl/ManufacturerServiceImpl.java
===================================================================
--- pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/impl/ManufacturerServiceImpl.java 2007-07-23 00:00:52 UTC (rev 334)
+++ pompei/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/impl/ManufacturerServiceImpl.java 2007-07-23 00:01:23 UTC (rev 335)
@@ -2,10 +2,13 @@
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import jp.sf.pal.pompei.allcommon.Entity;
+import jp.sf.pal.pompei.allcommon.bhv.setup.ValueLabelSetupper;
+import jp.sf.pal.pompei.cbean.ManufacturersCB;
import jp.sf.pal.pompei.cbean.ManufacturersInfoCB;
import jp.sf.pal.pompei.exbhv.ManufacturersBhv;
import jp.sf.pal.pompei.exbhv.ManufacturersInfoBhv;
@@ -44,12 +47,21 @@
return manufacturersInfoBhv.selectEntity(infoCb);
}
- public List<Entity> getManufacturesList() {
+ public List<Entity> getManufacturesInfoList() {
ManufacturersInfoCB infoCb = new ManufacturersInfoCB();
infoCb.addOrderBy_PK_Asc();
infoCb.setupSelect_Manufacturers();
return manufacturersInfoBhv.callReadList(infoCb);
+ }
+ public List<Manufacturers> getManufacturesList() {
+ ManufacturersCB cb = new ManufacturersCB();
+ List<Manufacturers> list = manufacturersBhv.selectList(cb);
+// List<String> nameList = new ArrayList<String>();
+// for (Manufacturers m : list) {
+// nameList.add(m.getManufacturersName());
+// }
+ return list;
}
public void updateManufactures(ManufacturersInfo info) {