Subversion Repositories SmartDukaan

Rev

Rev 26 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 26 Rev 32
Line 477... Line 477...
477 
			Utils.logger.info("Invalid file: " + this.srcFile);
 477 
			Utils.logger.info("Invalid file: " + this.srcFile);
478 
			return null;
 478 
			return null;
479 
		}
 479 
		}
480
480
481 
		Category root = this.convertCategoryType(jaxbCat, null, catMap);
 481 
		Category root = this.convertCategoryType(jaxbCat, null, catMap);
- 
 
 482 
		Utils.logger.info("catMap.get(10002)=" + catMap.get(new Long(10002)));
- 
 
 483
482 
		return root;
 484 
		return root;
483 
	}
 485 
	}
484
486
485 
	/**
 487 
	/**
486 
	 *
488 
	 *
487 
	 * @param jaxbCat
 489 
	 * @param jaxbCat
488 
	 * @return Category
 490 
	 * @return Category
489 
	 */
 491 
	 */
- 
 
 492 
	@SuppressWarnings("unchecked")
490 
	private Category convertCategoryType(CategoryType jaxbCat,
493 
	private Category convertCategoryType(CategoryType jaxbCat,
491 
			Category parentCat, Map<Long, Category> catMap) {
 494 
			Category parentCat, Map<Long, Category> catMap) {
492
495
493 
		Category cat = new Category(jaxbCat.getID());
 496 
		Category cat = new Category(jaxbCat.getID());
494 
		cat.setLabel(jaxbCat.getName());
 497 
		cat.setLabel(jaxbCat.getName());
495 
		cat.setDescription(jaxbCat.getDescription());
 498 
		cat.setDescription(jaxbCat.getDescription());
496 
		if(parentCat != null) {
 499 
		if(parentCat != null) {
497 
			cat.setParentCategory(parentCat);
 500 
			cat.setParentCategory(parentCat);
- 
 
 501
- 
 
 502 
			// Copy parent's category-slide definitions
- 
 
 503 
			ArrayList<CategorySlideDefinition> parentCSDef =
- 
 
 504 
				(ArrayList<CategorySlideDefinition>)
- 
 
 505 
				parentCat.getCategorySlideDefintions();
- 
 
 506
- 
 
 507 
			if(parentCSDef != null) {
- 
 
 508 
				cat.setCategorySlideDefintions(
- 
 
 509 
					(List<CategorySlideDefinition>) parentCSDef.clone());
- 
 
 510 
			}
498 
		}
 511 
		}
499
512
500 
		// Category Slide Definition
 513 
		// Category Slide Definition
501 
		List<CategorySlideDefinitionType> jaxbDefs = jaxbCat.getCategorySlideDefinition();
 514 
		List<CategorySlideDefinitionType> jaxbDefs =
- 
 
 515 
			jaxbCat.getCategorySlideDefinition();
- 
 
 516
502 
		Iterator<CategorySlideDefinitionType> it = jaxbDefs.iterator();
 517 
		Iterator<CategorySlideDefinitionType> it = jaxbDefs.iterator();
503 
		while(it.hasNext()) {
 518 
		while(it.hasNext()) {
504 
			CategorySlideDefinitionType jaxbDef = it.next();
 519 
			CategorySlideDefinitionType jaxbDef = it.next();
- 
 
 520 
			CategorySlideDefinition catSlideDef
505 
			CategorySlideDefinition catSlideDef = this.convertCategorySlideDefinitionType(jaxbCat.getID(), jaxbDef);
 521 
			= this.convertCategorySlideDefinitionType(jaxbCat.getID(), jaxbDef);
- 
 
 522
506 
			cat.addCategorySlideDefintion(catSlideDef);
 523 
			cat.addCategorySlideDefintion(catSlideDef);
507 
		}
 524 
		}
508
525
509 
		// Children
 526 
		// Children
510 
		List<CategoryType> jaxbChildren = jaxbCat.getChildCategory();
 527 
		List<CategoryType> jaxbChildren = jaxbCat.getChildCategory();
511 
		//Utils.logger.info("jaxbChildren.size: " + jaxbChildren.size());
 528 
		//Utils.logger.info("jaxbChildren.size: " + jaxbChildren.size());
512
529
513 
		Iterator<CategoryType> itChildren = jaxbChildren.iterator();
 530 
		Iterator<CategoryType> itChildren = jaxbChildren.iterator();
514 
		while(itChildren.hasNext()) {
 531 
		while(itChildren.hasNext()) {
515 
			CategoryType jaxbChildCat = itChildren.next();
 532 
			CategoryType jaxbChildCat = itChildren.next();
516 
			Category childCat = this.convertCategoryType(jaxbChildCat, cat, catMap);
 533 
			Category childCat = this.convertCategoryType(jaxbChildCat, cat,
- 
 
 534 
					catMap);
517 
			cat.addChild(childCat);
 535 
			cat.addChild(childCat);
518 
		}
 536 
		}
519 
		//Utils.logger.info("Parent cat: " + cat);
 537 
		//Utils.logger.info("Parent cat: " + cat);
- 
 
 538 
		// DEBUG ONLY
- 
 
 539 
		Utils.logger.info("####### Cat ID: " + cat.getID());
- 
 
 540 
		if(cat.getCategorySlideDefintions() != null) {
- 
 
 541 
			for(CategorySlideDefinition csd : cat.getCategorySlideDefintions()){
- 
 
 542 
				Utils.logger.info("####### SlideDefintionID=" +
- 
 
 543 
						csd.getSlideDefintionID());
- 
 
 544 
			}
- 
 
 545 
		}
- 
 
 546
520 
		catMap.put(new Long(jaxbCat.getID()), cat);
 547 
		catMap.put(new Long(jaxbCat.getID()), cat);
521 
		return cat;
 548 
		return cat;
522 
	}
 549 
	}
523
550
524 
	/**
 551 
	/**
Line 528... Line 555...
528 
	 */
 555 
	 */
529 
	private CategorySlideDefinition convertCategorySlideDefinitionType(
 556 
	private CategorySlideDefinition convertCategorySlideDefinitionType(
530 
			long categoryID, CategorySlideDefinitionType jaxbDef) {
 557 
			long categoryID, CategorySlideDefinitionType jaxbDef) {
531
558
532 
		CategorySlideDefinition catSlideDef = new CategorySlideDefinition(
 559 
		CategorySlideDefinition catSlideDef = new CategorySlideDefinition(
533 
				categoryID, jaxbDef.getSlideDefinitionID());
 560 
				jaxbDef.getSlideDefinitionID());
534
561
535 
		catSlideDef.setDescription(jaxbDef.getDescription());
 562 
		catSlideDef.setDescription(jaxbDef.getDescription());
536
563
537 
		EditorialImportanceType jaxbEdImp = jaxbDef.getEditorialImportance();
 564 
		EditorialImportanceType jaxbEdImp = jaxbDef.getEditorialImportance();
538 
		EditorialImportance edImp = this.convertEditorialImportance(jaxbEdImp);
 565 
		EditorialImportance edImp = this.convertEditorialImportance(jaxbEdImp);