Author: bbrossaud Date: 2010-07-09 15:48:00 +0200 (Fri, 09 Jul 2010) New Revision: 101 Url: http://chorem.org/repositories/revision/bonzoms/101 Log: addition missing files Added: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java Removed: trunk/bonzoms-ui-zk/src/main/webapp/companyPage Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul trunk/bonzoms-ui-zk/src/main/webapp/personPage.zul trunk/bonzoms-ui-zk/transaction.log Added: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java (rev 0) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java 2010-07-09 13:48:00 UTC (rev 101) @@ -0,0 +1,81 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.chorem.bonzoms.ui; + +import java.util.List; +import org.chorem.data.bonzoms.Company; +import org.zkoss.zk.ui.event.EventListener; +import org.zkoss.zk.ui.util.GenericForwardComposer; +import org.zkoss.zul.Button; +import org.zkoss.zul.Listcell; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; + +/** + * + * @author sherkhan + */ +public class CompanyController extends GenericForwardComposer { + protected Model _model = new Model(); + protected CompanyModel _companyModel = new CompanyModel(); + + public CompanyController() { + List<Company> companies = _model.retrieveAllCompanies(); + _companyModel.setCompanies(companies); + } + + /* + * Events + */ + + /* + * Renderers + */ + public ListitemRenderer getCompanyRenderer() { + return new ListitemRenderer() { + + @Override + public void render(Listitem item, Object data) throws Exception { + item.setValue(data); + final Company company = (Company) data; + + Listcell nameCell = new Listcell(company.getName()); + Listcell webSiteCell = new Listcell(company.getWebSite()); + Listcell phoneFaxCell = new Listcell(company.getPhone()+"/"+company.getFax()); + Listcell addressCell = new Listcell("address"); + Listcell typeCell = new Listcell(company.getType()); + Listcell detailsCell = new Listcell(); + Button details = new Button("details"); + detailsCell.appendChild(details); +// details.addEventListener("onClick", new EventListener() { +// +// @Override +// public void onEvent(Event event) throws Exception { +// createWindowEmployeeForm(employee); +// } +// }); + + item.appendChild(nameCell); + item.appendChild(webSiteCell); + item.appendChild(phoneFaxCell); + item.appendChild(addressCell); + item.appendChild(typeCell); + item.appendChild(detailsCell); + } + }; + } + + /* + * Setters + */ + + /* + * Getters + */ + public CompanyModel getCompanyModel() { + return _companyModel; + } +} Added: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java (rev 0) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java 2010-07-09 13:48:00 UTC (rev 101) @@ -0,0 +1,56 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.chorem.bonzoms.ui; + +import java.util.ArrayList; +import java.util.List; +import org.chorem.data.bonzoms.Company; +import org.zkoss.zkplus.databind.BindingListModel; +import org.zkoss.zul.AbstractListModel; +import org.zkoss.zul.event.ListDataEvent; + +/** + * + * @author sherkhan + */ +public class CompanyModel extends AbstractListModel implements BindingListModel { + protected List<Company> _companies = new ArrayList<Company>(); + + @Override + public Object getElementAt(int index) { + return _companies.get(index); + } + + @Override + public int getSize() { + return _companies.size(); + } + + @Override + public int indexOf(Object obj) { + return _companies.indexOf(obj); + } + + public void setCompanies(List<Company> companies) { + _companies = companies; + fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); + } + + public void addData(Company newData) { + _companies.add(newData); + fireEvent(ListDataEvent.INTERVAL_ADDED, _companies.size() - 1, _companies.size() - 1); + } + + public void removeData(Company data) { + int interval = _companies.indexOf(data); + _companies.remove(data); + fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + } + + public void reload() { + fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); + } +} Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java 2010-07-09 12:19:03 UTC (rev 100) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java 2010-07-09 13:48:00 UTC (rev 101) @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.List; import org.chorem.data.bonzoms.Address; +import org.chorem.data.bonzoms.Company; import org.chorem.data.bonzoms.Employee; import org.chorem.data.bonzoms.Phone; import org.nuiton.wikitty.Criteria; @@ -59,6 +60,13 @@ return employees; } + public List<Company> retrieveAllCompanies() { + Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, Company.EXT_COMPANY).criteria(); + List<Company> companies = proxy.findAllByCriteria(Company.class, criteria).getAll(); + companies = new ArrayList<Company>(companies); + return companies; + } + public WikittyExtension retrieveWikittyExtensionByExtensionName(String name) { WikittyService service = proxy.getWikittyService(); WikittyExtension wikittyExtension = service.restoreExtensionLastVersion(null, name); Added: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java (rev 0) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java 2010-07-09 13:48:00 UTC (rev 101) @@ -0,0 +1,16 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.chorem.bonzoms.ui; + +import org.zkoss.zk.ui.util.GenericForwardComposer; + +/** + * + * @author sherkhan + */ +public class PersonController extends GenericForwardComposer { + +} Deleted: trunk/bonzoms-ui-zk/src/main/webapp/companyPage =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/companyPage 2010-07-09 12:19:03 UTC (rev 100) +++ trunk/bonzoms-ui-zk/src/main/webapp/companyPage 2010-07-09 13:48:00 UTC (rev 101) @@ -1,17 +0,0 @@ -<?page id="company" title="Employee" cacheable="false" language="xul/html" zscriptLanguage="Java"?> -<?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> -<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="company"?> - -<window id="company" apply="org.chorem.bonzoms.ui.CompanyController"> - Companies: <toolbarbutton id="newCompany" label="Add new company" /> - <listbox autopaging="true" mold="paging" id="companyListBox" rows="20" model="@{company$composer.companyModel}" - itemRenderer="@{company$composer.companyRenderer}"> - <listhead> - <listheader label="Name" /> - <listheader label="Web site" /> - <listheader label="Phone/Fax" /> - <listheader label="Address" /> - <listheader label="Type" /> - </listhead> - </listbox> -</window> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul 2010-07-09 12:19:03 UTC (rev 100) +++ trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul 2010-07-09 13:48:00 UTC (rev 101) @@ -1,7 +1,18 @@ -<?page id="company" title="Company" cacheable="false" language="xul/html" zscriptLanguage="Java"?> +<?page id="company" title="Employee" cacheable="false" language="xul/html" zscriptLanguage="Java"?> <?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="company"?> <window id="company" apply="org.chorem.bonzoms.ui.CompanyController"> - + Companies: <toolbarbutton id="newCompany" label="Add new company" /> + <listbox autopaging="true" mold="paging" id="companyListBox" rows="20" model="@{company$composer.companyModel}" + itemRenderer="@{company$composer.companyRenderer}"> + <listhead> + <listheader label="Name" /> + <listheader label="Web site" /> + <listheader label="Phone/Fax" /> + <listheader label="Address" /> + <listheader label="Type" /> + <listheader label="details" /> + </listhead> + </listbox> </window> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/src/main/webapp/personPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/personPage.zul 2010-07-09 12:19:03 UTC (rev 100) +++ trunk/bonzoms-ui-zk/src/main/webapp/personPage.zul 2010-07-09 13:48:00 UTC (rev 101) @@ -3,5 +3,5 @@ <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="person"?> <window id="person" apply="org.chorem.bonzoms.ui.PersonController"> - + Person page coming soon... </window> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/transaction.log =================================================================== --- trunk/bonzoms-ui-zk/transaction.log 2010-07-09 12:19:03 UTC (rev 100) +++ trunk/bonzoms-ui-zk/transaction.log 2010-07-09 13:48:00 UTC (rev 101) @@ -288,3 +288,9 @@ 2010-07-09 14:14:34,168 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 53759 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService 2010-07-09 14:15:52,842 [http-8080-4] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@1aee513 2010-07-09 14:15:53,855 [http-8080-4] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@ce374a +2010-07-09 14:58:21,287 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 34074 +2010-07-09 14:58:21,289 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 34 074 +2010-07-09 14:58:21,374 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34074 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-09 15:06:01,332 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 51859 +2010-07-09 15:06:01,334 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 51 859 +2010-07-09 15:06:01,423 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 51859 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService