WebSVN – SmartDukaan – Diff – /trunk/ContentCreation/src/in/shop2020/creation/controllers/EntityController.java

 package in.shop2020.creation.controllers;
+import in.shop2020.content.security.User;
-import in.shop2020.creation.util.ContentValidator;
+import in.shop2020.content.security.UserManager;
 import in.shop2020.metamodel.util.CreationUtils;
 import in.shop2020.metamodel.core.Bullet;
 import in.shop2020.metamodel.core.CompositeDataObject;
 import in.shop2020.metamodel.core.Entity;
+import in.shop2020.metamodel.core.EntityState;
 import in.shop2020.metamodel.core.EnumDataObject;
 import in.shop2020.metamodel.core.Feature;
 import in.shop2020.metamodel.core.FreeformContent;
 import in.shop2020.metamodel.core.PrimitiveDataObject;
 import in.shop2020.metamodel.core.Slide;
 import in.shop2020.metamodel.definitions.EditorialImportance;
 import in.shop2020.metamodel.definitions.EntityContainer;
 import in.shop2020.metamodel.definitions.FeatureDefinition;
 import in.shop2020.metamodel.definitions.SlideDefinition;
 import in.shop2020.metamodel.definitions.SlideFeatureDefinition;
-import in.shop2020.metamodel.util.CN;
 import in.shop2020.metamodel.util.ExpandedBullet;
 import in.shop2020.metamodel.util.ExpandedBulletDefinition;
 import in.shop2020.metamodel.util.ExpandedEntity;
 import in.shop2020.metamodel.util.ExpandedFeature;
 import in.shop2020.metamodel.util.ExpandedFeatureDefinition;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.StringTokenizer;
 import org.apache.commons.lang.StringUtils;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.struts2.convention.annotation.InterceptorRef;
+import org.apache.struts2.convention.annotation.InterceptorRefs;
 import org.apache.struts2.convention.annotation.Result;
 import org.apache.struts2.convention.annotation.Results;
-import org.apache.struts2.interceptor.ParameterAware;
 import org.apache.struts2.rest.DefaultHttpHeaders;
 import org.apache.struts2.rest.HttpHeaders;
+@InterceptorRefs({
-import com.opensymphony.xwork2.ValidationAwareSupport;
+    @InterceptorRef("myDefault"),
+    @InterceptorRef("login")
+})
 @Results({
     @Result(name="success", type="redirectAction",
     		params = {"actionName" , "entity"}),
     @Result(name="redirect", location="${url}", type="redirect")
 })
