Projects >> application >>329516c62322508c710536dd61986275a782ed15

Chunk
Conflicting content
		for (String servicePart : r.getServicesRecordPathKeys()) {
			if (inProcessedPartsList(processedPartsList, servicePart) == false) {
<<<<<<< HEAD
				String namespaceURI = r.getServicesSchemaNameSpaceURI(servicePart);
				String schemaLocationCommon = namespaceURI + " " + r.getServicesSchemaBaseLocation() + labelsg + "/" + label + ".xsd";			
				makePart(r, cele, num.toString(), r.getServicesPartLabel(servicePart),
						num.toString(), namespaceURI, schemaLocationCommon, thisns, !isAuthority, servicePart);
=======
				String schemaNamespace = r.getServicesSchemaNameSpaceURI(servicePart);
				String schemaLocationCommon = r.getXMLSchemaLocation(servicePart);
				makePart(r, cele, num.toString(), r.getServicesPartLabel(servicePart), num.toString(), schemaNamespace,
						schemaLocationCommon, thisns, !isAuthority, servicePart);
>>>>>>> e7623ebcf2751b22d8dde53e89f7d96c160a0d0b
				processedPartsList.add(servicePart);
				num++;
			}
Solution content
		for (String servicePart : r.getServicesRecordPathKeys()) {
			if (inProcessedPartsList(processedPartsList, servicePart) == false) {
				String schemaNamespace = r.getServicesSchemaNameSpaceURI(servicePart);
				String schemaLocationCommon = r.getXMLSchemaLocation(servicePart);
				makePart(r, cele, num.toString(), r.getServicesPartLabel(servicePart), num.toString(), schemaNamespace,
						schemaLocationCommon, thisns, !isAuthority, servicePart);
				processedPartsList.add(servicePart);
				num++;
			}
File
Services.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable