[gatein-commits] gatein SVN: r1206 - in portal/trunk/portlet/exoadmin/src/main: webapp/groovy/wsrp/webui/component and 1 other directory.

Author: chris.laprun(a)jboss.com Date: 2010-01-08 10:26:33 -0500 (Fri, 08 Jan 2010) New Revision: 1206 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerEditor.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerPropertyEditor.java portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsumerOverview.gtmpl portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl Log: - Fixed lots of issues with UIWsrpProducerEditor to be able to contextually display registration details based on whether registration is required or not. - Cleaned-up some. Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerEditor.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerEditor.java 2010-01-08 15:22:50 UTC (rev 1205) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerEditor.java 2010-01-08 15:26:33 UTC (rev 1206) @@ -24,8 +24,8 @@ import org.exoplatform.commons.utils.LazyPageList; import org.exoplatform.commons.utils.ListAccess; +import org.exoplatform.portal.webui.util.Util; import org.exoplatform.web.application.ApplicationMessage; -import org.exoplatform.webui.application.WebuiRequestContext; import org.exoplatform.webui.config.annotation.ComponentConfig; import org.exoplatform.webui.config.annotation.ComponentConfigs; import org.exoplatform.webui.config.annotation.EventConfig; @@ -38,6 +38,7 @@ import org.exoplatform.webui.form.UIForm; import org.exoplatform.webui.form.UIFormCheckBoxInput; import org.exoplatform.webui.form.UIFormInputBase; +import org.exoplatform.webui.form.UIFormInputSet; import org.exoplatform.webui.form.UIFormStringInput; import org.gatein.registration.RegistrationPolicy; import org.gatein.registration.policies.DefaultRegistrationPolicy; @@ -79,14 +80,56 @@ private static final String REGISTRATION_DETAILS = "registrationdetails"; private ProducerConfigurationService configService; - private UIWSRPFormInputSet registrationDetails; + private static final String REGISTRATION_PROPERTIES = "RegistrationPropertySelector"; + private static final String REGISTRATION_PROPERTIES_ITERATOR = "ProducerPropPageIterator"; + private UIFormInputSet registrationDetails; + private UIFormInputBase<String> policy; + private UIFormInputBase<String> validator; + private UIFormCheckBoxInput regReqForDesc; + private UIFormCheckBoxInput strictMode; + private UIFormCheckBoxInput<Boolean> regRequired; + private UIGrid registrationProperties; public UIWsrpProducerEditor() throws Exception { - addUIFormInput(new UIFormCheckBoxInput(REG_REQUIRED_FOR_DESCRIPTION, REG_REQUIRED_FOR_DESCRIPTION, null)); - addUIFormInput(new UIFormCheckBoxInput(STRICT_MODE, STRICT_MODE, null)); - addUIFormInput(new UIFormCheckBoxInput(REQUIRES_REGISTRATION, REQUIRES_REGISTRATION, null)); + configService = Util.getUIPortalApplication().getApplicationComponent(ProducerConfigurationService.class); + regReqForDesc = new UIFormCheckBoxInput(REG_REQUIRED_FOR_DESCRIPTION, REG_REQUIRED_FOR_DESCRIPTION, null); + addUIFormInput(regReqForDesc); + strictMode = new UIFormCheckBoxInput(STRICT_MODE, STRICT_MODE, null); + addUIFormInput(strictMode); + + // registration required check box with onChange event + regRequired = new UIFormCheckBoxInput<Boolean>(REQUIRES_REGISTRATION, REQUIRES_REGISTRATION, null); + regRequired.setOnChange("RegistrationOnChange"); + addUIFormInput(regRequired); + // because when we use setOnChange method, new eventListener will add to this form, we must re-set the actions of this form. + // thif form has no action, so i'll put empty string array + setActions(new String[]{}); + + // registration details + // form set to gather registration information + registrationDetails = new UIWSRPFormInputSet(REGISTRATION_DETAILS); + addUIFormInput(registrationDetails); + + // policy + policy = new UIFormStringInput(POLICY_CLASS, POLICY_CLASS, null); + registrationDetails.addUIFormInput(policy); + + // validator + validator = new UIFormStringInput(VALIDATOR_CLASS, VALIDATOR_CLASS, null); + registrationDetails.addUIFormInput(validator); + + // registration properties + registrationProperties = registrationDetails.addChild(UIGrid.class, REGISTRATION_PROPERTIES, null); + //configure the edit and delete buttons based on an id from the data list - this will also be passed as param to listener + registrationProperties.configure("name", FIELDS, SELECT_ACTIONS); + registrationProperties.getUIPageIterator().setId(REGISTRATION_PROPERTIES_ITERATOR); + registrationDetails.addChild(registrationProperties.getUIPageIterator()); + registrationProperties.getUIPageIterator().setRendered(false); + + init(); + //add the popup for property edit and adding new properties UIPopupWindow popup = addChild(UIPopupWindow.class, null, null); popup.setWindowSize(400, 300); @@ -95,9 +138,9 @@ popup.setRendered(false); } - public void setConfigService(ProducerConfigurationService configService) + ProducerConfigurationService getService() { - this.configService = configService; + return configService; } private void init() throws Exception @@ -105,57 +148,41 @@ ProducerConfiguration configuration = configService.getConfiguration(); ProducerRegistrationRequirements registrationRequirements = configuration.getRegistrationRequirements(); - getUIFormCheckBoxInput(REG_REQUIRED_FOR_DESCRIPTION).setValue(registrationRequirements.isRegistrationRequiredForFullDescription()); - getUIFormCheckBoxInput(STRICT_MODE).setValue(configuration.isUsingStrictMode()); + regReqForDesc.setValue(registrationRequirements.isRegistrationRequiredForFullDescription()); + strictMode.setValue(configuration.isUsingStrictMode()); boolean registrationRequired = registrationRequirements.isRegistrationRequired(); - getUIFormCheckBoxInput(REQUIRES_REGISTRATION).setValue(registrationRequired); + regRequired.setValue(registrationRequired); - // reset potentially existing registration details - if (registrationDetails != null) - { - removeChild(registrationDetails.getClass()); - } - // if registration is required then we display more information if (registrationRequired) { - registrationDetails = new UIWSRPFormInputSet(REGISTRATION_DETAILS); + registrationDetails.setRendered(true); - // registration policy - UIFormInputBase<String> policyInput = new UIFormStringInput(POLICY_CLASS, POLICY_CLASS, null); - addUIFormInput(policyInput); - RegistrationPolicy policy = registrationRequirements.getPolicy(); String policyClassName = policy.getClass().getName(); - policyInput.setValue(policyClassName); + this.policy.setValue(policyClassName); // if policy is the default one, display information about the validator if (ProducerRegistrationRequirements.DEFAULT_POLICY_CLASS_NAME.equals(policyClassName)) { - UIFormInputBase<String> validatorInput = new UIFormStringInput(VALIDATOR_CLASS, VALIDATOR_CLASS, null); - registrationDetails.addUIFormInput(validatorInput); DefaultRegistrationPolicy defaultPolicy = (DefaultRegistrationPolicy)policy; - validatorInput.setValue(defaultPolicy.getValidator().getClass().getName()); + validator.setValue(defaultPolicy.getValidator().getClass().getName()); + validator.setRendered(true); } + else + { + validator.setRendered(false); + } // registration properties Map<QName, RegistrationPropertyDescription> regProps = configuration.getRegistrationRequirements().getRegistrationProperties(); - - UIGrid uiGrid = registrationDetails.addChild(UIGrid.class, "RegistrationPropertySelector", null); - //configure the edit and delete buttons based on an id from the data list - this will also be passed as param to listener - uiGrid.configure("name", FIELDS, SELECT_ACTIONS); - - //add the propery grid - uiGrid.getUIPageIterator().setId("ProducerPropPageIterator"); - addChild(uiGrid.getUIPageIterator()); - uiGrid.getUIPageIterator().setRendered(false); - LazyPageList propertyList = createPageList(getPropertyList(regProps)); - uiGrid.getUIPageIterator().setPageList(propertyList); - - addUIFormInput(registrationDetails); - registrationDetails.setRendered(true); + registrationProperties.getUIPageIterator().setPageList(createPageList(getPropertyList(regProps))); } + else + { + registrationDetails.setRendered(false); + } } private List<RegistrationPropertyDescription> getPropertyList(Map<QName, RegistrationPropertyDescription> descriptions) throws Exception @@ -219,61 +246,46 @@ { public void execute(Event<UIWsrpProducerEditor> event) throws Exception { - UIWsrpProducerEditor producerEditor = event.getSource(); - - WebuiRequestContext ctx = event.getRequestContext(); - producerEditor.save(ctx); - //producerEditor.reset(); - - } - } - - public boolean save(WebuiRequestContext context) throws Exception - { - //ConsumerRegistry consumerRegistry = getConsumerRegistry(); - //ProducerInfo producerInfo = consumerRegistry.getProducerInfoByKey("").getRegistrationInfo(). - UIApplication uiApp = context.getUIApplication(); - - ProducerConfiguration producerConfiguration = configService.getConfiguration(); - - try - { + UIWsrpProducerEditor source = event.getSource(); + ProducerConfigurationService service = source.getService(); + ProducerConfiguration producerConfiguration = service.getConfiguration(); ProducerRegistrationRequirements registrationRequirements = producerConfiguration.getRegistrationRequirements(); - registrationRequirements.setRegistrationRequiredForFullDescription(Boolean.parseBoolean(getUIFormCheckBoxInput(REG_REQUIRED_FOR_DESCRIPTION).getValue().toString())); - producerConfiguration.setUsingStrictMode(Boolean.parseBoolean(getUIFormCheckBoxInput(STRICT_MODE).getValue().toString())); + registrationRequirements.setRegistrationRequiredForFullDescription(Boolean.parseBoolean(source.regReqForDesc.getValue().toString())); + producerConfiguration.setUsingStrictMode(Boolean.parseBoolean(source.strictMode.getValue().toString())); - boolean requiresReg = Boolean.parseBoolean(getUIFormCheckBoxInput(REQUIRES_REGISTRATION).getValue().toString()); + boolean requiresReg = Boolean.parseBoolean(source.regRequired.getValue().toString()); registrationRequirements.setRegistrationRequired(requiresReg); - /*if (registrationDetails != null) + if (requiresReg) { - registrationRequirements.reloadPolicyFrom(registrationDetails.getUIStringInput(POLICY_CLASS).getValue(), - registrationDetails.getUIStringInput(VALIDATOR_CLASS).getValue()); - }*/ + registrationRequirements.reloadPolicyFrom(source.policy.getValue(), source.validator.getValue()); + } - configService.saveConfiguration(); - uiApp.addMessage(new ApplicationMessage("Producer Successfully Changed", null)); + try + { + service.saveConfiguration(); + } + catch (Exception e) + { + UIApplication uiApp = event.getRequestContext().getUIApplication(); + uiApp.addMessage(new ApplicationMessage("Producer Modification Error", null, ApplicationMessage.ERROR)); + e.printStackTrace(); + } + + source.init(); } - catch (Exception e) - { - uiApp.addMessage(new ApplicationMessage("Producer Modification Error", null, ApplicationMessage.ERROR)); - e.printStackTrace(); - } - - return true; } - static public class EditPropertyActionListener extends EventListener<UIWsrpProducerOverview> + static public class EditPropertyActionListener extends EventListener<UIWsrpProducerEditor> { - public void execute(Event<UIWsrpProducerOverview> event) throws Exception + public void execute(Event<UIWsrpProducerEditor> event) throws Exception { - UIWsrpProducerOverview producerOverview = event.getSource(); - UIApplication uiApp = event.getRequestContext().getUIApplication(); - UIPopupWindow popup = producerOverview.getChild(UIPopupWindow.class); + UIWsrpProducerEditor source = event.getSource(); + UIPopupWindow popup = source.getChild(UIPopupWindow.class); UIWsrpProducerPropertyEditor editor = (UIWsrpProducerPropertyEditor)popup.getUIComponent(); String id = event.getRequestContext().getRequestParameter(OBJECTID); try { - editor.setRegistrationPropertyDescription(producerOverview.getProducerConfigurationService().getConfiguration().getRegistrationRequirements().getRegistrationPropertyWith(id)); + editor.setRegistrationPropertyDescription(source.getService().getConfiguration().getRegistrationRequirements().getRegistrationPropertyWith(id)); } catch (Exception e) { @@ -286,19 +298,19 @@ } } - static public class DeletePropertyActionListener extends EventListener<UIWsrpProducerOverview> + static public class DeletePropertyActionListener extends EventListener<UIWsrpProducerEditor> { - public void execute(Event<UIWsrpProducerOverview> event) + public void execute(Event<UIWsrpProducerEditor> event) { - UIWsrpProducerOverview producerOverview = event.getSource(); + UIWsrpProducerEditor source = event.getSource(); UIApplication uiApp = event.getRequestContext().getUIApplication(); - UIPopupWindow popup = producerOverview.getChild(UIPopupWindow.class); - UIWsrpProducerPropertyEditor editor = (UIWsrpProducerPropertyEditor)popup.getUIComponent(); + UIPopupWindow popup = source.getChild(UIPopupWindow.class); String id = event.getRequestContext().getRequestParameter(OBJECTID); try { - producerOverview.getProducerConfigurationService().getConfiguration().getRegistrationRequirements().removeRegistrationProperty(id); - producerOverview.getProducerConfigurationService().saveConfiguration(); + ProducerConfigurationService service = source.getService(); + service.getConfiguration().getRegistrationRequirements().removeRegistrationProperty(id); + service.saveConfiguration(); } catch (Exception e) { @@ -309,12 +321,12 @@ } } - static public class AddPropertyActionListener extends EventListener<UIWsrpProducerOverview> + static public class AddPropertyActionListener extends EventListener<UIWsrpProducerEditor> { - public void execute(Event<UIWsrpProducerOverview> event) throws Exception + public void execute(Event<UIWsrpProducerEditor> event) throws Exception { - UIWsrpProducerOverview wsrpProducerOverview = event.getSource(); - UIPopupWindow popup = wsrpProducerOverview.getChild(UIPopupWindow.class); + UIWsrpProducerEditor source = event.getSource(); + UIPopupWindow popup = source.getChild(UIPopupWindow.class); UIWsrpProducerPropertyEditor editor = (UIWsrpProducerPropertyEditor)popup.getUIComponent(); //reset the form @@ -327,12 +339,17 @@ } } - @Override - public void processRender(WebuiRequestContext context) throws Exception + public static class RegistrationOnChangeActionListener extends EventListener<UIFormCheckBoxInput> { - // reset the GUI - init(); + public void execute(Event<UIFormCheckBoxInput> event) throws Exception + { + UIFormCheckBoxInput source = event.getSource(); + UIWsrpProducerEditor parent = source.getAncestorOfType(UIWsrpProducerEditor.class); + parent.init(); - super.processRender(context); + //update only the parent, avoid updating the full portlet + event.getRequestContext().addUIComponentToUpdateByAjax(parent); + } } + } Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java 2010-01-08 15:22:50 UTC (rev 1205) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java 2010-01-08 15:26:33 UTC (rev 1206) @@ -41,7 +41,6 @@ public UIWsrpProducerOverview() throws Exception { producerForm = createUIComponent(UIWsrpProducerEditor.class, null, "Producer Editor"); - producerForm.setConfigService(getProducerConfigurationService()); addChild(producerForm); } Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerPropertyEditor.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerPropertyEditor.java 2010-01-08 15:22:50 UTC (rev 1205) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerPropertyEditor.java 2010-01-08 15:26:33 UTC (rev 1206) @@ -35,7 +35,6 @@ import org.exoplatform.webui.form.UIForm; import org.exoplatform.webui.form.UIFormStringInput; import org.exoplatform.webui.form.validator.MandatoryValidator; -import org.gatein.wsrp.consumer.registry.ConsumerRegistry; import org.gatein.wsrp.producer.config.ProducerConfiguration; import org.gatein.wsrp.producer.config.ProducerConfigurationService; import org.gatein.wsrp.registration.LocalizedString; @@ -59,7 +58,8 @@ addUIFormInput(new UIFormStringInput(HINT, HINT, null).addValidator(MandatoryValidator.class)); } - public void setRegistrationPropertyDescription(RegistrationPropertyDescription registrationPropertyDescription) throws Exception { + public void setRegistrationPropertyDescription(RegistrationPropertyDescription registrationPropertyDescription) throws Exception + { this.registrationPropertyDescription_ = registrationPropertyDescription; @@ -80,18 +80,11 @@ return registrationPropertyDescription_; } - static public class SaveActionListener extends EventListener<UIWsrpProducerEditor> + static public class SaveActionListener extends EventListener<UIWsrpProducerPropertyEditor> { - public void execute(Event<UIWsrpProducerEditor> event) throws Exception + public void execute(Event<UIWsrpProducerPropertyEditor> event) throws Exception { - UIWsrpProducerEditor producerEditor = event.getSource(); - - UIWsrpProducerEditor producerOverview = producerEditor.getAncestorOfType(UIWsrpProducerEditor.class); - - WebuiRequestContext ctx = event.getRequestContext(); - producerEditor.save(ctx); - //producerEditor.reset(); - + // todo: implement } } @@ -102,15 +95,17 @@ ProducerConfiguration producerConfiguration = pconfService.getConfiguration(); - RegistrationPropertyDescription regPropDesc = getRegistrationPropertyDescription(); - if(regPropDesc != null){ + if (regPropDesc != null) + { System.out.println("---------old1: " + regPropDesc.getDescription()); RegistrationPropertyDescription oldRegPropDesc = producerConfiguration.getRegistrationRequirements().getRegistrationProperties().get(regPropDesc); invokeSetBindingBean(oldRegPropDesc); System.out.println("---------new1: " + oldRegPropDesc.getNameAsString()); //return; - }else{ + } + else + { RegistrationPropertyDescription newRegProcDesc = new RegistrationPropertyDescription(); newRegProcDesc.setDescription(new LocalizedString(getUIStringInput(DESCRIPTION).getValue())); @@ -122,10 +117,13 @@ UIApplication uiApp = context.getUIApplication(); - try{ + try + { pconfService.saveConfiguration(); uiApp.addMessage(new ApplicationMessage("Producer Successfully Changed", null)); - }catch(Exception e){ + } + catch (Exception e) + { uiApp.addMessage(new ApplicationMessage("Producer Modification Error", null)); } Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsumerOverview.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsumerOverview.gtmpl 2010-01-08 15:22:50 UTC (rev 1205) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsumerOverview.gtmpl 2010-01-08 15:26:33 UTC (rev 1206) @@ -1,32 +1,23 @@ - -<% - import org.exoplatform.webui.core.UIComponent ; - import org.exoplatform.webui.form.UIFormPageIterator ; - import org.exoplatform.webui.form.UIFormCheckBoxInput ; - -%> - - <div class="<%=uicomponent.getId()%>" id="<%=uicomponent.getId()%>"> - <div class="UIAction"> + <div class="UIAction"> <table class="ActionContainer"> - <tr> - <td> - <div onclick="<%=uicomponent.event("OpenPopup", "")%>" class="ActionButton LightBlueStyle"> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <a href="javascript:void(0);">Add New Consumer</a> + <tr> + <td> + <div onclick="<%=uicomponent.event("OpenPopup", "")%>" class="ActionButton LightBlueStyle"> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <a href="javascript:void(0);">Add New Consumer</a> + </div> + </div> </div> - </div> - </div> - </div> - </td> - </tr> + </div> + </td> + </tr> </table> - </div> + </div> - <% uicomponent.renderChildren(); %> + <% uicomponent.renderChildren(); %> </div> \ No newline at end of file Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl 2010-01-08 15:22:50 UTC (rev 1205) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl 2010-01-08 15:26:33 UTC (rev 1206) @@ -36,7 +36,15 @@ <table class="ActionContainer"> <tr> <td> - + <div onclick="<%=uicomponent.event("AddProperty")%>" class="ActionButton LightBlueStyle"> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.AddProperty")%></a> + </div> + </div> + </div> + </div> </td> <td> <div onclick="<%=uicomponent.event("Save")%>" class="ActionButton LightBlueStyle"> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl 2010-01-08 15:22:50 UTC (rev 1205) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl 2010-01-08 15:26:33 UTC (rev 1206) @@ -1,13 +1,4 @@ - -<% - import org.exoplatform.webui.core.UIComponent ; - import org.exoplatform.webui.form.UIFormPageIterator ; - import org.exoplatform.webui.form.UIFormCheckBoxInput ; - -%> - - <div class="<%=uicomponent.getId()%>" id="<%=uicomponent.getId()%>"> - <% uicomponent.renderChildren(); %> + <% uicomponent.renderChildren(); %> </div> \ No newline at end of file