unitime-cvs — CVS changes

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/solver SolverProxy.java, 1.4.2.4, 1.4.2.5 EnrollmentCheck.java, 1.2.2.3, 1.2.2.4 TimetableSolver.java, 1.6.2.9, 1.6.2.10 WebSolver.java, 1.13.2.5, 1.13.2.6 TimetableDatabaseLoader.java, 1.17.2.13, 1.17.2.14

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

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

Modified Files:
      Tag: dev_curriculum
	SolverProxy.java EnrollmentCheck.java TimetableSolver.java 
	WebSolver.java TimetableDatabaseLoader.java 
Log Message:
API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups

Index: WebSolver.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/WebSolver.java,v
retrieving revision 1.13.2.5
retrieving revision 1.13.2.6
diff -C2 -d -r1.13.2.5 -r1.13.2.6
*** WebSolver.java	9 Nov 2010 12:25:53 -0000	1.13.2.5
--- WebSolver.java	11 Nov 2010 14:27:50 -0000	1.13.2.6
***************
*** 23,31 ****
  import java.io.IOException;
  import java.text.SimpleDateFormat;
! import java.util.*;
  
  import javax.servlet.http.HttpSession;
  import javax.servlet.jsp.JspWriter;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
--- 23,43 ----
  import java.io.IOException;
  import java.text.SimpleDateFormat;
! import java.util.Date;
! import java.util.HashSet;
! import java.util.Hashtable;
! import java.util.Iterator;
! import java.util.List;
! import java.util.Map;
! import java.util.Set;
! import java.util.StringTokenizer;
  
  import javax.servlet.http.HttpSession;
  import javax.servlet.jsp.JspWriter;
  
+ import net.sf.cpsolver.ifs.util.DataProperties;
+ import net.sf.cpsolver.ifs.util.DistanceMetric;
+ import net.sf.cpsolver.ifs.util.Progress;
+ import net.sf.cpsolver.ifs.util.ProgressListener;
+ 
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
***************
*** 56,64 ****
  import org.unitime.timetable.util.Constants;
  
