[virtualcommons-svn] SF.net SVN: virtualcommons:[212] mentalmodels/trunk/src/main/java/edu/asu/ com
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] SF.net SVN: virtualcommons:[212] mentalmodels/trunk/src/main/java/edu/asu/ commons/mme
|
From: <see...@us...> - 2009-08-03 19:35:00
|
Revision: 212
http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=212&view=rev
Author: seematalele
Date: 2009-08-03 19:34:52 +0000 (Mon, 03 Aug 2009)
Log Message:
-----------
In revision 211 conflicts were not resolved properly. Those conflicts are resolved properly now.
Revision Links:
--------------
http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=211&view=rev
Modified Paths:
--------------
mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/QuestionGroup.java
mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/QuestionCreatorService.java
Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/QuestionGroup.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/QuestionGroup.java 2009-08-03 18:30:50 UTC (rev 211)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/QuestionGroup.java 2009-08-03 19:34:52 UTC (rev 212)
@@ -19,7 +19,6 @@
import javax.persistence.OrderBy;
import javax.persistence.Table;
-import sun.security.action.GetLongAction;
/*
Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/QuestionCreatorService.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/QuestionCreatorService.java 2009-08-03 18:30:50 UTC (rev 211)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/service/QuestionCreatorService.java 2009-08-03 19:34:52 UTC (rev 212)
@@ -14,7 +14,6 @@
import edu.asu.commons.mme.dao.HibernateCategoricalQuestionDao;
import edu.asu.commons.mme.dao.HibernateModuleDao;
import edu.asu.commons.mme.dao.HibernatePsychometricQuestionDao;
-import edu.asu.commons.mme.dao.HibernateModuleDao;
import edu.asu.commons.mme.dao.HibernateQuestionDao;
import edu.asu.commons.mme.dao.HibernateQuestionGroupDao;
import edu.asu.commons.mme.entity.Block;
@@ -23,7 +22,6 @@
import edu.asu.commons.mme.entity.InformationWindow;
import edu.asu.commons.mme.entity.Module;
import edu.asu.commons.mme.entity.PsychometricQuestion;
-import edu.asu.commons.mme.entity.Module;
import edu.asu.commons.mme.entity.Question;
import edu.asu.commons.mme.entity.QuestionGroup;
import edu.asu.commons.mme.entity.Round;
@@ -46,8 +44,6 @@
private HibernateQuestionGroupDao questionGroupDao;
private HibernatePsychometricQuestionDao psychometricQuestionDao;
private HibernateCategoricalQuestionDao categoricalQuestionDao;
- private HibernateModuleDao moduleDao;
- private HibernateQuestionGroupDao questionGroupDao;
Module module;
Block block;
@@ -702,173 +698,6 @@
}
- Module module;
- Block block;
- QuestionGroup questionGroup;
-
- public Module saveModule(Integer sequenceNo, String description, Integer duration)
- {
- module = new Module();
- module.setSequenceNo(sequenceNo);
- module.setDescription(description);
- module.setDuration(duration);
- moduleDao.save(module);
- getLogger().debug("module is created with Id: " + module.getId());
-
- return module;
-
- }
-
- public Module updateModule(Long id, Integer sequenceNo, String description, Integer duration)
- {
- getLogger().debug("Id came from client is: " + id);
-
- module = moduleDao.findByProperty("id", id);
- Hibernate.initialize(module);
- List<Block> listBlock = module.getBlocks();
- Iterator<Block> iterateBlock = listBlock.iterator();
- while(iterateBlock.hasNext())
- {
- Block block = iterateBlock.next();
- Hibernate.initialize(block);
- List<QuestionGroup> questionGroup = block.getQuestionGroups();
- Iterator<QuestionGroup> iteratorquestion = questionGroup.iterator();
- {
-
- while(iteratorquestion.hasNext())
- {
- Hibernate.initialize(iteratorquestion.next());
- }
- }
-
- }
- if( module != null)
- {
- module.setSequenceNo(sequenceNo);
- module.setDescription(description);
- module.setDuration(duration);
- moduleDao.save(module);
- getLogger().debug("module is updated with Id: " + module.getId());
-
- }
-
- return module;
-
- }
-
- public Block saveBlock(Integer sequenceNo, String description, Integer duration, Long module_Id)
- {
-
- Block block = new Block();
-
- block.setSequenceNo(sequenceNo);
- block.setDescription(description);
- block.setDuration(duration);
-
- module = moduleDao.find(module_Id);
- Hibernate.initialize(module);
- List<Block> listBlock = module.getBlocks();
- Iterator<Block> iterateBlock = listBlock.iterator();
- while(iterateBlock.hasNext())
- {
- Block moduleblock = iterateBlock.next();
- Hibernate.initialize(moduleblock);
- List<QuestionGroup> questionGroup = moduleblock.getQuestionGroups();
- Iterator<QuestionGroup> iteratorquestion = questionGroup.iterator();
- {
-
- while(iteratorquestion.hasNext())
- {
- Hibernate.initialize(iteratorquestion.next());
- }
- }
-
- }
- block.setModule(module);
- blockDao.save(block);
- getLogger().debug("block is created with Id: " + block.getId());
- return block;
-
- }
-
- public Block updateBlock(Long id, Integer sequenceNo, String description, Integer duration, Long module_Id)
- {
- getLogger().debug("Id came from client is: " + id);
-
- block = blockDao.findByProperty("id", id);
- Hibernate.initialize(block);
- List<QuestionGroup> questionGroup = block.getQuestionGroups();
- Iterator<QuestionGroup> iteratorquestion = questionGroup.iterator();
- {
-
- while(iteratorquestion.hasNext())
- {
- Hibernate.initialize(iteratorquestion.next());
- }
- }
- if(block != null)
- {
- block.setSequenceNo(sequenceNo);
- block.setDescription(description);
- block.setDuration(duration);
- module = moduleDao.find(module_Id);
- Hibernate.initialize(module);
- List<Block> listBlock = module.getBlocks();
- Iterator<Block> iterateBlock = listBlock.iterator();
- while(iterateBlock.hasNext())
- {
- Block moduleblock = iterateBlock.next();
- Hibernate.initialize(moduleblock);
- List<QuestionGroup> blockquestionGroup = moduleblock.getQuestionGroups();
- Iterator<QuestionGroup> blockiteratorquestion = blockquestionGroup.iterator();
- {
-
- while(blockiteratorquestion.hasNext())
- {
- Hibernate.initialize(blockiteratorquestion.next());
- }
- }
-
- }
- block.setModule(module);
- blockDao.save(block);
- getLogger().debug("block is updated with Id: " + block.getId());
- }
- return block;
-
- }
-
- public QuestionGroup saveQuestionGroup(Integer sequenceNo, String description, Long block_id)
- {
-
- questionGroup = new QuestionGroup();
- questionGroup.setSequenceNo(sequenceNo);
- questionGroup.setDescription(description);
- questionGroup.setBlock(blockDao.find(block_id));
- save(questionGroup);
- getLogger().debug("QuestionGroup is created with Id: " + questionGroup.getId());
- return questionGroup;
-
- }
-
- public QuestionGroup updateQuestionGroup(Long id, Integer sequenceNo, String description, Long block_id)
- {
- getLogger().debug("Id came from client is: " + id);
-
- questionGroup = questionGroupDao.findByProperty("id", id);
- Hibernate.initialize(questionGroup);
-
- if(questionGroup != null)
- {
- questionGroup.setSequenceNo(sequenceNo);
- questionGroup.setDescription(description);
- questionGroup.setBlock(blockDao.find(block_id));
- save(questionGroup);
- getLogger().debug("questionGroup is updated with Id: " + questionGroup.getId());
- }
- return questionGroup;
- }
-
public void createQuestions() {
// check if we need to recreate these questions.
block = blockDao.find(3L);
@@ -1013,14 +842,6 @@
public void setQuestionGroupDao(HibernateQuestionGroupDao questionGroupDao) {
this.questionGroupDao = questionGroupDao;
}
- public void setModuleDao(HibernateModuleDao moduleDao) {
- this.moduleDao = moduleDao;
- }
-
- public void setQuestionGroupDao(HibernateQuestionGroupDao questionGroupDao) {
- this.questionGroupDao = questionGroupDao;
- }
-
public void setPsychometricQuestionDao(HibernatePsychometricQuestionDao psychometricQuestionDao) {
this.psychometricQuestionDao = psychometricQuestionDao;
@@ -1030,4 +851,3 @@
}
}
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
