[jboss-svn-commits] JBL Code SVN: r33199 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering: domain/contract and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun May 30 08:40:22 EDT 2010
Author: ge0ffrey
Date: 2010-05-30 08:40:21 -0400 (Sun, 30 May 2010)
New Revision: 33199
Removed:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/PatternEntry.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/PatternEntryPropertyWildcard.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/PatternEntryOccurrence.java
Modified:
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/contract/PatternContractLine.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/persistence/NurseRosteringSolutionImporter.java
Log:
remove dead code
Deleted: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/PatternEntry.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/PatternEntry.java 2010-05-30 12:38:19 UTC (rev 33198)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/PatternEntry.java 2010-05-30 12:40:21 UTC (rev 33199)
@@ -1,82 +0,0 @@
-package org.drools.planner.examples.nurserostering.domain;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.apache.commons.lang.builder.CompareToBuilder;
-import org.drools.planner.examples.common.domain.AbstractPersistable;
-
-/**
- * @author Geoffrey De Smet
- */
- at XStreamAlias("PatternEntry")
-public class PatternEntry extends AbstractPersistable implements Comparable<PatternEntry> {
-
- private Pattern pattern;
- private int entryIndex;
-
- private PatternEntryPropertyWildcard shiftTypeWildcard;
- private ShiftType shiftType;
- private PatternEntryPropertyWildcard dayOfWeekWildcard;
- private DayOfWeek dayOfWeek;
-
- public Pattern getPattern() {
- return pattern;
- }
-
- public void setPattern(Pattern pattern) {
- this.pattern = pattern;
- }
-
- public int getEntryIndex() {
- return entryIndex;
- }
-
- public void setEntryIndex(int entryIndex) {
- this.entryIndex = entryIndex;
- }
-
- public PatternEntryPropertyWildcard getShiftTypeWildcard() {
- return shiftTypeWildcard;
- }
-
- public void setShiftTypeWildcard(PatternEntryPropertyWildcard shiftTypeWildcard) {
- this.shiftTypeWildcard = shiftTypeWildcard;
- }
-
- public ShiftType getShiftType() {
- return shiftType;
- }
-
- public void setShiftType(ShiftType shiftType) {
- this.shiftType = shiftType;
- }
-
- public PatternEntryPropertyWildcard getDayOfWeekWildcard() {
- return dayOfWeekWildcard;
- }
-
- public void setDayOfWeekWildcard(PatternEntryPropertyWildcard dayOfWeekWildcard) {
- this.dayOfWeekWildcard = dayOfWeekWildcard;
- }
-
- public DayOfWeek getDayOfWeek() {
- return dayOfWeek;
- }
-
- public void setDayOfWeek(DayOfWeek dayOfWeek) {
- this.dayOfWeek = dayOfWeek;
- }
-
- public int compareTo(PatternEntry other) {
- return new CompareToBuilder()
- .append(id, other.id)
- .toComparison();
- }
-
- @Override
- public String toString() {
- return pattern.getCode() + "-" + entryIndex + ": "
- + (shiftTypeWildcard == PatternEntryPropertyWildcard.SPECIFIC ? shiftType : shiftTypeWildcard) + " on "
- + (dayOfWeekWildcard == PatternEntryPropertyWildcard.SPECIFIC ? dayOfWeek : dayOfWeekWildcard);
- }
-
-}
Deleted: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/PatternEntryPropertyWildcard.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/PatternEntryPropertyWildcard.java 2010-05-30 12:38:19 UTC (rev 33198)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/PatternEntryPropertyWildcard.java 2010-05-30 12:40:21 UTC (rev 33199)
@@ -1,11 +0,0 @@
-package org.drools.planner.examples.nurserostering.domain;
-
-/**
- * @author Geoffrey De Smet
- */
-public enum PatternEntryPropertyWildcard {
- NONE,
- SPECIFIC,
- ANY;
-
-}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/contract/PatternContractLine.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/contract/PatternContractLine.java 2010-05-30 12:38:19 UTC (rev 33198)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/contract/PatternContractLine.java 2010-05-30 12:40:21 UTC (rev 33199)
@@ -3,10 +3,7 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.commons.lang.builder.CompareToBuilder;
import org.drools.planner.examples.common.domain.AbstractPersistable;
-import org.drools.planner.examples.nurserostering.domain.DayOfWeek;
import org.drools.planner.examples.nurserostering.domain.Pattern;
-import org.drools.planner.examples.nurserostering.domain.PatternEntryPropertyWildcard;
-import org.drools.planner.examples.nurserostering.domain.ShiftType;
/**
* @author Geoffrey De Smet
Deleted: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/PatternEntryOccurrence.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/PatternEntryOccurrence.java 2010-05-30 12:38:19 UTC (rev 33198)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/domain/solver/PatternEntryOccurrence.java 2010-05-30 12:40:21 UTC (rev 33199)
@@ -1,100 +0,0 @@
-package org.drools.planner.examples.nurserostering.domain.solver;
-
-import java.io.Serializable;
-
-import org.apache.commons.lang.builder.CompareToBuilder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.drools.planner.examples.nurserostering.domain.Employee;
-import org.drools.planner.examples.nurserostering.domain.Pattern;
-import org.drools.planner.examples.nurserostering.domain.PatternEntry;
-import org.drools.planner.examples.nurserostering.domain.ShiftDate;
-
-/**
- * @author Geoffrey De Smet
- */
-public class PatternEntryOccurrence implements Comparable<PatternEntryOccurrence>, Serializable {
-
- private PatternEntry patternEntry;
- private Employee employee;
- private ShiftDate shiftDate;
-
- public PatternEntryOccurrence(PatternEntry patternEntry, Employee employee, ShiftDate shiftDate) {
- this.patternEntry = patternEntry;
- this.employee = employee;
- this.shiftDate = shiftDate;
- }
-
- public PatternEntry getPatternEntry() {
- return patternEntry;
- }
-
- public void setPatternEntry(PatternEntry patternEntry) {
- this.patternEntry = patternEntry;
- }
-
- public Employee getEmployee() {
- return employee;
- }
-
- public void setEmployee(Employee employee) {
- this.employee = employee;
- }
-
- public ShiftDate getShiftDate() {
- return shiftDate;
- }
-
- public void setShiftDate(ShiftDate shiftDate) {
- this.shiftDate = shiftDate;
- }
-
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- } else if (o instanceof PatternEntryOccurrence) {
- PatternEntryOccurrence other = (PatternEntryOccurrence) o;
- return new EqualsBuilder()
- .append(patternEntry, other.patternEntry)
- .append(employee, other.employee)
- .append(shiftDate, other.shiftDate)
- .isEquals();
- } else {
- return false;
- }
- }
-
- public int hashCode() {
- return new HashCodeBuilder()
- .append(patternEntry)
- .append(employee)
- .append(shiftDate)
- .toHashCode();
- }
-
- public int compareTo(PatternEntryOccurrence other) {
- return new CompareToBuilder()
- .append(patternEntry, other.patternEntry)
- .append(employee, other.employee)
- .append(shiftDate, other.shiftDate)
- .toComparison();
- }
-
- @Override
- public String toString() {
- return patternEntry + " for " + employee + " on " + shiftDate;
- }
-
- public Pattern getPattern() {
- return patternEntry.getPattern();
- }
-
- public int getEntryIndex() {
- return patternEntry.getEntryIndex();
- }
-
- public int getDayIndex() {
- return shiftDate.getDayIndex();
- }
-
-}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/persistence/NurseRosteringSolutionImporter.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/persistence/NurseRosteringSolutionImporter.java 2010-05-30 12:38:19 UTC (rev 33198)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/persistence/NurseRosteringSolutionImporter.java 2010-05-30 12:40:21 UTC (rev 33199)
@@ -21,7 +21,6 @@
import org.drools.planner.examples.nurserostering.domain.FreeBeforeWorkSequencePattern;
import org.drools.planner.examples.nurserostering.domain.NurseRoster;
import org.drools.planner.examples.nurserostering.domain.Pattern;
-import org.drools.planner.examples.nurserostering.domain.PatternEntry;
import org.drools.planner.examples.nurserostering.domain.Shift;
import org.drools.planner.examples.nurserostering.domain.ShiftDate;
import org.drools.planner.examples.nurserostering.domain.ShiftType;
@@ -299,16 +298,13 @@
private void readPatternList(NurseRoster nurseRoster, Element patternsElement) throws JDOMException {
List<Pattern> patternList;
- List<PatternEntry> patternEntryList;
if (patternsElement == null) {
patternList = Collections.emptyList();
- patternEntryList = Collections.emptyList();
} else {
List<Element> patternElementList = (List<Element>) patternsElement.getChildren();
patternList = new ArrayList<Pattern>(patternElementList.size());
patternMap = new HashMap<String, Pattern>(patternElementList.size());
long id = 0L;
- patternEntryList = new ArrayList<PatternEntry>(patternElementList.size() * 3);
long patternEntryId = 0L;
for (Element element : patternElementList) {
assertElementName(element, "Pattern");
More information about the jboss-svn-commits
mailing list