- import net.sf.cpsolver.ifs.util.DataProperties;
- import net.sf.cpsolver.ifs.util.DistanceMetric;
- import net.sf.cpsolver.ifs.util.Progress;
- import net.sf.cpsolver.ifs.util.ProgressListener;
- 
  /**
   * @author Tomas Muller
--- 68,71 ----

Index: EnrollmentCheck.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/EnrollmentCheck.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -d -r1.2.2.3 -r1.2.2.4
*** EnrollmentCheck.java	9 Nov 2010 12:25:53 -0000	1.2.2.3
--- EnrollmentCheck.java	11 Nov 2010 14:27:50 -0000	1.2.2.4
***************
*** 20,25 ****
  package org.unitime.timetable.solver;
  
  import java.util.Collection;
- import java.util.Enumeration;
  import java.util.Iterator;
  import java.util.List;
--- 20,25 ----
  package org.unitime.timetable.solver;
  
+ import java.util.ArrayList;
  import java.util.Collection;
  import java.util.Iterator;
  import java.util.List;
***************
*** 27,38 ****
  import java.util.Vector;
  
- import org.unitime.timetable.model.Class_;
- import org.unitime.timetable.model.Department;
- import org.unitime.timetable.model.InstructionalOffering;
- import org.unitime.timetable.model.SchedulingSubpart;
- import org.unitime.timetable.model.dao.Class_DAO;
- import org.unitime.timetable.model.dao.InstructionalOfferingDAO;
- import org.unitime.timetable.model.dao.SchedulingSubpartDAO;
- 
  import net.sf.cpsolver.coursett.constraint.JenrlConstraint;
  import net.sf.cpsolver.coursett.model.Configuration;
--- 27,30 ----
***************
*** 41,47 ****
  import net.sf.cpsolver.coursett.model.Student;
  import net.sf.cpsolver.coursett.model.TimetableModel;
- import net.sf.cpsolver.ifs.util.ArrayList;
  import net.sf.cpsolver.ifs.util.Progress;
  
  /**
   * @author Tomas Muller
--- 33,46 ----
  import net.sf.cpsolver.coursett.model.Student;
  import net.sf.cpsolver.coursett.model.TimetableModel;
  import net.sf.cpsolver.ifs.util.Progress;
  
+ import org.unitime.timetable.model.Class_;
+ import org.unitime.timetable.model.Department;
+ import org.unitime.timetable.model.InstructionalOffering;
+ import org.unitime.timetable.model.SchedulingSubpart;
+ import org.unitime.timetable.model.dao.Class_DAO;
+ import org.unitime.timetable.model.dao.InstructionalOfferingDAO;
+ import org.unitime.timetable.model.dao.SchedulingSubpartDAO;
+ 
  /**
   * @author Tomas Muller
***************
*** 114,119 ****
              p.warn("Student "+s.getId()+" not enrolled in any class of subpart "+getSubpartLabel(subpartId)+".");
          } else if (enrolled.hasAnyChildren()) {
!             for (Enumeration e=enrolled.getChildrenSubpartIds();e.hasMoreElements();) {
!                 Long sid = (Long)e.nextElement();
                  checkEnrollment(p, s, sid, enrolled.getChildren(sid));
              }
--- 113,117 ----
              p.warn("Student "+s.getId()+" not enrolled in any class of subpart "+getSubpartLabel(subpartId)+".");
          } else if (enrolled.hasAnyChildren()) {
!             for (Long sid: enrolled.getChildrenSubpartIds()) {
                  checkEnrollment(p, s, sid, enrolled.getChildren(sid));
              }
***************
*** 236,241 ****
              for (Iterator j=student.getConfigurations().iterator();j.hasNext();) {
                  Configuration cfg = (Configuration)j.next();
!                 for (Enumeration e=cfg.getTopSubpartIds();e.hasMoreElements();) {
!                     Long subpartId = (Long)e.nextElement();
                      checkEnrollment(p, student, subpartId, cfg.getTopLectures(subpartId));
                  }
--- 234,238 ----
              for (Iterator j=student.getConfigurations().iterator();j.hasNext();) {
                  Configuration cfg = (Configuration)j.next();
!                 for (Long subpartId: cfg.getTopSubpartIds()) {
                      checkEnrollment(p, student, subpartId, cfg.getTopLectures(subpartId));
                  }

Index: TimetableDatabaseLoader.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/TimetableDatabaseLoader.java,v
retrieving revision 1.17.2.13
retrieving revision 1.17.2.14
diff -C2 -d -r1.17.2.13 -r1.17.2.14
*** TimetableDatabaseLoader.java	9 Nov 2010 12:25:53 -0000	1.17.2.13
--- TimetableDatabaseLoader.java	11 Nov 2010 14:27:50 -0000	1.17.2.14
***************
*** 61,65 ****
  import net.sf.cpsolver.coursett.preference.SumPreferenceCombination;
  import net.sf.cpsolver.ifs.model.Constraint;
- import net.sf.cpsolver.ifs.model.Value;
  import net.sf.cpsolver.ifs.util.DataProperties;
  import net.sf.cpsolver.ifs.util.Progress;
--- 61,64 ----
***************
*** 961,965 ****
      		if (lecture.getAssignment()!=null) continue;
      		Placement placement = (Placement)lecture.getInitialAssignment();
!             Hashtable conflictConstraints = getModel().conflictConstraints(placement);
              if (conflictConstraints.isEmpty()) {
                  lecture.assign(0,placement);
--- 960,964 ----
      		if (lecture.getAssignment()!=null) continue;
      		Placement placement = (Placement)lecture.getInitialAssignment();
!     		Map<Constraint<Lecture, Placement>, Set<Placement>> conflictConstraints = getModel().conflictConstraints(placement);
              if (conflictConstraints.isEmpty()) {
                  lecture.assign(0,placement);
***************
*** 967,976 ****
                  String warn = "Unable to assign committed class "+getClassLabel(lecture)+" &larr; "+placement.getName();
              	warn+="<br>&nbsp;&nbsp;Reason:";
!                 for (Enumeration ex=conflictConstraints.keys();ex.hasMoreElements();) {
!                     Constraint c = (Constraint)ex.nextElement();
!                     Collection vals = (Collection)conflictConstraints.get(c);
!                     for (Iterator i=vals.iterator();i.hasNext();) {
!                         Value v = (Value) i.next();
!                         warn+="<br>&nbsp;&nbsp;&nbsp;&nbsp;"+getClassLabel((Lecture)v.variable())+" = "+((Placement)v).getLongName();
                      }
                      warn+="<br>&nbsp;&nbsp;&nbsp;&nbsp;    in constraint "+c;
--- 966,973 ----
                  String warn = "Unable to assign committed class "+getClassLabel(lecture)+" &larr; "+placement.getName();
              	warn+="<br>&nbsp;&nbsp;Reason:";
!                 for (Constraint<Lecture, Placement> c: conflictConstraints.keySet()) {
!                 	Set<Placement> vals = conflictConstraints.get(c);
!                     for (Placement v: vals) {
!                         warn+="<br>&nbsp;&nbsp;&nbsp;&nbsp;"+getClassLabel(v.variable())+" = "+v.getLongName();
                      }
                      warn+="<br>&nbsp;&nbsp;&nbsp;&nbsp;    in constraint "+c;
***************
*** 1090,1101 ****
  	    		}
  	    	}
!             Hashtable conflictConstraints = getModel().conflictConstraints(initialPlacement);
              if (!conflictConstraints.isEmpty()) {
!                 for (Enumeration ex=conflictConstraints.keys();ex.hasMoreElements();) {
!                     Constraint c = (Constraint)ex.nextElement();
!                     Collection vals = (Collection)conflictConstraints.get(c);
!                     for (Iterator i=vals.iterator();i.hasNext();) {
!                         Placement p = (Placement) i.next();
!                         Lecture l = (Lecture)p.variable();
                          if (l.isCommitted())
                          	reason += "<br>&nbsp;&nbsp;&nbsp;&nbsp;conflict with committed assignment "+getClassLabel(l)+" = "+p.getLongName()+" (in constraint "+c+")";
--- 1087,1096 ----
  	    		}
  	    	}
! 	    	Map<Constraint<Lecture, Placement>, Set<Placement>> conflictConstraints = getModel().conflictConstraints(initialPlacement);
              if (!conflictConstraints.isEmpty()) {
!                 for (Constraint<Lecture, Placement> c: conflictConstraints.keySet()) {
!                 	Set<Placement> vals = conflictConstraints.get(c);
!                     for (Placement p: vals) {
!                         Lecture l = p.variable();
                          if (l.isCommitted())
                          	reason += "<br>&nbsp;&nbsp;&nbsp;&nbsp;conflict with committed assignment "+getClassLabel(l)+" = "+p.getLongName()+" (in constraint "+c+")";
***************
*** 1108,1112 ****
  		} else {
  			if (iMppAssignment) lecture.setInitialAssignment(initialPlacement);
! 			Hashtable conflictConstraints = getModel().conflictConstraints(initialPlacement);
          	if (conflictConstraints.isEmpty()) {
      	        lecture.assign(0,initialPlacement);
--- 1103,1107 ----
  		} else {
  			if (iMppAssignment) lecture.setInitialAssignment(initialPlacement);
! 			Map<Constraint<Lecture, Placement>, Set<Placement>> conflictConstraints = getModel().conflictConstraints(initialPlacement);
          	if (conflictConstraints.isEmpty()) {
      	        lecture.assign(0,initialPlacement);
***************
*** 1114,1123 ****
                  String warn = "Unable to assign "+getClassLabel(lecture)+" &larr; "+initialPlacement.getName();
                  warn += "<br>&nbsp;&nbsp;Reason:";
! 	            for (Enumeration ex=conflictConstraints.keys();ex.hasMoreElements();) {
!             	    Constraint c = (Constraint)ex.nextElement();
!         	        Collection vals = (Collection)conflictConstraints.get(c);
!     	            for (Iterator i=vals.iterator();i.hasNext();) {
! 	                    Value v = (Value) i.next();
!                         warn += "<br>&nbsp;&nbsp;&nbsp;&nbsp;"+getClassLabel((Lecture)v.variable())+" = "+((Placement)v).getLongName();
              	    }
                      warn += "<br>&nbsp;&nbsp;&nbsp;&nbsp;    in constraint "+c;
--- 1109,1116 ----
                  String warn = "Unable to assign "+getClassLabel(lecture)+" &larr; "+initialPlacement.getName();
                  warn += "<br>&nbsp;&nbsp;Reason:";
!                 for (Constraint<Lecture, Placement> c: conflictConstraints.keySet()) {
!                 	Set<Placement> vals = conflictConstraints.get(c);
!                 	for (Placement v: vals) {
!                         warn += "<br>&nbsp;&nbsp;&nbsp;&nbsp;"+getClassLabel(v.variable())+" = "+v.getLongName();
              	    }
                      warn += "<br>&nbsp;&nbsp;&nbsp;&nbsp;    in constraint "+c;
***************
*** 1632,1637 ****
      	if (!parentLecture.hasAnyChildren()) return;
      	
! 		for (Enumeration<Long> e = parentLecture.getChildrenSubpartIds(); e.hasMoreElements(); ) {
! 			Long subpartId = e.nextElement();
          	List<Lecture> children = parentLecture.getChildren(subpartId);
  
--- 1625,1629 ----
      	if (!parentLecture.hasAnyChildren()) return;
      	
! 		for (Long subpartId: parentLecture.getChildrenSubpartIds()) {
          	List<Lecture> children = parentLecture.getChildren(subpartId);
  
***************
*** 1892,1897 ****
      		boolean canAttend = true;
      		if (lecture.hasAnyChildren()) {
!     			for (Enumeration f=lecture.getChildrenSubpartIds();f.hasMoreElements();) {
!     				Long subpartId = (Long)f.nextElement();
      				if (!canAttend(cannotAttendLectures, lecture.getChildren(subpartId))) {
      					canAttend = false; break;
--- 1884,1888 ----
      		boolean canAttend = true;
      		if (lecture.hasAnyChildren()) {
!     			for (Long subpartId: lecture.getChildrenSubpartIds()) {
      				if (!canAttend(cannotAttendLectures, lecture.getChildren(subpartId))) {
      					canAttend = false; break;
***************
*** 1907,1912 ****
      	for (Configuration cfg: configurations) {
      		boolean canAttend = true;
!     		for (Enumeration f=cfg.getTopSubpartIds();f.hasMoreElements();) {
!     			Long subpartId = (Long)f.nextElement();
      			if (!canAttend(cannotAttendLectures, cfg.getTopLectures(subpartId))) {
      				canAttend = false; break;
--- 1898,1902 ----
      	for (Configuration cfg: configurations) {
      		boolean canAttend = true;
!     		for (Long subpartId: cfg.getTopSubpartIds()) {
      			if (!canAttend(cannotAttendLectures, cfg.getTopLectures(subpartId))) {
      				canAttend = false; break;
***************
*** 2959,2970 ****
      		    		}
      		    	}
!     	            Hashtable conflictConstraints = getModel().conflictConstraints(placement);
      	            if (!conflictConstraints.isEmpty()) {
!     	                for (Enumeration ex=conflictConstraints.keys();ex.hasMoreElements();) {
!     	                    Constraint c = (Constraint)ex.nextElement();
!     	                    Collection vals = (Collection)conflictConstraints.get(c);
!     	                    for (Iterator i=vals.iterator();i.hasNext();) {
!     	                        Placement p = (Placement) i.next();
!     	                        Lecture l = (Lecture)p.variable();
      	                        if (l.isCommitted())
      	                        	reason += "<br>&nbsp;&nbsp;&nbsp;&nbsp;conflict with committed assignment "+getClassLabel(l)+" = "+p.getLongName()+" (in constraint "+c+")";
--- 2949,2958 ----
      		    		}
      		    	}
!     		    	Map<Constraint<Lecture, Placement>, Set<Placement>> conflictConstraints = getModel().conflictConstraints(placement);
      	            if (!conflictConstraints.isEmpty()) {
!     	                for (Constraint<Lecture, Placement> c: conflictConstraints.keySet()) {
!     	                	Set<Placement> vals = conflictConstraints.get(c);
!     	                    for (Placement p: vals) {
!     	                        Lecture l = p.variable();
      	                        if (l.isCommitted())
      	                        	reason += "<br>&nbsp;&nbsp;&nbsp;&nbsp;conflict with committed assignment "+getClassLabel(l)+" = "+p.getLongName()+" (in constraint "+c+")";

Index: TimetableSolver.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/TimetableSolver.java,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -C2 -d -r1.6.2.9 -r1.6.2.10
*** TimetableSolver.java	9 Nov 2010 12:25:52 -0000	1.6.2.9
--- TimetableSolver.java	11 Nov 2010 14:27:50 -0000	1.6.2.10
***************
*** 127,132 ****
  	private Map iProgressBeforePassivation = null;
  	private PropertiesInfo iGlobalInfoBeforePassivation = null;
! 	private Hashtable iCurrentSolutionInfoBeforePassivation = null;
! 	private Hashtable iBestSolutionInfoBeforePassivation = null;
  	private File iPassivationFolder = null;
  	private String iPassivationPuid = null;
--- 127,132 ----
  	private Map iProgressBeforePassivation = null;
  	private PropertiesInfo iGlobalInfoBeforePassivation = null;
! 	private Map<String,String> iCurrentSolutionInfoBeforePassivation = null;
! 	private Map<String,String> iBestSolutionInfoBeforePassivation = null;
  	private File iPassivationFolder = null;
  	private String iPassivationPuid = null;
***************
*** 404,408 ****
      	}
      	private void assign(Placement placement) {
!             Hashtable conflictConstraints = currentSolution().getModel().conflictConstraints(placement);
              if (conflictConstraints.isEmpty()) {
              	placement.variable().assign(0,placement);
--- 404,408 ----
      	}
      	private void assign(Placement placement) {
!             Map<Constraint<Lecture, Placement>, Set<Placement>> conflictConstraints = currentSolution().getModel().conflictConstraints(placement);
              if (conflictConstraints.isEmpty()) {
              	placement.variable().assign(0,placement);
***************
*** 410,415 ****
                  iProgress.warn("Unable to assign "+placement.variable().getName()+" := "+placement.getName());
                  iProgress.warn("&nbsp;&nbsp;Reason:");
!                 for (Enumeration ex=conflictConstraints.keys();ex.hasMoreElements();) {
!                     Constraint c = (Constraint)ex.nextElement();
                      Collection vals = (Collection)conflictConstraints.get(c);
                      for (Iterator j=vals.iterator();j.hasNext();) {
--- 410,414 ----
                  iProgress.warn("Unable to assign "+placement.variable().getName()+" := "+placement.getName());
                  iProgress.warn("&nbsp;&nbsp;Reason:");
!                 for (Constraint<Lecture, Placement> c: conflictConstraints.keySet()) {
                      Collection vals = (Collection)conflictConstraints.get(c);
                      for (Iterator j=vals.iterator();j.hasNext();) {
***************
*** 501,505 ****
      public PropertiesInfo getGlobalInfo() {
      	if (isPassivated()) return iGlobalInfoBeforePassivation;
!     	Hashtable info = null;
      	synchronized (super.currentSolution()) {
      		info = super.currentSolution().getBestInfo();
--- 500,504 ----
      public PropertiesInfo getGlobalInfo() {
      	if (isPassivated()) return iGlobalInfoBeforePassivation;
!     	Map<String,String> info = null;
      	synchronized (super.currentSolution()) {
      		info = super.currentSolution().getBestInfo();
***************
*** 702,706 ****
      }
      
!     public Hashtable currentSolutionInfo() {
      	if (isPassivated()) return iCurrentSolutionInfoBeforePassivation;
      	synchronized (super.currentSolution()) {
--- 701,705 ----
      }
      
!     public Map<String,String> currentSolutionInfo() {
      	if (isPassivated()) return iCurrentSolutionInfoBeforePassivation;
      	synchronized (super.currentSolution()) {
***************
*** 709,713 ****
      }
  
!     public Hashtable bestSolutionInfo() {
      	if (isPassivated()) return iBestSolutionInfoBeforePassivation;
      	synchronized (super.currentSolution()) {
--- 708,712 ----
      }
  
!     public Map<String,String> bestSolutionInfo() {
      	if (isPassivated()) return iBestSolutionInfoBeforePassivation;
      	synchronized (super.currentSolution()) {

Index: SolverProxy.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/SolverProxy.java,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -d -r1.4.2.4 -r1.4.2.5
*** SolverProxy.java	9 Nov 2010 12:25:53 -0000	1.4.2.4
--- SolverProxy.java	11 Nov 2010 14:27:50 -0000	1.4.2.5
***************
*** 64,69 ****
  	public void restoreBest() throws Exception;
  	public void saveBest() throws Exception;
! 	public Hashtable currentSolutionInfo() throws Exception;
! 	public Hashtable bestSolutionInfo() throws Exception;
  	public boolean isWorking() throws Exception;
  
--- 64,69 ----
  	public void restoreBest() throws Exception;
  	public void saveBest() throws Exception;
! 	public Map<String,String> currentSolutionInfo() throws Exception;
! 	public Map<String,String> bestSolutionInfo() throws Exception;
  	public boolean isWorking() throws Exception;
  

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/model Class_.java, 1.30.2.11, 1.30.2.12 RoomSharingModel.java, 1.3.2.1, 1.3.2.2

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

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

Modified Files:
      Tag: dev_curriculum
	Class_.java RoomSharingModel.java 
Log Message:
API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups

Index: Class_.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/Class_.java,v
retrieving revision 1.30.2.11
retrieving revision 1.30.2.12
diff -C2 -d -r1.30.2.11 -r1.30.2.12
*** Class_.java	11 Nov 2010 00:30:40 -0000	1.30.2.11
--- Class_.java	11 Nov 2010 14:27:51 -0000	1.30.2.12
***************
*** 20,23 ****
--- 20,24 ----
  package org.unitime.timetable.model;
  
+ import java.util.ArrayList;
  import java.util.Collection;
  import java.util.Collections;
***************
*** 37,41 ****
  import net.sf.cpsolver.coursett.preference.MinMaxPreferenceCombination;
  import net.sf.cpsolver.coursett.preference.PreferenceCombination;
- import net.sf.cpsolver.ifs.util.ArrayList;
  
  import org.hibernate.LazyInitializationException;
--- 38,41 ----

Index: RoomSharingModel.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/RoomSharingModel.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** RoomSharingModel.java	9 Nov 2010 12:25:47 -0000	1.3.2.1
--- RoomSharingModel.java	11 Nov 2010 14:27:51 -0000	1.3.2.2
***************
*** 23,26 ****
--- 23,27 ----
  import java.math.BigInteger;
  import java.util.Collection;
+ import java.util.HashMap;
  import java.util.Hashtable;
  import java.util.Iterator;
***************
*** 98,102 ****
  		iDepartmentColors = new Color[departments.size()];
  		iEditingDepartments = editingDepartmentIds;
! 		iDepartmentIdx = new Hashtable();
  		int idx = 0;
  		for (Iterator i=departments.iterator();i.hasNext();idx++) {
--- 99,103 ----
  		iDepartmentColors = new Color[departments.size()];
  		iEditingDepartments = editingDepartmentIds;
! 		iDepartmentIdx = new HashMap<Long, Integer>();
  		int idx = 0;
  		for (Iterator i=departments.iterator();i.hasNext();idx++) {

[UniTime-cvs] UniTime/JavaSource/org/unitime/commons NaturalOrderComparator.java, 1.1, 1.1.6.1

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

Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15463/JavaSource/org/unitime/commons

Modified Files:
      Tag: dev_curriculum
	NaturalOrderComparator.java 
Log Message:
API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups

Index: NaturalOrderComparator.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/NaturalOrderComparator.java,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -C2 -d -r1.1 -r1.1.6.1
*** NaturalOrderComparator.java	12 Jun 2007 02:27:16 -0000	1.1
--- NaturalOrderComparator.java	11 Nov 2010 14:27:51 -0000	1.1.6.1
***************
*** 25,29 ****
  */
  
