svn commit: r586473 - in /ofbiz/trunk/framework/service
Locked
 
|
Author: doogie
Date: Fri Oct 19 07:22:10 2007 New Revision: 586473 URL: http://svn.apache.org/viewvc?rev=586473&view=rev Log: Make use of UtilXml's generics markup. Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaRule.java ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java?rev=586473&r1=586472&r2=586473&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/DispatchContext.java Fri Oct 19 07:22:10 2007 @@ -299,10 +299,7 @@ return null; } - List globalServicesElements = UtilXml.childElementList(rootElement, "global-services"); - Iterator gseIter = globalServicesElements.iterator(); - while (gseIter.hasNext()) { - Element globalServicesElement = (Element) gseIter.next(); + for (Element globalServicesElement: UtilXml.childElementList(rootElement, "global-services")) { ResourceHandler handler = new MainResourceHandler( ServiceConfigUtil.SERVICE_ENGINE_XML_FILENAME, globalServicesElement); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java?rev=586473&r1=586472&r2=586473&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java Fri Oct 19 07:22:10 2007 @@ -360,7 +360,7 @@ } protected void createNotification(Element baseElement, ModelService model) { - List n = UtilXml.childElementList(baseElement, "notification"); + List<? extends Element> n = UtilXml.childElementList(baseElement, "notification"); // default notification groups ModelNotification nSuccess = new ModelNotification(); nSuccess.notificationEvent = "success"; @@ -378,9 +378,7 @@ model.notifications.add(nError); if (n != null) { - Iterator i = n.iterator(); - while (i.hasNext()) { - Element e = (Element) i.next(); + for (Element e: n) { ModelNotification notify = new ModelNotification(); notify.notificationEvent = e.getAttribute("event"); notify.notificationGroupName = e.getAttribute("group"); @@ -400,11 +398,7 @@ } protected void createPermGroups(Element baseElement, ModelService model) { - List permGroups = UtilXml.childElementList(baseElement, "required-permissions"); - Iterator permIter = permGroups.iterator(); - - while (permIter.hasNext()) { - Element element = (Element) permIter.next(); + for (Element element: UtilXml.childElementList(baseElement, "required-permissions")) { ModelPermGroup group = new ModelPermGroup(); group.joinType = element.getAttribute("join-type"); createGroupPermissions(element, group, model); @@ -413,13 +407,8 @@ } protected void createGroupPermissions(Element baseElement, ModelPermGroup group, ModelService service) { - List permElements = UtilXml.childElementList(baseElement, "check-permission"); - List rolePermElements = UtilXml.childElementList(baseElement, "check-role-member"); - // create the simple permissions - Iterator si = permElements.iterator(); - while (si.hasNext()) { - Element element = (Element) si.next(); + for (Element element: UtilXml.childElementList(baseElement, "check-permission")) { ModelPermission perm = new ModelPermission(); perm.nameOrRole = element.getAttribute("permission").intern(); perm.action = element.getAttribute("action").intern(); @@ -433,9 +422,7 @@ } // create the role member permissions - Iterator ri = rolePermElements.iterator(); - while (ri.hasNext()) { - Element element = (Element) ri.next(); + for (Element element: UtilXml.childElementList(baseElement, "check-role-member")) { ModelPermission perm = new ModelPermission(); perm.permissionType = ModelPermission.ROLE_MEMBER; perm.nameOrRole = element.getAttribute("role-type").intern(); @@ -445,9 +432,9 @@ } protected void createGroupDefs(Element baseElement, ModelService service) { - List group = UtilXml.childElementList(baseElement, "group"); + List<? extends Element> group = UtilXml.childElementList(baseElement, "group"); if (group != null && group.size() > 0) { - Element groupElement = (Element) group.get(0); + Element groupElement = group.get(0); groupElement.setAttribute("name", "_" + service.name + ".group"); service.internalGroup = new GroupModel(groupElement); service.invoke = service.internalGroup.getGroupName(); @@ -456,11 +443,7 @@ } protected void createImplDefs(Element baseElement, ModelService service) { - List implElements = UtilXml.childElementList(baseElement, "implements"); - Iterator implIter = implElements.iterator(); - - while (implIter.hasNext()) { - Element implement = (Element) implIter.next(); + for (Element implement: UtilXml.childElementList(baseElement, "implements")) { String serviceName = UtilXml.checkEmpty(implement.getAttribute("service")).intern(); boolean optional = UtilXml.checkBoolean(implement.getAttribute("optional"), false); if (serviceName.length() > 0) @@ -470,11 +453,7 @@ } protected void createAutoAttrDefs(Element baseElement, ModelService service) { - List autoElement = UtilXml.childElementList(baseElement, "auto-attributes"); - Iterator autoIter = autoElement.iterator(); - - while (autoIter.hasNext()) { - Element element = (Element) autoIter.next(); + for (Element element: UtilXml.childElementList(baseElement, "auto-attributes")) { createAutoAttrDef(element, service); } } @@ -529,11 +508,9 @@ } // get the excludes list; and remove those from the map - List excludes = UtilXml.childElementList(autoElement, "exclude"); + List<? extends Element> excludes = UtilXml.childElementList(autoElement, "exclude"); if (excludes != null) { - Iterator excludesIter = excludes.iterator(); - while (excludesIter.hasNext()) { - Element exclude = (Element) excludesIter.next(); + for (Element exclude: excludes) { modelParamMap.remove(UtilXml.checkEmpty(exclude.getAttribute("field-name"))); } } @@ -557,11 +534,7 @@ protected void createAttrDefs(Element baseElement, ModelService service) { // Add in the defined attributes (override the above defaults if specified) - List paramElements = UtilXml.childElementList(baseElement, "attribute"); - Iterator paramIter = paramElements.iterator(); - - while (paramIter.hasNext()) { - Element attribute = (Element) paramIter.next(); + for (Element attribute: UtilXml.childElementList(baseElement, "attribute")) { ModelParam param = new ModelParam(); param.name = UtilXml.checkEmpty(attribute.getAttribute("name")).intern(); @@ -667,11 +640,7 @@ } protected void createOverrideDefs(Element baseElement, ModelService service) { - List paramElements = UtilXml.childElementList(baseElement, "override"); - Iterator paramIter = paramElements.iterator(); - - while (paramIter.hasNext()) { - Element attribute = (Element) paramIter.next(); + for (Element attribute: UtilXml.childElementList(baseElement, "override")) { String name = UtilXml.checkEmpty(attribute.getAttribute("name")); ModelParam param = service.getParam(name); boolean directToParams = true; @@ -732,13 +701,12 @@ } protected void addValidators(Element attribute, ModelParam param) { - List validateElements = UtilXml.childElementList(attribute, "type-validate"); + List<? extends Element> validateElements = UtilXml.childElementList(attribute, "type-validate"); if (validateElements != null && validateElements.size() > 0) { // always clear out old ones; never append param.validators = FastList.newInstance(); - Iterator i = validateElements.iterator(); - Element validate = (Element) i.next(); + Element validate = validateElements.get(0); String methodName = validate.getAttribute("method").intern(); String className = validate.getAttribute("class").intern(); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=586473&r1=586472&r2=586473&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Fri Oct 19 07:22:10 2007 @@ -976,11 +976,9 @@ } int servicesScheduled = 0; - List startupServices = UtilXml.childElementList(root, "startup-service"); + List<? extends Element> startupServices = UtilXml.childElementList(root, "startup-service"); if (startupServices != null && startupServices.size() > 0) { - Iterator i = startupServices.iterator(); - while (i.hasNext()) { - Element ss = (Element) i.next(); + for (Element ss: startupServices) { String serviceName = ss.getAttribute("name"); String runtimeDataId = ss.getAttribute("runtime-data-id"); String delayStr = ss.getAttribute("runtime-delay"); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java?rev=586473&r1=586472&r2=586473&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java Fri Oct 19 07:22:10 2007 @@ -74,13 +74,10 @@ List readPools = null; Element threadPool = getElement("thread-pool"); - List readPoolElements = UtilXml.childElementList(threadPool, "run-from-pool"); + List<? extends Element> readPoolElements = UtilXml.childElementList(threadPool, "run-from-pool"); if (readPoolElements != null) { readPools = FastList.newInstance(); - Iterator i = readPoolElements.iterator(); - - while (i.hasNext()) { - Element e = (Element) i.next(); + for (Element e: readPoolElements) { readPools.add(e.getAttribute("name")); } } @@ -122,10 +119,7 @@ FastMap engineNotifyMap = FastMap.newInstance(); - List nGroups = UtilXml.childElementList(rootElement, "notification-group"); - Iterator i = nGroups.iterator(); - while (i.hasNext()) { - Element e = (Element) i.next(); + for (Element e: UtilXml.childElementList(rootElement, "notification-group")) { NotificationGroup ng = new NotificationGroup(e); engineNotifyMap.put(ng.getName(), ng); } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java?rev=586473&r1=586472&r2=586473&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java Fri Oct 19 07:22:10 2007 @@ -57,22 +57,16 @@ this.runOnFailure = "true".equals(eca.getAttribute("run-on-failure")); this.runOnError = "true".equals(eca.getAttribute("run-on-error")); - List condList = UtilXml.childElementList(eca, "condition"); - Iterator ci = condList.iterator(); - while (ci.hasNext()) { - conditions.add(new ServiceEcaCondition((Element) ci.next(), true, false)); + for (Element element: UtilXml.childElementList(eca, "condition")) { + conditions.add(new ServiceEcaCondition(element, true, false)); } - List condFList = UtilXml.childElementList(eca, "condition-field"); - Iterator cfi = condFList.iterator(); - while (cfi.hasNext()) { - conditions.add(new ServiceEcaCondition((Element) cfi.next(), false, false)); + for (Element element: UtilXml.childElementList(eca, "condition-field")) { + conditions.add(new ServiceEcaCondition(element, false, false)); } - List condSList = UtilXml.childElementList(eca, "condition-service"); - Iterator sfi = condSList.iterator(); - while (sfi.hasNext()) { - conditions.add(new ServiceEcaCondition((Element) sfi.next(), false, true)); + for (Element element: UtilXml.childElementList(eca, "condition-service")) { + conditions.add(new ServiceEcaCondition(element, false, true)); } if (Debug.verboseOn()) Debug.logVerbose("Conditions: " + conditions, module); @@ -80,10 +74,7 @@ Set nameSet = FastSet.newInstance(); nameSet.add("set"); nameSet.add("action"); - List actionAndSetList = UtilXml.childElementList(eca, nameSet); - Iterator si = actionAndSetList.iterator(); - while (si.hasNext()) { - Element actionOrSetElement = (Element) si.next(); + for (Element actionOrSetElement: UtilXml.childElementList(eca, nameSet)) { if ("action".equals(actionOrSetElement.getNodeName())) { this.actionsAndSets.add(new ServiceEcaAction(actionOrSetElement, this.eventName)); } else { Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java?rev=586473&r1=586472&r2=586473&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java Fri Oct 19 07:22:10 2007 @@ -63,11 +63,9 @@ } if (root != null) { - List locationElements = UtilXml.childElementList(root, "service-location"); + List<? extends Element> locationElements = UtilXml.childElementList(root, "service-location"); if (locationElements != null) { - Iterator i = locationElements.iterator(); - while (i.hasNext()) { - Element e = (Element) i.next(); + for (Element e: locationElements) { locationMap.put(e.getAttribute("name"), e.getAttribute("location")); } } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java?rev=586473&r1=586472&r2=586473&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java Fri Oct 19 07:22:10 2007 @@ -60,20 +60,13 @@ throw new IllegalArgumentException("Group Definition found with no name attribute! : " + group); } - List serviceList = UtilXml.childElementList(group, "invoke"); - if (serviceList != null && serviceList.size() > 0) { - Iterator i = serviceList.iterator(); - while (i.hasNext()) { - Element service = (Element) i.next(); - services.add(new GroupServiceModel(service)); - } + for (Element service: UtilXml.childElementList(group, "invoke")) { + services.add(new GroupServiceModel(service)); } - List oldServiceTags = UtilXml.childElementList(group, "service"); - if (oldServiceTags != null && oldServiceTags.size() > 0) { - Iterator i = oldServiceTags.iterator(); - while (i.hasNext()) { - Element service = (Element) i.next(); + List<? extends Element> oldServiceTags = UtilXml.childElementList(group, "service"); + if (oldServiceTags.size() > 0) { + for (Element service: oldServiceTags) { services.add(new GroupServiceModel(service)); } Debug.logWarning("Service Group Definition : [" + group.getAttribute("name") + "] found with OLD 'service' attribute, change to use 'invoke'", module); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java?rev=586473&r1=586472&r2=586473&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java Fri Oct 19 07:22:10 2007 @@ -53,10 +53,7 @@ return; } - List serviceGroupElements = UtilXml.childElementList(rootElement, "service-groups"); - Iterator groupsIter = serviceGroupElements.iterator(); - while (groupsIter.hasNext()) { - Element serviceGroupElement = (Element) groupsIter.next(); + for (Element serviceGroupElement: UtilXml.childElementList(rootElement, "service-groups")) { ResourceHandler handler = new MainResourceHandler(ServiceConfigUtil.SERVICE_ENGINE_XML_FILENAME, serviceGroupElement); addGroupDefinitions(handler); } @@ -79,12 +76,9 @@ Debug.logError(e, module); return; } - List groupList = UtilXml.childElementList(rootElement, "group"); - Iterator groupIt = groupList.iterator(); int numDefs = 0; - while (groupIt.hasNext()) { - Element group = (Element) groupIt.next(); + for (Element group: UtilXml.childElementList(rootElement, "group")) { String groupName = group.getAttribute("name"); groupsCache.put(groupName, new GroupModel(group)); numDefs++; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java?rev=586473&r1=586472&r2=586473&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java Fri Oct 19 07:22:10 2007 @@ -84,12 +84,7 @@ if (Debug.verboseOn()) Debug.logVerbose("[ServiceDispatcher] : Loading JMS Listeners.", module); for (int i = 0; i < nodeList.getLength(); i++) { Element element = (Element) nodeList.item(i); - List serverList = UtilXml.childElementList(element, "server"); - Iterator serverIter = serverList.iterator(); - - while (serverIter.hasNext()) { - Element server = (Element) serverIter.next(); - + for (Element server: UtilXml.childElementList(element, "server")) { try { String listenerEnabled = server.getAttribute("listen"); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java?rev=586473&r1=586472&r2=586473&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsServiceEngine.java Fri Oct 19 07:22:10 2007 @@ -114,12 +114,12 @@ return message; } - protected List serverList(Element serviceElement) throws GenericServiceException { + protected List<? extends Element> serverList(Element serviceElement) throws GenericServiceException { String sendMode = serviceElement.getAttribute("send-mode"); - List serverList = UtilXml.childElementList(serviceElement, "server"); + List<? extends Element> serverList = UtilXml.childElementList(serviceElement, "server"); if (sendMode.equals("none")) { - return new ArrayList(); + return new ArrayList<Element>(); } else if (sendMode.equals("all")) { return serverList; } else { Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaRule.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaRule.java?rev=586473&r1=586472&r2=586473&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaRule.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaRule.java Fri Oct 19 07:22:10 2007 @@ -43,31 +43,19 @@ public ServiceMcaRule(Element mca) { this.ruleName = mca.getAttribute("mail-rule-name"); - List condFList = UtilXml.childElementList(mca, "condition-field"); - Iterator cfi = condFList.iterator(); - while (cfi.hasNext()) { - Element condElement = (Element) cfi.next(); + for (Element condElement: UtilXml.childElementList(mca, "condition-field")) { conditions.add(new ServiceMcaCondition(condElement, ServiceMcaCondition.CONDITION_FIELD)); } - List condHList = UtilXml.childElementList(mca, "condition-header"); - Iterator chi = condHList.iterator(); - while (chi.hasNext()) { - Element condElement = (Element) chi.next(); + for (Element condElement: UtilXml.childElementList(mca, "condition-header")) { conditions.add(new ServiceMcaCondition(condElement, ServiceMcaCondition.CONDITION_HEADER)); } - List condSList = UtilXml.childElementList(mca, "condition-service"); - Iterator csi = condSList.iterator(); - while (csi.hasNext()) { - Element condElement = (Element) csi.next(); + for (Element condElement: UtilXml.childElementList(mca, "condition-service")) { conditions.add(new ServiceMcaCondition(condElement, ServiceMcaCondition.CONDITION_SERVICE)); } - List actList = UtilXml.childElementList(mca, "action"); - Iterator ai = actList.iterator(); - while (ai.hasNext()) { - Element actionElement = (Element) ai.next(); + for (Element actionElement: UtilXml.childElementList(mca, "action")) { actions.add(new ServiceMcaAction(actionElement)); } } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java?rev=586473&r1=586472&r2=586473&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java Fri Oct 19 07:22:10 2007 @@ -55,10 +55,7 @@ return; } - List serviceMcasElements = UtilXml.childElementList(rootElement, "service-mcas"); - Iterator secasIter = serviceMcasElements.iterator(); - while (secasIter.hasNext()) { - Element serviceMcasElement = (Element) secasIter.next(); + for (Element serviceMcasElement: UtilXml.childElementList(rootElement, "service-mcas")) { ResourceHandler handler = new MainResourceHandler(ServiceConfigUtil.SERVICE_ENGINE_XML_FILENAME, serviceMcasElement); addMcaDefinitions(handler); } @@ -81,12 +78,9 @@ return; } - List ecaList = UtilXml.childElementList(rootElement, "mca"); - Iterator ecaIt = ecaList.iterator(); int numDefs = 0; - while (ecaIt.hasNext()) { - Element e = (Element) ecaIt.next(); + for (Element e: UtilXml.childElementList(rootElement, "mca")) { String ruleName = e.getAttribute("mail-rule-name"); mcaCache.put(ruleName, new ServiceMcaRule(e)); numDefs++; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |