Subversion Repositories SmartDukaan

Rev

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

Rev 24 Rev 28
Line 212... Line 212...
212
	 * 
212
	 * 
213
	 * @param label
213
	 * @param label
214
	 * @return List<SlideDefinition>
214
	 * @return List<SlideDefinition>
215
	 * @throws Exception
215
	 * @throws Exception
216
	 */
216
	 */
217
	public List<SlideDefinition> getSlideDefinition(String label) 
217
	public List<SlideDefinition> getSlideDefinitions(String label) 
218
		throws Exception {
218
		throws Exception {
219
		
219
		
220
		// Initialize 
220
		// Initialize 
221
		if(this.slideDefinitions == null) {
221
		if(this.slideDefinitions == null) {
222
			this.getSlideDefinitions();
222
			this.getSlideDefinitions();
Line 225... Line 225...
225
		List<SlideDefinition> matchingSlides = new ArrayList<SlideDefinition>();
225
		List<SlideDefinition> matchingSlides = new ArrayList<SlideDefinition>();
226
		for(Iterator<SlideDefinition> it = 
226
		for(Iterator<SlideDefinition> it = 
227
			this.slideDefinitions.values().iterator(); it.hasNext(); ) {
227
			this.slideDefinitions.values().iterator(); it.hasNext(); ) {
228
			
228
			
229
			SlideDefinition def = it.next();
229
			SlideDefinition def = it.next();
230
			if(def.getLabel().equals(label)) {
230
			if(def.getLabel().equalsIgnoreCase(label)) {
231
				matchingSlides.add(def);
231
				matchingSlides.add(def);
232
			}
232
			}
233
		}
233
		}
234
		
234
		
235
		return matchingSlides;
235
		return matchingSlides;
Line 365... Line 365...
365
			long featureDefID = slideFeatureDef.getFeatureDefintionID();
365
			long featureDefID = slideFeatureDef.getFeatureDefintionID();
366
			
366
			
367
			FeatureDefinition thisFeatureDef = this.getFeatureDefinition(
367
			FeatureDefinition thisFeatureDef = this.getFeatureDefinition(
368
					featureDefID);
368
					featureDefID);
369
			
369
			
370
			if(featureLabel.equals(thisFeatureDef.getLabel())) {
370
			if(featureLabel.equalsIgnoreCase(thisFeatureDef.getLabel())) {
371
				featureDef = thisFeatureDef;
371
				featureDef = thisFeatureDef;
372
			}
372
			}
373
		}
373
		}
374
		
374
		
375
		return featureDef;
375
		return featureDef;