! import java.util.*;
  
  public class NaturalOrderComparator implements Comparator {
--- 25,32 ----
  */
  
! import java.util.Arrays;
! import java.util.Collections;
! import java.util.Comparator;
! import java.util.List;
  
  public class NaturalOrderComparator implements Comparator {

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/gwt/server MenuServlet.java, 1.1.2.15, 1.1.2.16

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

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

Modified Files:
      Tag: dev_curriculum
	MenuServlet.java 
Log Message:
API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups

Index: MenuServlet.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/gwt/server/Attic/MenuServlet.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -C2 -d -r1.1.2.15 -r1.1.2.16
*** MenuServlet.java	9 Nov 2010 12:25:51 -0000	1.1.2.15
--- MenuServlet.java	11 Nov 2010 14:27:51 -0000	1.1.2.16
***************
*** 26,30 ****
  import java.util.Collection;
  import java.util.HashMap;
- import java.util.Hashtable;
  import java.util.Iterator;
  import java.util.List;
--- 26,29 ----
***************
*** 472,476 ****
  				ret.put("6Session", SessionDAO.getInstance().get(properties.getPropertyLong("General.SessionId",null)).getLabel());
  				
! 				Hashtable info = null;
  				
  				if (solver != null) {
--- 471,475 ----
  				ret.put("6Session", SessionDAO.getInstance().get(properties.getPropertyLong("General.SessionId",null)).getLabel());
  				
! 				Map<String,String> info = null;
  				
  				if (solver != null) {

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/solver/interactive Suggestions.java, 1.4.2.2, 1.4.2.3

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

Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/interactive
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15463/JavaSource/org/unitime/timetable/solver/interactive

Modified Files:
      Tag: dev_curriculum
	Suggestions.java 
Log Message:
API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups

Index: Suggestions.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/interactive/Suggestions.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -d -r1.4.2.2 -r1.4.2.3
*** Suggestions.java	9 Nov 2010 12:25:54 -0000	1.4.2.2
--- Suggestions.java	11 Nov 2010 14:27:51 -0000	1.4.2.3
***************
*** 22,33 ****
  
  import java.io.Serializable;
! import java.util.*;
! 
! import org.unitime.timetable.model.PreferenceLevel;
! import org.unitime.timetable.solver.interactive.Suggestion;
  
  import net.sf.cpsolver.coursett.heuristics.TimetableComparator;
! import net.sf.cpsolver.coursett.model.*;
! import net.sf.cpsolver.ifs.solver.*;
  
  /**
--- 22,42 ----
  
  import java.io.Serializable;
! import java.util.Collection;
! import java.util.Enumeration;
! import java.util.Hashtable;
! import java.util.Iterator;
! import java.util.Set;
! import java.util.StringTokenizer;
! import java.util.TreeSet;
! import java.util.Vector;
  
  import net.sf.cpsolver.coursett.heuristics.TimetableComparator;
! import net.sf.cpsolver.coursett.model.Lecture;
! import net.sf.cpsolver.coursett.model.Placement;
! import net.sf.cpsolver.coursett.model.TimeLocation;
! import net.sf.cpsolver.coursett.model.TimetableModel;
! import net.sf.cpsolver.ifs.solver.Solver;
! 
! import org.unitime.timetable.model.PreferenceLevel;
  
  /**

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/action ManageSolversAction.java, 1.6.2.2, 1.6.2.3

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

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

Modified Files:
      Tag: dev_curriculum
	ManageSolversAction.java 
Log Message:
API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups

Index: ManageSolversAction.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/action/ManageSolversAction.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -d -r1.6.2.2 -r1.6.2.3
*** ManageSolversAction.java	9 Nov 2010 12:25:49 -0000	1.6.2.2
--- ManageSolversAction.java	11 Nov 2010 14:27:50 -0000	1.6.2.3
***************
*** 22,26 ****
  import java.text.DecimalFormat;
  import java.text.SimpleDateFormat;
! import java.util.*;
  
  import javax.servlet.http.HttpServletRequest;
--- 22,31 ----
  import java.text.DecimalFormat;
  import java.text.SimpleDateFormat;
! import java.util.Date;
! import java.util.Enumeration;
! import java.util.HashSet;
! import java.util.Iterator;
! import java.util.Map;
! import java.util.Set;
  
  import javax.servlet.http.HttpServletRequest;
***************
*** 604,608 ****
  	                String status = (String)solver.getProgress().get("STATUS");
  	                
! 	                Hashtable info = null;
  	                try {
  	                	info = solver.currentSolutionInfo();
--- 609,613 ----
  	                String status = (String)solver.getProgress().get("STATUS");
  	                
! 	                Map<String,String> info = null;
  	                try {
  	                	info = solver.currentSolutionInfo();
***************
*** 729,733 ****
                     String status = (String)solver.getProgress().get("STATUS");
                     
!                    Hashtable info = null;
                     try {
                  	   info = solver.currentSolutionInfo();
--- 734,738 ----
                     String status = (String)solver.getProgress().get("STATUS");
                     
!                    Map<String,String> info = null;
                     try {
                  	   info = solver.currentSolutionInfo();

[UniTime-cvs] UniTime/JavaSource/org/unitime/commons/web WebTable.java, 1.9.2.2, 1.9.2.3

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

Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15463/JavaSource/org/unitime/commons/web

Modified Files:
      Tag: dev_curriculum
	WebTable.java 
Log Message:
API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups

Index: WebTable.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/commons/web/WebTable.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -C2 -d -r1.9.2.2 -r1.9.2.3
*** WebTable.java	9 Nov 2010 12:25:53 -0000	1.9.2.2
--- WebTable.java	11 Nov 2010 14:27:50 -0000	1.9.2.3
***************
*** 22,26 ****
  
  
! import java.util.*;
  
  import net.sf.cpsolver.ifs.util.CSVFile;
--- 22,30 ----
  
  
! import java.util.Collections;
! import java.util.Comparator;
! import java.util.Enumeration;
! import java.util.Hashtable;
! import java.util.Vector;
  
  import net.sf.cpsolver.ifs.util.CSVFile;

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/solver/curricula/students CurModel.java, 1.1.2.7, 1.1.2.8

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

Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/curricula/students
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15463/JavaSource/org/unitime/timetable/solver/curricula/students

Modified Files:
      Tag: dev_curriculum
	CurModel.java 
Log Message:
API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups

Index: CurModel.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/curricula/students/Attic/CurModel.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** CurModel.java	9 Nov 2010 12:25:50 -0000	1.1.2.7
--- CurModel.java	11 Nov 2010 14:27:50 -0000	1.1.2.8
***************
*** 129,134 ****
  	
  	@Override
! 	public Hashtable<String, String> getInfo() {
! 		Hashtable<String, String> ret = super.getInfo();
  		ret.put("Students", String.valueOf(getStudents().size()));
  		ret.put("Courses", String.valueOf(getCourses().size()));
--- 129,134 ----
  	
  	@Override
! 	public Map<String, String> getInfo() {
! 		Map<String, String> ret = super.getInfo();
  		ret.put("Students", String.valueOf(getStudents().size()));
  		ret.put("Courses", String.valueOf(getCourses().size()));

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/test FixCourseTimetablingInconsistencies.java, 1.1.2.6, 1.1.2.7

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

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

Modified Files:
      Tag: dev_curriculum
	FixCourseTimetablingInconsistencies.java 
Log Message:
API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups

Index: FixCourseTimetablingInconsistencies.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/test/Attic/FixCourseTimetablingInconsistencies.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
*** FixCourseTimetablingInconsistencies.java	9 Nov 2010 12:25:50 -0000	1.1.2.6
--- FixCourseTimetablingInconsistencies.java	11 Nov 2010 14:27:50 -0000	1.1.2.7
***************
*** 20,23 ****
--- 20,24 ----
  package org.unitime.timetable.test;
  
+ import java.util.ArrayList;
  import java.util.Enumeration;
  import java.util.HashSet;
***************
*** 31,35 ****
  import net.sf.cpsolver.coursett.model.Placement;
  import net.sf.cpsolver.coursett.model.TimeLocation;
- import net.sf.cpsolver.ifs.util.ArrayList;
  import net.sf.cpsolver.ifs.util.DistanceMetric;
  
--- 32,35 ----

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/solver/exam/ui ExamConflictStatisticsInfo.java, 1.4.2.3, 1.4.2.4

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

Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam/ui
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15463/JavaSource/org/unitime/timetable/solver/exam/ui

Modified Files:
      Tag: dev_curriculum
	ExamConflictStatisticsInfo.java 
Log Message:
API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups

Index: ExamConflictStatisticsInfo.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/exam/ui/ExamConflictStatisticsInfo.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -d -r1.4.2.3 -r1.4.2.4
*** ExamConflictStatisticsInfo.java	9 Nov 2010 12:25:50 -0000	1.4.2.3
--- ExamConflictStatisticsInfo.java	11 Nov 2010 14:27:51 -0000	1.4.2.4
***************
*** 22,34 ****
  import java.io.PrintWriter;
  import java.io.Serializable;
! import java.util.*;
  
  import javax.servlet.jsp.JspWriter;
  
- import org.dom4j.Element;
- import org.unitime.timetable.model.PreferenceLevel;
- import org.unitime.timetable.solver.ui.TimetableInfo;
- import org.unitime.timetable.webutil.timegrid.ExamGridTable;
- 
  import net.sf.cpsolver.exam.model.Exam;
  import net.sf.cpsolver.exam.model.ExamDistributionConstraint;
--- 22,38 ----
  import java.io.PrintWriter;
  import java.io.Serializable;
! import java.util.Collection;
! import java.util.Collections;
! import java.util.Enumeration;
! import java.util.HashSet;
! import java.util.Hashtable;
! import java.util.Iterator;
! import java.util.Map;
! import java.util.Set;
! import java.util.TreeSet;
! import java.util.Vector;
  
  import javax.servlet.jsp.JspWriter;
  
  import net.sf.cpsolver.exam.model.Exam;
  import net.sf.cpsolver.exam.model.ExamDistributionConstraint;
***************
*** 42,45 ****
--- 46,54 ----
  import net.sf.cpsolver.ifs.model.Constraint;
  
+ import org.dom4j.Element;
+ import org.unitime.timetable.model.PreferenceLevel;
+ import org.unitime.timetable.solver.ui.TimetableInfo;
+ import org.unitime.timetable.webutil.timegrid.ExamGridTable;
+ 
  /**
   * @author Tomas Muller

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/solver/ui PropertiesInfo.java, 1.2.2.1, 1.2.2.2 LogInfo.java, 1.2.2.2, 1.2.2.3

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

Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15463/JavaSource/org/unitime/timetable/solver/ui

Modified Files:
      Tag: dev_curriculum
	PropertiesInfo.java LogInfo.java 
Log Message:
API changes of the new constraint solver library (mostly Hashtable -> Map changes) + few tiny code cleanups

Index: PropertiesInfo.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/PropertiesInfo.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** PropertiesInfo.java	9 Nov 2010 12:25:47 -0000	1.2.2.1
--- PropertiesInfo.java	11 Nov 2010 14:27:50 -0000	1.2.2.2
***************
*** 21,25 ****
  
  import java.io.Serializable;
! import java.util.*;
  
  import org.dom4j.Element;
--- 21,27 ----
  
  import java.io.Serializable;
! import java.util.Iterator;
! import java.util.Map;
! import java.util.Properties;
  
  import org.dom4j.Element;

Index: LogInfo.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/solver/ui/LogInfo.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** LogInfo.java	9 Nov 2010 12:25:47 -0000	1.2.2.2
--- LogInfo.java	11 Nov 2010 14:27:50 -0000	1.2.2.3
***************
*** 21,31 ****
  
  import java.io.Serializable;
! import java.util.*;
! 
! import org.dom4j.Element;
  
- import net.sf.cpsolver.ifs.util.ArrayList;
  import net.sf.cpsolver.ifs.util.Progress;
  
  /**
   * @author Tomas Muller
--- 21,32 ----
  
  import java.io.Serializable;
! import java.util.ArrayList;
! import java.util.Iterator;
! import java.util.List;
  
  import net.sf.cpsolver.ifs.util.Progress;
  
+ import org.dom4j.Element;
+ 
  /**
   * @author Tomas Muller

[UniTime-cvs] UniTime/WebContent/WEB-INF/lib cpsolver-all-1.2.jar, 1.1.2.9, 1.1.2.10

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

Update of /cvsroot/unitime/UniTime/WebContent/WEB-INF/lib
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15259/WebContent/WEB-INF/lib

Modified Files:
      Tag: dev_curriculum
	cpsolver-all-1.2.jar 
Log Message:
Change to the latest version of the constraint solver library
 - license changed to GNU LGPL v3 (was v2.1)
 - code cleanup

Index: cpsolver-all-1.2.jar
===================================================================
RCS file: /cvsroot/unitime/UniTime/WebContent/WEB-INF/lib/Attic/cpsolver-all-1.2.jar,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
Binary files /tmp/cvsLioQiL and /tmp/cvsKx7Saw differ

[UniTime-cvs] UniTime build.xml,1.16.2.12,1.16.2.13

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

Update of /cvsroot/unitime/UniTime
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19850

Modified Files:
      Tag: dev_curriculum
	build.xml 
Log Message:
javac -- added includeantruntime="false"

Index: build.xml
===================================================================
RCS file: /cvsroot/unitime/UniTime/build.xml,v
retrieving revision 1.16.2.12
retrieving revision 1.16.2.13
diff -C2 -d -r1.16.2.12 -r1.16.2.13
*** build.xml	9 Nov 2010 12:25:52 -0000	1.16.2.12
--- build.xml	11 Nov 2010 00:31:26 -0000	1.16.2.13
***************
*** 88,92 ****
  	
  	<target name="compile-java" depends="prepare">
! 		<javac debug="${java.debug}" optimize="${java.optimize}" source="1.5" target="1.5" destdir="${build.dir}">
  			<src path="${build.dir}" />
  			<classpath refid="build.classpath" />
--- 88,92 ----
  	
  	<target name="compile-java" depends="prepare">
! 		<javac debug="${java.debug}" optimize="${java.optimize}" source="1.5" target="1.5" destdir="${build.dir}" includeantruntime="false">
  			<src path="${build.dir}" />
  			<classpath refid="build.classpath" />

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/test MasarykDefaultPreferences.java, 1.1.2.2, 1.1.2.3

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

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

Modified Files:
      Tag: dev_curriculum
	MasarykDefaultPreferences.java 
Log Message:
Few more changes to the default preferences.

Index: MasarykDefaultPreferences.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/test/Attic/MasarykDefaultPreferences.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** MasarykDefaultPreferences.java	9 Nov 2010 12:25:50 -0000	1.1.2.2
--- MasarykDefaultPreferences.java	11 Nov 2010 00:31:00 -0000	1.1.2.3
***************
*** 90,104 ****
              }
              
!             RoomGroup poc = null, mult = null;
              for (RoomGroup rg: (Collection<RoomGroup>)RoomGroup.getAllGlobalRoomGroups()) {
!             	if (rg.getAbbv().equals("MULT"))
!             		mult = rg;
!             	else if (rg.getAbbv().equals("POČ"))
              		poc = rg;
              }
              
              for (SchedulingSubpart ss: (List<SchedulingSubpart>)hibSession.createQuery(
!             		"select distinct s from SchedulingSubpart s inner join s.instrOfferingConfig.instructionalOffering.courseOfferings co where " +
!             		"co.subjectArea.department.session.uniqueId = :sessionId").setLong("sessionId", session.getUniqueId()).list()) {
              	
          		if (ss.getInstrOfferingConfig().isUnlimitedEnrollment()) {
--- 90,109 ----
              }
              
!             RoomGroup poc = null; //, mult = null, bez = null;
              for (RoomGroup rg: (Collection<RoomGroup>)RoomGroup.getAllGlobalRoomGroups()) {
!             	if (rg.getAbbv().equals("POČ"))
              		poc = rg;
+             	/*
+             	else if (rg.getAbbv().equals("MULT"))
+             		mult = rg;
+             	else if (rg.getAbbv().equals("BĚŽ"))
+             		bez = rg;
+             	*/
              }
              
              for (SchedulingSubpart ss: (List<SchedulingSubpart>)hibSession.createQuery(
!             		"select s from SchedulingSubpart s inner join s.instrOfferingConfig.instructionalOffering.courseOfferings co where " +
!             		"co.subjectArea.department.session.uniqueId = :sessionId")
!             		.setLong("sessionId", session.getUniqueId()).list()) {
              	
          		if (ss.getInstrOfferingConfig().isUnlimitedEnrollment()) {
***************
*** 114,118 ****
              		if ((minPerMeeting - 5) % 50 == 0) minPerMeeting -= 5;
              		if (ss.getMinutesPerWk() != minPerMeeting) {
!                 		System.out.println(c.getClassLabel() + " has " + ss.getMinutesPerWk() + " minutes per meeting (should have " + minPerMeeting + ").");
                  		if (c.getSectionNumber() == 1) {
                  			ss.setMinutesPerWk(minPerMeeting);
--- 119,123 ----
              		if ((minPerMeeting - 5) % 50 == 0) minPerMeeting -= 5;
              		if (ss.getMinutesPerWk() != minPerMeeting) {
!                 		System.out.println(c.getClassLabel(hibSession) + " has " + ss.getMinutesPerWk() + " minutes per meeting (should have " + minPerMeeting + ").");
                  		if (c.getSectionNumber() == 1) {
                  			ss.setMinutesPerWk(minPerMeeting);
***************
*** 157,162 ****
              				for (int t = 0; t < m.getNrTimes(); t++) {
              					if (a.getTimeLocation().getStartSlot() == m.getStartSlot(t) &&
!             						a.getTimeLocation().getDayCode() == m.getDayCode(d))
              						m.setPreference(d, t, PreferenceLevel.sStronglyPreferred);
              				}
                  		TimePref tp = new TimePref();
--- 162,171 ----
              				for (int t = 0; t < m.getNrTimes(); t++) {
              					if (a.getTimeLocation().getStartSlot() == m.getStartSlot(t) &&
!             						a.getTimeLocation().getDayCode() == m.getDayCode(d)) {
!             						for (int tt = Math.max(0, t - 1); tt < Math.min(m.getNrTimes(), t + 2); tt++)
!             							for (int dd = 0; dd < m.getNrDays(); dd++)
!                     						m.setPreference(dd, tt, PreferenceLevel.sPreferred);
              						m.setPreference(d, t, PreferenceLevel.sStronglyPreferred);
+             					}
              				}
                  		TimePref tp = new TimePref();
***************
*** 175,186 ****
              				c.getPreferences().add(rp);
              			} else {
!             				if (l.getCapacity() == 0) {
              					c.setRoomRatio(0f);
-                 				RoomPref rp = new RoomPref();
-                 				rp.setOwner(c);
                  				rp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sStronglyPreferred));
!                 				rp.setRoom(l);
!                 				c.getPreferences().add(rp);
              				}
              				BuildingPref bp = new BuildingPref();
              				bp.setOwner(c);
--- 184,199 ----
              				c.getPreferences().add(rp);
              			} else {
!             				RoomPref rp = new RoomPref();
!             				rp.setOwner(c);
!             				if (l.getRoomGroups().isEmpty()) {
!                 				rp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sRequired));
!             				} else if (l.getCapacity() == 0) {
              					c.setRoomRatio(0f);
                  				rp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sStronglyPreferred));
!             				} else {            					
!                 				rp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sPreferred));
              				}
+             				rp.setRoom(l);
+             				c.getPreferences().add(rp);
              				BuildingPref bp = new BuildingPref();
              				bp.setOwner(c);
***************
*** 192,196 ****
              				}
              			}
-             			boolean other = true;
              			for (RoomGroup rg: l.getRoomGroups()) {
              				if (rg.isGlobal() && rg.getAbbv().equals("MULT")) {
--- 205,208 ----
***************
*** 200,204 ****
              					gp.setRoomGroup(rg);
                  				c.getPreferences().add(gp);
!                 				other = false;
              				} else if (rg.isGlobal() && rg.getAbbv().equals("POČ")) {
              					RoomGroupPref gp = new RoomGroupPref();
--- 212,220 ----
              					gp.setRoomGroup(rg);
                  				c.getPreferences().add(gp);
!             					RoomGroupPref gp2 = new RoomGroupPref();
!             					gp2.setOwner(c);
!             					gp2.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sPreferred));
!             					gp2.setRoomGroup(poc);
!                 				c.getPreferences().add(gp2);
              				} else if (rg.isGlobal() && rg.getAbbv().equals("POČ")) {
              					RoomGroupPref gp = new RoomGroupPref();
***************
*** 207,229 ****
              					gp.setRoomGroup(rg);
                  				c.getPreferences().add(gp);
!                 				other = false;
!             				}
!             			}
!             			if (other && l instanceof Room) {
!             				if (poc != null) {
!             					RoomGroupPref gp = new RoomGroupPref();
!             					gp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sStronglyDiscouraged));
!             					gp.setOwner(c);
!             					gp.setRoomGroup(poc);
!                 				c.getPreferences().add(gp);
!             				}
!             				if (mult != null) {
              					RoomGroupPref gp = new RoomGroupPref();
!             					gp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sDiscouraged));
              					gp.setOwner(c);
!             					gp.setRoomGroup(mult);
                  				c.getPreferences().add(gp);
              				}
- 
              			}
              		}
--- 223,238 ----
              					gp.setRoomGroup(rg);
                  				c.getPreferences().add(gp);
!             				} else if (rg.isGlobal() && rg.getAbbv().equals("BĚŽ")) {
              					RoomGroupPref gp = new RoomGroupPref();
!             					gp.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sStronglyPreferred));
              					gp.setOwner(c);
!             					gp.setRoomGroup(rg);
                  				c.getPreferences().add(gp);
+             					RoomGroupPref gp2 = new RoomGroupPref();
+             					gp2.setOwner(c);
+             					gp2.setPrefLevel(PreferenceLevel.getPreferenceLevel(PreferenceLevel.sStronglyDiscouraged));
+             					gp2.setRoomGroup(poc);
+                 				c.getPreferences().add(gp2);
              				}
              			}
              		}
***************
*** 232,237 ****
              		hibSession.saveOrUpdate(c);
              	}
              }
-             
              hibSession.flush();
              
--- 241,246 ----
              		hibSession.saveOrUpdate(c);
              	}
+         		hibSession.flush();
              }
              hibSession.flush();
              

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/model Class_.java, 1.30.2.10, 1.30.2.11

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

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

Modified Files:
      Tag: dev_curriculum
	Class_.java 
Log Message:
added method getClassLabel(hibSession) that uses the given hibernate session to fill in the section number if needed

Index: Class_.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/Class_.java,v
retrieving revision 1.30.2.10
retrieving revision 1.30.2.11
diff -C2 -d -r1.30.2.10 -r1.30.2.11
*** Class_.java	9 Nov 2010 12:25:47 -0000	1.30.2.10
--- Class_.java	11 Nov 2010 00:30:40 -0000	1.30.2.11
***************
*** 578,581 ****
--- 578,585 ----
      }
  
