Subversion Repositories SmartDukaan

Rev

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

Rev 499 Rev 516
Line 103... Line 103...
103
	private long newNextSlideDefinitionID;
103
	private long newNextSlideDefinitionID;
104
	
104
	
105
	private long newPrevSlideDefinitionID;
105
	private long newPrevSlideDefinitionID;
106
 
106
 
107
	private Map<Long, List<Long>> catSlides;
107
	private Map<Long, List<Long>> catSlides;
-
 
108
	
-
 
109
	private Map<Long, List<Entity>> catEntities;
108
 
110
 
109
    // GET /entity/1
111
    // GET /entity/1
110
    public String show() {
112
    public String show() {
111
    	log.info("EntityController.show");
113
    	log.info("EntityController.show");
112
    	
114
    	
Line 130... Line 132...
130
    	
132
    	
131
    	EntityContainer ents = new EntityContainer();
133
    	EntityContainer ents = new EntityContainer();
132
    	
134
    	
133
    	try {
135
    	try {
134
			this.entities = ents.getEntities().values();
136
			this.entities = ents.getEntities().values();
-
 
137
			this.catEntities = ents.getEntitiesbyCategory();
135
		} catch (Exception e) {
138
		} catch (Exception e) {
136
			log.error(CreationUtils.getStackTrace(e));
139
			log.error(CreationUtils.getStackTrace(e));
137
			this.setErrorString(CreationUtils.getStackTrace(e));
140
			this.setErrorString(CreationUtils.getStackTrace(e));
138
			return new DefaultHttpHeaders("fatal");
141
			return new DefaultHttpHeaders("fatal");
139
		}
142
		}
Line 1039... Line 1042...
1039
	public Collection<Entity> getEntities() {
1042
	public Collection<Entity> getEntities() {
1040
		return entities;
1043
		return entities;
1041
	}
1044
	}
1042
 
1045
 
1043
	/**
1046
	/**
-
 
1047
	 * @return the entities
-
 
1048
	 */
-
 
1049
	public Map<Long, List<Entity>> getEntitiesByCategory() {
-
 
1050
		return catEntities;
-
 
1051
	}
-
 
1052
 
-
 
1053
	/**
1044
	 * 
1054
	 * 
1045
	 * @return
1055
	 * @return
1046
	 */
1056
	 */
1047
	public List<Entity> getIncompleteEntities() {
1057
	public List<Entity> getIncompleteEntities() {
1048
		try {
1058
		try {