Subversion Repositories SmartDukaan

Rev

Rev 4926 | Rev 5050 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4926 Rev 5048
Line 36... Line 36...
36 
import java.util.Map;
 36 
import java.util.Map;
37 
import java.util.Properties;
 37 
import java.util.Properties;
38 
 
 38 
 
39 
import org.apache.commons.collections.CollectionUtils;
 39 
import org.apache.commons.collections.CollectionUtils;
40 
import org.apache.commons.collections.Predicate;
 40 
import org.apache.commons.collections.Predicate;
- 
 
 41 
import org.apache.commons.lang.StringUtils;
41 
import org.apache.commons.logging.Log;
 42 
import org.apache.commons.logging.Log;
42 
import org.apache.commons.logging.LogFactory;
 43 
import org.apache.commons.logging.LogFactory;
43 
import org.apache.velocity.Template;
 44 
import org.apache.velocity.Template;
44 
import org.apache.velocity.VelocityContext;
 45 
import org.apache.velocity.VelocityContext;
45 
import org.apache.velocity.app.Velocity;
 46 
import org.apache.velocity.app.Velocity;
Line 440... Line 441...
440 
 
 441 
 
441 
        // TODO Investigate why brand + model number is used ?
 442 
        // TODO Investigate why brand + model number is used ?
442 
        slideNames.append(expEntity.getBrand() + SPACE
 443 
        slideNames.append(expEntity.getBrand() + SPACE
443 
                + expEntity.getModelNumber() + SPACE + expEntity.getModelName()
 444 
                + expEntity.getModelNumber() + SPACE + expEntity.getModelName()
444 
                + "\n");
 445 
                + "\n");
- 
 
 446 
        slideNames.append(expEntity.getBrand() + SPACE +
- 
 
 447 
        		(StringUtils.isEmpty(expEntity.getModelName()) ?  expEntity.getModelName() : expEntity.getModelNumber())
- 
 
 448 
        		+ "\n");
445 
 
 449 
 
446 
        Map<Long, Double> slideScores = CreationUtils
 450 
        Map<Long, Double> slideScores = CreationUtils
447 
                .getSlideComparisonScores(catalogId);
 451 
                .getSlideComparisonScores(catalogId);
448 
 
 452 
 
449 
        for (ExpandedSlide expSlide : expEntity.getExpandedSlides()) {
 453 
        for (ExpandedSlide expSlide : expEntity.getExpandedSlides()) {