+     public String getClassLabel(org.hibernate.Session hibSession) {
+     	return getCourseName()+" "+getItypeDesc().trim()+" "+getSectionNumberString(hibSession);
+     }
+ 
      public String getClassLabelWithTitle() {
      	return getCourseNameWithTitle()+" "+getItypeDesc().trim()+" "+getSectionNumberString();

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/model Assignment.java, 1.8.2.5, 1.8.2.6

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

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

Modified Files:
      Tag: dev_curriculum
	Assignment.java 
Log Message:
getClassName() -- use Assignment.className if not null

Index: Assignment.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/Assignment.java,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -C2 -d -r1.8.2.5 -r1.8.2.6
*** Assignment.java	9 Nov 2010 12:25:47 -0000	1.8.2.5
--- Assignment.java	11 Nov 2010 00:29:43 -0000	1.8.2.6
***************
*** 277,281 ****
  	
  	public String getClassName() {
- 		if (getClazz() != null) return getClazz().getClassLabel();
  		if (super.getClassName()!=null) return super.getClassName();
  		return getClazz().getClassLabel();
--- 277,280 ----

[UniTime-cvs] UniTime/WebContent/WEB-INF/lib ojdbc6.jar, 1.1.2.1, NONE

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

Update of /cvsroot/unitime/UniTime/WebContent/WEB-INF/lib
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12333/WebContent/WEB-INF/lib

Removed Files:
      Tag: dev_curriculum
	ojdbc6.jar 
Log Message:
To avoid any licensing troubles UniTime 3.2 will not include Oracle JDBC Driver (as does not UniTime 3.1)

Oracle JDBC License: http://www.oracle.com/technetwork/licenses/distribution-license-152002.html, e.g., from the Open Source section
 - You also may not combine the Oracle program with programs licensed under the GNU General Public License ("GPL") in any manner that could cause, or could be interpreted or asserted to cause, the Oracle program or any modifications thereto to become subject to the terms of the GPL.
 
For the rest, the GNU GPL version 3 should be compatible with all other (open source) licenses under which the included libraries are distributed (e.g., including Apache License 2.0)

--- ojdbc6.jar DELETED ---

[UniTime-cvs] UniTime v3.2 build 80 succeeded (10 Nov 2010 00:56)

[Nightly B. <no...@un...>]

Download the resultant file at http://www.unitime.org/uct_builds.php, see the attached build and change logs for more details.

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/tags Registration.java, 1.1.2.3, 1.1.2.4

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

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

Modified Files:
      Tag: dev_curriculum
	Registration.java 
Log Message:
Found a way how to refresh registration information right away.

Index: Registration.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/tags/Attic/Registration.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** Registration.java	9 Nov 2010 12:25:51 -0000	1.1.2.3
--- Registration.java	9 Nov 2010 19:41:37 -0000	1.1.2.4
***************
*** 25,28 ****
--- 25,29 ----
  import java.io.StringReader;
  import java.io.StringWriter;
+ import java.net.URLEncoder;
  import java.util.HashMap;
  import java.util.List;
***************
*** 182,193 ****
  					pageContext.getOut().println(sMessage);
  					if (isUpdate() && Web.getUser(pageContext.getSession()).isAdmin()) {
  						pageContext.getOut().println(
  								"<br><span style=\"font-size: x-small;\">Click <a "+
  								"onMouseOver=\"this.style.cursor='hand';this.style.cursor='pointer';\" " +
! 								"onClick=\"showGwtDialog('UniTime 3.2 Registration', 'https://unitimereg.appspot.com?key=" + sKey + "', '750px', '75%');\" " +
  								"title='UniTime 3.2 Registration'>here</a> to " +
! 								(sRegistered ? "update the current registration" : "register") +
! 								" [<a onClick=\"document.location='main.jsp?refresh=1';\" onMouseOver=\"this.style.cursor='hand';this.style.cursor='pointer';\" " +
! 								"title='Refresh registration information.'>refresh</a>]." +
  								"</span>");
  					}
--- 183,193 ----
  					pageContext.getOut().println(sMessage);
  					if (isUpdate() && Web.getUser(pageContext.getSession()).isAdmin()) {
+ 						String backUrl = URLEncoder.encode(((HttpServletRequest)pageContext.getRequest()).getRequestURL().toString() + "?refresh=1", "ISO-8859-1");
  						pageContext.getOut().println(
  								"<br><span style=\"font-size: x-small;\">Click <a "+
  								"onMouseOver=\"this.style.cursor='hand';this.style.cursor='pointer';\" " +
! 								"onClick=\"showGwtDialog('UniTime 3.2 Registration', 'https://unitimereg.appspot.com?key=" + sKey + "&back=" + backUrl + "', '750px', '75%');\" " +
  								"title='UniTime 3.2 Registration'>here</a> to " +
! 								(sRegistered ? "update the current registration" : "register") + "." +
  								"</span>");
  					}

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/filter QueryLogFilter.java, 1.1.2.3, 1.1.2.4

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

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

Modified Files:
      Tag: dev_curriculum
	QueryLogFilter.java 
Log Message:
Fixed NullPointerException that was sometimes thrown during undeployment.

Index: QueryLogFilter.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/filter/Attic/QueryLogFilter.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** QueryLogFilter.java	9 Nov 2010 12:25:49 -0000	1.1.2.3
--- QueryLogFilter.java	9 Nov 2010 19:40:42 -0000	1.1.2.4
***************
*** 144,148 ****
  	public void destroy() {
  		iActive = false;
! 		iSaver.interrupt();
  	}
  	
--- 144,149 ----
  	public void destroy() {
  		iActive = false;
! 		if (iSaver != null)
! 			iSaver.interrupt();
  	}
  	

[UniTime-cvs] UniTime/JavaSource dbupdate.xml,1.48.2.16,1.48.2.17

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

Update of /cvsroot/unitime/UniTime/JavaSource
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5679/JavaSource

Modified Files:
      Tag: dev_curriculum
	dbupdate.xml 
Log Message:
another fix of the last database update for MySQL (uid was renamed to userid because of Oracle)

Index: dbupdate.xml
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/dbupdate.xml,v
retrieving revision 1.48.2.16
retrieving revision 1.48.2.17
diff -C2 -d -r1.48.2.16 -r1.48.2.17
*** dbupdate.xml	9 Nov 2010 14:49:22 -0000	1.48.2.16
--- dbupdate.xml	9 Nov 2010 14:51:25 -0000	1.48.2.17
***************
*** 2869,2873 ****
  				type decimal(10,0) not null,
  				session_id varchar(32) null,
! 				uid varchar(40) null,
  				query longtext binary null,
  				exception longtext binary null
--- 2869,2873 ----
  				type decimal(10,0) not null,
  				session_id varchar(32) null,
! 				userid varchar(40) null,
  				query longtext binary null,
  				exception longtext binary null

[UniTime-cvs] UniTime/Documentation/Database/MySQL/Changes 63 Query log.sql, 1.1.2.3, 1.1.2.4

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

Update of /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5679/Documentation/Database/MySQL/Changes

Modified Files:
      Tag: dev_curriculum
	63 Query log.sql 
Log Message:
another fix of the last database update for MySQL (uid was renamed to userid because of Oracle)

Index: 63 Query log.sql
===================================================================
RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/Attic/63 Query log.sql,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** 63 Query log.sql	9 Nov 2010 14:49:22 -0000	1.1.2.3
--- 63 Query log.sql	9 Nov 2010 14:51:25 -0000	1.1.2.4
***************
*** 26,30 ****
  	type decimal(10,0) not null,
  	session_id varchar(32) null,
! 	uid varchar(40) null,
  	query longtext binary null,
  	exception longtext binary null
--- 26,30 ----
  	type decimal(10,0) not null,
  	session_id varchar(32) null,
! 	userid varchar(40) null,
  	query longtext binary null,
  	exception longtext binary null

[UniTime-cvs] UniTime/JavaSource dbupdate.xml,1.48.2.15,1.48.2.16

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

Update of /cvsroot/unitime/UniTime/JavaSource
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5031/JavaSource

Modified Files:
      Tag: dev_curriculum
	dbupdate.xml 
Log Message:
corrected a syntax error in the last database update (MySQL)

Index: dbupdate.xml
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/dbupdate.xml,v
retrieving revision 1.48.2.15
retrieving revision 1.48.2.16
diff -C2 -d -r1.48.2.15 -r1.48.2.16
*** dbupdate.xml	9 Nov 2010 12:25:48 -0000	1.48.2.15
--- dbupdate.xml	9 Nov 2010 14:49:22 -0000	1.48.2.16
***************
*** 2871,2875 ****
  				uid varchar(40) null,
  				query longtext binary null,
! 				exception longtext binary null,
  			) engine = INNODB
  		</mysql>
--- 2871,2875 ----
  				uid varchar(40) null,
  				query longtext binary null,
! 				exception longtext binary null
  			) engine = INNODB
  		</mysql>

[UniTime-cvs] UniTime/Documentation/Database/MySQL/Changes 63 Query log.sql, 1.1.2.2, 1.1.2.3

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

Update of /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5031/Documentation/Database/MySQL/Changes

Modified Files:
      Tag: dev_curriculum
	63 Query log.sql 
Log Message:
corrected a syntax error in the last database update (MySQL)

Index: 63 Query log.sql
===================================================================
RCS file: /cvsroot/unitime/UniTime/Documentation/Database/MySQL/Changes/Attic/63 Query log.sql,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** 63 Query log.sql	9 Nov 2010 12:25:48 -0000	1.1.2.2
--- 63 Query log.sql	9 Nov 2010 14:49:22 -0000	1.1.2.3
***************
*** 28,32 ****
  	uid varchar(40) null,
  	query longtext binary null,
! 	exception longtext binary null,
  ) engine = INNODB;
  
--- 28,32 ----
  	uid varchar(40) null,
  	query longtext binary null,
! 	exception longtext binary null
  ) engine = INNODB;
  

