Subversion Repositories SmartDukaan

Rev

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

Rev 6041 Rev 6877
Line 28... Line 28...
28 
import in.shop2020.metamodel.util.ExpandedFeature;
 28 
import in.shop2020.metamodel.util.ExpandedFeature;
29 
import in.shop2020.metamodel.util.ExpandedFeatureDefinition;
 29 
import in.shop2020.metamodel.util.ExpandedFeatureDefinition;
30 
import in.shop2020.metamodel.util.ExpandedSlide;
 30 
import in.shop2020.metamodel.util.ExpandedSlide;
31 
import in.shop2020.metamodel.util.ExpandedSlideDefinition;
 31 
import in.shop2020.metamodel.util.ExpandedSlideDefinition;
32 
import in.shop2020.model.v1.catalog.CatalogServiceException;
 32 
import in.shop2020.model.v1.catalog.CatalogServiceException;
33 
import in.shop2020.model.v1.catalog.CatalogServiceException;
 - 
 
34 
import in.shop2020.model.v1.catalog.Item;
 33 
import in.shop2020.model.v1.catalog.Item;
35 
import in.shop2020.model.v1.catalog.status;
 34 
import in.shop2020.model.v1.catalog.status;
36 
import in.shop2020.thrift.clients.CatalogClient;
 35 
import in.shop2020.thrift.clients.CatalogClient;
37 
import in.shop2020.util.Utils;
 36 
import in.shop2020.util.Utils;
38 
 
 37 
 
Line 42... Line 41...
42 
import java.util.Arrays;
 41 
import java.util.Arrays;
43 
import java.util.Collection;
 42 
import java.util.Collection;
44 
import java.util.Date;
 43 
import java.util.Date;
45 
import java.util.HashMap;
 44 
import java.util.HashMap;
46 
import java.util.List;
 45 
import java.util.List;
- 
 
 46 
import java.util.Locale;
47 
import java.util.Map;
 47 
import java.util.Map;
48 
import java.util.Set;
 48 
import java.util.Set;
49 
import java.util.StringTokenizer;
 49 
import java.util.StringTokenizer;
50 
 
 50 
 
51 
import org.apache.commons.lang.StringEscapeUtils;
 51 
import org.apache.commons.lang.StringEscapeUtils;
Line 87... Line 87...
87 
	/**
 87 
	/**
88 
	 *
88 
	 *
89 
	 */
 89 
	 */
90 
	private String id;
 90 
	private String id;
91
91
- 
 
 92 
	private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH", Locale.ENGLISH);
- 
 
 93
92 
	private ExpandedEntity expEntity;
 94 
	private ExpandedEntity expEntity;
93
95
94 
	private Entity entity = null;
 96 
	private Entity entity = null;
95
97
96 
	private Map<Long, EntityState> entitiesState;
 98 
	private Map<Long, EntityState> entitiesState;
Line 1615... Line 1617...
1615 
    }
 1617 
    }
1616
1618
1617 
    public String getJavascriptSafe(String string){
 1619 
    public String getJavascriptSafe(String string){
1618 
    	return StringEscapeUtils.escapeJavaScript(string);
 1620 
    	return StringEscapeUtils.escapeJavaScript(string);
1619 
    }
 1621 
    }
- 
 
 1622
- 
 
 1623 
    public String getFormattedDate(Date date){
- 
 
 1624 
    	return sdf.format(date);
- 
 
 1625 
    }
1620
1626
1621 
}
 1627 
}
1622 
 
 1628