Subversion Repositories SmartDukaan

Rev

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

Rev 7111 Rev 7123
Line 44... Line 44...
44
import java.util.Arrays;
44
import java.util.Arrays;
45
import java.util.Collection;
45
import java.util.Collection;
46
import java.util.Collections;
46
import java.util.Collections;
47
import java.util.HashMap;
47
import java.util.HashMap;
48
import java.util.Iterator;
48
import java.util.Iterator;
-
 
49
import java.util.LinkedHashMap;
49
import java.util.List;
50
import java.util.List;
50
import java.util.Map;
51
import java.util.Map;
51
import java.util.Set;
52
import java.util.Set;
52
import java.util.TreeMap;
53
import java.util.TreeMap;
53
 
54
 
Line 2030... Line 2031...
2030
					if (mediaMap == null) {
2031
					if (mediaMap == null) {
2031
						continue;
2032
						continue;
2032
					}
2033
					}
2033
					FreeformContent introFfc = introSlide
2034
					FreeformContent introFfc = introSlide
2034
							.getFreeformContent();
2035
							.getFreeformContent();
2035
					Map<String, Media> introMediaMap = introFfc.getMedias();
2036
					Map<String, Media> introMediaMap = new LinkedHashMap<String, Media>();
2036
					if (introMediaMap == null) {
-
 
2037
						introMediaMap = new HashMap<String, Media>();
-
 
2038
						introFfc.setMedias(introMediaMap);
2037
					introFfc.setMedias(introMediaMap);
2039
					}
-
 
2040
					Set<String> introMediaMapKeys = introMediaMap.keySet();
2038
					Set<String> introMediaMapKeys = introMediaMap.keySet();
2041
					for (Map.Entry<String, Media> entry : mediaMap
2039
					for (Map.Entry<String, Media> entry : mediaMap.entrySet()) {
2042
							.entrySet()) {
-
 
2043
						Media entryValue = entry.getValue();
2040
						Media entryValue = entry.getValue();
2044
						String entryKey = entry.getKey();
2041
						String entryKey = entry.getKey();
2045
						if (!introMediaMapKeys.contains(entryKey)) {
2042
						if (!introMediaMapKeys.contains(entryKey)) {
2046
							introMediaMap.put(entryKey,
2043
							introMediaMap.put(entryKey,
2047
									(Media) clone(entryValue));
2044
									(Media) clone(entryValue));