[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/model/base BaseCourseHistory.java, 1.2.2.1, 1.2.2.2 BaseSolverGroup.java, 1.2.2.2, 1.2.2.3 BaseCourseOffering.java, 1.6.2.2, 1.6.2.3 BaseAcademicAreaHistoryDAO.java, 1.2.2.2, 1.2.2.3 BaseDepartmentalInstructor.java, 1.5.2.2, 1.5.2.3 BaseStandardEventNote.java, 1.2.2.1, 1.2.2.2 BaseSolverPredefinedSettingDAO.java, 1.2.2.2, 1.2.2.3 BaseTimePrefDAO.java, 1.2.2.2, 1.2.2.3 BaseCurriculumCourseGroupDAO.java, 1.1.2.3, 1.1.2.4 BaseAcademicClassification.java, 1.2.2.1, 1.2.2.2 BasePositionCodeType.java, 1.2.2.2, 1.2.2.3 BaseDepartmentalInstructorDAO.java, 1.2.2.2, 1.2.2.3 BaseConstraintInfo.java, 1.2.2.2, 1.2.2.3 BaseRoomDAO.java, 1.2.2.2, 1.2.2.3 BaseAcademicAreaDAO.java, 1.2.2.2, 1.2.2.3 BaseBuildingAbbreviationHistory.java, 1.2.2.1, 1.2.2.2 BaseStudentEnrollmentMessageDAO.java, 1.2.2.2, 1.2.2.3 BaseChangeLog.java, 1.2.2.1, 1.2.2.2 BaseExamEventDAO.java, 1.1.2.2, 1.1.2.3 BaseUserDAO.java, 1.2.2.2, 1.2.2.3 BaseAssignmentInfo.java, 1.2.2.1, 1.2.2.2 BaseCourseCreditUnitConfigDAO.java, 1.2.2.2, 1.2.2.3 BaseBuildingPref.java, 1.2.2.1, 1.2.2.2 BaseJointEnrollment.java, 1.2.2.1, 1.2.2.2 BaseExamPeriodPrefDAO.java, 1.3.2.2, 1.3.2.3 BaseExternalRoomFeatureDAO.java, 1.2.2.2, 1.2.2.3 BaseRoomPrefDAO.java, 1.2.2.2, 1.2.2.3 BaseClassEvent.java, 1.1.2.1, 1.1.2.2 BaseRolesDAO.java, 1.2.2.2, 1.2.2.3 BaseExactTimeMins.java, 1.2.2.1, 1.2.2.2 BaseEventContactDAO.java, 1.2.2.2, 1.2.2.3 BaseStudentSectioningQueueDAO.java, 1.1.2.1, 1.1.2.2 BasePositionType.java, 1.2.2.1, 1.2.2.2 BaseTimePref.java, 1.2.2.1, 1.2.2.2 BaseAcademicAreaClassification.java, 1.2.2.1, 1.2.2.2 BaseDepartmentRoomFeatureDAO.java, 1.2.2.2, 1.2.2.3 BaseHistory.java, 1.2.2.1, 1.2.2.2 BaseRoomFeaturePref.java, 1.2.2.1, 1.2.2.2 BaseDesignator.java, 1.2.2.1, 1.2.2.2 BaseRelatedCourseInfoDAO.java, 1.2.2.2, 1.2.2.3 BaseBuildingAbbreviationHistoryDAO.java, 1.2.2.2, 1.2.2.3 BaseCourseEventDAO.java, 1.1.2.2, 1.1.2.3 BaseRoomGroupPrefDAO.java, 1.2.2.2, 1.2.2.3 BaseMidtermExamEventDAO.java, 1.1.2.2, 1.1.2.3 BaseExternalBuilding.java, 1.2.2.3, 1.2.2.4 BaseSolverInfo.java, 1.2.2.1, 1.2.2.2 BaseFixedCreditUnitConfigDAO.java, 1.2.2.2, 1.2.2.3 BaseInstructionalOffering.java, 1.5.2.3, 1.5.2.4 BaseSubjectAreaDAO.java, 1.2.2.2, 1.2.2.3 BaseDistributionType.java, 1.3.2.2, 1.3.2.3 BaseSolution.java, 1.2.2.2, 1.2.2.3 BaseCourseEvent.java, 1.1.2.2, 1.1.2.3 BaseCurriculumClassificationDAO.java, 1.1.2.2, 1.1.2.3 BaseAcadAreaPosReservation.java, 1.2.2.1, 1.2.2.2 BaseFinalExamEventDAO.java, 1.1.2.2, 1.1.2.3 BaseBuilding.java, 1.2.2.2, 1.2.2.3 BaseRefTableEntryDAO.java, 1.2.2.2, 1.2.2.3 BaseTimetableManagerDAO.java, 1.2.2.2, 1.2.2.3 BaseAssignmentDAO.java, 1.2.2.2, 1.2.2.3 BaseExamLocationPref.java, 1.2.2.1, 1.2.2.2 BaseExamConflict.java, 1.3.2.2, 1.3.2.3 BaseSettings.java, 1.2.2.2, 1.2.2.3 BaseBuildingPrefDAO.java, 1.2.2.2, 1.2.2.3 BaseSolverParameterDAO.java, 1.2.2.2, 1.2.2.3 BaseAcadAreaReservationDAO.java, 1.2.2.2, 1.2.2.3 BaseSolverPredefinedSetting.java, 1.2.2.2, 1.2.2.3 BaseDepartment.java, 1.2.2.2, 1.2.2.3 BaseSubjectHistory.java, 1.2.2.1, 1.2.2.2 BaseCourseHistoryDAO.java, 1.2.2.2, 1.2.2.3 BaseSectioningInfoDAO.java, 1.2.2.2, 1.2.2.3 BaseSponsoringOrganization.java, 1.1.2.1, 1.1.2.2 BasePreferenceDAO.java, 1.2.2.2, 1.2.2.3 BaseSolutionDAO.java, 1.2.2.2, 1.2.2.3 BaseInstrOfferingConfig.java, 1.3.2.2, 1.3.2.3 BaseCourseSubpartCreditDAO.java, 1.2.2.2, 1.2.2.3 BaseStudentGroupDAO.java, 1.2.2.2, 1.2.2.3 BaseAcademicClassificationDAO.java, 1.2.2.2, 1.2.2.3 BaseTimePatternDAO.java, 1.2.2.2, 1.2.2.3 BaseDistributionObject.java, 1.2.2.1, 1.2.2.2 BaseExternalRoomDepartmentDAO.java, 1.2.2.2, 1.2.2.3 BasePosMinor.java, 1.2.2.2, 1.2.2.3 BaseCurriculumCourseGroup.java, 1.1.2.2, 1.1.2.3 BaseCourseCreditTypeDAO.java, 1.2.2.2, 1.2.2.3 BaseIndividualReservationDAO.java, 1.2.2.2, 1.2.2.3 BasePosReservationDAO.java, 1.2.2.2, 1.2.2.3 BaseExamOwnerDAO.java, 1.3.2.2, 1.3.2.3 BaseWaitList.java, 1.2.2.1, 1.2.2.2 BaseVariableFixedCreditUnitConfigDAO.java, 1.2.2.2, 1.2.2.3 BaseEventNote.java, 1.3.2.1, 1.3.2.2 BaseInstrOfferingConfigDAO.java, 1.2.2.2, 1.2.2.3 BaseSessionDAO.java, 1.2.2.2, 1.2.2.3 BaseDatePatternDAO.java, 1.2.2.2, 1.2.2.3 BaseRoomPref.java, 1.2.2.1, 1.2.2.2 BaseFreeTimeDAO.java, 1.2.2.2, 1.2.2.3 BaseTimePatternTime.java, 1.2.2.1, 1.2.2.2 BaseAssignmentInfoDAO.java, 1.2.2.2, 1.2.2.3 BaseCourseRequest.java, 1.2.2.2, 1.2.2.3 BaseStaffDAO.java, 1.2.2.2, 1.2.2.3 BaseDatePattern.java, 1.2.2.2, 1.2.2.3 BaseStudentSectHistoryDAO.java, 1.2.2.2, 1.2.2.3 BaseVariableRangeCreditUnitConfigDAO.java, 1.2.2.2, 1.2.2.3 BaseExternalRoom.java, 1.4.2.3, 1.4.2.4 BaseExamEvent.java, 1.1.2.1, 1.1.2.2 BaseClassWaitList.java, 1.2.2.1, 1.2.2.2 BaseStaff.java, 1.2.2.1, 1.2.2.2 BaseSectioningInfo.java, 1.2.2.1, 1.2.2.2 BaseStudentStatusType.java, 1.2.2.1, 1.2.2.2 BaseTimetableManager.java, 1.2.2.2, 1.2.2.3 BaseDepartmentStatusType.java, 1.2.2.1, 1.2.2.2 BaseMeetingDAO.java, 1.2.2.2, 1.2.2.3 BaseOfferingConsentTypeDAO.java, 1.2.2.2, 1.2.2.3 BaseStudentAccomodationDAO.java, 1.2.2.2, 1.2.2.3 BaseArrangeCreditUnitConfigDAO.java, 1.2.2.2, 1.2.2.3 BaseLastLikeCourseDemandDAO.java, 1.2.2.2, 1.2.2.3 BaseSponsoringOrganizationDAO.java, 1.1.2.2, 1.1.2.3 BaseSchedulingSubpart.java, 1.3.2.2, 1.3.2.3 BaseAcadAreaPosReservationDAO.java, 1.2.2.2, 1.2.2.3 BaseStudentEnrollment.java, 1.2.2.1, 1.2.2.2 BaseEventDAO.java, 1.2.2.2, 1.2.2.3 BaseCurriculumCourse.java, 1.1.2.4, 1.1.2.5 BaseRoomTypeDAO.java, 1.2.2.2, 1.2.2.3 BaseSolverParameterGroup.java, 1.4.2.2, 1.4.2.3 BaseRoomTypeOption.java, 1.1.2.2, 1.1.2.3 BaseRefTableEntry.java, 1.2.2.1, 1.2.2.2 BaseHistoryDAO.java, 1.2.2.2, 1.2.2.3 BaseArrangeCreditUnitConfig.java, 1.2.2.1, 1.2.2.2 BaseSchedulingSubpartDAO.java, 1.2.2.2, 1.2.2.3 BaseReservationType.java, 1.2.2.1, 1.2.2.2 BaseApplicationConfig.java, 1.2.2.1, 1.2.2.2 BaseDepartmentDAO.java, 1.2.2.2, 1.2.2.3 BaseExamOwner.java, 1.3.2.1, 1.3.2.2 BaseGlobalRoomFeature.java, 1.2.2.1, 1.2.2.2 BaseStudentDAO.java, 1.2.2.2, 1.2.2.3 BaseApplicationConfigDAO.java, 1.2.2.2, 1.2.2.3 BaseEvent.java, 1.3.2.2, 1.3.2.3 BasePreferenceGroupDAO.java, 1.2.2.2, 1.2.2.3 BaseDistributionPref.java, 1.3.2.2, 1.3.2.3 BasePosReservation.java, 1.2.2.1, 1.2.2.2 BaseCourseCreditFormat.java, 1.2.2.1, 1.2.2.2 BaseReservationTypeDAO.java, 1.2.2.2, 1.2.2.3 BaseAcademicAreaClassificationDAO.java, 1.2.2.2, 1.2.2.3 BaseBuildingDAO.java, 1.2.2.2, 1.2.2.3 BaseEventNoteDAO.java, 1.2.2.2, 1.2.2.3 BaseManagerRole.java, 1.3.2.1, 1.3.2.2 BaseAcademicArea.java, 1.2.2.2, 1.2.2.3 BaseExamDAO.java, 1.4.2.2, 1.4.2.3 BaseDemandOfferingType.java, 1.2.2.1, 1.2.2.2 BaseCourseCreditFormatDAO.java, 1.2.2.2, 1.2.2.3 BaseManagerRoleDAO.java, 1.2.2.2, 1.2.2.3 BaseStudentGroupReservation.java, 1.2.2.1, 1.2.2.2 BasePosMajor.java, 1.2.2.2, 1.2.2.3 BaseFinalExamEvent.java, 1.1.2.1, 1.1.2.2 BaseFreeTime.java, 1.2.2.1, 1.2.2.2 BaseTimePattern.java, 1.2.2.2, 1.2.2.3 BaseClassWaitListDAO.java, 1.2.2.2, 1.2.2.3 BaseSolverParameterDefDAO.java, 1.2.2.2, 1.2.2.3 BasePosMinorDAO.java, 1.2.2.2, 1.2.2.3 BaseSolverParameter.java, 1.2.2.1, 1.2.2.2 BaseUser.java, 1.2.2.1, 1.2.2.2 BaseStudentGroup.java, 1.2.2.1, 1.2.2.2 BaseSession.java, 1.5.2.2, 1.5.2.3 BaseStudentEnrollmentMessage.java, 1.2.2.1, 1.2.2.2 BaseSubjectHistoryDAO.java, 1.2.2.2, 1.2.2.3 BaseStudentStatusTypeDAO.java, 1.2.2.2, 1.2.2.3 BaseSettingsDAO.java, 1.2.2.2, 1.2.2.3 BaseExamPeriodDAO.java, 1.4.2.2, 1.4.2.3 BaseCourseRequestDAO.java, 1.2.2.2, 1.2.2.3 BaseExamPeriod.java, 1.5.2.1, 1.5.2.2 BaseStudentClassEnrollment.java, 1.3.2.1, 1.3.2.2 BaseQueryLog.java, 1.1.2.1, 1.1.2.2 BaseSolutionInfoDAO.java, 1.2.2.2, 1.2.2.3 BaseExternalBuildingDAO.java, 1.2.2.2, 1.2.2.3 BaseCharacteristicReservation.java, 1.2.2.1, 1.2.2.2 BaseStudentGroupReservationDAO.java, 1.2.2.2, 1.2.2.3 BaseCourseCatalog.java, 1.2.2.2, 1.2.2.3 BaseDistributionTypeDAO.java, 1.2.2.2, 1.2.2.3 BaseCurriculumProjectionRule.java, 1.1.2.2, 1.1.2.3 BaseCurriculumProjectionRuleDAO.java, 1.1.2.3, 1.1.2.4 BaseItypeDesc.java, 1.5.2.1, 1.5.2.2 _BaseRootDAO.java, 1.4.2.5, 1.4.2.6 BaseExternalRoomDAO.java, 1.2.2.2, 1.2.2.3 BaseCourseCreditUnitConfig.java, 1.2.2.1, 1.2.2.2 BaseRoomFeature.java, 1.3.2.2, 1.3.2.3 BaseMidtermExamEvent.java, 1.1.2.1, 1.1.2.2 BaseStandardEventNoteDAO.java, 1.2.2.2, 1.2.2.3 BaseStudentEnrollmentDAO.java, 1.2.2.2, 1.2.2.3 BaseExactTimeMinsDAO.java, 1.2.2.2, 1.2.2.3 BaseReservation.java, 1.2.2.1, 1.2.2.2 BaseClassInstructorDAO.java, 1.2.2.2, 1.2.2.3 BasePositionCodeTypeDAO.java, 1.2.2.2, 1.2.2.3 BaseUserDataDAO.java, 1.2.2.2, 1.2.2.3 BaseExamLocationPrefDAO.java, 1.2.2.2, 1.2.2.3 BaseExamPeriodPref.java, 1.3.2.1, 1.3.2.2 BaseStudentSectioningQueue.java, 1.1.2.1, 1.1.2.2 BaseVariableFixedCreditUnitConfig.java, 1.2.2.1, 1.2.2.2 BaseCourseCatalogDAO.java, 1.2.2.2, 1.2.2.3 BasePreferenceLevel.java, 1.2.2.1, 1.2.2.2 BaseGlobalRoomFeatureDAO.java, 1.2.2.2, 1.2.2.3 BaseClass_DAO.java, 1.4.2.2, 1.4.2.3 BaseRoomFeaturePrefDAO.java, 1.2.2.2, 1.2.2.3 BaseRoomGroup.java, 1.3.2.2, 1.3.2.3 BasePosMajorDAO.java, 1.2.2.2, 1.2.2.3 BaseNonUniversityLocation.java, 1.4.2.1, 1.4.2.2 BaseCurriculum.java, 1.2.2.3, 1.2.2.4 BaseManagerSettingsDAO.java, 1.2.2.2, 1.2.2.3 BaseEventContact.java, 1.3.2.1, 1.3.2.2 BaseCourseCreditUnitType.java, 1.2.2.1, 1.2.2.2 BaseFixedCreditUnitConfig.java, 1.2.2.1, 1.2.2.2 BaseTimePatternDays.java, 1.2.2.1, 1.2.2.2 BaseCourseRequestOption.java, 1.2.2.1, 1.2.2.2 BaseSubjectArea.java, 1.2.2.2, 1.2.2.3 BasePreferenceLevelDAO.java, 1.2.2.2, 1.2.2.3 BaseChangeLogDAO.java, 1.2.2.2, 1.2.2.3 BaseExternalRoomDepartment.java, 1.2.2.1, 1.2.2.2 BaseSolverGroupDAO.java, 1.2.2.2, 1.2.2.3 BaseJointEnrollmentDAO.java, 1.2.2.2, 1.2.2.3 BaseAssignment.java, 1.4.2.2, 1.4.2.3 BaseCurriculumCourseDAO.java, 1.1.2.2, 1.1.2.3 BaseRoom.java, 1.4.2.1, 1.4.2.2 BaseRelatedCourseInfo.java, 1.3.2.1, 1.3.2.2 BaseSolverInfoDAO.java, 1.2.2.2, 1.2.2.3 BaseClassEventDAO.java, 1.1.2.2, 1.1.2.3 BaseManagerSettings.java, 1.2.2.1, 1.2.2.2 BaseAcadAreaReservation.java, 1.2.2.1, 1.2.2.2 BaseCourseSubpartCredit.java, 1.2.2.1, 1.2.2.2 BaseIndividualReservation.java, 1.2.2.1, 1.2.2.2 BaseUserData.java, 1.2.2.2, 1.2.2.3 BaseConstraintInfoDAO.java, 1.2.2.2, 1.2.2.3 BasePreferenceGroup.java, 1.3.2.2, 1.3.2.3 BaseRoomType.java, 1.3.2.1, 1.3.2.2 BaseRoomTypeOptionDAO.java, 1.1.2.2, 1.1.2.3 BaseOfferingConsentType.java, 1.2.2.1, 1.2.2.2 BaseStudent.java, 1.2.2.2, 1.2.2.3 BaseMeeting.java, 1.3.2.1, 1.3.2.2 BaseCourseOfferingReservationDAO.java, 1.2.2.2, 1.2.2.3 BaseLocationDAO.java, 1.3.2.2, 1.3.2.3 BaseCourseOfferingReservation.java, 1.2.2.1, 1.2.2.2 BaseRoomGroupDAO.java, 1.2.2.2, 1.2.2.3 BaseQueryLogDAO.java, 1.1.2.1, 1.1.2.2 BaseVariableRangeCreditUnitConfig.java, 1.2.2.1, 1.2.2.2 BaseTimePatternDaysDAO.java, 1.2.2.2, 1.2.2.3 BaseSolverParameterGroupDAO.java, 1.2.2.2, 1.2.2.3 BaseInstructionalOfferingDAO.java, 1.4.2.2, 1.4.2.3 BaseCurriculumClassification.java, 1.2.2.4, 1.2.2.5 BaseRoomGroupPref.java, 1.2.2.1, 1.2.2.2 BaseSolverInfoDefDAO.java, 1.2.2.2, 1.2.2.3 BaseSolverParameterDef.java, 1.2.2.1, 1.2.2.2 BaseTimePatternTimeDAO.java, 1.2.2.2, 1.2.2.3 BaseCourseDemand.java, 1.2.2.2, 1.2.2.3 BaseStudentClassEnrollmentDAO.java, 1.2.2.2, 1.2.2.3 BaseRoomDept.java, 1.2.2.1, 1.2.2.2 BaseCourseCreditUnitTypeDAO.java, 1.2.2.2, 1.2.2.3 BaseDistributionPrefDAO.java, 1.2.2.2, 1.2.2.3 BaseRoomFeatureDAO.java, 1.2.2.2, 1.2.2.3 BaseItypeDescDAO.java, 1.2.2.2, 1.2.2.3 BaseStudentSectHistory.java, 1.2.2.1, 1.2.2.2 BaseDepartmentRoomFeature.java, 1.2.2.1, 1.2.2.2 BaseAcademicAreaHistory.java, 1.2.2.1, 1.2.2.2 BaseClass_.java, 1.7.2.2, 1.7.2.3 BaseLastLikeCourseDemand.java, 1.2.2.1, 1.2.2.2 BaseDesignatorDAO.java, 1.2.2.2, 1.2.2.3 BaseNonUniversityLocationDAO.java, 1.2.2.2, 1.2.2.3 BaseCourseDemandDAO.java, 1.2.2.2, 1.2.2.3 BaseDepartmentStatusTypeDAO.java, 1.2.2.2, 1.2.2.3 BaseRoomDeptDAO.java, 1.2.2.2, 1.2.2.3 BaseCharacteristicReservationDAO.java, 1.2.2.2, 1.2.2.3 BaseSolverInfoDef.java, 1.2.2.1, 1.2.2.2 BasePositionTypeDAO.java, 1.2.2.2, 1.2.2.3 BaseExam.java, 1.10.2.2, 1.10.2.3 BaseDemandOfferingTypeDAO.java, 1.2.2.2, 1.2.2.3 BaseExamConflictDAO.java, 1.3.2.2, 1.3.2.3 BaseCourseOfferingDAO.java, 1.3.2.2, 1.3.2.3 BaseWaitListDAO.java, 1.2.2.2, 1.2.2.3 BaseLocation.java, 1.5.2.3, 1.5.2.4 BaseDistributionObjectDAO.java, 1.2.2.2, 1.2.2.3 BaseCourseRequestOptionDAO.java, 1.2.2.2, 1.2.2.3 BaseSpecialEventDAO.java, 1.1.2.2, 1.1.2.3 BaseReservationDAO.java, 1.2.2.2, 1.2.2.3 BaseStudentAccomodation.java, 1.2.2.1, 1.2.2.2 BaseExternalRoomFeature.java, 1.2.2.1, 1.2.2.2 BaseCurriculumDAO.java, 1.1.2.2, 1.1.2.3 BaseSpecialEvent.java, 1.1.2.1, 1.1.2.2 BaseCourseCreditType.java, 1.2.2.1, 1.2.2.2 BaseRoles.java, 1.2.2.1, 1.2.2.2 BaseSolutionInfo.java, 1.2.2.1, 1.2.2.2 BaseClassInstructor.java, 1.2.2.1, 1.2.2.2 BasePreference.java, 1.2.2.1, 1.2.2.2

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

Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9885/JavaSource/org/unitime/timetable/model/base

Modified Files:
      Tag: dev_curriculum
	BaseCourseHistory.java BaseSolverGroup.java 
	BaseCourseOffering.java BaseAcademicAreaHistoryDAO.java 
	BaseDepartmentalInstructor.java BaseStandardEventNote.java 
	BaseSolverPredefinedSettingDAO.java BaseTimePrefDAO.java 
	BaseCurriculumCourseGroupDAO.java 
	BaseAcademicClassification.java BasePositionCodeType.java 
	BaseDepartmentalInstructorDAO.java BaseConstraintInfo.java 
	BaseRoomDAO.java BaseAcademicAreaDAO.java 
	BaseBuildingAbbreviationHistory.java 
	BaseStudentEnrollmentMessageDAO.java BaseChangeLog.java 
	BaseExamEventDAO.java BaseUserDAO.java BaseAssignmentInfo.java 
	BaseCourseCreditUnitConfigDAO.java BaseBuildingPref.java 
	BaseJointEnrollment.java BaseExamPeriodPrefDAO.java 
	BaseExternalRoomFeatureDAO.java BaseRoomPrefDAO.java 
	BaseClassEvent.java BaseRolesDAO.java BaseExactTimeMins.java 
	BaseEventContactDAO.java BaseStudentSectioningQueueDAO.java 
	BasePositionType.java BaseTimePref.java 
	BaseAcademicAreaClassification.java 
	BaseDepartmentRoomFeatureDAO.java BaseHistory.java 
	BaseRoomFeaturePref.java BaseDesignator.java 
	BaseRelatedCourseInfoDAO.java 
	BaseBuildingAbbreviationHistoryDAO.java 
	BaseCourseEventDAO.java BaseRoomGroupPrefDAO.java 
	BaseMidtermExamEventDAO.java BaseExternalBuilding.java 
	BaseSolverInfo.java BaseFixedCreditUnitConfigDAO.java 
	BaseInstructionalOffering.java BaseSubjectAreaDAO.java 
	BaseDistributionType.java BaseSolution.java 
	BaseCourseEvent.java BaseCurriculumClassificationDAO.java 
	BaseAcadAreaPosReservation.java BaseFinalExamEventDAO.java 
	BaseBuilding.java BaseRefTableEntryDAO.java 
	BaseTimetableManagerDAO.java BaseAssignmentDAO.java 
	BaseExamLocationPref.java BaseExamConflict.java 
	BaseSettings.java BaseBuildingPrefDAO.java 
	BaseSolverParameterDAO.java BaseAcadAreaReservationDAO.java 
	BaseSolverPredefinedSetting.java BaseDepartment.java 
	BaseSubjectHistory.java BaseCourseHistoryDAO.java 
	BaseSectioningInfoDAO.java BaseSponsoringOrganization.java 
	BasePreferenceDAO.java BaseSolutionDAO.java 
	BaseInstrOfferingConfig.java BaseCourseSubpartCreditDAO.java 
	BaseStudentGroupDAO.java BaseAcademicClassificationDAO.java 
	BaseTimePatternDAO.java BaseDistributionObject.java 
	BaseExternalRoomDepartmentDAO.java BasePosMinor.java 
	BaseCurriculumCourseGroup.java BaseCourseCreditTypeDAO.java 
	BaseIndividualReservationDAO.java BasePosReservationDAO.java 
	BaseExamOwnerDAO.java BaseWaitList.java 
	BaseVariableFixedCreditUnitConfigDAO.java BaseEventNote.java 
	BaseInstrOfferingConfigDAO.java BaseSessionDAO.java 
	BaseDatePatternDAO.java BaseRoomPref.java BaseFreeTimeDAO.java 
	BaseTimePatternTime.java BaseAssignmentInfoDAO.java 
	BaseCourseRequest.java BaseStaffDAO.java BaseDatePattern.java 
	BaseStudentSectHistoryDAO.java 
	BaseVariableRangeCreditUnitConfigDAO.java 
	BaseExternalRoom.java BaseExamEvent.java 
	BaseClassWaitList.java BaseStaff.java BaseSectioningInfo.java 
	BaseStudentStatusType.java BaseTimetableManager.java 
	BaseDepartmentStatusType.java BaseMeetingDAO.java 
	BaseOfferingConsentTypeDAO.java 
	BaseStudentAccomodationDAO.java 
	BaseArrangeCreditUnitConfigDAO.java 
	BaseLastLikeCourseDemandDAO.java 
	BaseSponsoringOrganizationDAO.java BaseSchedulingSubpart.java 
	BaseAcadAreaPosReservationDAO.java BaseStudentEnrollment.java 
	BaseEventDAO.java BaseCurriculumCourse.java 
	BaseRoomTypeDAO.java BaseSolverParameterGroup.java 
	BaseRoomTypeOption.java BaseRefTableEntry.java 
	BaseHistoryDAO.java BaseArrangeCreditUnitConfig.java 
	BaseSchedulingSubpartDAO.java BaseReservationType.java 
	BaseApplicationConfig.java BaseDepartmentDAO.java 
	BaseExamOwner.java BaseGlobalRoomFeature.java 
	BaseStudentDAO.java BaseApplicationConfigDAO.java 
	BaseEvent.java BasePreferenceGroupDAO.java 
	BaseDistributionPref.java BasePosReservation.java 
	BaseCourseCreditFormat.java BaseReservationTypeDAO.java 
	BaseAcademicAreaClassificationDAO.java BaseBuildingDAO.java 
	BaseEventNoteDAO.java BaseManagerRole.java 
	BaseAcademicArea.java BaseExamDAO.java 
	BaseDemandOfferingType.java BaseCourseCreditFormatDAO.java 
	BaseManagerRoleDAO.java BaseStudentGroupReservation.java 
	BasePosMajor.java BaseFinalExamEvent.java BaseFreeTime.java 
	BaseTimePattern.java BaseClassWaitListDAO.java 
	BaseSolverParameterDefDAO.java BasePosMinorDAO.java 
	BaseSolverParameter.java BaseUser.java BaseStudentGroup.java 
	BaseSession.java BaseStudentEnrollmentMessage.java 
	BaseSubjectHistoryDAO.java BaseStudentStatusTypeDAO.java 
	BaseSettingsDAO.java BaseExamPeriodDAO.java 
	BaseCourseRequestDAO.java BaseExamPeriod.java 
	BaseStudentClassEnrollment.java BaseQueryLog.java 
	BaseSolutionInfoDAO.java BaseExternalBuildingDAO.java 
	BaseCharacteristicReservation.java 
	BaseStudentGroupReservationDAO.java BaseCourseCatalog.java 
	BaseDistributionTypeDAO.java BaseCurriculumProjectionRule.java 
	BaseCurriculumProjectionRuleDAO.java BaseItypeDesc.java 
	_BaseRootDAO.java BaseExternalRoomDAO.java 
	BaseCourseCreditUnitConfig.java BaseRoomFeature.java 
	BaseMidtermExamEvent.java BaseStandardEventNoteDAO.java 
	BaseStudentEnrollmentDAO.java BaseExactTimeMinsDAO.java 
	BaseReservation.java BaseClassInstructorDAO.java 
	BasePositionCodeTypeDAO.java BaseUserDataDAO.java 
	BaseExamLocationPrefDAO.java BaseExamPeriodPref.java 
	BaseStudentSectioningQueue.java 
	BaseVariableFixedCreditUnitConfig.java 
	BaseCourseCatalogDAO.java BasePreferenceLevel.java 
	BaseGlobalRoomFeatureDAO.java BaseClass_DAO.java 
	BaseRoomFeaturePrefDAO.java BaseRoomGroup.java 
	BasePosMajorDAO.java BaseNonUniversityLocation.java 
	BaseCurriculum.java BaseManagerSettingsDAO.java 
	BaseEventContact.java BaseCourseCreditUnitType.java 
	BaseFixedCreditUnitConfig.java BaseTimePatternDays.java 
	BaseCourseRequestOption.java BaseSubjectArea.java 
	BasePreferenceLevelDAO.java BaseChangeLogDAO.java 
	BaseExternalRoomDepartment.java BaseSolverGroupDAO.java 
	BaseJointEnrollmentDAO.java BaseAssignment.java 
	BaseCurriculumCourseDAO.java BaseRoom.java 
	BaseRelatedCourseInfo.java BaseSolverInfoDAO.java 
	BaseClassEventDAO.java BaseManagerSettings.java 
	BaseAcadAreaReservation.java BaseCourseSubpartCredit.java 
	BaseIndividualReservation.java BaseUserData.java 
	BaseConstraintInfoDAO.java BasePreferenceGroup.java 
	BaseRoomType.java BaseRoomTypeOptionDAO.java 
	BaseOfferingConsentType.java BaseStudent.java BaseMeeting.java 
	BaseCourseOfferingReservationDAO.java BaseLocationDAO.java 
	BaseCourseOfferingReservation.java BaseRoomGroupDAO.java 
	BaseQueryLogDAO.java BaseVariableRangeCreditUnitConfig.java 
	BaseTimePatternDaysDAO.java BaseSolverParameterGroupDAO.java 
	BaseInstructionalOfferingDAO.java 
	BaseCurriculumClassification.java BaseRoomGroupPref.java 
	BaseSolverInfoDefDAO.java BaseSolverParameterDef.java 
	BaseTimePatternTimeDAO.java BaseCourseDemand.java 
	BaseStudentClassEnrollmentDAO.java BaseRoomDept.java 
	BaseCourseCreditUnitTypeDAO.java BaseDistributionPrefDAO.java 
	BaseRoomFeatureDAO.java BaseItypeDescDAO.java 
	BaseStudentSectHistory.java BaseDepartmentRoomFeature.java 
	BaseAcademicAreaHistory.java BaseClass_.java 
	BaseLastLikeCourseDemand.java BaseDesignatorDAO.java 
	BaseNonUniversityLocationDAO.java BaseCourseDemandDAO.java 
	BaseDepartmentStatusTypeDAO.java BaseRoomDeptDAO.java 
	BaseCharacteristicReservationDAO.java BaseSolverInfoDef.java 
	BasePositionTypeDAO.java BaseExam.java 
	BaseDemandOfferingTypeDAO.java BaseExamConflictDAO.java 
	BaseCourseOfferingDAO.java BaseWaitListDAO.java 
	BaseLocation.java BaseDistributionObjectDAO.java 
	BaseCourseRequestOptionDAO.java BaseSpecialEventDAO.java 
	BaseReservationDAO.java BaseStudentAccomodation.java 
	BaseExternalRoomFeature.java BaseCurriculumDAO.java 
	BaseSpecialEvent.java BaseCourseCreditType.java BaseRoles.java 
	BaseSolutionInfo.java BaseClassInstructor.java 
	BasePreference.java 
Log Message:
License changed to GNU GPL version 3 (was version 2).

Index: BaseSession.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseSession.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -d -r1.5.2.2 -r1.5.2.3
*** BaseSession.java	18 Aug 2010 13:56:16 -0000	1.5.2.2
--- BaseSession.java	9 Nov 2010 12:25:46 -0000	1.5.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseReservation.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseReservation.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** BaseReservation.java	6 Jul 2010 20:32:19 -0000	1.2.2.1
--- BaseReservation.java	9 Nov 2010 12:25:46 -0000	1.2.2.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BasePositionTypeDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BasePositionTypeDAO.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** BasePositionTypeDAO.java	18 Aug 2010 13:56:16 -0000	1.2.2.2
--- BasePositionTypeDAO.java	9 Nov 2010 12:25:47 -0000	1.2.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseSolverInfoDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseSolverInfoDAO.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** BaseSolverInfoDAO.java	18 Aug 2010 13:56:17 -0000	1.2.2.2
--- BaseSolverInfoDAO.java	9 Nov 2010 12:25:47 -0000	1.2.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseRelatedCourseInfo.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseRelatedCourseInfo.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** BaseRelatedCourseInfo.java	6 Jul 2010 20:32:19 -0000	1.3.2.1
--- BaseRelatedCourseInfo.java	9 Nov 2010 12:25:47 -0000	1.3.2.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseCourseRequestDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseCourseRequestDAO.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** BaseCourseRequestDAO.java	18 Aug 2010 13:56:16 -0000	1.2.2.2
--- BaseCourseRequestDAO.java	9 Nov 2010 12:25:46 -0000	1.2.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseExam.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseExam.java,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -C2 -d -r1.10.2.2 -r1.10.2.3
*** BaseExam.java	18 Aug 2010 13:56:16 -0000	1.10.2.2
--- BaseExam.java	9 Nov 2010 12:25:47 -0000	1.10.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseExactTimeMins.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseExactTimeMins.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** BaseExactTimeMins.java	6 Jul 2010 20:32:19 -0000	1.2.2.1
--- BaseExactTimeMins.java	9 Nov 2010 12:25:46 -0000	1.2.2.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseIndividualReservation.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseIndividualReservation.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** BaseIndividualReservation.java	6 Jul 2010 20:32:19 -0000	1.2.2.1
--- BaseIndividualReservation.java	9 Nov 2010 12:25:47 -0000	1.2.2.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseClassEvent.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseClassEvent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** BaseClassEvent.java	6 Jul 2010 20:32:19 -0000	1.1.2.1
--- BaseClassEvent.java	9 Nov 2010 12:25:46 -0000	1.1.2.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseDesignator.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseDesignator.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** BaseDesignator.java	6 Jul 2010 20:32:19 -0000	1.2.2.1
--- BaseDesignator.java	9 Nov 2010 12:25:46 -0000	1.2.2.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BasePosReservation.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BasePosReservation.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** BasePosReservation.java	6 Jul 2010 20:32:19 -0000	1.2.2.1
--- BasePosReservation.java	9 Nov 2010 12:25:46 -0000	1.2.2.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseDepartmentRoomFeatureDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseDepartmentRoomFeatureDAO.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** BaseDepartmentRoomFeatureDAO.java	18 Aug 2010 13:56:16 -0000	1.2.2.2
--- BaseDepartmentRoomFeatureDAO.java	9 Nov 2010 12:25:46 -0000	1.2.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseReservationDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseReservationDAO.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** BaseReservationDAO.java	18 Aug 2010 13:56:16 -0000	1.2.2.2
--- BaseReservationDAO.java	9 Nov 2010 12:25:47 -0000	1.2.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseCourseCatalog.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseCourseCatalog.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** BaseCourseCatalog.java	18 Aug 2010 13:56:16 -0000	1.2.2.2
--- BaseCourseCatalog.java	9 Nov 2010 12:25:46 -0000	1.2.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseCurriculumDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseCurriculumDAO.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** BaseCurriculumDAO.java	18 Aug 2010 13:56:16 -0000	1.1.2.2
--- BaseCurriculumDAO.java	9 Nov 2010 12:25:47 -0000	1.1.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseAssignmentInfo.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseAssignmentInfo.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** BaseAssignmentInfo.java	6 Jul 2010 20:32:19 -0000	1.2.2.1
--- BaseAssignmentInfo.java	9 Nov 2010 12:25:46 -0000	1.2.2.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseSolutionInfoDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseSolutionInfoDAO.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** BaseSolutionInfoDAO.java	18 Aug 2010 13:56:16 -0000	1.2.2.2
--- BaseSolutionInfoDAO.java	9 Nov 2010 12:25:46 -0000	1.2.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseAcademicClassificationDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseAcademicClassificationDAO.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** BaseAcademicClassificationDAO.java	18 Aug 2010 13:56:16 -0000	1.2.2.2
--- BaseAcademicClassificationDAO.java	9 Nov 2010 12:25:46 -0000	1.2.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseQueryLogDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/Attic/BaseQueryLogDAO.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** BaseQueryLogDAO.java	8 Nov 2010 18:47:24 -0000	1.1.2.1
--- BaseQueryLogDAO.java	9 Nov 2010 12:25:47 -0000	1.1.2.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseSolverInfoDefDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseSolverInfoDefDAO.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** BaseSolverInfoDefDAO.java	18 Aug 2010 13:56:16 -0000	1.2.2.2
--- BaseSolverInfoDefDAO.java	9 Nov 2010 12:25:47 -0000	1.2.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseDepartmentDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseDepartmentDAO.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** BaseDepartmentDAO.java	18 Aug 2010 13:56:16 -0000	1.2.2.2
--- BaseDepartmentDAO.java	9 Nov 2010 12:25:46 -0000	1.2.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseCourseCreditFormat.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseCourseCreditFormat.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** BaseCourseCreditFormat.java	6 Jul 2010 20:32:19 -0000	1.2.2.1
--- BaseCourseCreditFormat.java	9 Nov 2010 12:25:46 -0000	1.2.2.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseOfferingConsentTypeDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseOfferingConsentTypeDAO.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** BaseOfferingConsentTypeDAO.java	18 Aug 2010 13:56:16 -0000	1.2.2.2
--- BaseOfferingConsentTypeDAO.java	9 Nov 2010 12:25:46 -0000	1.2.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseInstructionalOffering.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseInstructionalOffering.java,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -C2 -d -r1.5.2.3 -r1.5.2.4
*** BaseInstructionalOffering.java	18 Aug 2010 13:56:16 -0000	1.5.2.3
--- BaseInstructionalOffering.java	9 Nov 2010 12:25:46 -0000	1.5.2.4
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseCharacteristicReservation.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseCharacteristicReservation.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** BaseCharacteristicReservation.java	6 Jul 2010 20:32:19 -0000	1.2.2.1
--- BaseCharacteristicReservation.java	9 Nov 2010 12:25:46 -0000	1.2.2.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseNonUniversityLocation.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseNonUniversityLocation.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -d -r1.4.2.1 -r1.4.2.2
*** BaseNonUniversityLocation.java	6 Jul 2010 20:32:19 -0000	1.4.2.1
--- BaseNonUniversityLocation.java	9 Nov 2010 12:25:46 -0000	1.4.2.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseExternalBuildingDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseExternalBuildingDAO.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** BaseExternalBuildingDAO.java	18 Aug 2010 13:56:16 -0000	1.2.2.2
--- BaseExternalBuildingDAO.java	9 Nov 2010 12:25:46 -0000	1.2.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseCourseDemand.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseCourseDemand.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** BaseCourseDemand.java	18 Aug 2010 13:56:16 -0000	1.2.2.2
--- BaseCourseDemand.java	9 Nov 2010 12:25:47 -0000	1.2.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseReservationType.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseReservationType.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** BaseReservationType.java	6 Jul 2010 20:32:19 -0000	1.2.2.1
--- BaseReservationType.java	9 Nov 2010 12:25:46 -0000	1.2.2.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseCourseHistory.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseCourseHistory.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** BaseCourseHistory.java	6 Jul 2010 20:32:19 -0000	1.2.2.1
--- BaseCourseHistory.java	9 Nov 2010 12:25:46 -0000	1.2.2.2
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseRoomGroup.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseRoomGroup.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -d -r1.3.2.2 -r1.3.2.3
*** BaseRoomGroup.java	18 Aug 2010 13:56:16 -0000	1.3.2.2
--- BaseRoomGroup.java	9 Nov 2010 12:25:46 -0000	1.3.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseClassEventDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseClassEventDAO.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** BaseClassEventDAO.java	18 Aug 2010 13:56:17 -0000	1.1.2.2
--- BaseClassEventDAO.java	9 Nov 2010 12:25:47 -0000	1.1.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseCourseCreditUnitConfigDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/BaseCourseCreditUnitConfigDAO.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** BaseCourseCreditUnitConfigDAO.java	18 Aug 2010 13:56:16 -0000	1.2.2.2
--- BaseCourseCreditUnitConfigDAO.java	9 Nov 2010 12:25:46 -0000	1.2.2.3
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
   * 
--- 6,10 ----
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 3 of the License, or
   * (at your option) any later version.
   * 
***************
*** 15,20 ****
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program; if not, write to the Free Software Foundation, Inc.,
!  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
  package org.unitime.timetable.model.base;
--- 15,20 ----
   * 
   * You should have received a copy of the GNU General Public License along
!  * with this program.  If not, see <http://www.gnu.org/licenses/>.
!  * 
  */
  package org.unitime.timetable.model.base;

Index: BaseCurriculumCourseGroupDAO.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/base/Attic/BaseCurriculumCourseGroupDAO.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** BaseCurriculumCourseGroupDAO.java	18 Aug 2010 13:56:16 -0000	1.1.2.3
--- BaseCurriculumCourseGroupDAO.java	9 Nov 2010 12:25:46 -0000	1.1.2.4
***************
*** 6,10 ****
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
   * (at your option) any later version.
...
 
[truncated message content]