[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/gwt/services CurriculaService.java, 1.1.2.6, 1.1.2.7 CurriculaServiceAsync.java, 1.1.2.6, 1.1.2.7

[Tomas M. <to...@us...>]

Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/services
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24033/JavaSource/org/unitime/timetable/gwt/services

Modified Files:
      Tag: dev_curriculum
	CurriculaService.java CurriculaServiceAsync.java 
Log Message:
Curriculum-based Timetabling
 - last-like course demands could have student properties (academic area, classification, and major) from a different term -- match on area abbreviation and classification/major codes
  - removed unused makupClassifications

Index: CurriculaService.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/services/Attic/CurriculaService.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** CurriculaService.java	15 Jun 2010 12:09:50 -0000	1.1.2.6
--- CurriculaService.java	15 Jun 2010 23:05:32 -0000	1.1.2.7
***************
*** 36,40 ****
  	public TreeSet<CurriculumInterface> findCurricula(String filter) throws CurriculaException;
  	public List<CurriculumInterface.CurriculumClassificationInterface> loadClassifications(List<Long> curriculumIds) throws CurriculaException;
- 	public TreeSet<CurriculumInterface.CurriculumClassificationInterface> makupClassifications(Long acadAreaId, List<Long> majors, boolean includeCourses) throws CurriculaException;
  	public HashMap<String, Integer[][]> computeEnrollmentsAndLastLikes(Long acadAreaId, List<Long> majors) throws CurriculaException;
  	public TreeSet<CurriculumInterface.AcademicAreaInterface> loadAcademicAreas() throws CurriculaException;
--- 36,39 ----

Index: CurriculaServiceAsync.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/services/Attic/CurriculaServiceAsync.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** CurriculaServiceAsync.java	15 Jun 2010 12:09:50 -0000	1.1.2.6
--- CurriculaServiceAsync.java	15 Jun 2010 23:05:32 -0000	1.1.2.7
***************
*** 34,38 ****
  	public void findCurricula(String filter, AsyncCallback<TreeSet<CurriculumInterface>> callback) throws CurriculaException;
  	public void loadClassifications(List<Long> curriculumIds, AsyncCallback<List<CurriculumInterface.CurriculumClassificationInterface>> callback) throws CurriculaException;
- 	public void makupClassifications(Long acadAreaId, List<Long> majors, boolean includeCourses, AsyncCallback<TreeSet<CurriculumInterface.CurriculumClassificationInterface>> callback) throws CurriculaException;
  	public void computeEnrollmentsAndLastLikes(Long acadAreaId, List<Long> majors, AsyncCallback<HashMap<String, Integer[][]>> callback) throws CurriculaException;
  	public void loadAcademicAreas(AsyncCallback<TreeSet<CurriculumInterface.AcademicAreaInterface>> callback) throws CurriculaException;
--- 34,37 ----