-public class EntityController extends ValidationAwareSupport
+public class EntityController extends BaseController {
-	implements ParameterAware {
 	/**
+	 *
 	 */
 	private static final long serialVersionUID = 1L;
 	 */
 	private String id;
 	private ExpandedEntity expEntity;
-	private Entity entity;
+	private Entity entity = null;
 	private Collection<Entity> entities;
-	private Map<String, String[]> reqparams;
+	private Map<Long, EntityState> entitiesState;
-	private EntityContainer ents;
+	private EntityContainer ents = Catalog.getInstance().getEntityContainer();
-	private DefinitionsContainer defs;
+	private DefinitionsContainer defs = Catalog.getInstance().getDefinitionsContainer();
 	private long firstSlideDefID;
 	private ExpandedSlideDefinition expSlideDef;
 	private long newPrevSlideDefinitionID;
 	private Map<Long, List<Long>> catSlides;
 	private Map<Long, List<Entity>> catEntities;
-    // GET /entity/1
+		// GET /entity/1
     public String show() {
     	log.info("EntityController.show");
     	try {
     		long entityID = Long.parseLong(this.getId());
     		log.info("entityID:" + entityID);
+    		if(!UserManager.getUserManager().canView(getUsername(), entityID)){
+    			return "fatel";
+    		}
 			this.expEntity = this.getExpandedEntity(entityID);
 			return "show";
 		} catch (Exception e) {
 			log.error(CreationUtils.getStackTrace(e));
+    }
     // GET /entity
     public HttpHeaders index() {
     	log.info("EntityController.index");
-    	EntityContainer ents = new EntityContainer();
     	createEntitiesForItemsInProcess();
     	try {
-			this.entities = ents.getEntities().values();
+			this.entities = CreationUtils.getEntities().values();
-			this.catEntities = ents.getEntitiesbyCategory();
+			this.entitiesState = CreationUtils.getEntitiesState();
 		} catch (Exception e) {
 			log.error(CreationUtils.getStackTrace(e));
 			this.setErrorString(CreationUtils.getStackTrace(e));
 			return new DefaultHttpHeaders("fatal");
+		}
     // GET /entity
     public String create() {
     	log.info("EntityController.create");
+    	if(!UserManager.getUserManager().canCreate(getUsername())){
+			return "success";
+		}
 		SequenceGenerator sg;
 		try {
 			sg = SequenceGenerator.getInstance();
 			long entityID = sg.getNextSequence(SequenceGenerator.ENTITY);
 			entity.setBrand(this.reqparams.get("brand")[0]);
 			entity.setModelName(this.reqparams.get("modelname")[0]);
 			entity.setModelNumber(this.reqparams.get("modelnumber")[0]);
+			EntityState entityState = new EntityState(entityID, getUsername());
-			this.addEntity(entity);
+			CreationUtils.createEntity(entity, entityState);
 	    	this.setId(new Long(entityID).toString());
 		} catch (Exception e) {
 			log.error(CreationUtils.getStackTrace(e));
 			this.setErrorString(CreationUtils.getStackTrace(e));
     public String edit() {
     	log.info("EntityController.edit");
     	long entityID = Long.parseLong(this.getId());
     	log.info("entityID:" + entityID);
+    	if(!UserManager.getUserManager().canEdit(getUsername(), entityID)){
-    	DefinitionsContainer defs = this.getDefinitionsContainer();
+    		addActionError("You can not edit as this entity is not assigned to you");
+			return "success";
+		}
     	try {
 			this.expEntity = this.getExpandedEntity(entityID);
 			//log.info("this.expEntity:" + this.expEntity);
 			if(inputSlideDefIDs != null && inputSlideDefIDs.length > 0) {
 				try {
 					inputSlideDefID = Long.parseLong(inputSlideDefIDs[0]);
 				} catch (NumberFormatException nfe) {}
+			}
-			long categoryID = this.getEntity(entityID).getCategoryID();
+			long categoryID = CreationUtils.getEntity(entityID).getCategoryID();
 			log.info("Entity ID:" + entityID + "   CategoryID " + categoryID );
 			//Changed to make correct order of borrowed slides
-			List<Long> slideDefIDs = CreationUtils.getSlideSequence(entityID, categoryID);
+			//List<Long> slideDefIDs = CreationUtils.getSlideSequence(entityID, categoryID);
+			List<Long> slideDefIDs = expEntity.getSlideSequence();
+			log.info("slideDefIDs:" + slideDefIDs);
+			if(slideDefIDs == null){
+				slideDefIDs = Catalog.getInstance().getDefinitionsContainer().getCategorySlideSequence(categoryID);
+			}
 			log.info("slideDefIDs:" + slideDefIDs);
 			// Edit the entity from a specific slide
 			if(slideDefIDs != null && inputSlideDefID != 0L) {
      */
     // GET /entity/new
     public String editNew() {
     	log.info("EntityController.editNew");
+    	if(!UserManager.getUserManager().canCreate(getUsername())){
+    		addActionError("You do not have rights to create an entity.");
+			return "success";
+		}
         return "editNew";
+    }
     /**
+     *
     	log.info("EntityController.update");
     	long entityID = Long.parseLong(this.getId());
     	log.info("entityID:" + entityID);
-    	DefinitionsContainer defs = this.getDefinitionsContainer();
+    	if(!UserManager.getUserManager().canEdit(getUsername(), entityID)){
+			return "success";
+		}
     	try {
 			this.expEntity = this.getExpandedEntity(entityID);
 			//log.info("this.expEntity:" + this.expEntity);
+			log.info("p0");
 			// Save and Go to slides selection page
 			if (this.reqparams.containsKey("slides")) {
-				log.info("Slides");
+				log.info("p1");
 				Entity entity = this.expEntity.getEntity();
+				log.info("p2");
 				String categoryID = this.reqparams.get("category")[0];
 				entity.setCategoryID(Long.parseLong(categoryID));
 				entity.setBrand(this.reqparams.get("brand")[0]);
 				entity.setModelName(this.reqparams.get("modelname")[0]);
 				entity.setModelNumber(this.reqparams.get("modelnumber")[0]);
+				log.info("p3");
+				CreationUtils.updateEntity(entity);
-				this.updateEntity(entity);
+				//this.updateEntity(entity);
 				this.redirectURL = "/slides/" + this.getId() + "/edit";
 				return "redirect";
+			}
 				entity.setCategoryID(Long.parseLong(categoryID));
 				entity.setBrand(this.reqparams.get("brand")[0]);
 				entity.setModelName(this.reqparams.get("modelname")[0]);
 				entity.setModelNumber(this.reqparams.get("modelnumber")[0]);
-				this.updateEntity(entity);
+				CreationUtils.updateEntity(entity);
 				return "success";
+			}
 			List<Long> slideIDs = this.getSlideSequence(entityID);
 			if(slideIDs == null) {
 				this.setErrorString("Slides need to be picked first!");
 				return "fatal";
+			}
+			log.info("p4");
 			boolean skip = false;
 			if(this.reqparams.containsKey("skipprev") ||
 					this.reqparams.containsKey("skipnext")) {
 				skip = true;
+			}
 			// Save or Next or Prev or Go - When editing a slide
 			int currentSlideIndex = 0;
 			currentSlideIndex = slideIDs.indexOf(new Long(currentSlideDefID));
 			log.info("currentSlideIndex:" + currentSlideIndex);
+			log.info("p5");
 			if(!skip && currentSlideDefID != 0L) {
 				Entity entity = this.expEntity.getEntity();
+				log.info("p6");
 				// Create new instance and override existing
 				Slide currentSlide = this.createSlide(currentSlideDefID);
 				entity.addSlide(currentSlide);
 				long categoryID = this.getEntity().getCategoryID();
-				List<Long> orderedSlideIDs =
+				//List<Long> orderedSlideIDs = CreationUtils.getSlideSequence(entityID, categoryID);
-					CreationUtils.getSlideSequence(entityID, categoryID);
+				List<Long> orderedSlideIDs = entity.getSlideSequence();
 				if(orderedSlideIDs != null) {
-					entity.reorderSlides(orderedSlideIDs);
+					//entity.reorderSlides(orderedSlideIDs);
+				}
+				log.info("p7");
 				// Store
-				this.updateEntity(entity);
+				CreationUtils.updateEntity(entity);
 				//log.info("entity:" + entity);
+			}
 			// Skip will delete current slide from entity
 			else if(skip && currentSlideDefID != 0L) {
 				Entity entity = this.expEntity.getEntity();
 				entity.removeSlide(currentSlideDefID);
 				long categoryID = this.getEntity().getCategoryID();
-				List<Long> orderedSlideIDs =
-					CreationUtils.getSlideSequence(entityID, categoryID);
+				//List<Long> orderedSlideIDs = CreationUtils.getSlideSequence(entityID, categoryID);
+				log.info("p8");
+				List<Long> orderedSlideIDs = entity.getSlideSequence();
 				if(orderedSlideIDs != null) {
-					entity.reorderSlides(orderedSlideIDs);
+					//entity.reorderSlides(orderedSlideIDs);
+				}
 				// Store
-				this.updateEntity(entity);
+				CreationUtils.updateEntity(entity);
 				//log.info("entity:" + entity);
+				log.info("p9");
+			}
 			boolean showAnotherSlide = false;
 			// -2 : Not set
 			int newPrevIndex = -2;
 			// Next
 			if(next && nextSlideDefID != 0L) {
 				log.info("Next");
+				log.info("p10");
 				// Decide on next slide ID
 				int nextSlideIndex = slideIDs.indexOf(new Long(nextSlideDefID));
 				log.info("nextSlideIndex:"+nextSlideIndex);
 				// New Current
+			}
 			// Prev
 			if(prev && prevSlideDefID != 0L) {
 				log.info("Prev");
+				log.info("p11");
 				// Decide on prev slide ID
 				int prevSlideIndex = slideIDs.indexOf(new Long(prevSlideDefID));
 				log.info("prevSlideIndex:" + prevSlideIndex);
 				if (prevSlideIndex == -1) {
+			}
 			// Go to
 			if(go && gotoSlideDefID != 0) {
 				log.info("Goto");
+				log.info("p12");
 				int gotoSlideIndex = slideIDs.indexOf(new Long(gotoSlideDefID));
 				log.info("gotoSlideIndex:" + gotoSlideIndex);
 				if (gotoSlideIndex == -1) {
 					this.setErrorString("Invalid Go to slide ID " +
 			if(showAnotherSlide) {
  				log.info("newCurrentIndex:" + newCurrentIndex);
 				log.info("newNextIndex:" + newNextIndex);
 				log.info("newPrevIndex:" + newPrevIndex);
+				log.info("p13");
 				if(newCurrentIndex != -2) {
 					this.setNewCurrentSlideDefinitionID(
 							slideIDs.get(newCurrentIndex).longValue());
+				}
      * @return
      * @throws Exception
      */
     public long getBorrowedCategoryID(long slideDefID) throws Exception {
     	long entityID = Long.parseLong(this.getId());
-    	Entity entity = this.getEntity(entityID);
+    	entity = CreationUtils.getEntity(entityID);
     	Long entityCatID = new Long(entity.getCategoryID());
     	Map<Long, List<Long>> catSlides = this.getRawSlideSequence(entityID);
     	Long lSlideDefID = new Long(slideDefID);
      * @param entityID
      * @return
      * @throws Exception
      */
     private List<Long> getSlideSequence(long entityID) throws Exception {
-    	this.catSlides = this.getRawSlideSequence(entityID);
+    	//this.catSlides = this.getRawSlideSequence(entityID);
-    	return CreationUtils.getSlideSequence(this.catSlides);
+    	//return CreationUtils.getSlideSequence(this.catSlides);
+    	return entity.getSlideSequence();
+	}
     /**
+     *
      * @param entityID
      * @throws Exception
      */
 	private Map<Long, List<Long>> getRawSlideSequence(long entityID)
 		throws Exception {
 		if(this.catSlides == null) {
-			this.catSlides = CreationUtils.getRawSlideSequence(entityID);
+			this.catSlides = defs.getCategorySlideSequence();
+		}
 		return this.catSlides;
+	}
 		log.info("features:" + features);
 		slide.setFeatures(features);
 		// Collect children slides
-		SlideDefinition slideDef =
-			this.getDefinitionsContainer().getSlideDefinition(slideDefID);
+		SlideDefinition slideDef = this.defs.getSlideDefinition(slideDefID);
 		List<Long> childrenSlideIDs = slideDef.getChildrenSlideDefinitionIDs();
 		if(childrenSlideIDs != null) {
 			List<Slide> childrenSlides = new ArrayList<Slide>();
 			for (Long childSlideID : childrenSlideIDs) {
 		SlideDefinition slideDef = defs.getSlideDefinition(slideDefID);
 		List<SlideFeatureDefinition> slideFeatureDefs =
 			slideDef.getSlideFeatureDefinitions();
-		DefinitionsContainer defs = this.getDefinitionsContainer();
 		List<Feature> features = new ArrayList<Feature>();
 		for(SlideFeatureDefinition slideFeatureDef : slideFeatureDefs) {
 			long featureDefinitionID = slideFeatureDef.getFeatureDefintionID();
 			log.info("featureDefinitionID:" + featureDefinitionID);
     	log.info("#### EntityController.destroy ####");
     	long entityID = Long.parseLong(this.getId());
     	log.info("entityID:" + entityID);
+    	if(!UserManager.getUserManager().canDelete(getUsername(), entityID)){
+    		addActionError("You do not have rights to delete an entity");
+    		return "success";
+		}
 		// Store
 		try {
-	    	Entity entity = this.getEntity(entityID);
-	    	EntityContainer ents = this.getEntityContainer();
-	    	Map<Long, Entity> entities = ents.getEntities();
-	    	Map<Long, List<Entity>> entitiesbycat =
-	    		ents.getEntitiesbyCategory();
-	    	entities.remove(new Long(entityID));
-	    	List<Entity> catentities =
-	    		entitiesbycat.get(new Long(entity.getCategoryID()));
-	    	Entity entitytodelete = null;
-	    	for(Entity catentity : catentities) {
-	    		if(catentity.getID() == entityID) {
-	    			entitytodelete = catentity;
-	    			break;
-	    		}
-	    	}
-	    	if(entitytodelete != null) {
-	    		catentities.remove(entitytodelete);
-	    	}
-	    	CreationUtils.deleteFromIncomplete(entity);
 	    	CreationUtils.deleteEntity(entityID);
-	    	CreationUtils.rewriteRepository(entities, entitiesbycat);
-			// Added automatic learning once someone rewrites repository
-			CN cn = new CN();
-			cn.learn();
 		} catch (Exception e) {
 			log.error(CreationUtils.getStackTrace(e));
 			this.setErrorString(CreationUtils.getStackTrace(e));
 			return "fatal";
+		}
         addActionMessage("Entity deleted successfully");
         return "success";
+    }
 	/**
+     *
     		long slideId = Long.parseLong(tokenizer.nextToken());
     		FreeformContent old_ffc = null;
     		if(this.entity.getSlide(slideId) != null){
     			old_ffc = this.entity.getSlide(slideId).getFreeformContent();
     			if(old_ffc != null){
-    				ffc.setMedia("image", old_ffc.getImageRefs());
-    				ffc.setMedia("youtube", old_ffc.getYoutubeRefs());
+    				ffc.setMedias(old_ffc.getMedias());
+    			}
+    		}
+    	}
 	 */
 	public Map<Long, List<Entity>> getEntitiesByCategory() {
 		return catEntities;
+	}
-	/**
+		/**
-	 *
-	 * @return
-	 */
-	public List<Entity> getIncompleteEntities() {
-		try {
-			return CreationUtils.getIncomplete();
-		} catch (Exception e) {
-			log.error(CreationUtils.getStackTrace(e));
-			this.setErrorString(CreationUtils.getStackTrace(e));
-			return null;
-		}
-	}
-	/**
 	 * Inquires about items in the IN_PROCESS state with the Catalog service and
 	 * creates those entities which do not exist in the CMS already.
+	 *
 	 * @return A List of entities fetched from the catalog.
 	 */
 					log.info("#### Going to add the entity with id: ####" + entityID);
 					Entity entity = new Entity(entityID, -1);
 					entity.setBrand(item.getBrand());
 					entity.setModelNumber(item.getModelNumber() + " (" + item.getProductGroup() + ")");
 					entity.setModelName((item.getModelName()==null) ? "" : item.getModelName());
+					EntityState entityState = new EntityState(entityID, UserManager.getUserManager().getAdminName());
-					addEntity(entity);
+					CreationUtils.createEntity(entity, entityState);
 				}else
 					log.info("###Everything went all right and we got an entity");
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
+	 *
 	 * @param slideDefID
 	 * @return
 	 */
 	public ExpandedSlideDefinition getExpandedSlideDefinition(long slideDefID) {
-		DefinitionsContainer defs = this.getDefinitionsContainer();
 		try {
 			return defs.getExpandedSlideDefinition(slideDefID);
 		} catch (Exception e) {
 			return null;
+		}
 	 */
 	public long getFirstSlideDefID() {
 		return firstSlideDefID;
+	}
-	@Override
-	public void setParameters(Map<String, String[]> reqmap) {
-		log.info("setParameters:" + reqmap);
-		this.reqparams = reqmap;
-	}
 	public String getCategoriesTree()  throws Exception {
-		DefinitionsContainer defs = this.getDefinitionsContainer();
 		Map<String, String> cats = new HashMap<String, String>();
-		List<Category> children = defs.getChildrenCategories(10000L);
+		List<Category> children = defs.getChildrenCategories(Catalog.getInstance().getRootCategory().getID());
 		for(Category child : children) {
 			cats.put(new Long(child.getID()).toString(), child.getLabel());
+		}
 		return "";
+	}
 	public Map<String, String> getCategories() throws Exception {
-		DefinitionsContainer defs = this.getDefinitionsContainer();
 		Map<String, String> cats = new HashMap<String, String>();
-		List<Category> children = defs.getChildrenCategories(10000L);
+		List<Category> children = defs.getChildrenCategories(Catalog.getInstance().getRootCategory().getID());
 		for(Category child : children) {
 			cats.put(new Long(child.getID()).toString(), child.getLabel());
+		}
 		return cats;
+	}
 	public Map<String, String> getSubcategories() throws Exception {
-		DefinitionsContainer defs = this.getDefinitionsContainer();
 		Map<String, String> cats = new HashMap<String, String>();
-		List<Category> children = defs.getChildrenCategories(10000L);
+		List<Category> children = defs.getChildrenCategories(Catalog.getInstance().getRootCategory().getID());
 		for(Category child : children) {
 			List<Category> grandChildren = defs.getChildrenCategories(child.getID());
 			for(Category grandchild : grandChildren) {
 				cats.put(new Long(grandchild.getID()).toString(), grandchild.getLabel());
+			}
+		}
 		return cats;
+	}
 	public String getCategoriesString() throws Exception {
-		DefinitionsContainer defs = this.getDefinitionsContainer();
 		StringBuilder categoryString = new StringBuilder();
 		categoryString.append("<label for=\"basecategory\">Category: </label>");
 		categoryString.append("\n");
 		categoryString.append("<select id=\"basecategory\"  name=\"basecategory\" >");
 		categoryString.append("\n");
-		List<Category> children = defs.getChildrenCategories(10000L);
+		List<Category> children = defs.getChildrenCategories(Catalog.getInstance().getRootCategory().getID());
 		for(Category child : children) {
 			categoryString.append("<option value=\"" + new Long(child.getID()).toString() + "\">" + child.getLabel() + "</option>");
 			categoryString.append("\n");
+		}
 		categoryString.append("</select>");
+	 *
 	 * @return
 	 * @throws Exception
 	 */
 	public List<String> getBrands() throws Exception {
-		EntityContainer ents = this.getEntityContainer();
 		List<String> brands = new ArrayList<String>();
 		List<ExpandedBullet> expBullets;
-		expBullets = ents.getLearnedBullets(
+		expBullets = CreationUtils.getLearnedBullets(Utils.BRAND_FEATURE_DEFINITION_ID);
-				Utils.BRAND_FEATURE_DEFINITION_ID);
+		if(expBullets!=null){
-		for(ExpandedBullet expBullet : expBullets) {
+			for(ExpandedBullet expBullet : expBullets) {
-			brands.add(expBullet.getValue());
+				brands.add(expBullet.getValue());
+			}
+		}
 		return brands;
+	}
-	/**
-	 *
-	 * @return
-	 */
-    protected EntityContainer getEntityContainer() {
-    	if(this.ents == null) {
-    		this.ents = Catalog.getInstance().getEntityContainer();
-    	}
-	    return this.ents;
-    }
-    /**
-     *
-     * @return
-     */
-    protected DefinitionsContainer getDefinitionsContainer() {
-    	if(this.defs == null) {
-    		this.defs = Catalog.getInstance().getDefinitionsContainer();
-    	}
-	    return this.defs;
-    }
-    /**
-     *
-     * @param entity
-     * @throws Exception
-     */
-	private void addEntity(Entity entity) throws Exception {
-		log.info("#### EntityController.addEntity ####");
-		EntityContainer entContainer = this.getEntityContainer();
-		entContainer.addEntity(entity);
-		CreationUtils.storeEntity(entity);
-		ContentValidator validator = new ContentValidator();
-		if(!validator.validate(entity)) {
-			CreationUtils.addToIncomplete(entity);
-		}
-		// Add to repository only if validations succeed
-		else {
-			CreationUtils.deleteFromIncomplete(entity);
-			this.updateRepository();
-			// Added automatic learning once someone rewrites repository
-			CN cn = new CN();
-			cn.learn();
-		}
-	}
-    /**
-     *
-     * @param entity
-     * @throws Exception
-     */
-	private void updateEntity(Entity entity) throws Exception {
-		log.info("#### EntityController.updateEntity ####");
-		EntityContainer entContainer = this.getEntityContainer();
-		ContentValidator validator = new ContentValidator();
-		if(!validator.validate(entity)) {
-			CreationUtils.addToIncomplete(entity);
-			// Delete from repository if incomplete
-			entContainer.deleteEntity(entity);
-		}
-		else {
-			CreationUtils.deleteFromIncomplete(entity);
-			entContainer.updateEntity(entity);
-		}
-		CreationUtils.storeEntity(entity);
-		this.updateRepository();
-		if(validator.validate(entity)) {
-			// Added automatic learning once someone rewrites repository
-			CN cn = new CN();
-			cn.learn();
-		}
-	}
-	/**
-	 *
-	 * @throws Exception
-	 */
-	private void updateRepository() throws Exception {
-		EntityContainer entContainer = this.getEntityContainer();
-		Map<Long, Entity> entities = entContainer.getEntities();
-		log.info("entities.size():" + entities.size());
-		Map<Long, List<Entity>> entitiesByCategory =
-			entContainer.getEntitiesbyCategory();
-		log.info("entitiesByCategory.size():" + entitiesByCategory.size());
-		CreationUtils.rewriteRepository(entities, entitiesByCategory);
-	}
 	/**
 	 * @param exception the exception to set
 	 */
 	public void setException(Exception exception) {
 		this.exception = exception;
 	 */
 	public long getNewCurrentSlideDefinitionID() {
 		return newCurrentSlideDefinitionID;
+	}
 	/**
 	 * @param newNextSlideID the newNextSlideID to set
 	 */
 	public void setNewNextSlideDefinitionID(long newNextSlideDefinitionID) {
 		this.newNextSlideDefinitionID = newNextSlideDefinitionID;
 	 * @return
 	 * @throws Exception
 	 */
 	public List<String> getLearnedValues(long featureDefinitionID)
 			throws Exception {
-		EntityContainer ents = this.getEntityContainer();
-		List<ExpandedBullet> learnedBullets =
-			ents.getLearnedBullets(featureDefinitionID);
+		List<ExpandedBullet> learnedBullets = CreationUtils.getLearnedBullets(featureDefinitionID);
 		if(learnedBullets == null) {
 			return null;
+		}
 	 * @return
 	 * @throws Exception
 	 */
 	public ExpandedFeature getFeature(long featureDefinitionID)
 		throws Exception {
-		EntityContainer ents = this.getEntityContainer();
 		if(this.expSlide != null) {
 			Feature feature = ents.getFeature(
 					this.expSlide, featureDefinitionID);
 			if(feature == null) {
 		return "";
 		*/
+	}
-	/**
-	 *
-	 * @return
-	 * @throws Exception
-	 * @throws NumberFormatException
-	 */
-	public List<String> getMediaLabels(String type) {
-		try {
-			return CreationUtils.getMediaLabels(Long.parseLong(this.getId()),
-					type);
-		}
-		catch(Exception nfe) {
-			return null;
-		}
-	}
 	/**
+	 *
 	 * @return
 	 */
 	public String getCategoryName(long categoryID) {
 		if(categoryID==-1)
 			return "Yet to be Asssigned";
 		try {
-			return this.getDefinitionsContainer().getCategory(categoryID).
+			return this.defs.getCategory(categoryID).getLabel();
-				getLabel();
 		} catch (Exception e) {
 			return null;
+		}
+	}
 	 */
 	public List<String[]> getSlides() {
 		try {
 			long entityID = Long.parseLong(this.getId());
 			long categoryID = this.getEntity().getCategoryID();
-			List<Long> slideDefIDs = CreationUtils.getSlideSequence(entityID, categoryID);
+			//List<Long> slideDefIDs = CreationUtils.getSlideSequence(entityID, categoryID);
+			List<Long> slideDefIDs = CreationUtils.getEntity(entityID).getSlideSequence();
 			List<String[]> slideData = new ArrayList<String[]>();
-			DefinitionsContainer defs = this.getDefinitionsContainer();
 			for(Long slideDefID : slideDefIDs) {
 				SlideDefinition slideDef = defs.getSlideDefinition(slideDefID);
 				String label = slideDef.getLabel();
 				slideData.add(new String[] {slideDefID.toString(), label});
      * @throws Exception
      */
     private ExpandedEntity getExpandedEntity(long entityID) throws Exception {
     	if(this.expEntity == null) {
     		if(this.entity == null) {
-    			this.entity = this.getEntity(entityID);
+    			this.entity = CreationUtils.getEntity(entityID);
+    		}
-	    	this.expEntity = new ExpandedEntity(entity);
+    		this.expEntity = new ExpandedEntity(entity);
+    	}
     	return this.expEntity;
+    }
+    public Map<Long, EntityState> getEntitiesState(){
+    	return this.entitiesState;
-    /**
+    }
-     *
-     * @param entityID
+    public Set<String> getAllUserNames(){
+    	return UserManager.getUserManager().getAllUserNames();
-     * @return
+    }
-     * @throws Exception
-     */
-    private Entity getEntity(long entityID) throws Exception {
+    public Collection<User> getAllUsers(){
-    	log.info("Getting entity with id : " + entityID);
+    	return UserManager.getUserManager().getAllUsers();
-		if(this.entity == null) {
-			this.entity = CreationUtils.getEntity(entityID);
-		}
+    }
-		return this.entity;
-	}
+}

Subversion Repositories SmartDukaan

(root)/trunk/ContentCreation/src/in/shop2020/creation/controllers/EntityController.java @ 1068 – Rev 964 → 1051