diff --git a/com.patrikdufresne.planimod-installation-package/pom.xml b/com.patrikdufresne.planimod-installation-package/pom.xml index 590afe9791688c310a2776a0c71a8003c02e6bb1..61fc9c88e80aabaab11d3aabb34e759b5843cc60 100644 --- a/com.patrikdufresne.planimod-installation-package/pom.xml +++ b/com.patrikdufresne.planimod-installation-package/pom.xml @@ -62,7 +62,7 @@ - org.eclipse.swt + org.eclipse.platform org.eclipse.swt.win32.win32.x86 @@ -78,7 +78,7 @@ - org.eclipse.swt + org.eclipse.platform org.eclipse.swt.win32.win32.x86_64 diff --git a/com.patrikdufresne.planimod-installation-package/src/main/assembly/linux-package.xml b/com.patrikdufresne.planimod-installation-package/src/main/assembly/linux-package.xml index e40c9a944953f96087e8b12950060ef48e06c05a..e4322bebcf8d39535eac53a784547da013610512 100644 --- a/com.patrikdufresne.planimod-installation-package/src/main/assembly/linux-package.xml +++ b/com.patrikdufresne.planimod-installation-package/src/main/assembly/linux-package.xml @@ -1,4 +1,23 @@ + + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser 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. +==== + nsisFirewall -- Small NSIS plugin for simple tasks with Windows Firewall Web site: http://wiz0u.free.fr/prog/nsisFirewall diff --git a/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/ReadMe.txt b/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/ReadMe.txt index 67c7d52efc5620c3043625ec0cce36b9646f297b..d4912cf52e822104ad23a76cb53eb2c7b3fb5640 100644 --- a/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/ReadMe.txt +++ b/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/ReadMe.txt @@ -1,3 +1,21 @@ +==== + Copyright (C) 2019 Patrik Dufresne Service Logiciel + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser 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. +==== + nsisFirewall 1.2 -- Small NSIS plugin for simple tasks with Windows build-in Firewall Web site: http://wiz0u.free.fr/prog/nsisFirewall --------------------------------------------------------- diff --git a/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/exdll.h b/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/exdll.h index feca246b5a45177335b49e5e7a66d3292e2d4745..05b1e0c26c71d338ba4fdc913816a0850037d64e 100644 --- a/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/exdll.h +++ b/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/exdll.h @@ -1,3 +1,20 @@ +/** + * Copyright (C) 2019 Patrik Dufresne Service Logiciel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + */ #ifndef _EXDLL_H_ #define _EXDLL_H_ diff --git a/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/nsisFirewall.cpp b/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/nsisFirewall.cpp index ef50011755300fa8f94b67e78ff63b59e0ecb340..c96e823b458b39e9c328180f3e5aa2fe26a1feca 100644 --- a/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/nsisFirewall.cpp +++ b/com.patrikdufresne.planimod-installation-package/src/main/nsis/plugin/nsisFirewall-src/nsisFirewall.cpp @@ -1,3 +1,20 @@ +/** + * Copyright (C) 2019 Patrik Dufresne Service Logiciel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + */ /* nsisFirewall -- Small NSIS plugin for simple tasks with Windows Firewall Web site: http://wiz0u.free.fr/prog/nsisFirewall diff --git a/com.patrikdufresne.planimod-installation-package/src/main/root/logback.xml b/com.patrikdufresne.planimod-installation-package/src/main/root/logback.xml index bf04dcda1eddc2e7f0258388855de3e9a2995dbf..107cb752550529511124e01b3310e38df4b9efe9 100644 --- a/com.patrikdufresne.planimod-installation-package/src/main/root/logback.xml +++ b/com.patrikdufresne.planimod-installation-package/src/main/root/logback.xml @@ -1,3 +1,22 @@ + diff --git a/com.patrikdufresne.planimod/pom.xml b/com.patrikdufresne.planimod/pom.xml index f8bfce7ba5fafe1f5d3000bb293b2e8711979144..8fb95b27af899f38a4c2168f9d2f0dbeb7a499b0 100644 --- a/com.patrikdufresne.planimod/pom.xml +++ b/com.patrikdufresne.planimod/pom.xml @@ -8,86 +8,24 @@ ${revision} planimod - - - linux_x86_64 - - - linux - amd64 - - - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.x86_64 - provided - - - - - win_x86 - - - windows - amd64 - - - - - org.eclipse.swt - org.eclipse.swt.win32.win32.x86_64 - provided - - - - - - org.hibernate - hibernate-core - 4.2.0.Final - org.slf4j slf4j-api 1.7.5 - - org.eclipse.jface - org.eclipse.jface - 3.8.0.v20120521-2329 - - - org.eclipse.core.databinding - org.eclipse.core.databinding.property - 1.4.0.I20110222-0800 - - - org.eclipse.ui - org.eclipse.ui.forms - 3.5.200.v20120521-2329 - junit junit - 4.10 test - com.patrikdufresne.managers - com.patrikdufresne.managers.jface - 1.21 - - - com.patrikdufresne.managers - com.patrikdufresne.managers.databinding - 1.21 + com.patrikdufresne + managers-databinding - com.patrikdufresne.printing - com.patrikdufresne.printing - 0.8 + com.patrikdufresne + printing ch.qos.logback @@ -136,38 +74,6 @@ - - - com.googlecode.maven-java-formatter-plugin - maven-java-formatter-plugin - - - - format - - - - - ${project.basedir}/../formatter.xml - CRLF - - - - - com.mycila.maven-license-plugin - maven-license-plugin - - - process-sources - - format - - - - -
license-header.txt
- - @@ -191,15 +97,6 @@ properties - - - org.apache.maven.plugins - maven-surefire-plugin - - -Xmx512m - false - - \ No newline at end of file diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ApplicationSettingManager.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ApplicationSettingManager.java index 43cb50aceea83faa3f3ce6752a81df31b77b2d51..3454879792f77e430d6241b92ac87889b63f58da 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ApplicationSettingManager.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ApplicationSettingManager.java @@ -42,11 +42,8 @@ public class ApplicationSettingManager extends AbstractManager() { @Override public EmployeePreference run() throws ManagerException { - return (EmployeePreference) ManagerContext - .getDefaultSession() - .createCriteria(objectClass()) - .add(Restrictions.eq(EmployeePreference.EMPLOYEE, employee)) - .uniqueResult(); + return (EmployeePreference) ManagerContext.getDefaultSession().createCriteria(objectClass()).add( + Restrictions.eq(EmployeePreference.EMPLOYEE, employee)).uniqueResult(); } }); @@ -96,11 +93,8 @@ public class EmployeePreferenceManager extends AbstractManager run() throws ManagerException { // FIXME This function return multiple EmployeePreference for // the same Employee. - List preferences = ManagerContext - .getDefaultSession() - .createCriteria(objectClass()) - .add(Restrictions.in(EmployeePreference.EMPLOYEE, employees)) - .list(); + List preferences = ManagerContext.getDefaultSession().createCriteria(objectClass()).add( + Restrictions.in(EmployeePreference.EMPLOYEE, employees)).list(); // Quick fix return new ArrayList(new HashSet(preferences)); } @@ -119,12 +113,8 @@ public class EmployeePreferenceManager extends AbstractManager run() throws ManagerException { // FIXME This function return multiple EmployeePreference for // the same Employee. - List preferences = ManagerContext - .getDefaultSession() - .createCriteria(EmployeePreference.class) - .createCriteria(EmployeePreference.EMPLOYEE) - .add(Restrictions.isNull(ArchivableObject.ARCHIVED_DATE)) - .list(); + List preferences = ManagerContext.getDefaultSession().createCriteria(EmployeePreference.class).createCriteria( + EmployeePreference.EMPLOYEE).add(Restrictions.isNull(ArchivableObject.ARCHIVED_DATE)).list(); // Quick fix return new ArrayList(new HashSet(preferences)); } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/NonAvailabilityManager.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/NonAvailabilityManager.java index 31e82cf96ef8cc02c10b11adc097a5dda17af234..c9ed5b6bb923da955772a64c2f639da8aedc1f34 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/NonAvailabilityManager.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/NonAvailabilityManager.java @@ -49,11 +49,10 @@ public class NonAvailabilityManager extends AbstractManager { // (start < event.end < end) // OU // (event.start < start ET event.end > end) - return Restrictions.or( - Restrictions.or( - Restrictions.between(AbstractCalendarEvent.START_DATE, start, end), - Restrictions.between(AbstractCalendarEvent.END_DATE, start, end)), - Restrictions.and(Restrictions.lt(AbstractCalendarEvent.START_DATE, start), Restrictions.gt(AbstractCalendarEvent.END_DATE, end))); + return Restrictions.or(Restrictions.or(Restrictions.between(AbstractCalendarEvent.START_DATE, start, end), Restrictions.between( + AbstractCalendarEvent.END_DATE, + start, + end)), Restrictions.and(Restrictions.lt(AbstractCalendarEvent.START_DATE, start), Restrictions.gt(AbstractCalendarEvent.END_DATE, end))); } public NonAvailabilityManager(PlanimodManagers managers) { @@ -81,13 +80,8 @@ public class NonAvailabilityManager extends AbstractManager { return getManagers().query(new Query>() { @Override public List run() throws ManagerException { - return ManagerContext - .getDefaultSession() - .createCriteria(NonAvailability.class) - .add(startEndCriterion(start, end)) - .createCriteria(NonAvailability.EMPLOYEE) - .add(Restrictions.isNull(ArchivableObject.ARCHIVED_DATE)) - .list(); + return ManagerContext.getDefaultSession().createCriteria(NonAvailability.class).add(startEndCriterion(start, end)).createCriteria( + NonAvailability.EMPLOYEE).add(Restrictions.isNull(ArchivableObject.ARCHIVED_DATE)).list(); } }); } @@ -108,14 +102,8 @@ public class NonAvailabilityManager extends AbstractManager { return getManagers().query(new Query>() { @Override public List run() throws ManagerException { - return ManagerContext - .getDefaultSession() - .createCriteria(NonAvailability.class) - .add(Restrictions.eq(NonAvailability.VISIBLE, visibility)) - .add(startEndCriterion(start, end)) - .createCriteria(NonAvailability.EMPLOYEE) - .add(Restrictions.isNull(ArchivableObject.ARCHIVED_DATE)) - .list(); + return ManagerContext.getDefaultSession().createCriteria(NonAvailability.class).add(Restrictions.eq(NonAvailability.VISIBLE, visibility)).add( + startEndCriterion(start, end)).createCriteria(NonAvailability.EMPLOYEE).add(Restrictions.isNull(ArchivableObject.ARCHIVED_DATE)).list(); } }); } @@ -124,12 +112,8 @@ public class NonAvailabilityManager extends AbstractManager { return getManagers().query(new Query>() { @Override public List run() throws ManagerException { - return ManagerContext - .getDefaultSession() - .createCriteria(objectClass()) - .add(startEndCriterion(start, end)) - .add(Restrictions.in(NonAvailability.EMPLOYEE, employees)) - .list(); + return ManagerContext.getDefaultSession().createCriteria(objectClass()).add(startEndCriterion(start, end)).add( + Restrictions.in(NonAvailability.EMPLOYEE, employees)).list(); } }); } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/Product.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/Product.java index ac250cb621f855ca7ab7beaeeb8d8a994ca252a0..5ff73bdf28cde237d9213b6dc2a75010379f74cd 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/Product.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/Product.java @@ -28,7 +28,7 @@ import com.patrikdufresne.managers.ArchivableObject; * The Product class represent one product that may be schedule. */ @Entity -@NamedQueries({ +@NamedQueries( { @NamedQuery(name = "listProductTableByShifts", query = "SELECT S, P, SUM(PP.number), S.team " + "FROM Product as P, Shift as S, ProductionEvent as PE, ProductPosition as PP " + "WHERE PP.product = P " diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ProductionEvent.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ProductionEvent.java index 50245f0b5b2ab4b7d20a9aaed96974028fe40177..e158921f669759fa4162d7616998798eb77be271 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ProductionEvent.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ProductionEvent.java @@ -33,7 +33,7 @@ import com.patrikdufresne.managers.ManagedObject; * */ @Entity -@NamedQueries({ @NamedQuery(name = "listProductionEventTableByShifts", query = "SELECT PE, SUM(PP.number), PE.product, PE.shift, S.team " +@NamedQueries( { @NamedQuery(name = "listProductionEventTableByShifts", query = "SELECT PE, SUM(PP.number), PE.product, PE.shift, S.team " + "FROM ProductPosition as PP, ProductionEvent as PE JOIN PE.product JOIN PE.shift as S JOIN S.team " + "WHERE PP.product = PE.product " + "AND PE.shift in (:shifts) " diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ProductionEventManager.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ProductionEventManager.java index ab08b5825f51e8f006c3e4fb7a9b64b28b5dc51a..732227255db29478f18bd7f1fd61a3cc5a7bb52a 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ProductionEventManager.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ProductionEventManager.java @@ -47,11 +47,10 @@ public class ProductionEventManager extends AbstractManager { // (start < event.end < end) // OU // (event.start < start ET event.end > end) - return Restrictions.or( - Restrictions.or( - Restrictions.between(AbstractCalendarEvent.START_DATE, start, end), - Restrictions.between(AbstractCalendarEvent.END_DATE, start, end)), - Restrictions.and(Restrictions.lt(AbstractCalendarEvent.START_DATE, start), Restrictions.gt(AbstractCalendarEvent.END_DATE, end))); + return Restrictions.or(Restrictions.or(Restrictions.between(AbstractCalendarEvent.START_DATE, start, end), Restrictions.between( + AbstractCalendarEvent.END_DATE, + start, + end)), Restrictions.and(Restrictions.lt(AbstractCalendarEvent.START_DATE, start), Restrictions.gt(AbstractCalendarEvent.END_DATE, end))); } public ProductionEventManager(PlanimodManagers managers) { @@ -158,12 +157,8 @@ public class ProductionEventManager extends AbstractManager { return getManagers().query(new Query>() { @Override public List run() throws ManagerException { - return ManagerContext - .getDefaultSession() - .createCriteria(ProductionEvent.class) - .createCriteria(ProductionEvent.SHIFT) - .add(startEndCriterion(start, end)) - .list(); + return ManagerContext.getDefaultSession().createCriteria(ProductionEvent.class).createCriteria(ProductionEvent.SHIFT).add( + startEndCriterion(start, end)).list(); } }); } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/Qualification.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/Qualification.java index 1d831aa2cef1e39d2de655a7e0cbf7a75c0055f1..07e382c1791a9c1bcceaba2c5ae34b6261370f0f 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/Qualification.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/Qualification.java @@ -32,7 +32,7 @@ import com.patrikdufresne.managers.ManagedObject; * */ @Entity -@NamedQueries({ @NamedQuery(name = "getQualificationTableByPositions", query = "SELECT E, Po, Se " +@NamedQueries( { @NamedQuery(name = "getQualificationTableByPositions", query = "SELECT E, Po, Se " + "FROM Qualification Q JOIN Q.employee as E JOIN Q.position as Po JOIN Po.section as Se " + "WHERE Q.position in :positions AND E.archivedDate is null") }) public class Qualification extends ManagedObject { diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ShiftManager.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ShiftManager.java index 0ba819e969fc1c71fbde8f9a0eca33322ac105b8..4af6a0dfa3e2f23b0bf6542bf82f55caaf7d1e48 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ShiftManager.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/ShiftManager.java @@ -127,11 +127,8 @@ public class ShiftManager extends AbstractManager { return getManagers().query(new Query>() { @Override public List run() throws ManagerException { - return ManagerContext - .getDefaultSession() - .createCriteria(objectClass()) - .add(Restrictions.and(Restrictions.eq(Shift.TEAM, team), startEndCriterion(start, end))) - .list(); + return ManagerContext.getDefaultSession().createCriteria(objectClass()).add( + Restrictions.and(Restrictions.eq(Shift.TEAM, team), startEndCriterion(start, end))).list(); } }); } @@ -196,11 +193,10 @@ public class ShiftManager extends AbstractManager { // (start < event.end < end) // OU // (event.start < start ET event.end > end) - return Restrictions.or( - Restrictions.or( - Restrictions.between(AbstractCalendarEvent.START_DATE, start, end), - Restrictions.between(AbstractCalendarEvent.END_DATE, start, end)), - Restrictions.and(Restrictions.lt(AbstractCalendarEvent.START_DATE, start), Restrictions.gt(AbstractCalendarEvent.END_DATE, end))); + return Restrictions.or(Restrictions.or(Restrictions.between(AbstractCalendarEvent.START_DATE, start, end), Restrictions.between( + AbstractCalendarEvent.END_DATE, + start, + end)), Restrictions.and(Restrictions.lt(AbstractCalendarEvent.START_DATE, start), Restrictions.gt(AbstractCalendarEvent.END_DATE, end))); } /** diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/Task.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/Task.java index 62c69fdb2437475870f620f2ab55138ef43f9440..4da1da5422843f2f02fe1622923418b1f2dfa4e4 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/Task.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/Task.java @@ -31,21 +31,19 @@ import org.hibernate.annotations.NamedQuery; * */ @Entity -@NamedQueries({ - @NamedQuery( - name = "listQualificationAndAvaibilityTable", - query = "SELECT E, Ta, Po, Se, PE, Pr, S, Te " - + "FROM Employee E, Task Ta JOIN Ta.position as Po JOIN Po.section as Se JOIN Ta.productionEvent as PE JOIN PE.product as Pr JOIN PE.shift as S JOIN S.team as Te, Qualification Q " - + "WHERE E.id = Q.employee " - + "AND Q.position=Ta.position " - + "AND Ta.startDate >= :start " - + "AND Ta.endDate <= :end " - + "AND not exists ( " - + "FROM NonAvailability as NA " - + "WHERE NA.employee=E " - + "AND NA.startDate <= Ta.startDate " - + "AND NA.endDate >= Ta.endDate " - + ")"), +@NamedQueries( { + @NamedQuery(name = "listQualificationAndAvaibilityTable", query = "SELECT E, Ta, Po, Se, PE, Pr, S, Te " + + "FROM Employee E, Task Ta JOIN Ta.position as Po JOIN Po.section as Se JOIN Ta.productionEvent as PE JOIN PE.product as Pr JOIN PE.shift as S JOIN S.team as Te, Qualification Q " + + "WHERE E.id = Q.employee " + + "AND Q.position=Ta.position " + + "AND Ta.startDate >= :start " + + "AND Ta.endDate <= :end " + + "AND not exists ( " + + "FROM NonAvailability as NA " + + "WHERE NA.employee=E " + + "AND NA.startDate <= Ta.startDate " + + "AND NA.endDate >= Ta.endDate " + + ")"), @NamedQuery(name = "listQualifiedAndAvailableEmployees", query = "SELECT DISTINCT E " + "FROM Employee E, Qualification Q, ProductPosition PP, ProductionEvent PE " + "JOIN PE.shift as S " diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/TaskManager.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/TaskManager.java index c37d10a24ca836e4dbabcd6d2a4df40cec566585..63f5ef516f81a3c68fe08d9a107c4d58094e2113 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/TaskManager.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/TaskManager.java @@ -62,11 +62,10 @@ public class TaskManager extends AbstractManager { // (start < event.end < end) // OU // (event.start < start ET event.end > end) - return Restrictions.or( - Restrictions.or( - Restrictions.between(AbstractCalendarEvent.START_DATE, start, end), - Restrictions.between(AbstractCalendarEvent.END_DATE, start, end)), - Restrictions.and(Restrictions.lt(AbstractCalendarEvent.START_DATE, start), Restrictions.gt(AbstractCalendarEvent.END_DATE, end))); + return Restrictions.or(Restrictions.or(Restrictions.between(AbstractCalendarEvent.START_DATE, start, end), Restrictions.between( + AbstractCalendarEvent.END_DATE, + start, + end)), Restrictions.and(Restrictions.lt(AbstractCalendarEvent.START_DATE, start), Restrictions.gt(AbstractCalendarEvent.END_DATE, end))); } public TaskManager(PlanimodManagers managers) { @@ -175,12 +174,8 @@ public class TaskManager extends AbstractManager { return getManagers().query(new Query>() { @Override public List run() throws ManagerException { - return ManagerContext - .getDefaultSession() - .createCriteria(Task.class) - .add(startEndCriterion(start, end)) - .add(Restrictions.eq(Task.EMPLOYEE, employee)) - .list(); + return ManagerContext.getDefaultSession().createCriteria(Task.class).add(startEndCriterion(start, end)).add( + Restrictions.eq(Task.EMPLOYEE, employee)).list(); } }); } @@ -213,11 +208,8 @@ public class TaskManager extends AbstractManager { // FIXME the list of events should be used to reduce the // size of the table Query database DetachedCriteria subSelectProducts = DetachedCriteria.forClass(ProductionEvent.class).setProjection(Property.forName(ProductionEvent.PRODUCT)); - List productPositions = ManagerContext - .getDefaultSession() - .createCriteria(ProductPosition.class) - .add(Property.forName(ProductPosition.PRODUCT).in(subSelectProducts)) - .list(); + List productPositions = ManagerContext.getDefaultSession().createCriteria(ProductPosition.class).add( + Property.forName(ProductPosition.PRODUCT).in(subSelectProducts)).list(); // Create the table. BidiMultiMap table = new BidiMultiHashMap(); diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/comparators/EmployeeComparators.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/comparators/EmployeeComparators.java index 2d0ab4844da0f70662df1ffe7ac78794251cc04d..229a3de8462ece41d4ab33a707ae4ce718b444f9 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/comparators/EmployeeComparators.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/comparators/EmployeeComparators.java @@ -42,33 +42,30 @@ public class EmployeeComparators { // TODO This comparator should be removed public static Comparator bySeniority() { ComparatorChain chain = new ComparatorChain(); - chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator( - ComparatorUtils.nullHighComparator(ComparatorUtils.naturalComparator()), - new Transformer() { + chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator(ComparatorUtils.nullHighComparator(ComparatorUtils + .naturalComparator()), new Transformer() { - @Override - public Object transform(Object arg0) { - return ((Employee) arg0).getHireDate(); - } - }))); - chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator( - ComparatorUtils.nullHighComparator(ComparatorUtils.naturalComparator()), - new Transformer() { + @Override + public Object transform(Object arg0) { + return ((Employee) arg0).getHireDate(); + } + }))); + chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator(ComparatorUtils.nullHighComparator(ComparatorUtils + .naturalComparator()), new Transformer() { - @Override - public Object transform(Object arg0) { - return ((Employee) arg0).getFirstname(); - } - }))); - chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator( - ComparatorUtils.nullHighComparator(ComparatorUtils.naturalComparator()), - new Transformer() { + @Override + public Object transform(Object arg0) { + return ((Employee) arg0).getFirstname(); + } + }))); + chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator(ComparatorUtils.nullHighComparator(ComparatorUtils + .naturalComparator()), new Transformer() { - @Override - public Object transform(Object arg0) { - return ((Employee) arg0).getLastname(); - } - }))); + @Override + public Object transform(Object arg0) { + return ((Employee) arg0).getLastname(); + } + }))); return chain; } @@ -79,24 +76,22 @@ public class EmployeeComparators { */ public static Comparator byName() { ComparatorChain chain = new ComparatorChain(); - chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator( - ComparatorUtils.nullLowComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.naturalComparator())), - new Transformer() { + chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator(ComparatorUtils.nullLowComparator(ComparatorUtils + .nullHighComparator(ComparatorUtils.naturalComparator())), new Transformer() { - @Override - public Object transform(Object arg0) { - return ((Employee) arg0).getFirstname(); - } - }))); - chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator( - ComparatorUtils.nullHighComparator(ComparatorUtils.naturalComparator()), - new Transformer() { + @Override + public Object transform(Object arg0) { + return ((Employee) arg0).getFirstname(); + } + }))); + chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator(ComparatorUtils.nullHighComparator(ComparatorUtils + .naturalComparator()), new Transformer() { - @Override - public Object transform(Object arg0) { - return ((Employee) arg0).getLastname(); - } - }))); + @Override + public Object transform(Object arg0) { + return ((Employee) arg0).getLastname(); + } + }))); return chain; } } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/comparators/NonAvailabilityComparators.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/comparators/NonAvailabilityComparators.java index c83a6e911dc511a0d88c14f6b568a12929f3f154..f72f5723fdd97e3296190e93d134112072fc5e7c 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/comparators/NonAvailabilityComparators.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/comparators/NonAvailabilityComparators.java @@ -44,23 +44,21 @@ public class NonAvailabilityComparators { ComparatorChain chain = new ComparatorChain(); - chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator( - ComparatorUtils.nullLowComparator(ComparatorUtils.naturalComparator()), - new Transformer() { - @Override - public Object transform(Object arg0) { - return ((AbstractCalendarEvent) arg0).getStartDate(); - } - }))); + chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator(ComparatorUtils.nullLowComparator(ComparatorUtils + .naturalComparator()), new Transformer() { + @Override + public Object transform(Object arg0) { + return ((AbstractCalendarEvent) arg0).getStartDate(); + } + }))); - chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator( - ComparatorUtils.nullLowComparator(EmployeeComparators.byName()), - new Transformer() { - @Override - public Object transform(Object arg0) { - return ((NonAvailability) arg0).getEmployee(); - } - }))); + chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator(ComparatorUtils.nullLowComparator(EmployeeComparators + .byName()), new Transformer() { + @Override + public Object transform(Object arg0) { + return ((NonAvailability) arg0).getEmployee(); + } + }))); return chain; } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/comparators/ProductComparators.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/comparators/ProductComparators.java index bc9472101008e8171f13d5808ebc1b149c8e2b2b..25b08e3cbd05ecc7b27aa8890ebcbcd41d86ddb4 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/core/comparators/ProductComparators.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/core/comparators/ProductComparators.java @@ -49,33 +49,30 @@ public class ProductComparators { public static Comparator byRefIdFamilyName() { ComparatorChain chain = new ComparatorChain(); - chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator( - ComparatorUtils.nullHighComparator(HumanNaturalComparator.getInstance()), - new Transformer() { - @Override - public Object transform(Object arg0) { - String refId = ((Product) arg0).getRefId(); - return refId == null || refId.isEmpty() ? null : refId; - } - }))); + chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator(ComparatorUtils.nullHighComparator(HumanNaturalComparator + .getInstance()), new Transformer() { + @Override + public Object transform(Object arg0) { + String refId = ((Product) arg0).getRefId(); + return refId == null || refId.isEmpty() ? null : refId; + } + }))); - chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator( - ComparatorUtils.nullHighComparator(ComparatorUtils.naturalComparator()), - new Transformer() { - @Override - public Object transform(Object arg0) { - return ((Product) arg0).getFamily(); - } - }))); + chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator(ComparatorUtils.nullHighComparator(ComparatorUtils + .naturalComparator()), new Transformer() { + @Override + public Object transform(Object arg0) { + return ((Product) arg0).getFamily(); + } + }))); - chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator( - ComparatorUtils.nullHighComparator(ComparatorUtils.naturalComparator()), - new Transformer() { - @Override - public Object transform(Object arg0) { - return ((Product) arg0).getName(); - } - }))); + chain.addComparator(ComparatorUtils.nullHighComparator(ComparatorUtils.transformedComparator(ComparatorUtils.nullHighComparator(ComparatorUtils + .naturalComparator()), new Transformer() { + @Override + public Object transform(Object arg0) { + return ((Product) arg0).getName(); + } + }))); return chain; } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/DatabaseSelectorDialog.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/DatabaseSelectorDialog.java index 2dba8871293268c62cef74a391ff8cf532ce99d2..c3141adc12976adb1bd06ad9475f065d756d56a0 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/DatabaseSelectorDialog.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/DatabaseSelectorDialog.java @@ -80,11 +80,8 @@ public class DatabaseSelectorDialog extends TitleAreaDialog { private static Image getTitleImage() { Image image = JFaceResources.getImage(TITLE_IMAGE); if (image == null) { - OverlayImageDescriptor icon = new OverlayImageDescriptor( - JFaceResources.getImageRegistry().getDescriptor(DLG_IMG_TITLE_BANNER), - Resources.getImageDescriptor(Resources.APP_ICON_48), - SWT.LEFT, - SWT.CENTER); + OverlayImageDescriptor icon = new OverlayImageDescriptor(JFaceResources.getImageRegistry().getDescriptor(DLG_IMG_TITLE_BANNER), Resources + .getImageDescriptor(Resources.APP_ICON_48), SWT.LEFT, SWT.CENTER); JFaceResources.getImageRegistry().put(TITLE_IMAGE, icon); image = JFaceResources.getImage(TITLE_IMAGE); } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/databinding/DateColorControlStyleSupport.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/databinding/DateColorControlStyleSupport.java index d0650200344367186c878545bc403c206a8428af..3e3cc38bdbc8b515c1338336641c34fc30a6eff6 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/databinding/DateColorControlStyleSupport.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/databinding/DateColorControlStyleSupport.java @@ -70,10 +70,8 @@ public class DateColorControlStyleSupport { private Color getInPastColor() { if (this.inPast == null) { if (!JFaceResources.getColorRegistry().hasValueFor(IN_PAST)) { - RGB rgb = ColorUtil.blend( - Display.getDefault().getSystemColor(SWT.COLOR_LIST_BACKGROUND).getRGB(), - Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND).getRGB(), - 50); + RGB rgb = ColorUtil.blend(Display.getDefault().getSystemColor(SWT.COLOR_LIST_BACKGROUND).getRGB(), Display.getDefault().getSystemColor( + SWT.COLOR_WIDGET_BACKGROUND).getRGB(), 50); JFaceResources.getColorRegistry().put(IN_PAST, rgb); } this.inPast = JFaceResources.getColorRegistry().get(IN_PAST); diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/printing/PlanimodPrintFactory.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/printing/PlanimodPrintFactory.java index a1ce7c8a47a02368a239fd3e424c8f3fe5370916..c60aa714e266faddf724916a7cdeffaaab5f2fef 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/printing/PlanimodPrintFactory.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/printing/PlanimodPrintFactory.java @@ -21,13 +21,13 @@ import static com.planimod.ui.Localized._; import java.util.Date; -import net.sf.paperclips.EmptyPrint; -import net.sf.paperclips.GridPrint; -import net.sf.paperclips.PageNumber; -import net.sf.paperclips.PageNumberFormat; -import net.sf.paperclips.PageNumberPrint; -import net.sf.paperclips.Print; -import net.sf.paperclips.TextPrint; +import org.eclipse.nebula.paperclips.core.EmptyPrint; +import org.eclipse.nebula.paperclips.core.grid.GridPrint; +import org.eclipse.nebula.paperclips.core.page.PageNumber; +import org.eclipse.nebula.paperclips.core.page.PageNumberFormat; +import org.eclipse.nebula.paperclips.core.page.PageNumberPrint; +import org.eclipse.nebula.paperclips.core.Print; +import org.eclipse.nebula.paperclips.core.text.TextPrint; import org.eclipse.swt.SWT; diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/theme/Resources.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/theme/Resources.java index be3493b3bc83b134b7d83b5cf2a543531ceeb8b3..c57c583b58cd3d7104f657e9186c862c287a8e49 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/theme/Resources.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/theme/Resources.java @@ -154,13 +154,8 @@ public class Resources { ir.put(ICON_PRINT_16, ImageDescriptor.createFromFile(Resources.class, "printer-printing-16.png")); ir.put(ICON_PRINT_48, ImageDescriptor.createFromFile(Resources.class, "printer-printing-48.png")); // Composite images - ir.put( - DLG_EDIT_TITLE_IMAGE, - new OverlayImageDescriptor( - ir.getDescriptor(TitleAreaDialog.DLG_IMG_TITLE_BANNER), - Resources.getImageDescriptor(Resources.ICON_EDIT_48), - SWT.LEFT, - SWT.CENTER)); + ir.put(DLG_EDIT_TITLE_IMAGE, new OverlayImageDescriptor(ir.getDescriptor(TitleAreaDialog.DLG_IMG_TITLE_BANNER), Resources + .getImageDescriptor(Resources.ICON_EDIT_48), SWT.LEFT, SWT.CENTER)); } } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/viewers/planner/PlanimodPlannerLook.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/viewers/planner/PlanimodPlannerLook.java index 92064f0e187d846a73ea196a612e8fa014ddecd5..7259cdc4fa68a421cfb55d7124999a0a58f9b174 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/viewers/planner/PlanimodPlannerLook.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/viewers/planner/PlanimodPlannerLook.java @@ -92,10 +92,8 @@ public class PlanimodPlannerLook extends DefaultPlannerLook { public Color getItemColor(Planner planner) { if (this.itemColor == null) { if (!JFaceResources.getColorRegistry().hasValueFor(ITEM_COLOR)) { - RGB rgb = ColorUtil.blend( - Display.getDefault().getSystemColor(SWT.COLOR_LIST_BACKGROUND).getRGB(), - Display.getDefault().getSystemColor(SWT.COLOR_LIST_SELECTION).getRGB(), - 75); + RGB rgb = ColorUtil.blend(Display.getDefault().getSystemColor(SWT.COLOR_LIST_BACKGROUND).getRGB(), Display.getDefault().getSystemColor( + SWT.COLOR_LIST_SELECTION).getRGB(), 75); JFaceResources.getColorRegistry().put(ITEM_COLOR, rgb); } this.itemColor = JFaceResources.getColorRegistry().get(ITEM_COLOR); diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/position/PositionPageViewPart.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/position/PositionPageViewPart.java index c164b558d965d22a60c02ad559e21f99e127373b..bdf3dd54d35532eda0749fbe67b465b4508a5d88 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/position/PositionPageViewPart.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/position/PositionPageViewPart.java @@ -179,25 +179,17 @@ public class PositionPageViewPart extends AbstractViewPart { protected void createColumns(TableViewer viewer, IObservableSet knownPositions) { // RefId IBeanValueProperty redIfProperty = BeanProperties.value(Position.class, Position.REFID, String.class); - ColumnSupport - .create(viewer, _("No."), knownPositions, redIfProperty) - .setWidth(75) - .addPropertySorting() - .addTextEditingSupport( - getDbc(), - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null); + ColumnSupport.create(viewer, _("No."), knownPositions, redIfProperty).setWidth(75).addPropertySorting().addTextEditingSupport( + getDbc(), + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null); // Name IBeanValueProperty nameProperty = BeanProperties.value(Position.class, Position.NAME, String.class); - ColumnSupport - .create(viewer, _("Nom"), knownPositions, nameProperty) - .setWidth(150) - .addPropertySorting() - .addTextEditingSupport( - getDbc(), - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null); + ColumnSupport.create(viewer, _("Nom"), knownPositions, nameProperty).setWidth(150).addPropertySorting().addTextEditingSupport( + getDbc(), + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null); // Section IObservableSet proposedSections = PlanimodObservables.listSection(getSite().getService(PlanimodManagers.class)); @@ -226,26 +218,20 @@ public class PositionPageViewPart extends AbstractViewPart { // Classified IValueProperty classifiedProperty = BeanProperties.value(Position.class, Position.CLASSIFIED, Boolean.TYPE); IValueProperty classifiedLabel = classifiedProperty.value(BindingProperties.convertedValue(Converters.booleanConverter())); - ColumnSupport - .create(viewer, _("Classifié"), knownPositions, classifiedLabel) - .addPropertySorting() - .addCheckboxEditingSupport( - getDbc(), - classifiedProperty, - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null); + ColumnSupport.create(viewer, _("Classifié"), knownPositions, classifiedLabel).addPropertySorting().addCheckboxEditingSupport( + getDbc(), + classifiedProperty, + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null); // Swappable IBeanValueProperty swappableProperty = BeanProperties.value(Position.class, Position.SWAPPABLE, Boolean.TYPE); IValueProperty swappablesLabel = swappableProperty.value(BindingProperties.convertedValue(Converters.booleanConverter())); - ColumnSupport - .create(viewer, _("Permutable"), knownPositions, swappablesLabel) - .addPropertySorting() - .addCheckboxEditingSupport( - getDbc(), - swappableProperty, - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null); + ColumnSupport.create(viewer, _("Permutable"), knownPositions, swappablesLabel).addPropertySorting().addCheckboxEditingSupport( + getDbc(), + swappableProperty, + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null); ColumnViewerPreferences.create(viewer, PlanimodPreferences.getPreferenceStore(), PREFERENCE_COLUMNS); } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/product/ProductPageViewPart.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/product/ProductPageViewPart.java index 19755c65c0400ef4d2a69b6aead84c6de512ab5f..e8e9efe4e3c9fdea6f9971dc914e9a5bf4337c80 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/product/ProductPageViewPart.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/product/ProductPageViewPart.java @@ -205,10 +205,8 @@ public class ProductPageViewPart extends AbstractViewPart { createProductPositionColumns(this.productPositionViewer, productPositions); this.productPositionViewer.setInput(productPositions); // Bind editor actions - dbc.bindValue( - JFaceProperties.value(AddProductPositionAction.class, AddProductPositionAction.PRODUCT, AddProductPositionAction.PRODUCT).observe( - this.addActionProductPosition), - selectedProduct); + dbc.bindValue(JFaceProperties.value(AddProductPositionAction.class, AddProductPositionAction.PRODUCT, AddProductPositionAction.PRODUCT).observe( + this.addActionProductPosition), selectedProduct); dbc.bindValue( JFaceProperties.value(RemoveAction.class, RemoveAction.OBJECT, RemoveAction.OBJECT).observe(this.removeActionProductPosition), ViewerProperties.singleSelection().observe(this.productPositionViewer)); @@ -219,10 +217,8 @@ public class ProductPageViewPart extends AbstractViewPart { getDbc().bindValue( JFaceProperties.value(RemoveAction.class, RemoveAction.OBJECTS, RemoveAction.OBJECTS).observe(this.removeAction), new ListObservableValue(selections, AbstractCalendarEvent.class)); - dbc.bindValue( - JFaceProperties.value(DuplicateProductAction.class, DuplicateProductAction.PRODUCT, DuplicateProductAction.PRODUCT).observe( - this.duplicateProductAction), - selectedProduct); + dbc.bindValue(JFaceProperties.value(DuplicateProductAction.class, DuplicateProductAction.PRODUCT, DuplicateProductAction.PRODUCT).observe( + this.duplicateProductAction), selectedProduct); } @@ -237,34 +233,22 @@ public class ProductPageViewPart extends AbstractViewPart { protected void createColumns(TableViewer viewer, IObservableSet knownProducts) { // RefId IBeanValueProperty refIdProperty = BeanProperties.value(Product.class, Product.REFID); - ColumnSupport - .create(viewer, _("No."), knownProducts, refIdProperty) - .setWidth(75) - .addPropertySorting() - .addTextEditingSupport( - getDbc(), - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null); + ColumnSupport.create(viewer, _("No."), knownProducts, refIdProperty).setWidth(75).addPropertySorting().addTextEditingSupport( + getDbc(), + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null); // Name IBeanValueProperty nameProperty = BeanProperties.value(Product.class, Product.NAME); - ColumnSupport - .create(viewer, _("Nom"), knownProducts, nameProperty) - .setWidth(250) - .addPropertySorting() - .addTextEditingSupport( - getDbc(), - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null); + ColumnSupport.create(viewer, _("Nom"), knownProducts, nameProperty).setWidth(250).addPropertySorting().addTextEditingSupport( + getDbc(), + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null); // Family IBeanValueProperty familyProperty = BeanProperties.value(Product.class, Product.FAMILY); - ColumnSupport - .create(viewer, _("Famille"), knownProducts, familyProperty) - .setWidth(150) - .addPropertySorting() - .addTextEditingSupport( - getDbc(), - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null); + ColumnSupport.create(viewer, _("Famille"), knownProducts, familyProperty).setWidth(150).addPropertySorting().addTextEditingSupport( + getDbc(), + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null); ColumnViewerPreferences.create(viewer, PlanimodPreferences.getPreferenceStore(), PREFERENCE_COLUMNS); } @@ -341,12 +325,10 @@ public class ProductPageViewPart extends AbstractViewPart { PlanimodManagers managers = getSite().getService(PlanimodManagers.class); // Number final IValueProperty numberProperty = BeanProperties.value(ProductPosition.class, ProductPosition.NUMBER, Integer.class); - ColumnSupport - .create(viewer, _("Nombre"), knownElements, numberProperty) - .addPropertySorting() - .addTextEditingSupport(dbc, new ManagerUpdateValueStrategy(managers, UpdateValueStrategy.POLICY_CONVERT), null) - .setPixelLayoutData(25) - .setMoveable(false); + ColumnSupport.create(viewer, _("Nombre"), knownElements, numberProperty).addPropertySorting().addTextEditingSupport( + dbc, + new ManagerUpdateValueStrategy(managers, UpdateValueStrategy.POLICY_CONVERT), + null).setPixelLayoutData(25).setMoveable(false); // Position IObservableSet positionProposeds = PlanimodObservables.listPosition(managers); IObservableMap positionProposedLabels = BeanProperties.value(Position.class, Position.NAME).observeDetail(positionProposeds); @@ -356,18 +338,12 @@ public class ProductPageViewPart extends AbstractViewPart { proposalCellEditor.setInput(positionProposeds); IValueProperty positionProperty = BeanProperties.value(ProductPosition.class, ProductPosition.POSITION, Position.class); IValueProperty positionLabel = BeanProperties.value(ProductPosition.class, ProductPosition.POSITION + DOT + Position.NAME, Position.class); - ColumnSupport - .create(viewer, _("Poste"), knownElements, positionLabel) - .setWidth(150) - .addViewerEditingSupport( - dbc, - positionProperty, - proposalCellEditor, - new ManagerUpdateValueStrategy(managers, UpdateValueStrategy.POLICY_CONVERT), - null) - .setWeightLayoutData(1, 75) - .setResizable(false) - .setMoveable(false); + ColumnSupport.create(viewer, _("Poste"), knownElements, positionLabel).setWidth(150).addViewerEditingSupport( + dbc, + positionProperty, + proposalCellEditor, + new ManagerUpdateValueStrategy(managers, UpdateValueStrategy.POLICY_CONVERT), + null).setWeightLayoutData(1, 75).setResizable(false).setMoveable(false); ColumnViewerPreferences.create(viewer, PlanimodPreferences.getPreferenceStore(), PREFERENCE_EDITOR_COLUMNS); } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/product/ProductPositionPrintFactory.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/product/ProductPositionPrintFactory.java index 4a23ee4b240621b3a2b4799453660f1f10de6820..0d2a360bc25a0e91396b1f8f520931cdd04de2cf 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/product/ProductPositionPrintFactory.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/product/ProductPositionPrintFactory.java @@ -1,19 +1,16 @@ /** * Copyright (C) 2019 Patrik Dufresne Service Logiciel * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. * - * You should have received a copy of the GNU Lesser 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. + * You should have received a copy of the GNU Lesser 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 com.planimod.ui.views.admin.product; @@ -28,15 +25,13 @@ import java.util.List; import java.util.Map.Entry; import java.util.Set; -import net.sf.paperclips.DefaultGridLook; -import net.sf.paperclips.GridPrint; -import net.sf.paperclips.LineBorder; -import net.sf.paperclips.PageNumber; -import net.sf.paperclips.Print; -import net.sf.paperclips.TextPrint; - import org.apache.commons.collections.ComparatorUtils; import org.apache.commons.collections.Transformer; +import org.eclipse.nebula.paperclips.core.Print; +import org.eclipse.nebula.paperclips.core.border.LineBorder; +import org.eclipse.nebula.paperclips.core.grid.DefaultGridLook; +import org.eclipse.nebula.paperclips.core.grid.GridPrint; +import org.eclipse.nebula.paperclips.core.text.TextPrint; import com.patrikdufresne.printing.FontDataUtil; import com.planimod.core.Position; diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/section/SectionPageViewPart.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/section/SectionPageViewPart.java index 1619ccf706303bbd6f7bc91609af507e0dfd9d8e..4393247f453ee8fdc54c269f8a487e1b9ed848ff 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/section/SectionPageViewPart.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/section/SectionPageViewPart.java @@ -129,16 +129,10 @@ public class SectionPageViewPart extends AbstractViewPart { // Name IBeanValueProperty nameProperty = BeanProperties.value(Section.class, Section.NAME); - ColumnSupport - .create(viewer, _("Nom"), knownSections, nameProperty) - .addPropertySorting() - .addTextEditingSupport( - getDbc(), - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null) - .setWeightLayoutData(1, 75) - .setResizable(false) - .setMoveable(false); + ColumnSupport.create(viewer, _("Nom"), knownSections, nameProperty).addPropertySorting().addTextEditingSupport( + getDbc(), + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null).setWeightLayoutData(1, 75).setResizable(false).setMoveable(false); ColumnViewerPreferences.create(viewer, PlanimodPreferences.getPreferenceStore(), PREFERENCE_COLUMNS); } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/team/TeamPageViewPart.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/team/TeamPageViewPart.java index 5d11f2165621ec811c2ee09b4c25fb4b43ad5e41..081bf6c9477214af125ac6a66d53017a9954cd30 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/team/TeamPageViewPart.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/admin/team/TeamPageViewPart.java @@ -165,16 +165,10 @@ public class TeamPageViewPart extends AbstractViewPart { protected void createColumns(TableViewer viewer, IObservableSet knownTeams) { // Name columns IBeanValueProperty nameProperty = BeanProperties.value(Team.class, Team.NAME, String.class); - ColumnSupport - .create(viewer, _("Nom"), knownTeams, nameProperty) - .addPropertySorting() - .addTextEditingSupport( - getDbc(), - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null) - .setWeightLayoutData(1, 75) - .setResizable(false) - .setMoveable(false); + ColumnSupport.create(viewer, _("Nom"), knownTeams, nameProperty).addPropertySorting().addTextEditingSupport( + getDbc(), + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null).setWeightLayoutData(1, 75).setResizable(false).setMoveable(false); // Attach column preference ColumnViewerPreferences.create(viewer, PlanimodPreferences.getPreferenceStore(), PREFERENCE_COLUMNS); } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/employees/EmployeeBySectionPrintFactory.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/employees/EmployeeBySectionPrintFactory.java index 319bfbbd52df68c20b7b8208fd4f34c35a840500..587c43b572f0e6ce0c3fbc73dbcbd4a2d2a9bc22 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/employees/EmployeeBySectionPrintFactory.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/employees/EmployeeBySectionPrintFactory.java @@ -28,12 +28,12 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import net.sf.paperclips.ColumnPrint; -import net.sf.paperclips.DefaultGridLook; -import net.sf.paperclips.GridPrint; -import net.sf.paperclips.LineBorder; -import net.sf.paperclips.Print; -import net.sf.paperclips.TextPrint; +import org.eclipse.nebula.paperclips.core.ColumnPrint; +import org.eclipse.nebula.paperclips.core.grid.DefaultGridLook; +import org.eclipse.nebula.paperclips.core.grid.GridPrint; +import org.eclipse.nebula.paperclips.core.border.LineBorder; +import org.eclipse.nebula.paperclips.core.Print; +import org.eclipse.nebula.paperclips.core.text.TextPrint; import org.apache.commons.collections.Predicate; import org.apache.commons.collections.iterators.FilterIterator; diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/employees/EmployeeBySeniorityPrintFactory.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/employees/EmployeeBySeniorityPrintFactory.java index 19f57e48f17227f88952b0bafc416361937bcf07..e0deb539e65de847b21f95ee6777c1086a4d90c0 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/employees/EmployeeBySeniorityPrintFactory.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/employees/EmployeeBySeniorityPrintFactory.java @@ -24,12 +24,12 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import net.sf.paperclips.ColumnPrint; -import net.sf.paperclips.DefaultGridLook; -import net.sf.paperclips.GridPrint; -import net.sf.paperclips.LineBorder; -import net.sf.paperclips.Print; -import net.sf.paperclips.TextPrint; +import org.eclipse.nebula.paperclips.core.ColumnPrint; +import org.eclipse.nebula.paperclips.core.grid.DefaultGridLook; +import org.eclipse.nebula.paperclips.core.grid.GridPrint; +import org.eclipse.nebula.paperclips.core.border.LineBorder; +import org.eclipse.nebula.paperclips.core.Print; +import org.eclipse.nebula.paperclips.core.text.TextPrint; import com.patrikdufresne.printing.FontDataUtil; import com.planimod.core.EmployeePreference; diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/employees/EmployeeViewPart.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/employees/EmployeeViewPart.java index 6c3eea4bc66b911f502715a9abcc260b577e47e0..621eb1762b6d3006115ba352344007e93222e888 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/employees/EmployeeViewPart.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/employees/EmployeeViewPart.java @@ -237,12 +237,8 @@ public class EmployeeViewPart extends AbstractViewPart { // Bind Hire date IObservableValue hireDate = BeanProperties.value(Employee.class, Employee.HIRE_DATE, Date.class).observeDetail(employee); IObservableValue hireDateTime = new WritableValue(null, Date.class); - DateTimeSupport dts = DateTimeSupport.create( - this.hireTime, - dbc, - hireDateTime, - DateFormatRegistry.getFormat(DateFormatRegistry.TIME | DateFormatRegistry.SHORT), - DateTimeSupport.STEP_60); + DateTimeSupport dts = DateTimeSupport.create(this.hireTime, dbc, hireDateTime, DateFormatRegistry.getFormat(DateFormatRegistry.TIME + | DateFormatRegistry.SHORT), DateTimeSupport.STEP_60); if (this.hireTime.getLayoutData() instanceof GridData) { ((GridData) this.hireTime.getLayoutData()).widthHint = dts.getWidthHint(); } @@ -265,73 +261,58 @@ public class EmployeeViewPart extends AbstractViewPart { null); // Bind preferred position IObservableValue preferredPositionLabel = (new EmployeePreferredPositionValueProperty(_("Aucune préférence"))).observeDetail(selection); - dbc.bindValue( - JFaceProperties.value( - EmployeeEditPreferredPositionAction.class, - EmployeeEditPreferredPositionAction.TEXT, - EmployeeEditPreferredPositionAction.TEXT).observe(this.preferredPositionAction), - preferredPositionLabel); - dbc.bindValue( - JFaceProperties.value( - EmployeeEditPreferredPositionAction.class, - EmployeeEditPreferredPositionAction.TOOL_TIP_TEXT, - EmployeeEditPreferredPositionAction.TOOL_TIP_TEXT).observe(this.preferredPositionAction), - preferredPositionLabel); - dbc.bindValue( - JFaceProperties.value( - EmployeeEditPreferredPositionAction.class, - EmployeeEditPreferredPositionAction.EMPLOYEE_PREFERENCE, - EmployeeEditPreferredPositionAction.EMPLOYEE_PREFERENCE).observe(this.preferredPositionAction), - selection); + dbc.bindValue(JFaceProperties.value( + EmployeeEditPreferredPositionAction.class, + EmployeeEditPreferredPositionAction.TEXT, + EmployeeEditPreferredPositionAction.TEXT).observe(this.preferredPositionAction), preferredPositionLabel); + dbc.bindValue(JFaceProperties.value( + EmployeeEditPreferredPositionAction.class, + EmployeeEditPreferredPositionAction.TOOL_TIP_TEXT, + EmployeeEditPreferredPositionAction.TOOL_TIP_TEXT).observe(this.preferredPositionAction), preferredPositionLabel); + dbc.bindValue(JFaceProperties.value( + EmployeeEditPreferredPositionAction.class, + EmployeeEditPreferredPositionAction.EMPLOYEE_PREFERENCE, + EmployeeEditPreferredPositionAction.EMPLOYEE_PREFERENCE).observe(this.preferredPositionAction), selection); // Bind preferred team viewer // Avoid creating columns for this viewer Since the data will not // display properly. See bug #176. IObservableList preferredTeams = BeanProperties.list(EmployeePreference.class, EmployeePreference.PREFERRED_TEAM, Team.class).observeDetail(selection); this.preferredTeamViewer.setContentProvider(new ObservableListContentProvider()); - this.preferredTeamViewer.setLabelProvider(new EmployeePreferredTeamLabelProvider(BeanProperties - .value(Team.class, Team.NAME) - .value(BindingProperties.convertedValue(Converters.removeFrontNumber())) - .observeDetail(new ListToSetAdapter(preferredTeams)), preferredTeams)); + this.preferredTeamViewer.setLabelProvider(new EmployeePreferredTeamLabelProvider(BeanProperties.value(Team.class, Team.NAME).value( + BindingProperties.convertedValue(Converters.removeFrontNumber())).observeDetail(new ListToSetAdapter(preferredTeams)), preferredTeams)); this.preferredTeamViewer.setInput(preferredTeams); IObservableValue preferredTeamSelection = ViewerProperties.singleSelection().observe(this.preferredTeamViewer); IViewerObservableList preferredTeamSelections = ViewerProperties.multipleSelection().observe(this.preferredTeamViewer); // Add all - dbc.bindValue( - JFaceProperties.value( - EmployeePreferredTeamAddAllAction.class, - EmployeePreferredTeamAddAllAction.EMPLOYEE_PREFERENCE, - EmployeePreferredTeamAddAllAction.EMPLOYEE_PREFERENCE).observe(this.preferredTeamAddAllAction), - selection); + dbc.bindValue(JFaceProperties.value( + EmployeePreferredTeamAddAllAction.class, + EmployeePreferredTeamAddAllAction.EMPLOYEE_PREFERENCE, + EmployeePreferredTeamAddAllAction.EMPLOYEE_PREFERENCE).observe(this.preferredTeamAddAllAction), selection); // Remove action - dbc.bindValue( - JFaceProperties.value( - EmployeePreferredTeamRemoveAction.class, - EmployeePreferredTeamRemoveAction.EMPLOYEE_PREFERENCE, - EmployeePreferredTeamRemoveAction.EMPLOYEE_PREFERENCE).observe(this.preferredTeamRemoveAction), - selection); - dbc.bindValue( - JFaceProperties.value( + dbc.bindValue(JFaceProperties.value( + EmployeePreferredTeamRemoveAction.class, + EmployeePreferredTeamRemoveAction.EMPLOYEE_PREFERENCE, + EmployeePreferredTeamRemoveAction.EMPLOYEE_PREFERENCE).observe(this.preferredTeamRemoveAction), selection); + dbc + .bindValue(JFaceProperties.value( EmployeePreferredTeamRemoveAction.class, EmployeePreferredTeamRemoveAction.SHIFTS, - EmployeePreferredTeamRemoveAction.SHIFTS).observe(this.preferredTeamRemoveAction), - new ListObservableValue(preferredTeamSelections, Team.class)); + EmployeePreferredTeamRemoveAction.SHIFTS).observe(this.preferredTeamRemoveAction), new ListObservableValue( + preferredTeamSelections, + Team.class)); // Move up - dbc.bindValue( - JFaceProperties.value( - EmployeePreferredTeamMoveAction.class, - EmployeePreferredTeamMoveAction.EMPLOYEE_PREFERENCE, - EmployeePreferredTeamMoveAction.EMPLOYEE_PREFERENCE).observe(this.preferredTeamMoveUpAction), - selection); + dbc.bindValue(JFaceProperties.value( + EmployeePreferredTeamMoveAction.class, + EmployeePreferredTeamMoveAction.EMPLOYEE_PREFERENCE, + EmployeePreferredTeamMoveAction.EMPLOYEE_PREFERENCE).observe(this.preferredTeamMoveUpAction), selection); dbc.bindValue(JFaceProperties .value(EmployeePreferredTeamMoveAction.class, EmployeePreferredTeamMoveAction.SHIFT, EmployeePreferredTeamMoveAction.SHIFT) .observe(this.preferredTeamMoveUpAction), preferredTeamSelection); // Move down - dbc.bindValue( - JFaceProperties.value( - EmployeePreferredTeamMoveAction.class, - EmployeePreferredTeamMoveAction.EMPLOYEE_PREFERENCE, - EmployeePreferredTeamMoveAction.EMPLOYEE_PREFERENCE).observe(this.preferredTeamMoveDownAction), - selection); + dbc.bindValue(JFaceProperties.value( + EmployeePreferredTeamMoveAction.class, + EmployeePreferredTeamMoveAction.EMPLOYEE_PREFERENCE, + EmployeePreferredTeamMoveAction.EMPLOYEE_PREFERENCE).observe(this.preferredTeamMoveDownAction), selection); dbc.bindValue(JFaceProperties .value(EmployeePreferredTeamMoveAction.class, EmployeePreferredTeamMoveAction.SHIFT, EmployeePreferredTeamMoveAction.SHIFT) .observe(this.preferredTeamMoveDownAction), preferredTeamSelection); @@ -467,41 +448,28 @@ public class EmployeeViewPart extends AbstractViewPart { private void createViewerColumns(TableViewer viewer, IObservableSet employeePreferences) { // RedId IValueProperty refIdProperty = BeanProperties.value(EmployeePreference.class, EmployeePreference.EMPLOYEE + DOT + Employee.REFID); - ColumnSupport - .create(viewer, _("No."), employeePreferences, refIdProperty) - .addPropertySorting() - .addTextEditingSupport( - getDbc(), - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null); + ColumnSupport.create(viewer, _("No."), employeePreferences, refIdProperty).addPropertySorting().addTextEditingSupport( + getDbc(), + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null); // FirstName IValueProperty firstnameProperty = BeanProperties.value(EmployeePreference.class, EmployeePreference.EMPLOYEE + DOT + Employee.FIRSTNAME); - ColumnSupport - .create(viewer, ("Prénom"), employeePreferences, firstnameProperty) - .setWidth(150) - .addPropertySorting() - .addTextEditingSupport( - getDbc(), - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null); + ColumnSupport.create(viewer, ("Prénom"), employeePreferences, firstnameProperty).setWidth(150).addPropertySorting().addTextEditingSupport( + getDbc(), + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null); // Lastname IValueProperty lastnameProperty = BeanProperties.value(EmployeePreference.class, EmployeePreference.EMPLOYEE + DOT + Employee.LASTNAME); - ColumnSupport - .create(viewer, _("Nom"), employeePreferences, lastnameProperty) - .setWidth(150) - .addPropertySorting() - .addTextEditingSupport( - getDbc(), - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null); + ColumnSupport.create(viewer, _("Nom"), employeePreferences, lastnameProperty).setWidth(150).addPropertySorting().addTextEditingSupport( + getDbc(), + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null); // HireDate IValueProperty hireDateLabelProperty = BeanProperties.value(EmployeePreference.class, EmployeePreference.EMPLOYEE + DOT + Employee.HIRE_DATE).value( BindingProperties.convertedValue(Converters.shortDateConverter())); - ColumnSupport - .create(viewer, _("Date d'ancienneté"), employeePreferences, hireDateLabelProperty) - .setWidth(150) - .addPropertySorting(new SelfValueProperty(EmployeePreference.class), EmployeePreferenceComparators.bySeniority()) - .activateSorting(); + ColumnSupport.create(viewer, _("Date d'ancienneté"), employeePreferences, hireDateLabelProperty).setWidth(150).addPropertySorting( + new SelfValueProperty(EmployeePreference.class), + EmployeePreferenceComparators.bySeniority()).activateSorting(); // Preferred Seniority IValueProperty preferredSeniorityProperty = BeanProperties.value(EmployeePreference.class, EmployeePreference.EMPLOYEE + DOT diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityDialog.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityDialog.java index 0d0fbb1063fe8e1a8ff71bd4608e08e026fb4a98..f8972985534d119fa815a8fe44b681fd915b5c47 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityDialog.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityDialog.java @@ -227,12 +227,8 @@ public class NonAvailabilityDialog extends TitleAreaDialog { // Bind start date time WritableValue startTimeValue = new WritableValue(null, Date.class); - DateTimeSupport startTimeSupport = DateTimeSupport.create( - this.startTime, - dbc, - startTimeValue, - DateFormatRegistry.getFormat(DateFormatRegistry.TIME | DateFormatRegistry.MEDIUM), - DateTimeSupport.STEP_60); + DateTimeSupport startTimeSupport = DateTimeSupport.create(this.startTime, dbc, startTimeValue, DateFormatRegistry.getFormat(DateFormatRegistry.TIME + | DateFormatRegistry.MEDIUM), DateTimeSupport.STEP_60); dbc.bindValue(new DateAndTimeObservableValue(SWTObservables.observeSelection(this.startDate), startTimeValue), middleStart); if (this.endTime.getLayoutData() instanceof GridData) { ((GridData) this.startTime.getLayoutData()).widthHint = startTimeSupport.getWidthHint(); @@ -240,12 +236,8 @@ public class NonAvailabilityDialog extends TitleAreaDialog { // Bind end date time WritableValue endTimeValue = new WritableValue(null, Date.class); - DateTimeSupport endTimeSupport = DateTimeSupport.create( - this.endTime, - dbc, - endTimeValue, - DateFormatRegistry.getFormat(DateFormatRegistry.TIME | DateFormatRegistry.MEDIUM), - DateTimeSupport.STEP_60); + DateTimeSupport endTimeSupport = DateTimeSupport.create(this.endTime, dbc, endTimeValue, DateFormatRegistry.getFormat(DateFormatRegistry.TIME + | DateFormatRegistry.MEDIUM), DateTimeSupport.STEP_60); if (this.endTime.getLayoutData() instanceof GridData) { ((GridData) this.endTime.getLayoutData()).widthHint = endTimeSupport.getWidthHint(); } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityPrintAction.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityPrintAction.java index 15a2d482b50ccc8f341089582cbb10879e9c6b5c..657c3c6a3b2ee7b3cfa74c7446d25b0d4088fd87 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityPrintAction.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityPrintAction.java @@ -243,9 +243,8 @@ public class NonAvailabilityPrintAction extends PrintAction { // Keep reference on the user selection. this.firstDayOfWeek = store.getInt(ApplicationSetting.FIRST_DAY_OF_WEEK); this.title = dlg.getPrintTitle(); - this.range = new ConcreteTimeRange( - TimeRanges.getFirstDayOfFirstWeekOfMonth(dlg.getStart(), this.firstDayOfWeek), - TimeRanges.getLastDayOfLastWeekOfMonth(dlg.getEnd(), this.firstDayOfWeek)); + this.range = new ConcreteTimeRange(TimeRanges.getFirstDayOfFirstWeekOfMonth(dlg.getStart(), this.firstDayOfWeek), TimeRanges + .getLastDayOfLastWeekOfMonth(dlg.getEnd(), this.firstDayOfWeek)); this.filter = dlg.getFilter(); // Generate the print. super.run(); diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityPrintDialog.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityPrintDialog.java index c11fd208e00c352c17bb27bd0224d363a1772863..c39e932c155cbd6e03e7573c89aad47fe12740f3 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityPrintDialog.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityPrintDialog.java @@ -83,11 +83,8 @@ public class NonAvailabilityPrintDialog extends TitleAreaDialog { private static Image getTitleImage() { Image image = JFaceResources.getImage(TITLE_IMAGE); if (image == null) { - OverlayImageDescriptor icon = new OverlayImageDescriptor( - JFaceResources.getImageRegistry().getDescriptor(DLG_IMG_TITLE_BANNER), - Resources.getImageDescriptor(Resources.ICON_PRINT_48), - SWT.LEFT, - SWT.CENTER); + OverlayImageDescriptor icon = new OverlayImageDescriptor(JFaceResources.getImageRegistry().getDescriptor(DLG_IMG_TITLE_BANNER), Resources + .getImageDescriptor(Resources.ICON_PRINT_48), SWT.LEFT, SWT.CENTER); JFaceResources.getImageRegistry().put(TITLE_IMAGE, icon); image = JFaceResources.getImage(TITLE_IMAGE); } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityPrintFactory.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityPrintFactory.java index 1e624ec512ef66bba2b282e278ba879d20edc799..619d60ed9cda5b00591acd94e88752a141fbac5a 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityPrintFactory.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/nonavailabilities/NonAvailabilityPrintFactory.java @@ -30,14 +30,14 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import net.sf.paperclips.AlignPrint; -import net.sf.paperclips.ColumnPrint; -import net.sf.paperclips.DefaultGridLook; -import net.sf.paperclips.GridPrint; -import net.sf.paperclips.LineBorder; -import net.sf.paperclips.Print; -import net.sf.paperclips.ScalePrint; -import net.sf.paperclips.TextPrint; +import org.eclipse.nebula.paperclips.core.AlignPrint; +import org.eclipse.nebula.paperclips.core.ColumnPrint; +import org.eclipse.nebula.paperclips.core.grid.DefaultGridLook; +import org.eclipse.nebula.paperclips.core.grid.GridPrint; +import org.eclipse.nebula.paperclips.core.border.LineBorder; +import org.eclipse.nebula.paperclips.core.Print; +import org.eclipse.nebula.paperclips.core.ScalePrint; +import org.eclipse.nebula.paperclips.core.text.TextPrint; import org.apache.commons.collections.Predicate; import org.apache.commons.collections.iterators.FilterIterator; diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/ProposedTaskViewPartPage.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/ProposedTaskViewPartPage.java index 52eb3707b66b4a12be7060ce023e0ce7f440eb1c..e7c8644555238e90e40b86ab62bb7fdb39abe221 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/ProposedTaskViewPartPage.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/ProposedTaskViewPartPage.java @@ -233,10 +233,8 @@ public class ProposedTaskViewPartPage extends AbstractViewPart implements IViewP */ getDbc().bindValue( SWTObservables.observeText(this.dateLabel), - BeanProperties - .value(GeneratePlanifContext.class, GeneratePlanifContext.START) - .value(BindingProperties.convertedValue(Converters.weekTitleConverter())) - .observe(context)); + BeanProperties.value(GeneratePlanifContext.class, GeneratePlanifContext.START).value( + BindingProperties.convertedValue(Converters.weekTitleConverter())).observe(context)); /* * Bind the employee viewer to manager model */ @@ -262,10 +260,8 @@ public class ProposedTaskViewPartPage extends AbstractViewPart implements IViewP * Bind warnings */ ProposedWarningComputedSet proposedWarning = new ProposedWarningComputedSet(context, selectedEmployee); - IObservableValue warningsText = CollectionProperties - .set() - .value(BindingProperties.convertedValue(new ProposedWarningsToStringConverter())) - .observe(proposedWarning); + IObservableValue warningsText = CollectionProperties.set().value(BindingProperties.convertedValue(new ProposedWarningsToStringConverter())).observe( + proposedWarning); getDbc().bindValue(FormWidgetProperties.text(true, false).observe(this.warningsFormText), warningsText); ControlStyleSupport.create(this.warningsFormText, warningsText, new ControlStyleUpdater() { @@ -367,11 +363,9 @@ public class ProposedTaskViewPartPage extends AbstractViewPart implements IViewP IValueProperty teamLabel = BeanProperties .value(Task.class, Task.PRODUCTION_EVENT + DOT + ProductionEvent.SHIFT + DOT + Shift.TEAM + DOT + Team.NAME) .value(BindingProperties.convertedValue(Converters.removeFrontNumber())); - ColumnSupport - .create(viewer, _("Équipe"), knownElements, teamLabel) - .setWidth(150) - .addPropertySorting(new SelfValueProperty(Task.class), TaskComparators.byTeam()) - .activateSorting(); + ColumnSupport.create(viewer, _("Équipe"), knownElements, teamLabel).setWidth(150).addPropertySorting( + new SelfValueProperty(Task.class), + TaskComparators.byTeam()).activateSorting(); // Time Range IValueProperty timeRangeProperty = DateFormatRangeValueProperty.createTimeMedium(); IValueProperty startDateProperty = BeanProperties.value(Task.class, AbstractCalendarEvent.START_DATE); @@ -379,14 +373,11 @@ public class ProposedTaskViewPartPage extends AbstractViewPart implements IViewP // Locked IValueProperty lockedProperty = BeanProperties.value(Task.class, Task.LOCKED, Boolean.TYPE); IValueProperty lockedLabel = lockedProperty.value(BindingProperties.convertedValue(Converters.booleanConverter())); - ColumnSupport - .create(viewer, _("Verrouillé"), knownElements, lockedLabel) - .addPropertySorting() - .addCheckboxEditingSupport( - getDbc(), - lockedProperty, - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null); + ColumnSupport.create(viewer, _("Verrouillé"), knownElements, lockedLabel).addPropertySorting().addCheckboxEditingSupport( + getDbc(), + lockedProperty, + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null); // Attach a column preference ColumnViewerPreferences.create(viewer, PlanimodPreferences.getPreferenceStore(), PREFERENCE_COLUMNS_CURRENT_TASK); } @@ -425,20 +416,19 @@ public class ProposedTaskViewPartPage extends AbstractViewPart implements IViewP comboViewer.setInput(proposedEmployees); IValueProperty employeeProperty = BeanProperties.value(Task.class, Task.EMPLOYEE); IValueProperty employeeLabel = employeeProperty.value(BindingProperties.convertedValue(EmployeeViewerUtils.fullnameConverter())); - ColumnSupport - .create(viewer, _("Employé"), knownElements, employeeLabel) - .setWidth(150) - .addPropertySorting() - .addViewerEditingSupport(getDbc(), employeeProperty, employeeCellEditor, new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER), null); + ColumnSupport.create(viewer, _("Employé"), knownElements, employeeLabel).setWidth(150).addPropertySorting().addViewerEditingSupport( + getDbc(), + employeeProperty, + employeeCellEditor, + new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER), + null); // Team IValueProperty teamLabel = BeanProperties .value(Task.class, Task.PRODUCTION_EVENT + DOT + ProductionEvent.SHIFT + DOT + Shift.TEAM + DOT + Team.NAME) .value(BindingProperties.convertedValue(Converters.removeFrontNumber())); - ColumnSupport - .create(viewer, _("Équipe"), knownElements, teamLabel) - .setWidth(150) - .addPropertySorting(new SelfValueProperty(Task.class), TaskComparators.byTeam()) - .activateSorting(); + ColumnSupport.create(viewer, _("Équipe"), knownElements, teamLabel).setWidth(150).addPropertySorting( + new SelfValueProperty(Task.class), + TaskComparators.byTeam()).activateSorting(); // Time Range IValueProperty timeRangeProperty = DateFormatRangeValueProperty.createTimeMedium(); IValueProperty startDateProperty = BeanProperties.value(Task.class, AbstractCalendarEvent.START_DATE); @@ -447,14 +437,11 @@ public class ProposedTaskViewPartPage extends AbstractViewPart implements IViewP final IObservableValue selectedEmployee = ViewersObservables.observeSingleSelection(this.employeeViewer); IValueProperty lockedProperty = new TaskLockedValueProperty(selectedEmployee); IValueProperty lockedLabel = BeanProperties.value(Task.class, Task.LOCKED).value(BindingProperties.convertedValue(Converters.booleanConverter())); - ColumnSupport - .create(viewer, _("Verrouillé"), knownElements, lockedLabel) - .addPropertySorting() - .addCheckboxEditingSupport( - getDbc(), - lockedProperty, - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null); + ColumnSupport.create(viewer, _("Verrouillé"), knownElements, lockedLabel).addPropertySorting().addCheckboxEditingSupport( + getDbc(), + lockedProperty, + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null); // Attach a column preference ColumnViewerPreferences.create(viewer, PlanimodPreferences.getPreferenceStore(), PREFERENCE_COLUMNS_OFFER_TASK); } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/TaskViewPartPage.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/TaskViewPartPage.java index f1669268a70ee9e80bb610b3b722c1284b2fcf2e..91859d7fd32678e4cf46b2899ceb919f34a3590b 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/TaskViewPartPage.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/TaskViewPartPage.java @@ -183,10 +183,8 @@ public class TaskViewPartPage extends AbstractViewPart implements IViewPartPage */ getDbc().bindValue( SWTObservables.observeText(this.dateLabel), - BeanProperties - .value(GeneratePlanifContext.class, GeneratePlanifContext.START) - .value(BindingProperties.convertedValue(Converters.weekTitleConverter())) - .observe(context)); + BeanProperties.value(GeneratePlanifContext.class, GeneratePlanifContext.START).value( + BindingProperties.convertedValue(Converters.weekTitleConverter())).observe(context)); /* * Bind the viewer content. @@ -215,10 +213,8 @@ public class TaskViewPartPage extends AbstractViewPart implements IViewPartPage /* * Bind remove action to production events */ - IObservableValue productionEvent = ViewerProperties - .singleSelection() - .value(BeanProperties.value(Task.class, Task.PRODUCTION_EVENT)) - .observe(this.viewer); + IObservableValue productionEvent = ViewerProperties.singleSelection().value(BeanProperties.value(Task.class, Task.PRODUCTION_EVENT)).observe( + this.viewer); getDbc().bindValue(JFaceProperties.value(RemoveAction.class, RemoveAction.OBJECT, RemoveAction.OBJECT).observe(this.removeAction), productionEvent); } @@ -252,25 +248,20 @@ public class TaskViewPartPage extends AbstractViewPart implements IViewPartPage IValueProperty employeeProperty = BeanProperties.value(Task.class, Task.EMPLOYEE); IValueProperty employeeLabel = employeeProperty.value(BindingProperties.convertedValue(EmployeeViewerUtils.fullnameConverter())); - ColumnSupport - .create(viewer, _("Employé"), knownElements, employeeLabel) - .addPropertySorting() - .setWidth(150) - .addViewerEditingSupport( - getDbc(), - employeeProperty, - employeeCellEditor, - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null); + ColumnSupport.create(viewer, _("Employé"), knownElements, employeeLabel).addPropertySorting().setWidth(150).addViewerEditingSupport( + getDbc(), + employeeProperty, + employeeCellEditor, + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null); // Team IValueProperty teamLabel = BeanProperties .value(Task.class, Task.PRODUCTION_EVENT + DOT + ProductionEvent.SHIFT + DOT + Shift.TEAM + DOT + Team.NAME) .value(BindingProperties.convertedValue(Converters.removeFrontNumber())); - ColumnSupport - .create(viewer, _("Équipe"), knownElements, teamLabel) - .setWidth(150) - .addPropertySorting(new SelfValueProperty(Task.class), TaskComparators.byTeam()); + ColumnSupport.create(viewer, _("Équipe"), knownElements, teamLabel).setWidth(150).addPropertySorting( + new SelfValueProperty(Task.class), + TaskComparators.byTeam()); // Time Range IValueProperty timeRangeProperty = DateFormatRangeValueProperty.createTimeMedium(); @@ -280,14 +271,11 @@ public class TaskViewPartPage extends AbstractViewPart implements IViewPartPage // Locked IValueProperty lockedProperty = BeanProperties.value(Task.class, Task.LOCKED, Boolean.TYPE); IValueProperty lockedLabel = lockedProperty.value(BindingProperties.convertedValue(Converters.booleanConverter())); - ColumnSupport - .create(viewer, _("Verrouillé"), knownElements, lockedLabel) - .addPropertySorting() - .addCheckboxEditingSupport( - getDbc(), - lockedProperty, - new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), - null); + ColumnSupport.create(viewer, _("Verrouillé"), knownElements, lockedLabel).addPropertySorting().addCheckboxEditingSupport( + getDbc(), + lockedProperty, + new ManagerUpdateValueStrategy(getSite().getService(PlanimodManagers.class), UpdateValueStrategy.POLICY_CONVERT), + null); // Attach a column preference ColumnViewerPreferences.create(viewer, PlanimodPreferences.getPreferenceStore(), PREFERENCE_COLUMNS); diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/GridHelper.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/GridHelper.java index 87a56c5d63effe8d9ba6bb3394ed8555185a1c3c..27b876fd77d603f8088a2d6f33e0f7c4158a74cd 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/GridHelper.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/GridHelper.java @@ -20,12 +20,12 @@ package com.planimod.ui.views.planif.printing; import java.util.ArrayList; import java.util.List; -import net.sf.paperclips.ColumnPrint; -import net.sf.paperclips.GridPrint; -import net.sf.paperclips.LineBreakPrint; -import net.sf.paperclips.NoBreakPrint; -import net.sf.paperclips.Print; -import net.sf.paperclips.TextPrint; +import org.eclipse.nebula.paperclips.core.ColumnPrint; +import org.eclipse.nebula.paperclips.core.grid.GridPrint; +import org.eclipse.nebula.paperclips.core.text.LineBreakPrint; +import org.eclipse.nebula.paperclips.core.NoBreakPrint; +import org.eclipse.nebula.paperclips.core.Print; +import org.eclipse.nebula.paperclips.core.text.TextPrint; import com.patrikdufresne.printing.FontDataUtil; diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifDaySummaryPrintAction.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifDaySummaryPrintAction.java index e44f56cfd74a62a3a8825599240b178abdf52d90..9773290c1ad593778cd19e386f7ba86d84ca556f 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifDaySummaryPrintAction.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifDaySummaryPrintAction.java @@ -115,10 +115,9 @@ public class PlanifDaySummaryPrintAction extends PrintAction { ((PlanifDaySummaryPrintFactory) factory).setEmployeePreferences(this.context.listEmployeePreferences()); - ((PlanifDaySummaryPrintFactory) factory).setNonAvailabilties(this.context - .getManagers() - .getNonAvailabilityManager() - .list(this.context.getStart(), this.context.getEnd())); + ((PlanifDaySummaryPrintFactory) factory).setNonAvailabilties(this.context.getManagers().getNonAvailabilityManager().list( + this.context.getStart(), + this.context.getEnd())); } catch (ManagerException e) { PlanimodPolicy.showException(e); diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifDaySummaryPrintFactory.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifDaySummaryPrintFactory.java index 625f152bc8fc8fbba6feee51218283bae3420853..54aa93c8d29957516758cee82eea84a518ee7053 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifDaySummaryPrintFactory.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifDaySummaryPrintFactory.java @@ -31,11 +31,11 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import net.sf.paperclips.DefaultGridLook; -import net.sf.paperclips.GridPrint; -import net.sf.paperclips.LineBorder; -import net.sf.paperclips.Print; -import net.sf.paperclips.TextPrint; +import org.eclipse.nebula.paperclips.core.grid.DefaultGridLook; +import org.eclipse.nebula.paperclips.core.grid.GridPrint; +import org.eclipse.nebula.paperclips.core.border.LineBorder; +import org.eclipse.nebula.paperclips.core.Print; +import org.eclipse.nebula.paperclips.core.text.TextPrint; import com.patrikdufresne.printing.BackgroundProvider; import com.patrikdufresne.printing.ColorUtil; diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifWeekSummaryPrintAction.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifWeekSummaryPrintAction.java index 1c5b83bb07ef83bdf1ebafdc63f7c685ecd70541..9045f1d5329c5f8b966728e4848e3eaaeedd5912 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifWeekSummaryPrintAction.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifWeekSummaryPrintAction.java @@ -114,10 +114,9 @@ public class PlanifWeekSummaryPrintAction extends PrintAction { ((PlanifWeekSummaryPrintFactory) factory).setEmployeePreferences(this.context.listEmployeePreferences()); - ((PlanifWeekSummaryPrintFactory) factory).setNonAvailabilties(this.context - .getManagers() - .getNonAvailabilityManager() - .list(this.context.getStart(), this.context.getEnd())); + ((PlanifWeekSummaryPrintFactory) factory).setNonAvailabilties(this.context.getManagers().getNonAvailabilityManager().list( + this.context.getStart(), + this.context.getEnd())); } catch (ManagerException e) { PlanimodPolicy.showException(e); diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifWeekSummaryPrintFactory.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifWeekSummaryPrintFactory.java index 858135a66ef5ffd0b14b2bc07c55b9c5983fa130..969111595766c4c52e6e63cc545779ec612d45ef 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifWeekSummaryPrintFactory.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifWeekSummaryPrintFactory.java @@ -30,11 +30,11 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import net.sf.paperclips.DefaultGridLook; -import net.sf.paperclips.GridPrint; -import net.sf.paperclips.LineBorder; -import net.sf.paperclips.Print; -import net.sf.paperclips.TextPrint; +import org.eclipse.nebula.paperclips.core.grid.DefaultGridLook; +import org.eclipse.nebula.paperclips.core.grid.GridPrint; +import org.eclipse.nebula.paperclips.core.border.LineBorder; +import org.eclipse.nebula.paperclips.core.Print; +import org.eclipse.nebula.paperclips.core.text.TextPrint; import com.patrikdufresne.printing.BackgroundProvider; import com.patrikdufresne.printing.ColorUtil; diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifWeekTransfertPrintFactory.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifWeekTransfertPrintFactory.java index bcaa3ea0c79ebd190ce24c1c35f792fdfdc4b4c0..5437b9d531c07b739df4fbef67d4dbd82d6e1ba6 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifWeekTransfertPrintFactory.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/planif/printing/PlanifWeekTransfertPrintFactory.java @@ -25,11 +25,11 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import net.sf.paperclips.DefaultGridLook; -import net.sf.paperclips.GridPrint; -import net.sf.paperclips.LineBorder; -import net.sf.paperclips.Print; -import net.sf.paperclips.TextPrint; +import org.eclipse.nebula.paperclips.core.grid.DefaultGridLook; +import org.eclipse.nebula.paperclips.core.grid.GridPrint; +import org.eclipse.nebula.paperclips.core.border.LineBorder; +import org.eclipse.nebula.paperclips.core.Print; +import org.eclipse.nebula.paperclips.core.text.TextPrint; import com.patrikdufresne.printing.BackgroundProvider; import com.patrikdufresne.printing.ColorUtil; diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/production/DuplicateProductionEventDialog.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/production/DuplicateProductionEventDialog.java index 6a8084d4f96346918af97bf6fd79e5d4bb8d6013..a774b065ccac6456ccbc3327e7434a3f0d637f0c 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/production/DuplicateProductionEventDialog.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/production/DuplicateProductionEventDialog.java @@ -73,11 +73,8 @@ public class DuplicateProductionEventDialog extends TitleAreaDialog { private static Image getTitleImage() { Image image = JFaceResources.getImage(TITLE_IMAGE); if (image == null) { - OverlayImageDescriptor icon = new OverlayImageDescriptor( - JFaceResources.getImageRegistry().getDescriptor(DLG_IMG_TITLE_BANNER), - Resources.getImageDescriptor(Resources.ICON_DUPLICATE_48), - SWT.LEFT, - SWT.CENTER); + OverlayImageDescriptor icon = new OverlayImageDescriptor(JFaceResources.getImageRegistry().getDescriptor(DLG_IMG_TITLE_BANNER), Resources + .getImageDescriptor(Resources.ICON_DUPLICATE_48), SWT.LEFT, SWT.CENTER); JFaceResources.getImageRegistry().put(TITLE_IMAGE, icon); image = JFaceResources.getImage(TITLE_IMAGE); } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/production/EditProductionEventDialog.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/production/EditProductionEventDialog.java index d335ad3e31f8430a8fa685fb5d026fd866126b3d..22b4605de86c63656b05d6b87982e0415e397da5 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/production/EditProductionEventDialog.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/production/EditProductionEventDialog.java @@ -201,19 +201,14 @@ public class EditProductionEventDialog extends TitleAreaDialog { /* * Bind the team label. */ - this.dbc.bindValue( - WidgetProperties.text().observe(this.teamLabel), - BeanProperties - .value(Shift.class, Shift.TEAM + DOT + Team.NAME) - .value(BindingProperties.convertedValue(Converters.removeFrontNumber())) - .observeDetail(this.shift)); + this.dbc.bindValue(WidgetProperties.text().observe(this.teamLabel), BeanProperties.value(Shift.class, Shift.TEAM + DOT + Team.NAME).value( + BindingProperties.convertedValue(Converters.removeFrontNumber())).observeDetail(this.shift)); /* * Bind date to date label */ - this.dbc.bindValue( - SWTObservables.observeText(this.dateLabel), - new DateFormatRangeValueProperty(DateFormatRegistry.TIME | DateFormatRegistry.LONG).observeDetail(this.shift)); + this.dbc.bindValue(SWTObservables.observeText(this.dateLabel), new DateFormatRangeValueProperty(DateFormatRegistry.TIME | DateFormatRegistry.LONG) + .observeDetail(this.shift)); /* * Bind product viewer diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/production/ProductionViewPart.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/production/ProductionViewPart.java index 4d1bbeb13d4cc64ecd799baf44548ee5d785dc7b..746a8dc9ea314c694740533e0bcbb3d1042765e2 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/production/ProductionViewPart.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/production/ProductionViewPart.java @@ -143,10 +143,8 @@ public class ProductionViewPart extends AbstractViewPart { IObservableMap shiftLabels = new ShiftProductionEventObservableMap(getSite().getService(PlanimodManagers.class), shifts); IObservableMap shiftStart = BeanProperties.value(AbstractCalendarEvent.class, AbstractCalendarEvent.START_DATE, Date.class).observeDetail(shifts); IObservableMap shiftEnd = BeanProperties.value(AbstractCalendarEvent.class, AbstractCalendarEvent.END_DATE, Date.class).observeDetail(shifts); - IObservableMap color = BeanProperties - .value(Shift.class, Shift.TEAM + DOT + Team.COLOR) - .value(BindingProperties.convertedValue(Converters.StringToRGB())) - .observeDetail(shifts); + IObservableMap color = BeanProperties.value(Shift.class, Shift.TEAM + DOT + Team.COLOR).value( + BindingProperties.convertedValue(Converters.StringToRGB())).observeDetail(shifts); this.viewer.setContentProvider(new ObservableSetContentProvider(new PlannerViewerUpdater(this.viewer))); this.viewer.setLabelProvider(new ObservableMapPlannerLabelProviderWithColor(shiftLabels, shiftStart, shiftEnd, color)); diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/qualifs/QualificationPrintFactory.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/qualifs/QualificationPrintFactory.java index 992aa9886560b228dbd7d38d9639f48b424c4092..63a13732f968e1870d357ae9f3d48779432b20e0 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/qualifs/QualificationPrintFactory.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/qualifs/QualificationPrintFactory.java @@ -27,21 +27,21 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import net.sf.paperclips.AlignPrint; -import net.sf.paperclips.CellBackgroundProvider; -import net.sf.paperclips.DefaultGridLook; -import net.sf.paperclips.GridPrint; -import net.sf.paperclips.LineBorder; -import net.sf.paperclips.PageNumber; -import net.sf.paperclips.PageNumberFormat; -import net.sf.paperclips.PageNumberPrint; -import net.sf.paperclips.Print; -import net.sf.paperclips.RotatePrint; -import net.sf.paperclips.ScalePrint; -import net.sf.paperclips.SidewaysPrint; -import net.sf.paperclips.StyledTextPrint; -import net.sf.paperclips.TextPrint; -import net.sf.paperclips.TextStyle; +import org.eclipse.nebula.paperclips.core.AlignPrint; +import org.eclipse.nebula.paperclips.core.grid.CellBackgroundProvider; +import org.eclipse.nebula.paperclips.core.grid.DefaultGridLook; +import org.eclipse.nebula.paperclips.core.grid.GridPrint; +import org.eclipse.nebula.paperclips.core.border.LineBorder; +import org.eclipse.nebula.paperclips.core.page.PageNumber; +import org.eclipse.nebula.paperclips.core.page.PageNumberFormat; +import org.eclipse.nebula.paperclips.core.page.PageNumberPrint; +import org.eclipse.nebula.paperclips.core.Print; +import org.eclipse.nebula.paperclips.core.RotatePrint; +import org.eclipse.nebula.paperclips.core.ScalePrint; +import org.eclipse.nebula.paperclips.core.SidewaysPrint; +import org.eclipse.nebula.paperclips.core.text.StyledTextPrint; +import org.eclipse.nebula.paperclips.core.text.TextPrint; +import org.eclipse.nebula.paperclips.core.text.TextStyle; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.RGB; @@ -198,9 +198,8 @@ public class QualificationPrintFactory extends PlanimodPrintFactory { // Get Positions List positions = new ArrayList(data.listPositions()); - Collections.sort( - positions, - this.orientation == SWT.HORIZONTAL ? Collections.reverseOrder(PositionComparators.byClassifiedName()) : PositionComparators.byClassifiedName()); + Collections.sort(positions, this.orientation == SWT.HORIZONTAL ? Collections.reverseOrder(PositionComparators.byClassifiedName()) : PositionComparators + .byClassifiedName()); // Create Grid holding the qualifications GridPrint grid = new GridPrint(); @@ -426,11 +425,9 @@ public class QualificationPrintFactory extends PlanimodPrintFactory { protected Print createMiddleFooterPrint(PageNumber pageNumber) { StyledTextPrint text = new StyledTextPrint(); text.setStyle(new TextStyle().font(FontDataUtil.SMALL)); - text - .append(_("X : Formé pour le poste")) - .newline() - .append(" X ", new TextStyle().background(new RGB(0, 0, 0)).foreground(new RGB(255, 255, 255)).font(FontDataUtil.SMALL)) - .append(_(": Détient le poste")); + text.append(_("X : Formé pour le poste")).newline().append( + " X ", + new TextStyle().background(new RGB(0, 0, 0)).foreground(new RGB(255, 255, 255)).font(FontDataUtil.SMALL)).append(_(": Détient le poste")); return text; } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/qualifs/QualificationViewPart.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/qualifs/QualificationViewPart.java index 6fcb25ec06bbaba0a2b1e89a0b2829c40328bd96..e050251930b52f116526aa173be2a2ebbdb91368 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/qualifs/QualificationViewPart.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/qualifs/QualificationViewPart.java @@ -202,10 +202,9 @@ public class QualificationViewPart extends AbstractViewPart { IObservableSet qualifiedPosition = new QualifyPositionComputedSet(getSite().getService(PlanimodManagers.class), selectedEmployee); IValueProperty employeeIsQualify = new SetContainsPropertyValue(qualifiedPosition); IValueProperty employeeIsQualifyLabel = employeeIsQualify.value(BindingProperties.convertedValue(Converters.booleanConverter())); - ColumnSupport - .create(viewer, _("Formé"), knownElements, employeeIsQualifyLabel) - .addPropertySorting() - .addCheckboxEditingSupport(getDbc(), employeeIsQualify); + ColumnSupport.create(viewer, _("Formé"), knownElements, employeeIsQualifyLabel).addPropertySorting().addCheckboxEditingSupport( + getDbc(), + employeeIsQualify); // Attach a columns preferences ColumnViewerPreferences.create(viewer, PlanimodPreferences.getPreferenceStore(), PREFERENCE_POSITION_COLUMNS); } diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/shifts/ShiftDialog.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/shifts/ShiftDialog.java index bc2fa81c568cb444c18b5963d0bca442abade6e7..f9920447515ca20e7ffa132aa484e5bd4b9ca7cb 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/shifts/ShiftDialog.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/shifts/ShiftDialog.java @@ -173,24 +173,16 @@ public class ShiftDialog extends TitleAreaDialog { */ WritableValue startTimeValue = new WritableValue(null, Date.class); WritableValue endTimeValue = new WritableValue(null, Date.class); - DateTimeSupport startTimeSupport = DateTimeSupport.create( - this.startTime, - this.dbc, - startTimeValue, - DateFormatRegistry.getFormat(DateFormatRegistry.TIME | DateFormatRegistry.MEDIUM), - DateTimeSupport.STEP_60); + DateTimeSupport startTimeSupport = DateTimeSupport.create(this.startTime, this.dbc, startTimeValue, DateFormatRegistry + .getFormat(DateFormatRegistry.TIME | DateFormatRegistry.MEDIUM), DateTimeSupport.STEP_60); this.dbc.bindValue(new DateAndTimeObservableValue(SWTObservables.observeSelection(this.startDate), startTimeValue), this.start); if (this.startTime.getLayoutData() instanceof GridData) { ((GridData) this.startTime.getLayoutData()).widthHint = startTimeSupport.getWidthHint(); } - DateTimeSupport endTimeSupport = DateTimeSupport.create( - this.endTime, - this.dbc, - endTimeValue, - DateFormatRegistry.getFormat(DateFormatRegistry.TIME | DateFormatRegistry.MEDIUM), - DateTimeSupport.STEP_60); + DateTimeSupport endTimeSupport = DateTimeSupport.create(this.endTime, this.dbc, endTimeValue, DateFormatRegistry.getFormat(DateFormatRegistry.TIME + | DateFormatRegistry.MEDIUM), DateTimeSupport.STEP_60); this.dbc.bindValue(new DateAndTimeObservableValue(SWTObservables.observeSelection(this.endDate), endTimeValue), this.end); if (this.endTime.getLayoutData() instanceof GridData) { ((GridData) this.endTime.getLayoutData()).widthHint = endTimeSupport.getWidthHint(); diff --git a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/shifts/ShiftViewPart.java b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/shifts/ShiftViewPart.java index 180431c149ac407bdcc8b99409cbcf5988df1fd6..0240cc6f3e70acff3c32d0db07daf0424a1ac2c1 100644 --- a/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/shifts/ShiftViewPart.java +++ b/com.patrikdufresne.planimod/src/main/java/com/planimod/ui/views/shifts/ShiftViewPart.java @@ -153,10 +153,8 @@ public class ShiftViewPart extends AbstractViewPart { BeanProperties.value(Shift.class, Shift.TEAM + DOT + Team.NAME).observeDetail(shifts)); IObservableMap shiftStart = BeanProperties.value(AbstractCalendarEvent.class, AbstractCalendarEvent.START_DATE).observeDetail(shifts); IObservableMap shiftEnd = BeanProperties.value(AbstractCalendarEvent.class, AbstractCalendarEvent.END_DATE).observeDetail(shifts); - IObservableMap color = BeanProperties - .value(Shift.class, Shift.TEAM + DOT + Team.COLOR) - .value(BindingProperties.convertedValue(Converters.StringToRGB())) - .observeDetail(shifts); + IObservableMap color = BeanProperties.value(Shift.class, Shift.TEAM + DOT + Team.COLOR).value( + BindingProperties.convertedValue(Converters.StringToRGB())).observeDetail(shifts); this.viewer.setContentProvider(new ObservableSetContentProvider(new PlannerViewerUpdater(this.viewer))); this.viewer.setLabelProvider(new ObservableMapPlannerLabelProviderWithColor(shiftLabels, shiftStart, shiftEnd, color)); this.viewer.setComparator(new PropertyViewerComparator(ShiftComparators.byHourAndTeam())); diff --git a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/AllTests.java b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/AllTests.java index 54ea550e716034c999a1bb3e6833295a3fa2080f..04d888d9f1401b41945e28642f7f8d09a2311362 100644 --- a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/AllTests.java +++ b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/AllTests.java @@ -23,7 +23,7 @@ import org.junit.runners.Suite; import com.planimod.core.planif.TableTest; @RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite.SuiteClasses( { ApplicationSettingManagerTest.class, TimeRangesTest.class, EmployeeManagerTest.class, diff --git a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/ManagerTestCase.java b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/ManagerTestCase.java index 3b8e591c34e7bbaad2e289f6c5fac01b94b0b67c..38800e31604e15518ff0ed190dd0fd9d6cc7f593 100644 --- a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/ManagerTestCase.java +++ b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/ManagerTestCase.java @@ -528,10 +528,8 @@ public abstract class ManagerTestCase { Collection emp) { ProductionEvent[] a1 = new ProductionEvent[prodEvent.size()]; - int count = CollectionUtils.countMatches( - events, - new PlanifEventPredicate(prodEvent.toArray(a1), start, end, pos != null ? pos.toArray(new Position[pos.size()]) : null, emp != null ? emp - .toArray(new Employee[emp.size()]) : null)); + int count = CollectionUtils.countMatches(events, new PlanifEventPredicate(prodEvent.toArray(a1), start, end, pos != null ? pos.toArray(new Position[pos + .size()]) : null, emp != null ? emp.toArray(new Employee[emp.size()]) : null)); if (count < min || count > max) { StringBuilder buf = new StringBuilder(); if (prodEvent.size() > 1) { diff --git a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20110925.java b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20110925.java index e433df13d715242fc1d720b198d0d6e32845563c..b141fe197c3b12a0866d3e78f68f00f5dd794a8e 100644 --- a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20110925.java +++ b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20110925.java @@ -2967,13 +2967,11 @@ public class PlanifEventManagerGeneratePlanifTest20110925 extends ManagerTestCas // EMPLOYEEPREFERENCE_SHIFT.PREFERREDSHIFT_ID = SHIFT.ID) || ')','null') // || ');' FROM EMPLOYEE, EMPLOYEEPREFERENCE WHERE EMPLOYEE.ID = // EMPLOYEEPREFERENCE.EMPLOYEE_ID; - setEmployeePreference( - managers, - donaldTheriault, - mecanicien, + setEmployeePreference(managers, donaldTheriault, mecanicien, joursDeSemaine, maintenance, Arrays.asList( joursDeSemaine, - maintenance, - Arrays.asList(joursDeSemaine, soirSemaine, jourFinDeSemaine, soirFinDeSemaine)); + soirSemaine, + jourFinDeSemaine, + soirFinDeSemaine)); setEmployeePreference(managers, louiseVeillette, null, null, null, null); setEmployeePreference(managers, caroleMorand, null, null, emballage, Arrays.asList( joursDeSemaine, @@ -3196,13 +3194,11 @@ public class PlanifEventManagerGeneratePlanifTest20110925 extends ManagerTestCas soirRemplacementSemaine, joursRemplacementFinDeSemaine, soirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - michelMeunier, - huileurGraisseurEntretienPreventif, + setEmployeePreference(managers, michelMeunier, huileurGraisseurEntretienPreventif, joursDeSemaine, maintenance, Arrays.asList( joursDeSemaine, - maintenance, - Arrays.asList(joursDeSemaine, soirSemaine, jourFinDeSemaine, soirFinDeSemaine)); + soirSemaine, + jourFinDeSemaine, + soirFinDeSemaine)); setEmployeePreference(managers, pierreLamarque, operateurEnsacheuseVerticalSnack, joursDeSemaine, snack, Arrays.asList( joursDeSemaine, soirSemaine, @@ -3514,13 +3510,11 @@ public class PlanifEventManagerGeneratePlanifTest20110925 extends ManagerTestCas soirRemplacementSemaine, joursRemplacementFinDeSemaine, soirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - marcBellemare, - mecanicien, + setEmployeePreference(managers, marcBellemare, mecanicien, joursDeSemaine, maintenance, Arrays.asList( joursDeSemaine, - maintenance, - Arrays.asList(joursDeSemaine, jourFinDeSemaine, soirSemaine, soirFinDeSemaine)); + jourFinDeSemaine, + soirSemaine, + soirFinDeSemaine)); setEmployeePreference(managers, michelineLegault, null, null, emballage, Arrays.asList( soirSemaine, soirRemplacementSemaine, @@ -3721,13 +3715,11 @@ public class PlanifEventManagerGeneratePlanifTest20110925 extends ManagerTestCas soirRemplacementSemaine, nuitSemaineSalubrite, soirSemaine)); - setEmployeePreference( - managers, - lucRoy, - mecanicien, + setEmployeePreference(managers, lucRoy, mecanicien, joursDeSemaine, maintenance, Arrays.asList( joursDeSemaine, - maintenance, - Arrays.asList(joursDeSemaine, soirSemaine, jourFinDeSemaine, soirFinDeSemaine)); + soirSemaine, + jourFinDeSemaine, + soirFinDeSemaine)); setEmployeePreference(managers, lucieCaron, null, null, emballage, Arrays.asList( joursDeSemaine, soirSemaine, @@ -3838,20 +3830,16 @@ public class PlanifEventManagerGeneratePlanifTest20110925 extends ManagerTestCas soirRemplacementFinDeSemaine, nuitSemaineSalubrite, soirFinDeSemaine)); - setEmployeePreference( - managers, - sylvainJulien, - electrotechniciens, + setEmployeePreference(managers, sylvainJulien, electrotechniciens, joursDeSemaine, maintenance, Arrays.asList( joursDeSemaine, - maintenance, - Arrays.asList(joursDeSemaine, jourFinDeSemaine, soirSemaine, soirFinDeSemaine)); - setEmployeePreference( - managers, - sylvainCarriere, - mecanicien, + jourFinDeSemaine, + soirSemaine, + soirFinDeSemaine)); + setEmployeePreference(managers, sylvainCarriere, mecanicien, joursDeSemaine, maintenance, Arrays.asList( joursDeSemaine, - maintenance, - Arrays.asList(joursDeSemaine, soirSemaine, jourFinDeSemaine, soirFinDeSemaine)); + soirSemaine, + jourFinDeSemaine, + soirFinDeSemaine)); setEmployeePreference(managers, richardVaillant, null, null, boulangerie, Arrays.asList( joursDeSemaine, jourFinDeSemaine, @@ -3912,13 +3900,11 @@ public class PlanifEventManagerGeneratePlanifTest20110925 extends ManagerTestCas soirRemplacementFinDeSemaine, nuitSemaineSalubrite, soirFinDeSemaine)); - setEmployeePreference( - managers, - ivanhoeMaisonneuve, - electrotechniciens, + setEmployeePreference(managers, ivanhoeMaisonneuve, electrotechniciens, jourFinDeSemaine, maintenance, Arrays.asList( + joursDeSemaine, jourFinDeSemaine, - maintenance, - Arrays.asList(joursDeSemaine, jourFinDeSemaine, soirFinDeSemaine, soirSemaine)); + soirFinDeSemaine, + soirSemaine)); setEmployeePreference(managers, mathieuGuy, operateurLigneAPain, jourFinDeSemaine, boulangerie, Arrays.asList( jourFinDeSemaine, joursDeSemaine, @@ -3929,13 +3915,11 @@ public class PlanifEventManagerGeneratePlanifTest20110925 extends ManagerTestCas joursRemplacementFinDeSemaine, soirRemplacementSemaine, nuitSemaineSalubrite)); - setEmployeePreference( - managers, - denisBerube, - mecanicien, + setEmployeePreference(managers, denisBerube, mecanicien, jourFinDeSemaine, maintenance, Arrays.asList( jourFinDeSemaine, - maintenance, - Arrays.asList(jourFinDeSemaine, joursDeSemaine, soirSemaine, soirFinDeSemaine)); + joursDeSemaine, + soirSemaine, + soirFinDeSemaine)); setEmployeePreference(managers, daisyBourget, null, null, emballage, Arrays.asList( joursDeSemaine, soirSemaine, @@ -3946,13 +3930,11 @@ public class PlanifEventManagerGeneratePlanifTest20110925 extends ManagerTestCas soirRemplacementFinDeSemaine, soirFinDeSemaine, nuitSemaineSalubrite)); - setEmployeePreference( - managers, - mathewBellemare, - mecanicien, + setEmployeePreference(managers, mathewBellemare, mecanicien, soirSemaine, maintenance, Arrays.asList( + joursDeSemaine, + jourFinDeSemaine, soirSemaine, - maintenance, - Arrays.asList(joursDeSemaine, jourFinDeSemaine, soirSemaine, soirFinDeSemaine)); + soirFinDeSemaine)); setEmployeePreference(managers, alexandreDube, preposeSalubrite, soirFinDeSemaine, salubrite, Arrays.asList( soirFinDeSemaine, joursDeSemaine, @@ -4043,13 +4025,11 @@ public class PlanifEventManagerGeneratePlanifTest20110925 extends ManagerTestCas soirRemplacementSemaine, soirRemplacementFinDeSemaine, joursRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - ginoLemoine, - electrotechniciens, + setEmployeePreference(managers, ginoLemoine, electrotechniciens, soirSemaine, maintenance, Arrays.asList( + joursDeSemaine, + jourFinDeSemaine, soirSemaine, - maintenance, - Arrays.asList(joursDeSemaine, jourFinDeSemaine, soirSemaine, soirFinDeSemaine)); + soirFinDeSemaine)); setEmployeePreference(managers, ginetteLevesque, null, null, emballage, Arrays.asList( joursDeSemaine, jourRemplacementSemaine, diff --git a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20120930.java b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20120930.java index be23395831997891d951348b986169934558d667..0feb44a7099efd4ad986128cbc1285ae1c124587 100644 --- a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20120930.java +++ b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20120930.java @@ -720,13 +720,11 @@ public class PlanifEventManagerGeneratePlanifTest20120930 extends ManagerTestCas * */ private void createPreferences() throws ManagerException { - setEmployeePreference( - managers, - empDonaldTheriault, - posMecanicien, + setEmployeePreference(managers, empDonaldTheriault, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLouiseVeillette, null, null, sec1Emballage, Arrays.asList( team1JoursDeSemaine, team2JourRemplacementSemaine, @@ -980,13 +978,11 @@ public class PlanifEventManagerGeneratePlanifTest20120930 extends ManagerTestCas team6JoursRemplacementFinDeSemaine, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMichelMeunier, - posHuileurGraisseurEntretienPreventif, + setEmployeePreference(managers, empMichelMeunier, posHuileurGraisseurEntretienPreventif, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empPierreLamarque, posOperateurEnsacheuseVerticalSnack, team1JoursDeSemaine, sec2Snack, Arrays.asList( team1JoursDeSemaine, team3SoirSemaine, @@ -1317,13 +1313,11 @@ public class PlanifEventManagerGeneratePlanifTest20120930 extends ManagerTestCas team6JoursRemplacementFinDeSemaine, team8SoirRemplacementFinDeSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empMarcBellemare, - posMecanicien, + setEmployeePreference(managers, empMarcBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMichelineLegault, null, null, sec1Emballage, Arrays.asList( team3SoirSemaine, team1JoursDeSemaine, @@ -1544,13 +1538,11 @@ public class PlanifEventManagerGeneratePlanifTest20120930 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team4SoirRemplacementSemaine, team3SoirSemaine)); - setEmployeePreference( - managers, - empLucRoy, - posMecanicien, + setEmployeePreference(managers, empLucRoy, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLucieCaron, null, null, sec5Salubrite, Arrays.asList( team10NuitSemaineLunVenSalubrite, team9NuitSemaineDimJeuSalubrite, @@ -1672,20 +1664,16 @@ public class PlanifEventManagerGeneratePlanifTest20120930 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainJulien, - posElectrotechniciens, + setEmployeePreference(managers, empSylvainJulien, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainCarriere, - posMecanicien, + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); + setEmployeePreference(managers, empSylvainCarriere, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empRichardVaillant, null, null, sec3Boulangerie, Arrays.asList( team1JoursDeSemaine, team5JourFinDeSemaine, @@ -1741,13 +1729,11 @@ public class PlanifEventManagerGeneratePlanifTest20120930 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team8SoirRemplacementFinDeSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empIvanhoeMaisonneuve, - posElectrotechniciens, + setEmployeePreference(managers, empIvanhoeMaisonneuve, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine, team3SoirSemaine)); + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine, + team3SoirSemaine)); setEmployeePreference(managers, empMathieuGuy, posOperateurGerbeuseVerification, team5JourFinDeSemaine, sec3Boulangerie, Arrays.asList( team5JourFinDeSemaine, team1JoursDeSemaine, @@ -1770,13 +1756,11 @@ public class PlanifEventManagerGeneratePlanifTest20120930 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empMathewBellemare, - posMecanicien, + setEmployeePreference(managers, empMathewBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empAlexandreDube, posPreposeSalubrite, team7SoirDeFinDeSemaine, sec5Salubrite, Arrays.asList( team7SoirDeFinDeSemaine, team1JoursDeSemaine, @@ -1876,13 +1860,11 @@ public class PlanifEventManagerGeneratePlanifTest20120930 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empGinoLemoine, - posElectrotechniciens, + setEmployeePreference(managers, empGinoLemoine, posElectrotechniciens, team3SoirSemaine, sec7Maintenance, Arrays.asList( + team1JoursDeSemaine, + team5JourFinDeSemaine, team3SoirSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMarioLongtin, null, null, sec4Baton, Arrays.asList( team1JoursDeSemaine, team3SoirSemaine, @@ -5366,23 +5348,21 @@ public class PlanifEventManagerGeneratePlanifTest20120930 extends ManagerTestCas assertAssignment(1, tasks, events1JoursDeSemaineTue, emballagePositions, empJohanneLemieux); assertAssignment(1, tasks, events1JoursDeSemaineWed, emballagePositions, empJohanneLemieux); assertAssignment(1, tasks, events1JoursDeSemaineThu, emballagePositions, empJohanneLemieux); - assertAssignment( - 2, - tasks, - events2JourRemplacementSemaineMon, - emballagePositions, - Arrays.asList(empManonTremblay, empClaudineRochefort, empPierretteLamothe)); + assertAssignment(2, tasks, events2JourRemplacementSemaineMon, emballagePositions, Arrays.asList( + empManonTremblay, + empClaudineRochefort, + empPierretteLamothe)); assertAssignment(1, tasks, events2JourRemplacementSemaineTue, emballagePositions, empManonTremblay); assertAssignment(1, tasks, events2JourRemplacementSemaineWed, emballagePositions, empManonTremblay); assertAssignment(1, tasks, events2JourRemplacementSemaineThu, emballagePositions, empManonTremblay); assertAssignment(1, tasks, events1JoursDeSemaineMon, posFournier, empBernardBerube); assertAssignment(1, tasks, events1JoursDeSemaineTue, posFournier, empBernardBerube); - assertAssignment( - 2, - tasks, - events1JoursDeSemaineWed, - snackPositions, - Arrays.asList(empBernardBerube, empLiseJoncas, empMarioPaille, empRachelMoise, empFrancoisBeaulne)); + assertAssignment(2, tasks, events1JoursDeSemaineWed, snackPositions, Arrays.asList( + empBernardBerube, + empLiseJoncas, + empMarioPaille, + empRachelMoise, + empFrancoisBeaulne)); assertAssignment(1, tasks, events1JoursDeSemaineThu, boulangeriePositions, empBernardBerube); assertAssignment(1, tasks, events3SoirSemaineMon, posOperateurGerbeuseVerification, empRobertLazure); assertAssignment(1, tasks, events3SoirSemaineTue, posOperateurGerbeuseVerification, empRobertLazure); diff --git a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121028.java b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121028.java index b9a376f56392ede64a8922764694abbb710c30c5..e31d81a0d813272f27690b55162f4889b74c2a9b 100644 --- a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121028.java +++ b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121028.java @@ -522,13 +522,11 @@ public class PlanifEventManagerGeneratePlanifTest20121028 extends ManagerTestCas * */ private void createPreferences() throws ManagerException { - setEmployeePreference( - managers, - empDonaldTheriault, - posMecanicien, + setEmployeePreference(managers, empDonaldTheriault, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLouiseVeillette, null, null, sec1Emballage, Arrays.asList( team1JoursDeSemaine, team2JourRemplacementSemaine, @@ -782,13 +780,11 @@ public class PlanifEventManagerGeneratePlanifTest20121028 extends ManagerTestCas team6JoursRemplacementFinDeSemaine, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMichelMeunier, - posHuileurGraisseurEntretienPreventif, + setEmployeePreference(managers, empMichelMeunier, posHuileurGraisseurEntretienPreventif, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empPierreLamarque, posOperateurEnsacheuseVerticalSnack, team1JoursDeSemaine, sec2Snack, Arrays.asList( team1JoursDeSemaine, team3SoirSemaine, @@ -1119,13 +1115,11 @@ public class PlanifEventManagerGeneratePlanifTest20121028 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMarcBellemare, - posMecanicien, + setEmployeePreference(managers, empMarcBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMichelineLegault, null, null, sec1Emballage, Arrays.asList( team3SoirSemaine, team1JoursDeSemaine, @@ -1346,13 +1340,11 @@ public class PlanifEventManagerGeneratePlanifTest20121028 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team4SoirRemplacementSemaine, team3SoirSemaine)); - setEmployeePreference( - managers, - empLucRoy, - posMecanicien, + setEmployeePreference(managers, empLucRoy, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLucieCaron, null, null, sec5Salubrite, Arrays.asList( team10NuitSemaineLunVenSalubrite, team9NuitSemaineDimJeuSalubrite, @@ -1474,20 +1466,16 @@ public class PlanifEventManagerGeneratePlanifTest20121028 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainJulien, - posElectrotechniciens, + setEmployeePreference(managers, empSylvainJulien, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainCarriere, - posMecanicien, + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); + setEmployeePreference(managers, empSylvainCarriere, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empRichardVaillant, null, null, sec3Boulangerie, Arrays.asList( team1JoursDeSemaine, team5JourFinDeSemaine, @@ -1543,13 +1531,11 @@ public class PlanifEventManagerGeneratePlanifTest20121028 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team8SoirRemplacementFinDeSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empIvanhoeMaisonneuve, - posElectrotechniciens, + setEmployeePreference(managers, empIvanhoeMaisonneuve, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine, team3SoirSemaine)); + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine, + team3SoirSemaine)); setEmployeePreference(managers, empMathieuGuy, posOperateurGerbeuseVerification, team5JourFinDeSemaine, sec3Boulangerie, Arrays.asList( team5JourFinDeSemaine, team1JoursDeSemaine, @@ -1572,13 +1558,11 @@ public class PlanifEventManagerGeneratePlanifTest20121028 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empMathewBellemare, - posMecanicien, + setEmployeePreference(managers, empMathewBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empAlexandreDube, posPreposeSalubrite, team7SoirDeFinDeSemaine, sec5Salubrite, Arrays.asList( team7SoirDeFinDeSemaine, team1JoursDeSemaine, @@ -1678,13 +1662,11 @@ public class PlanifEventManagerGeneratePlanifTest20121028 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empGinoLemoine, - posElectrotechniciens, + setEmployeePreference(managers, empGinoLemoine, posElectrotechniciens, team3SoirSemaine, sec7Maintenance, Arrays.asList( + team1JoursDeSemaine, + team5JourFinDeSemaine, team3SoirSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMarioLongtin, null, null, sec4Baton, Arrays.asList( team1JoursDeSemaine, team3SoirSemaine, @@ -5825,55 +5807,47 @@ public class PlanifEventManagerGeneratePlanifTest20121028 extends ManagerTestCas assertAssignment(1, tasks, events10NuitSemaineLunVenSalubriteThu, group5Salubrite, empChristopheDeneault); assertAssignment(1, tasks, events10NuitSemaineLunVenSalubriteFri, group5Salubrite, empChristopheDeneault); - assertAssignment( - 2, - tasks, - events2JourRemplacementSemaineMon, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empLouisCarlPage, empDanielGuillemette)); - assertAssignment( - 2, - tasks, - events2JourRemplacementSemaineTue, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empLouisCarlPage, empDanielGuillemette)); - assertAssignment( - 2, - tasks, - events2JourRemplacementSemaineWed, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empLouisCarlPage, empDanielGuillemette)); - assertAssignment( - 2, - tasks, - events2JourRemplacementSemaineThu, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empLouisCarlPage, empDanielGuillemette)); + assertAssignment(2, tasks, events2JourRemplacementSemaineMon, group1Emballage, Arrays.asList( + empPierreLemelin, + empRobertShonfield, + empLouisCarlPage, + empDanielGuillemette)); + assertAssignment(2, tasks, events2JourRemplacementSemaineTue, group1Emballage, Arrays.asList( + empPierreLemelin, + empRobertShonfield, + empLouisCarlPage, + empDanielGuillemette)); + assertAssignment(2, tasks, events2JourRemplacementSemaineWed, group1Emballage, Arrays.asList( + empPierreLemelin, + empRobertShonfield, + empLouisCarlPage, + empDanielGuillemette)); + assertAssignment(2, tasks, events2JourRemplacementSemaineThu, group1Emballage, Arrays.asList( + empPierreLemelin, + empRobertShonfield, + empLouisCarlPage, + empDanielGuillemette)); - assertAssignment( - 2, - tasks, - events4SoirRemplacementSemaineMon, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empLouisCarlPage, empDanielGuillemette)); - assertAssignment( - 2, - tasks, - events4SoirRemplacementSemaineTue, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empLouisCarlPage, empDanielGuillemette)); - assertAssignment( - 2, - tasks, - events4SoirRemplacementSemaineWed, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empLouisCarlPage, empDanielGuillemette)); - assertAssignment( - 2, - tasks, - events4SoirRemplacementSemaineThu, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empLouisCarlPage, empDanielGuillemette)); + assertAssignment(2, tasks, events4SoirRemplacementSemaineMon, group1Emballage, Arrays.asList( + empPierreLemelin, + empRobertShonfield, + empLouisCarlPage, + empDanielGuillemette)); + assertAssignment(2, tasks, events4SoirRemplacementSemaineTue, group1Emballage, Arrays.asList( + empPierreLemelin, + empRobertShonfield, + empLouisCarlPage, + empDanielGuillemette)); + assertAssignment(2, tasks, events4SoirRemplacementSemaineWed, group1Emballage, Arrays.asList( + empPierreLemelin, + empRobertShonfield, + empLouisCarlPage, + empDanielGuillemette)); + assertAssignment(2, tasks, events4SoirRemplacementSemaineThu, group1Emballage, Arrays.asList( + empPierreLemelin, + empRobertShonfield, + empLouisCarlPage, + empDanielGuillemette)); } } diff --git a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121104.java b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121104.java index 52fff9f49515000edda8e5b5d3ec7b4dd1ac6086..3f3c35abbef7576ac0238942a796c601410e23a7 100644 --- a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121104.java +++ b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121104.java @@ -564,13 +564,11 @@ public class PlanifEventManagerGeneratePlanifTest20121104 extends ManagerTestCas * */ private void createPreferences() throws ManagerException { - setEmployeePreference( - managers, - empDonaldTheriault, - posMecanicien, + setEmployeePreference(managers, empDonaldTheriault, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLouiseVeillette, null, null, sec1Emballage, Arrays.asList( team1JoursDeSemaine, team2JourRemplacementSemaine, @@ -824,13 +822,11 @@ public class PlanifEventManagerGeneratePlanifTest20121104 extends ManagerTestCas team6JoursRemplacementFinDeSemaine, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMichelMeunier, - posHuileurGraisseurEntretienPreventif, + setEmployeePreference(managers, empMichelMeunier, posHuileurGraisseurEntretienPreventif, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empPierreLamarque, posOperateurEnsacheuseVerticalSnack, team1JoursDeSemaine, sec2Snack, Arrays.asList( team1JoursDeSemaine, team3SoirSemaine, @@ -1161,13 +1157,11 @@ public class PlanifEventManagerGeneratePlanifTest20121104 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMarcBellemare, - posMecanicien, + setEmployeePreference(managers, empMarcBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMichelineLegault, null, null, sec1Emballage, Arrays.asList( team3SoirSemaine, team1JoursDeSemaine, @@ -1388,13 +1382,11 @@ public class PlanifEventManagerGeneratePlanifTest20121104 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team4SoirRemplacementSemaine, team3SoirSemaine)); - setEmployeePreference( - managers, - empLucRoy, - posMecanicien, + setEmployeePreference(managers, empLucRoy, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLucieCaron, null, null, sec5Salubrite, Arrays.asList( team10NuitSemaineLunVenSalubrite, team9NuitSemaineDimJeuSalubrite, @@ -1516,20 +1508,16 @@ public class PlanifEventManagerGeneratePlanifTest20121104 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainJulien, - posElectrotechniciens, + setEmployeePreference(managers, empSylvainJulien, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainCarriere, - posMecanicien, + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); + setEmployeePreference(managers, empSylvainCarriere, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empRichardVaillant, null, null, sec3Boulangerie, Arrays.asList( team1JoursDeSemaine, team5JourFinDeSemaine, @@ -1585,13 +1573,11 @@ public class PlanifEventManagerGeneratePlanifTest20121104 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team8SoirRemplacementFinDeSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empIvanhoeMaisonneuve, - posElectrotechniciens, + setEmployeePreference(managers, empIvanhoeMaisonneuve, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine, team3SoirSemaine)); + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine, + team3SoirSemaine)); setEmployeePreference(managers, empMathieuGuy, posOperateurGerbeuseVerification, team5JourFinDeSemaine, sec3Boulangerie, Arrays.asList( team5JourFinDeSemaine, team1JoursDeSemaine, @@ -1614,13 +1600,11 @@ public class PlanifEventManagerGeneratePlanifTest20121104 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empMathewBellemare, - posMecanicien, + setEmployeePreference(managers, empMathewBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empAlexandreDube, posPreposeSalubrite, team7SoirDeFinDeSemaine, sec5Salubrite, Arrays.asList( team7SoirDeFinDeSemaine, team1JoursDeSemaine, @@ -1720,13 +1704,11 @@ public class PlanifEventManagerGeneratePlanifTest20121104 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empGinoLemoine, - posElectrotechniciens, + setEmployeePreference(managers, empGinoLemoine, posElectrotechniciens, team3SoirSemaine, sec7Maintenance, Arrays.asList( + team1JoursDeSemaine, + team5JourFinDeSemaine, team3SoirSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMarioLongtin, null, null, sec4Baton, Arrays.asList( team1JoursDeSemaine, team3SoirSemaine, diff --git a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121111.java b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121111.java index 7894668cf25911ac8321b8fcc0cebe8261e7b2c7..f5fff9073e733a563742d97ff1d09e019c1264b4 100644 --- a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121111.java +++ b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121111.java @@ -548,13 +548,11 @@ public class PlanifEventManagerGeneratePlanifTest20121111 extends ManagerTestCas * */ private void createPreferences() throws ManagerException { - setEmployeePreference( - managers, - empDonaldTheriault, - posMecanicien, + setEmployeePreference(managers, empDonaldTheriault, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLouiseVeillette, null, null, sec1Emballage, Arrays.asList( team1JoursDeSemaine, team2JourRemplacementSemaine, @@ -808,13 +806,11 @@ public class PlanifEventManagerGeneratePlanifTest20121111 extends ManagerTestCas team6JoursRemplacementFinDeSemaine, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMichelMeunier, - posHuileurGraisseurEntretienPreventif, + setEmployeePreference(managers, empMichelMeunier, posHuileurGraisseurEntretienPreventif, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empPierreLamarque, posOperateurEnsacheuseVerticalSnack, team1JoursDeSemaine, sec2Snack, Arrays.asList( team1JoursDeSemaine, team3SoirSemaine, @@ -1145,13 +1141,11 @@ public class PlanifEventManagerGeneratePlanifTest20121111 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMarcBellemare, - posMecanicien, + setEmployeePreference(managers, empMarcBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMichelineLegault, null, null, sec1Emballage, Arrays.asList( team3SoirSemaine, team1JoursDeSemaine, @@ -1372,13 +1366,11 @@ public class PlanifEventManagerGeneratePlanifTest20121111 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team4SoirRemplacementSemaine, team3SoirSemaine)); - setEmployeePreference( - managers, - empLucRoy, - posMecanicien, + setEmployeePreference(managers, empLucRoy, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLucieCaron, null, null, sec5Salubrite, Arrays.asList( team10NuitSemaineLunVenSalubrite, team9NuitSemaineDimJeuSalubrite, @@ -1500,20 +1492,16 @@ public class PlanifEventManagerGeneratePlanifTest20121111 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainJulien, - posElectrotechniciens, + setEmployeePreference(managers, empSylvainJulien, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainCarriere, - posMecanicien, + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); + setEmployeePreference(managers, empSylvainCarriere, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empRichardVaillant, null, null, sec3Boulangerie, Arrays.asList( team1JoursDeSemaine, team5JourFinDeSemaine, @@ -1569,13 +1557,11 @@ public class PlanifEventManagerGeneratePlanifTest20121111 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team8SoirRemplacementFinDeSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empIvanhoeMaisonneuve, - posElectrotechniciens, + setEmployeePreference(managers, empIvanhoeMaisonneuve, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine, team3SoirSemaine)); + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine, + team3SoirSemaine)); setEmployeePreference(managers, empMathieuGuy, posOperateurGerbeuseVerification, team5JourFinDeSemaine, sec3Boulangerie, Arrays.asList( team5JourFinDeSemaine, team1JoursDeSemaine, @@ -1598,13 +1584,11 @@ public class PlanifEventManagerGeneratePlanifTest20121111 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empMathewBellemare, - posMecanicien, + setEmployeePreference(managers, empMathewBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empAlexandreDube, posPreposeSalubrite, team7SoirDeFinDeSemaine, sec5Salubrite, Arrays.asList( team7SoirDeFinDeSemaine, team1JoursDeSemaine, @@ -1704,13 +1688,11 @@ public class PlanifEventManagerGeneratePlanifTest20121111 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empGinoLemoine, - posElectrotechniciens, + setEmployeePreference(managers, empGinoLemoine, posElectrotechniciens, team3SoirSemaine, sec7Maintenance, Arrays.asList( + team1JoursDeSemaine, + team5JourFinDeSemaine, team3SoirSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMarioLongtin, null, null, sec4Baton, Arrays.asList( team1JoursDeSemaine, team3SoirSemaine, @@ -5908,54 +5890,22 @@ public class PlanifEventManagerGeneratePlanifTest20121111 extends ManagerTestCas assertAssignment(1, tasks, events10NuitSemaineLunVenSalubriteWed, group5Salubrite, empChristopheDeneault); assertAssignment(1, tasks, events10NuitSemaineLunVenSalubriteThu, group5Salubrite, empChristopheDeneault); assertAssignment(1, tasks, events10NuitSemaineLunVenSalubriteFri, group5Salubrite, empChristopheDeneault); - assertAssignment( - 1, - tasks, - events4SoirRemplacementSemaineMon, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); - assertAssignment( - 1, - tasks, - events4SoirRemplacementSemaineTue, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); - assertAssignment( - 1, - tasks, - events4SoirRemplacementSemaineWed, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); - assertAssignment( - 1, - tasks, - events4SoirRemplacementSemaineThu, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); - assertAssignment( - 2, - tasks, - events2JourRemplacementSemaineMon, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); - assertAssignment( - 1, - tasks, - events2JourRemplacementSemaineTue, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); - assertAssignment( - 2, - tasks, - events2JourRemplacementSemaineWed, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); - assertAssignment( - 2, - tasks, - events2JourRemplacementSemaineThu, - group1Emballage, - Arrays.asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); + assertAssignment(1, tasks, events4SoirRemplacementSemaineMon, group1Emballage, Arrays + .asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); + assertAssignment(1, tasks, events4SoirRemplacementSemaineTue, group1Emballage, Arrays + .asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); + assertAssignment(1, tasks, events4SoirRemplacementSemaineWed, group1Emballage, Arrays + .asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); + assertAssignment(1, tasks, events4SoirRemplacementSemaineThu, group1Emballage, Arrays + .asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); + assertAssignment(2, tasks, events2JourRemplacementSemaineMon, group1Emballage, Arrays + .asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); + assertAssignment(1, tasks, events2JourRemplacementSemaineTue, group1Emballage, Arrays + .asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); + assertAssignment(2, tasks, events2JourRemplacementSemaineWed, group1Emballage, Arrays + .asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); + assertAssignment(2, tasks, events2JourRemplacementSemaineThu, group1Emballage, Arrays + .asList(empPierreLemelin, empRobertShonfield, empDanielGuillemette)); assertAssignment(1, tasks, events1JoursDeSemaineMon, group8Formation, empLouisCarlPage); assertAssignment(1, tasks, events1JoursDeSemaineTue, group8Formation, empLouisCarlPage); assertAssignment(1, tasks, events1JoursDeSemaineWed, group8Formation, empLouisCarlPage); diff --git a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121202.java b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121202.java index ef310b6ece8d1f204cfa54b5c039f2e50298ebe5..d53cce2de65da02d866680a7b517a2e803db6878 100644 --- a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121202.java +++ b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121202.java @@ -539,13 +539,11 @@ public class PlanifEventManagerGeneratePlanifTest20121202 extends ManagerTestCas */ private void createPreferences() throws ManagerException { - setEmployeePreference( - managers, - empDonaldTheriault, - posMecanicien, + setEmployeePreference(managers, empDonaldTheriault, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLouiseVeillette, null, null, sec1Emballage, Arrays.asList( team1JoursDeSemaine, team2JourRemplacementSemaine, @@ -799,13 +797,11 @@ public class PlanifEventManagerGeneratePlanifTest20121202 extends ManagerTestCas team6JoursRemplacementFinDeSemaine, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMichelMeunier, - posHuileurGraisseurEntretienPreventif, + setEmployeePreference(managers, empMichelMeunier, posHuileurGraisseurEntretienPreventif, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empPierreLamarque, posOperateurEnsacheuseVerticalSnack, team1JoursDeSemaine, sec2Snack, Arrays.asList( team1JoursDeSemaine, team3SoirSemaine, @@ -1136,13 +1132,11 @@ public class PlanifEventManagerGeneratePlanifTest20121202 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMarcBellemare, - posMecanicien, + setEmployeePreference(managers, empMarcBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMichelineLegault, null, null, sec1Emballage, Arrays.asList( team3SoirSemaine, team1JoursDeSemaine, @@ -1363,13 +1357,11 @@ public class PlanifEventManagerGeneratePlanifTest20121202 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team4SoirRemplacementSemaine, team3SoirSemaine)); - setEmployeePreference( - managers, - empLucRoy, - posMecanicien, + setEmployeePreference(managers, empLucRoy, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLucieCaron, null, null, sec5Salubrite, Arrays.asList( team10NuitSemaineLunVenSalubrite, team9NuitSemaineDimJeuSalubrite, @@ -1491,20 +1483,16 @@ public class PlanifEventManagerGeneratePlanifTest20121202 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainJulien, - posElectrotechniciens, + setEmployeePreference(managers, empSylvainJulien, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainCarriere, - posMecanicien, + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); + setEmployeePreference(managers, empSylvainCarriere, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empRichardVaillant, null, null, sec3Boulangerie, Arrays.asList( team1JoursDeSemaine, team5JourFinDeSemaine, @@ -1560,13 +1548,11 @@ public class PlanifEventManagerGeneratePlanifTest20121202 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team8SoirRemplacementFinDeSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empIvanhoeMaisonneuve, - posElectrotechniciens, + setEmployeePreference(managers, empIvanhoeMaisonneuve, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine, team3SoirSemaine)); + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine, + team3SoirSemaine)); setEmployeePreference(managers, empMathieuGuy, posOperateurGerbeuseVerification, team5JourFinDeSemaine, sec3Boulangerie, Arrays.asList( team5JourFinDeSemaine, team1JoursDeSemaine, @@ -1589,13 +1575,11 @@ public class PlanifEventManagerGeneratePlanifTest20121202 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empMathewBellemare, - posMecanicien, + setEmployeePreference(managers, empMathewBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empAlexandreDube, posPreposeSalubrite, team7SoirDeFinDeSemaine, sec5Salubrite, Arrays.asList( team7SoirDeFinDeSemaine, team1JoursDeSemaine, @@ -1695,13 +1679,11 @@ public class PlanifEventManagerGeneratePlanifTest20121202 extends ManagerTestCas team10NuitSemaineLunVenSalubrite, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empGinoLemoine, - posElectrotechniciens, + setEmployeePreference(managers, empGinoLemoine, posElectrotechniciens, team3SoirSemaine, sec7Maintenance, Arrays.asList( + team1JoursDeSemaine, + team5JourFinDeSemaine, team3SoirSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMarioLongtin, null, null, sec4Baton, Arrays.asList( team3SoirSemaine, team1JoursDeSemaine, @@ -5852,12 +5834,12 @@ public class PlanifEventManagerGeneratePlanifTest20121202 extends ManagerTestCas assertAssignment(1, tasks, events9NuitSemaineDimJeuSalubriteWed, posPreposeSalubrite, empSolangeGirard); assertAssignment(1, tasks, events9NuitSemaineDimJeuSalubriteThu, posPreposeSalubrite, empSolangeGirard); assertAssignment(1, tasks, events1JoursDeSemaineMon, group2Snack, empMartinLina); - assertAssignment( - 3, - tasks, - events1JoursDeSemaineTue, - group2Snack, - Arrays.asList(empDanielDuquette, empMartinLina, empChristopheDeneault, empRobertShonfield, empSabrinaDupuis)); + assertAssignment(3, tasks, events1JoursDeSemaineTue, group2Snack, Arrays.asList( + empDanielDuquette, + empMartinLina, + empChristopheDeneault, + empRobertShonfield, + empSabrinaDupuis)); assertAssignment(1, tasks, events1JoursDeSemaineWed, group1Emballage, Arrays.asList(empMartinLina, empPierreLemelin)); assertAssignment(1, tasks, events1JoursDeSemaineThu, group1Emballage, empMartinLina); assertAssignment(1, tasks, events1JoursDeSemaineMon, posOperateurGrispac, empLiseJoncas); @@ -5905,18 +5887,19 @@ public class PlanifEventManagerGeneratePlanifTest20121202 extends ManagerTestCas assertAssignment(1, tasks, events7SoirDeFinDeSemaineSun, group5Salubrite, empAlexandreDube); assertAssignment(1, tasks, events7SoirDeFinDeSemaineFri, group5Salubrite, empAlexandreDube); assertAssignment(1, tasks, events7SoirDeFinDeSemaineSat, group5Salubrite, empAlexandreDube); - assertAssignment( - 2, - tasks, - events1JoursDeSemaineMon, - group4Baton, - Arrays.asList(empRobertShonfield, empNancyTheoret, empRachelMoise, empSabrinaDupuis, empChristopheDeneault, empDanielDuquette)); - assertAssignment( - 2, - tasks, - events1JoursDeSemaineTue, - group4Baton, - Arrays.asList(empChristopheDeneault, empMartinLina, empDanielDuquette, empRobertShonfield, empSabrinaDupuis)); + assertAssignment(2, tasks, events1JoursDeSemaineMon, group4Baton, Arrays.asList( + empRobertShonfield, + empNancyTheoret, + empRachelMoise, + empSabrinaDupuis, + empChristopheDeneault, + empDanielDuquette)); + assertAssignment(2, tasks, events1JoursDeSemaineTue, group4Baton, Arrays.asList( + empChristopheDeneault, + empMartinLina, + empDanielDuquette, + empRobertShonfield, + empSabrinaDupuis)); assertAssignment(1, tasks, events1JoursDeSemaineWed, group1Emballage, empDanielDuquette); assertAssignment(1, tasks, events1JoursDeSemaineThu, group1Emballage, empDanielDuquette); assertAssignment(1, tasks, events9NuitSemaineDimJeuSalubriteSun, group5Salubrite, empJohanneDuval); @@ -5972,21 +5955,19 @@ public class PlanifEventManagerGeneratePlanifTest20121202 extends ManagerTestCas assertAssignment(1, tasks, events10NuitSemaineLunVenSalubriteThu, group5Salubrite, Arrays.asList(empLouisCarlPage, empDanielGuillemette)); assertAssignment(1, tasks, events10NuitSemaineLunVenSalubriteFri, group5Salubrite, Arrays.asList(empLouisCarlPage, empDanielGuillemette)); assertAssignment(1, tasks, events2JourRemplacementSemaineMon, group1Emballage, Arrays.asList(empLouisCarlPage, empDanielGuillemette)); - assertAssignment( - 1, - tasks, - events2JourRemplacementSemaineTue, - group1Emballage, - Arrays.asList(empLouisCarlPage, empDanielGuillemette, empNathalieBedard, empDavidWayne)); + assertAssignment(1, tasks, events2JourRemplacementSemaineTue, group1Emballage, Arrays.asList( + empLouisCarlPage, + empDanielGuillemette, + empNathalieBedard, + empDavidWayne)); assertAssignment(1, tasks, events2JourRemplacementSemaineWed, group1Emballage, Arrays.asList(empLouisCarlPage, empDanielGuillemette)); assertAssignment(1, tasks, events2JourRemplacementSemaineThu, group1Emballage, Arrays.asList(empLouisCarlPage, empDanielGuillemette)); assertAssignment(1, tasks, events2JourRemplacementSemaineMon, group1Emballage, Arrays.asList(empNathalieBedard, empDavidWayne)); - assertAssignment( - 1, - tasks, - events1JoursDeSemaineTue, - group1Emballage, - Arrays.asList(empNathalieBedard, empLouisCarlPage, empDanielGuillemette, empDavidWayne)); + assertAssignment(1, tasks, events1JoursDeSemaineTue, group1Emballage, Arrays.asList( + empNathalieBedard, + empLouisCarlPage, + empDanielGuillemette, + empDavidWayne)); assertAssignment(1, tasks, events2JourRemplacementSemaineWed, group1Emballage, Arrays.asList(empNathalieBedard, empDavidWayne)); assertAssignment(1, tasks, events2JourRemplacementSemaineThu, group1Emballage, Arrays.asList(empNathalieBedard, empDavidWayne)); assertAssignment(1, tasks, events1JoursDeSemaineMon, group4Baton, empPierreGagne); diff --git a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121209.java b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121209.java index 916ab9f067283da50ed641bc0f98c8625812ae19..499b0c5c4022b6a1a6f6cf1f405e880a0d05d650 100644 --- a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121209.java +++ b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20121209.java @@ -569,13 +569,11 @@ public class PlanifEventManagerGeneratePlanifTest20121209 extends ManagerTestCas */ private void createPreferences() throws ManagerException { - setEmployeePreference( - managers, - empDonaldTheriault, - posMecanicien, + setEmployeePreference(managers, empDonaldTheriault, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLouiseVeillette, null, null, sec1Emballage, Arrays.asList( team1JoursDeSemaine, team2JourRemplacementSemaine, @@ -829,13 +827,11 @@ public class PlanifEventManagerGeneratePlanifTest20121209 extends ManagerTestCas team6JoursRemplacementFinDeSemaine, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMichelMeunier, - posHuileurGraisseurEntretienPreventif, + setEmployeePreference(managers, empMichelMeunier, posHuileurGraisseurEntretienPreventif, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empPierreLamarque, posOperateurEnsacheuseVerticalSnack, team1JoursDeSemaine, sec2Snack, Arrays.asList( team1JoursDeSemaine, team3SoirSemaine, @@ -1166,13 +1162,11 @@ public class PlanifEventManagerGeneratePlanifTest20121209 extends ManagerTestCas team10NuitSemaineLunVen, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMarcBellemare, - posMecanicien, + setEmployeePreference(managers, empMarcBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMichelineLegault, null, null, sec1Emballage, Arrays.asList( team3SoirSemaine, team1JoursDeSemaine, @@ -1393,13 +1387,11 @@ public class PlanifEventManagerGeneratePlanifTest20121209 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team4SoirRemplacementSemaine, team3SoirSemaine)); - setEmployeePreference( - managers, - empLucRoy, - posMecanicien, + setEmployeePreference(managers, empLucRoy, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLucieCaron, null, null, sec5Salubrite, Arrays.asList( team10NuitSemaineLunVen, team9NuitSemaineDimJeu, @@ -1521,20 +1513,16 @@ public class PlanifEventManagerGeneratePlanifTest20121209 extends ManagerTestCas team10NuitSemaineLunVen, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainJulien, - posElectrotechniciens, + setEmployeePreference(managers, empSylvainJulien, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainCarriere, - posMecanicien, + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); + setEmployeePreference(managers, empSylvainCarriere, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empRichardVaillant, null, null, sec3Boulangerie, Arrays.asList( team1JoursDeSemaine, team5JourFinDeSemaine, @@ -1590,13 +1578,11 @@ public class PlanifEventManagerGeneratePlanifTest20121209 extends ManagerTestCas team10NuitSemaineLunVen, team8SoirRemplacementFinDeSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empIvanhoeMaisonneuve, - posElectrotechniciens, + setEmployeePreference(managers, empIvanhoeMaisonneuve, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine, team3SoirSemaine)); + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine, + team3SoirSemaine)); setEmployeePreference(managers, empMathieuGuy, posOperateurGerbeuseVerification, team5JourFinDeSemaine, sec3Boulangerie, Arrays.asList( team5JourFinDeSemaine, team1JoursDeSemaine, @@ -1619,13 +1605,11 @@ public class PlanifEventManagerGeneratePlanifTest20121209 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team10NuitSemaineLunVen, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empMathewBellemare, - posMecanicien, + setEmployeePreference(managers, empMathewBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empAlexandreDube, posPreposeSalubrite, team7SoirDeFinDeSemaine, sec5Salubrite, Arrays.asList( team7SoirDeFinDeSemaine, team1JoursDeSemaine, @@ -1725,13 +1709,11 @@ public class PlanifEventManagerGeneratePlanifTest20121209 extends ManagerTestCas team10NuitSemaineLunVen, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empGinoLemoine, - posElectrotechniciens, + setEmployeePreference(managers, empGinoLemoine, posElectrotechniciens, team3SoirSemaine, sec7Maintenance, Arrays.asList( + team1JoursDeSemaine, + team5JourFinDeSemaine, team3SoirSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMarioLongtin, null, null, sec4Baton, Arrays.asList( team3SoirSemaine, team1JoursDeSemaine, diff --git a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20130106.java b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20130106.java index d5f865e9c9f1f6cbd632fa02490481189ca14b9e..ff757af367acc9cd8097cbc71bd8131f73826824 100644 --- a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20130106.java +++ b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20130106.java @@ -571,13 +571,11 @@ public class PlanifEventManagerGeneratePlanifTest20130106 extends ManagerTestCas */ private void createPreferences() throws ManagerException { - setEmployeePreference( - managers, - empDonaldTheriault, - posMecanicien, + setEmployeePreference(managers, empDonaldTheriault, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLouiseVeillette, null, null, sec1Emballage, Arrays.asList( team1JoursDeSemaine, team2JourRemplacementSemaine, @@ -831,13 +829,11 @@ public class PlanifEventManagerGeneratePlanifTest20130106 extends ManagerTestCas team6JoursRemplacementFinDeSemaine, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMichelMeunier, - posHuileurGraisseurEntretienPreventif, + setEmployeePreference(managers, empMichelMeunier, posHuileurGraisseurEntretienPreventif, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empPierreLamarque, posOperateurEnsacheuseVerticalSnack, team1JoursDeSemaine, sec2Snack, Arrays.asList( team1JoursDeSemaine, team3SoirSemaine, @@ -1168,13 +1164,11 @@ public class PlanifEventManagerGeneratePlanifTest20130106 extends ManagerTestCas team10NuitSemaineLunVen, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMarcBellemare, - posMecanicien, + setEmployeePreference(managers, empMarcBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMichelineLegault, null, null, sec1Emballage, Arrays.asList( team3SoirSemaine, team1JoursDeSemaine, @@ -1395,13 +1389,11 @@ public class PlanifEventManagerGeneratePlanifTest20130106 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team4SoirRemplacementSemaine, team3SoirSemaine)); - setEmployeePreference( - managers, - empLucRoy, - posMecanicien, + setEmployeePreference(managers, empLucRoy, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLucieCaron, null, null, sec5Salubrite, Arrays.asList( team10NuitSemaineLunVen, team9NuitSemaineDimJeu, @@ -1523,20 +1515,16 @@ public class PlanifEventManagerGeneratePlanifTest20130106 extends ManagerTestCas team10NuitSemaineLunVen, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainJulien, - posElectrotechniciens, + setEmployeePreference(managers, empSylvainJulien, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainCarriere, - posMecanicien, + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); + setEmployeePreference(managers, empSylvainCarriere, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empRichardVaillant, null, null, sec3Boulangerie, Arrays.asList( team1JoursDeSemaine, team5JourFinDeSemaine, @@ -1592,13 +1580,11 @@ public class PlanifEventManagerGeneratePlanifTest20130106 extends ManagerTestCas team10NuitSemaineLunVen, team8SoirRemplacementFinDeSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empIvanhoeMaisonneuve, - posElectrotechniciens, + setEmployeePreference(managers, empIvanhoeMaisonneuve, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine, team3SoirSemaine)); + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine, + team3SoirSemaine)); setEmployeePreference(managers, empMathieuGuy, posOperateurGerbeuseVerification, team5JourFinDeSemaine, sec3Boulangerie, Arrays.asList( team5JourFinDeSemaine, team1JoursDeSemaine, @@ -1621,13 +1607,11 @@ public class PlanifEventManagerGeneratePlanifTest20130106 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team10NuitSemaineLunVen, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empMathewBellemare, - posMecanicien, + setEmployeePreference(managers, empMathewBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empAlexandreDube, posPreposeSalubrite, team7SoirDeFinDeSemaine, sec5Salubrite, Arrays.asList( team7SoirDeFinDeSemaine, team1JoursDeSemaine, @@ -1727,13 +1711,11 @@ public class PlanifEventManagerGeneratePlanifTest20130106 extends ManagerTestCas team10NuitSemaineLunVen, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empGinoLemoine, - posElectrotechniciens, + setEmployeePreference(managers, empGinoLemoine, posElectrotechniciens, team3SoirSemaine, sec7Maintenance, Arrays.asList( + team1JoursDeSemaine, + team5JourFinDeSemaine, team3SoirSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMarioLongtin, null, null, sec4Baton, Arrays.asList( team3SoirSemaine, team1JoursDeSemaine, @@ -5868,12 +5850,11 @@ public class PlanifEventManagerGeneratePlanifTest20130106 extends ManagerTestCas assertAssignment(1, tasks, events5JourFinDeSemaineSat, posRecuperateurEmballage, empStephaneJacques); assertAssignment(1, tasks, events1JoursDeSemaineMon, group4Baton, empBrigitteBouchard); assertAssignment(1, tasks, events1JoursDeSemaineTue, group4Baton, empBrigitteBouchard); - assertAssignment( - 1, - tasks, - events1JoursDeSemaineWed, - group2Snack, - Arrays.asList(empBrigitteBouchard, empRichardVaillant, empRachelMoise, empCatherinePiette)); + assertAssignment(1, tasks, events1JoursDeSemaineWed, group2Snack, Arrays.asList( + empBrigitteBouchard, + empRichardVaillant, + empRachelMoise, + empCatherinePiette)); assertAssignment(1, tasks, events1JoursDeSemaineThu, group1Emballage, empBrigitteBouchard); assertAssignment(1, tasks, events5JourFinDeSemaineSun, posOperateurLigneFourMelba, empJoseeLapierre); assertAssignment(1, tasks, events5JourFinDeSemaineFri, posOperateurLigneFourMelba, empJoseeLapierre); @@ -5997,60 +5978,54 @@ public class PlanifEventManagerGeneratePlanifTest20130106 extends ManagerTestCas assertAssignment(1, tasks, events5JourFinDeSemaineSun, group3Boulangerie, empLouisCarlPage); assertAssignment(1, tasks, events5JourFinDeSemaineFri, group3Boulangerie, empLouisCarlPage); assertAssignment(1, tasks, events5JourFinDeSemaineSat, group3Boulangerie, empLouisCarlPage); - assertAssignment( - 1, - tasks, - events5JourFinDeSemaineSun, - group1Emballage, - Arrays.asList(empPierreLemelin, empDanielGuillemette, empNathalieBedard, empPierreGagne, empWayneDavid)); - assertAssignment( - 1, - tasks, - events5JourFinDeSemaineFri, - group1Emballage, - Arrays.asList(empPierreLemelin, empDanielGuillemette, empNathalieBedard, empPierreGagne, empWayneDavid)); - assertAssignment( - 1, - tasks, - events5JourFinDeSemaineSat, - group1Emballage, - Arrays.asList(empPierreLemelin, empDanielGuillemette, empNathalieBedard, empPierreGagne, empWayneDavid)); - assertAssignment( - 2, - tasks, - events2JourRemplacementSemaineWed, - group1Emballage, - Arrays.asList(empDanielGuillemette, empNathalieBedard, empPierreGagne, empWayneDavid)); - assertAssignment( - 2, - tasks, - events2JourRemplacementSemaineThu, - group1Emballage, - Arrays.asList(empDanielGuillemette, empNathalieBedard, empPierreGagne, empWayneDavid)); - assertAssignment( - 1, - tasks, - events4SoirRemplacementSemaineMon, - group1Emballage, - Arrays.asList(empDanielGuillemette, empNathalieBedard, empPierreGagne, empWayneDavid)); - assertAssignment( - 1, - tasks, - events4SoirRemplacementSemaineTue, - group1Emballage, - Arrays.asList(empDanielGuillemette, empNathalieBedard, empPierreGagne, empWayneDavid)); - assertAssignment( - 1, - tasks, - events4SoirRemplacementSemaineWed, - group1Emballage, - Arrays.asList(empDanielGuillemette, empNathalieBedard, empPierreGagne, empWayneDavid)); - assertAssignment( - 1, - tasks, - events4SoirRemplacementSemaineThu, - group1Emballage, - Arrays.asList(empDanielGuillemette, empNathalieBedard, empPierreGagne, empWayneDavid)); + assertAssignment(1, tasks, events5JourFinDeSemaineSun, group1Emballage, Arrays.asList( + empPierreLemelin, + empDanielGuillemette, + empNathalieBedard, + empPierreGagne, + empWayneDavid)); + assertAssignment(1, tasks, events5JourFinDeSemaineFri, group1Emballage, Arrays.asList( + empPierreLemelin, + empDanielGuillemette, + empNathalieBedard, + empPierreGagne, + empWayneDavid)); + assertAssignment(1, tasks, events5JourFinDeSemaineSat, group1Emballage, Arrays.asList( + empPierreLemelin, + empDanielGuillemette, + empNathalieBedard, + empPierreGagne, + empWayneDavid)); + assertAssignment(2, tasks, events2JourRemplacementSemaineWed, group1Emballage, Arrays.asList( + empDanielGuillemette, + empNathalieBedard, + empPierreGagne, + empWayneDavid)); + assertAssignment(2, tasks, events2JourRemplacementSemaineThu, group1Emballage, Arrays.asList( + empDanielGuillemette, + empNathalieBedard, + empPierreGagne, + empWayneDavid)); + assertAssignment(1, tasks, events4SoirRemplacementSemaineMon, group1Emballage, Arrays.asList( + empDanielGuillemette, + empNathalieBedard, + empPierreGagne, + empWayneDavid)); + assertAssignment(1, tasks, events4SoirRemplacementSemaineTue, group1Emballage, Arrays.asList( + empDanielGuillemette, + empNathalieBedard, + empPierreGagne, + empWayneDavid)); + assertAssignment(1, tasks, events4SoirRemplacementSemaineWed, group1Emballage, Arrays.asList( + empDanielGuillemette, + empNathalieBedard, + empPierreGagne, + empWayneDavid)); + assertAssignment(1, tasks, events4SoirRemplacementSemaineThu, group1Emballage, Arrays.asList( + empDanielGuillemette, + empNathalieBedard, + empPierreGagne, + empWayneDavid)); // assertAssignment(1, tasks, events2JourRemplacementSemaineWed, group1Emballage, // Arrays.asList(empDanielGuillemette, empNathalieBedard, empPierreGagne, empWayneDavid)); // assertAssignment(1, tasks, events2JourRemplacementSemaineThu, group1Emballage, diff --git a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20130113.java b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20130113.java index 71e07308a7f0a13afa8ee6dc4e59041683c125e5..254ba01f65d74b73a029877c370e250d44ad42bb 100644 --- a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20130113.java +++ b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20130113.java @@ -571,13 +571,11 @@ public class PlanifEventManagerGeneratePlanifTest20130113 extends ManagerTestCas */ private void createPreferences() throws ManagerException { - setEmployeePreference( - managers, - empDonaldTheriault, - posMecanicien, + setEmployeePreference(managers, empDonaldTheriault, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLouiseVeillette, null, null, sec1Emballage, Arrays.asList( team1JoursDeSemaine, team2JourRemplacementSemaine, @@ -831,13 +829,11 @@ public class PlanifEventManagerGeneratePlanifTest20130113 extends ManagerTestCas team6JoursRemplacementFinDeSemaine, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMichelMeunier, - posHuileurGraisseurEntretienPreventif, + setEmployeePreference(managers, empMichelMeunier, posHuileurGraisseurEntretienPreventif, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empPierreLamarque, posOperateurEnsacheuseVerticalSnack, team1JoursDeSemaine, sec2Snack, Arrays.asList( team1JoursDeSemaine, team3SoirSemaine, @@ -1168,13 +1164,11 @@ public class PlanifEventManagerGeneratePlanifTest20130113 extends ManagerTestCas team10NuitSemaineLunVen, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMarcBellemare, - posMecanicien, + setEmployeePreference(managers, empMarcBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMichelineLegault, null, null, sec1Emballage, Arrays.asList( team3SoirSemaine, team1JoursDeSemaine, @@ -1395,13 +1389,11 @@ public class PlanifEventManagerGeneratePlanifTest20130113 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team4SoirRemplacementSemaine, team3SoirSemaine)); - setEmployeePreference( - managers, - empLucRoy, - posMecanicien, + setEmployeePreference(managers, empLucRoy, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLucieCaron, null, null, sec5Salubrite, Arrays.asList( team10NuitSemaineLunVen, team9NuitSemaineDimJeu, @@ -1523,20 +1515,16 @@ public class PlanifEventManagerGeneratePlanifTest20130113 extends ManagerTestCas team10NuitSemaineLunVen, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainJulien, - posElectrotechniciens, + setEmployeePreference(managers, empSylvainJulien, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainCarriere, - posMecanicien, + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); + setEmployeePreference(managers, empSylvainCarriere, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empRichardVaillant, null, null, sec3Boulangerie, Arrays.asList( team1JoursDeSemaine, team5JourFinDeSemaine, @@ -1592,13 +1580,11 @@ public class PlanifEventManagerGeneratePlanifTest20130113 extends ManagerTestCas team10NuitSemaineLunVen, team8SoirRemplacementFinDeSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empIvanhoeMaisonneuve, - posElectrotechniciens, + setEmployeePreference(managers, empIvanhoeMaisonneuve, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine, team3SoirSemaine)); + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine, + team3SoirSemaine)); setEmployeePreference(managers, empMathieuGuy, posOperateurGerbeuseVerification, team5JourFinDeSemaine, sec3Boulangerie, Arrays.asList( team5JourFinDeSemaine, team1JoursDeSemaine, @@ -1621,13 +1607,11 @@ public class PlanifEventManagerGeneratePlanifTest20130113 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team10NuitSemaineLunVen, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empMathewBellemare, - posMecanicien, + setEmployeePreference(managers, empMathewBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empAlexandreDube, posPreposeSalubrite, team7SoirDeFinDeSemaine, sec5Salubrite, Arrays.asList( team7SoirDeFinDeSemaine, team1JoursDeSemaine, @@ -1727,13 +1711,11 @@ public class PlanifEventManagerGeneratePlanifTest20130113 extends ManagerTestCas team10NuitSemaineLunVen, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empGinoLemoine, - posElectrotechniciens, + setEmployeePreference(managers, empGinoLemoine, posElectrotechniciens, team3SoirSemaine, sec7Maintenance, Arrays.asList( + team1JoursDeSemaine, + team5JourFinDeSemaine, team3SoirSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMarioLongtin, null, null, sec4Baton, Arrays.asList( team3SoirSemaine, team1JoursDeSemaine, @@ -5939,24 +5921,24 @@ public class PlanifEventManagerGeneratePlanifTest20130113 extends ManagerTestCas assertAssignment(1, tasks, events3SoirSemaineThu, posPrefarinePremelange, empDominicHoude); assertAssignment(1, tasks, events1JoursDeSemaineMon, group3Boulangerie, empFrancoisParent); assertAssignment(1, tasks, events1JoursDeSemaineTue, group3Boulangerie, empFrancoisParent); - assertAssignment( - 3, - tasks, - events1JoursDeSemaineWed, - group1Emballage, - Arrays.asList(empMartinLina, empFrancoisParent, empRichardVaillant, empDanielDuquette, empRobertAllen)); - assertAssignment( - 1, - tasks, - events1JoursDeSemaineWed, - group2Snack, - Arrays.asList(empMartinLina, empFrancoisParent, empRichardVaillant, empDanielDuquette, empRobertAllen)); - assertAssignment( - 1, - tasks, - events1JoursDeSemaineWed, - group4Baton, - Arrays.asList(empMartinLina, empFrancoisParent, empRichardVaillant, empDanielDuquette, empRobertAllen)); + assertAssignment(3, tasks, events1JoursDeSemaineWed, group1Emballage, Arrays.asList( + empMartinLina, + empFrancoisParent, + empRichardVaillant, + empDanielDuquette, + empRobertAllen)); + assertAssignment(1, tasks, events1JoursDeSemaineWed, group2Snack, Arrays.asList( + empMartinLina, + empFrancoisParent, + empRichardVaillant, + empDanielDuquette, + empRobertAllen)); + assertAssignment(1, tasks, events1JoursDeSemaineWed, group4Baton, Arrays.asList( + empMartinLina, + empFrancoisParent, + empRichardVaillant, + empDanielDuquette, + empRobertAllen)); // assertAssignment(1, tasks, events1JoursDeSemaineWed, group1Emballage, empFrancoisParent); assertAssignment(1, tasks, events1JoursDeSemaineThu, group3Boulangerie, empFrancoisParent); assertAssignment(1, tasks, events9NuitSemaineDimJeuSun, posPreposeSalubrite, empSolangeGirard); @@ -5985,12 +5967,11 @@ public class PlanifEventManagerGeneratePlanifTest20130113 extends ManagerTestCas assertAssignment(1, tasks, events3SoirSemaineThu, posMecanicien, empSylvainCarriere); // assertAssignment(1, tasks, events1JoursDeSemaineMon, group4Baton, empRichardVaillant); // assertAssignment(1, tasks, events1JoursDeSemaineWed, group1Emballage, empRichardVaillant); - assertAssignment( - 1, - tasks, - events1JoursDeSemaineThu, - group1Emballage, - Arrays.asList(empMartinLina, empRichardVaillant, empRobertAllen, empDanielDuquette)); + assertAssignment(1, tasks, events1JoursDeSemaineThu, group1Emballage, Arrays.asList( + empMartinLina, + empRichardVaillant, + empRobertAllen, + empDanielDuquette)); assertAssignment(1, tasks, events3SoirSemaineMon, group1Emballage, empFranceBoyer); assertAssignment(1, tasks, events3SoirSemaineTue, group1Emballage, empFranceBoyer); assertAssignment(1, tasks, events3SoirSemaineWed, group1Emballage, empFranceBoyer); @@ -6060,54 +6041,47 @@ public class PlanifEventManagerGeneratePlanifTest20130113 extends ManagerTestCas assertAssignment(1, tasks, events5JourFinDeSemaineSun, group1Emballage, empPierreLemelin); assertAssignment(1, tasks, events5JourFinDeSemaineFri, group1Emballage, empPierreLemelin); assertAssignment(1, tasks, events5JourFinDeSemaineSat, group1Emballage, empPierreLemelin); - assertAssignment( - 2, - tasks, - events5JourFinDeSemaineSun, - group1Emballage, - Arrays.asList(empRobertShonfield, empPierreGagne, empDanielGuillemette, empNathalieBedard)); - assertAssignment( - 2, - tasks, - events5JourFinDeSemaineFri, - group1Emballage, - Arrays.asList(empRobertShonfield, empPierreGagne, empDanielGuillemette, empNathalieBedard)); - assertAssignment( - 1, - tasks, - events5JourFinDeSemaineSat, - group1Emballage, - Arrays.asList(empRobertShonfield, empPierreGagne, empDanielGuillemette, empNathalieBedard)); + assertAssignment(2, tasks, events5JourFinDeSemaineSun, group1Emballage, Arrays.asList( + empRobertShonfield, + empPierreGagne, + empDanielGuillemette, + empNathalieBedard)); + assertAssignment(2, tasks, events5JourFinDeSemaineFri, group1Emballage, Arrays.asList( + empRobertShonfield, + empPierreGagne, + empDanielGuillemette, + empNathalieBedard)); + assertAssignment(1, tasks, events5JourFinDeSemaineSat, group1Emballage, Arrays.asList( + empRobertShonfield, + empPierreGagne, + empDanielGuillemette, + empNathalieBedard)); assertAssignment(1, tasks, events5JourFinDeSemaineSun, group3Boulangerie, empLouisCarlPage); assertAssignment(1, tasks, events5JourFinDeSemaineFri, group3Boulangerie, empLouisCarlPage); assertAssignment(1, tasks, events5JourFinDeSemaineSat, group3Boulangerie, empLouisCarlPage); // assertAssignment(1, tasks, events5JourFinDeSemaineSun, group1Emballage, empDanielGuillemette); // assertAssignment(1, tasks, events5JourFinDeSemaineFri, group1Emballage, empDanielGuillemette); assertAssignment(1, tasks, events5JourFinDeSemaineSat, group3Boulangerie, Arrays.asList(empRobertShonfield, empPierreGagne, empDanielGuillemette)); - assertAssignment( - 2, - tasks, - events2JourRemplacementSemaineMon, - group1Emballage, - Arrays.asList(empRobertShonfield, empPierreGagne, empDanielGuillemette, empNathalieBedard)); - assertAssignment( - 2, - tasks, - events2JourRemplacementSemaineTue, - group1Emballage, - Arrays.asList(empRobertShonfield, empPierreGagne, empDanielGuillemette, empNathalieBedard)); - assertAssignment( - 2, - tasks, - events2JourRemplacementSemaineWed, - group1Emballage, - Arrays.asList(empRobertShonfield, empPierreGagne, empDanielGuillemette, empNathalieBedard)); - assertAssignment( - 2, - tasks, - events2JourRemplacementSemaineThu, - group1Emballage, - Arrays.asList(empRobertShonfield, empPierreGagne, empDanielGuillemette, empNathalieBedard)); + assertAssignment(2, tasks, events2JourRemplacementSemaineMon, group1Emballage, Arrays.asList( + empRobertShonfield, + empPierreGagne, + empDanielGuillemette, + empNathalieBedard)); + assertAssignment(2, tasks, events2JourRemplacementSemaineTue, group1Emballage, Arrays.asList( + empRobertShonfield, + empPierreGagne, + empDanielGuillemette, + empNathalieBedard)); + assertAssignment(2, tasks, events2JourRemplacementSemaineWed, group1Emballage, Arrays.asList( + empRobertShonfield, + empPierreGagne, + empDanielGuillemette, + empNathalieBedard)); + assertAssignment(2, tasks, events2JourRemplacementSemaineThu, group1Emballage, Arrays.asList( + empRobertShonfield, + empPierreGagne, + empDanielGuillemette, + empNathalieBedard)); // assertAssignment(1, tasks, events2JourRemplacementSemaineMon, group1Emballage, // Arrays.asList(empRobertShonfield, empPierreGagne,empDanielGuillemette)); // assertAssignment(1, tasks, events2JourRemplacementSemaineTue, group1Emballage, diff --git a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20130120.java b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20130120.java index efd7a58783a3d6f86af6bc9bb415870f5be163b7..df2f7a59ca8d537d4d21d3b6cb04fed93ad80d20 100644 --- a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20130120.java +++ b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/PlanifEventManagerGeneratePlanifTest20130120.java @@ -728,13 +728,11 @@ public class PlanifEventManagerGeneratePlanifTest20130120 extends ManagerTestCas */ private void createPreferences() throws ManagerException { - setEmployeePreference( - managers, - empDonaldTheriault, - posMecanicien, + setEmployeePreference(managers, empDonaldTheriault, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLouiseVeillette, null, null, sec1Emballage, Arrays.asList( team1JoursDeSemaine, team2JourRemplacementSemaine, @@ -988,13 +986,11 @@ public class PlanifEventManagerGeneratePlanifTest20130120 extends ManagerTestCas team6JoursRemplacementFinDeSemaine, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMichelMeunier, - posHuileurGraisseurEntretienPreventif, + setEmployeePreference(managers, empMichelMeunier, posHuileurGraisseurEntretienPreventif, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empPierreLamarque, posOperateurEnsacheuseVerticalSnack, team1JoursDeSemaine, sec2Snack, Arrays.asList( team1JoursDeSemaine, team3SoirSemaine, @@ -1325,13 +1321,11 @@ public class PlanifEventManagerGeneratePlanifTest20130120 extends ManagerTestCas team10NuitSemaineLunVen, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empMarcBellemare, - posMecanicien, + setEmployeePreference(managers, empMarcBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMichelineLegault, null, null, sec1Emballage, Arrays.asList( team3SoirSemaine, team1JoursDeSemaine, @@ -1552,13 +1546,11 @@ public class PlanifEventManagerGeneratePlanifTest20130120 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team4SoirRemplacementSemaine, team3SoirSemaine)); - setEmployeePreference( - managers, - empLucRoy, - posMecanicien, + setEmployeePreference(managers, empLucRoy, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empLucieCaron, null, null, sec5Salubrite, Arrays.asList( team10NuitSemaineLunVen, team9NuitSemaineDimJeu, @@ -1680,20 +1672,16 @@ public class PlanifEventManagerGeneratePlanifTest20130120 extends ManagerTestCas team9NuitSemaineDimJeu, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainJulien, - posElectrotechniciens, + setEmployeePreference(managers, empSylvainJulien, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empSylvainCarriere, - posMecanicien, + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); + setEmployeePreference(managers, empSylvainCarriere, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team3SoirSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine)); + team3SoirSemaine, + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empRichardVaillant, null, null, sec3Boulangerie, Arrays.asList( team1JoursDeSemaine, team5JourFinDeSemaine, @@ -1749,13 +1737,11 @@ public class PlanifEventManagerGeneratePlanifTest20130120 extends ManagerTestCas team10NuitSemaineLunVen, team8SoirRemplacementFinDeSemaine, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empIvanhoeMaisonneuve, - posElectrotechniciens, + setEmployeePreference(managers, empIvanhoeMaisonneuve, posElectrotechniciens, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team7SoirDeFinDeSemaine, team3SoirSemaine)); + team5JourFinDeSemaine, + team7SoirDeFinDeSemaine, + team3SoirSemaine)); setEmployeePreference(managers, empMathieuGuy, posOperateurGerbeuseVerification, team5JourFinDeSemaine, sec3Boulangerie, Arrays.asList( team5JourFinDeSemaine, team1JoursDeSemaine, @@ -1778,13 +1764,11 @@ public class PlanifEventManagerGeneratePlanifTest20130120 extends ManagerTestCas team8SoirRemplacementFinDeSemaine, team10NuitSemaineLunVen, team7SoirDeFinDeSemaine)); - setEmployeePreference( - managers, - empMathewBellemare, - posMecanicien, + setEmployeePreference(managers, empMathewBellemare, posMecanicien, team1JoursDeSemaine, sec7Maintenance, Arrays.asList( team1JoursDeSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team5JourFinDeSemaine, + team3SoirSemaine, + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empAlexandreDube, posPreposeSalubrite, team7SoirDeFinDeSemaine, sec5Salubrite, Arrays.asList( team7SoirDeFinDeSemaine, team1JoursDeSemaine, @@ -1884,13 +1868,11 @@ public class PlanifEventManagerGeneratePlanifTest20130120 extends ManagerTestCas team10NuitSemaineLunVen, team7SoirDeFinDeSemaine, team8SoirRemplacementFinDeSemaine)); - setEmployeePreference( - managers, - empGinoLemoine, - posElectrotechniciens, + setEmployeePreference(managers, empGinoLemoine, posElectrotechniciens, team3SoirSemaine, sec7Maintenance, Arrays.asList( + team1JoursDeSemaine, + team5JourFinDeSemaine, team3SoirSemaine, - sec7Maintenance, - Arrays.asList(team1JoursDeSemaine, team5JourFinDeSemaine, team3SoirSemaine, team7SoirDeFinDeSemaine)); + team7SoirDeFinDeSemaine)); setEmployeePreference(managers, empMarioLongtin, null, null, sec4Baton, Arrays.asList( team3SoirSemaine, team1JoursDeSemaine, diff --git a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/ProductionEventManagerTest.java b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/ProductionEventManagerTest.java index d5971276ce37623e0f774510258404ed3d1b57e4..55c481fb1f0fab192db8d5c49397168c39909199 100644 --- a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/ProductionEventManagerTest.java +++ b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/ProductionEventManagerTest.java @@ -59,7 +59,8 @@ public class ProductionEventManagerTest extends ManagerTestCase { ProductionEvent event = (ProductionEvent) object; return event.getProduct().equals(product) && (shiftEvent == null && event.getShift().getStartDate().getTime() == start.getTime() && event.getShift().getEndDate().getTime() == end - .getTime()) || (shiftEvent != null && event.getShift().equals(shiftEvent)); + .getTime()) + || (shiftEvent != null && event.getShift().equals(shiftEvent)); } }); if (expected != count) { diff --git a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/comparators/AllTests.java b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/comparators/AllTests.java index 8206dba1806ee91b3ad764772fe6924304b1ac52..ae4e0e41af0cdeaeba10b3cfe258d14c40519f2e 100644 --- a/com.patrikdufresne.planimod/src/test/java/com/planimod/core/comparators/AllTests.java +++ b/com.patrikdufresne.planimod/src/test/java/com/planimod/core/comparators/AllTests.java @@ -21,7 +21,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({ EmployeeComparatorsTest.class, HumanNaturalComparatorTest.class }) +@Suite.SuiteClasses( { EmployeeComparatorsTest.class, HumanNaturalComparatorTest.class }) public class AllTests { } diff --git a/formatter.xml b/formatter.xml index 2ce16cf469380f5501ffb01eb5fe1912d0490a3b..ca35534940daccf5479d6ec16516bbedf188a46d 100644 --- a/formatter.xml +++ b/formatter.xml @@ -1,19 +1,21 @@ diff --git a/ilp/ilp-cbc/.gitignore b/ilp-cbc/.gitignore similarity index 100% rename from ilp/ilp-cbc/.gitignore rename to ilp-cbc/.gitignore diff --git a/ilp/ilp-cbc/pom.xml b/ilp-cbc/pom.xml similarity index 68% rename from ilp/ilp-cbc/pom.xml rename to ilp-cbc/pom.xml index 0ea1266db4385852bafac72f4d011cef29638537..878e5c1770243af3d333cedc57455137dd1eeaa9 100644 --- a/ilp/ilp-cbc/pom.xml +++ b/ilp-cbc/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.patrikdufresne - ilp-parent + planimod-parent ${revision} ilp-cbc @@ -46,7 +46,6 @@ junit junit - 4.11 test @@ -63,40 +62,4 @@ test - - - - - com.googlecode.maven-java-formatter-plugin - maven-java-formatter-plugin - - - - format - - - - - ${project.basedir}/../../formatter.xml - CRLF - - - - - com.mycila.maven-license-plugin - maven-license-plugin - - - process-sources - - format - - - - -
license-header.txt
- - - - \ No newline at end of file diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcConstraint.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcConstraint.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcConstraint.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcConstraint.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcLinearProblem.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcLinearProblem.java similarity index 94% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcLinearProblem.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcLinearProblem.java index 188580b5116fe4204bbbcc9446e4456971141d88..c9afe0f33a3597f98e52c70097acfad1088f971e 100644 --- a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcLinearProblem.java +++ b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcLinearProblem.java @@ -182,13 +182,8 @@ public class CbcLinearProblem extends AbstractLinearProblem implements IPersiste columns = new int[0]; coefs = new double[0]; } - cbc4j.addRow( - this.lp, - columns.length, - columns, - coefs, - lowerBound != null ? lowerBound.doubleValue() : -this.infinity, - upperBound != null ? upperBound.doubleValue() : this.infinity); + cbc4j.addRow(this.lp, columns.length, columns, coefs, lowerBound != null ? lowerBound.doubleValue() : -this.infinity, upperBound != null ? upperBound + .doubleValue() : this.infinity); if (constraint.row != this.constraints.size()) { throw new RuntimeException("CbcConstraint.row is not set properly."); //$NON-NLS-1$ } diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolver.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolver.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolver.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolver.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverFactory.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverFactory.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverFactory.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverFactory.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverOption.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverOption.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverOption.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcSolverOption.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcVariable.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcVariable.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcVariable.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CbcVariable.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CostStrategy.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CostStrategy.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CostStrategy.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/CostStrategy.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/GMICuts.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/GMICuts.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/GMICuts.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/GMICuts.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/LatwomirCuts.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/LatwomirCuts.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/LatwomirCuts.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/LatwomirCuts.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Preprocess.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Preprocess.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Preprocess.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Preprocess.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Presolve.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Presolve.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Presolve.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/Presolve.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ProbingCuts.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ProbingCuts.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ProbingCuts.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ProbingCuts.java diff --git a/ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ReduceAndSplitCuts.java b/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ReduceAndSplitCuts.java similarity index 100% rename from ilp/ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ReduceAndSplitCuts.java rename to ilp-cbc/src/main/java/com/patrikdufresne/ilp/cbc/ReduceAndSplitCuts.java diff --git a/ilp/ilp-cbc/src/test/java/com/patrikdufresne/Main.java b/ilp-cbc/src/test/java/com/patrikdufresne/Main.java similarity index 100% rename from ilp/ilp-cbc/src/test/java/com/patrikdufresne/Main.java rename to ilp-cbc/src/test/java/com/patrikdufresne/Main.java diff --git a/ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/AllTests.java b/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/AllTests.java similarity index 86% rename from ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/AllTests.java rename to ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/AllTests.java index 16dbb65c76d01990569e7722a899e14c23228d39..01af55c075c5ca201b90b68880b5a42357208075 100644 --- a/ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/AllTests.java +++ b/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/AllTests.java @@ -21,7 +21,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({ CbcLinearProblemTest.class, CbcSolverTest.class, CbcVariableTest.class, CbcConstraintTest.class }) +@Suite.SuiteClasses( { CbcLinearProblemTest.class, CbcSolverTest.class, CbcVariableTest.class, CbcConstraintTest.class }) public class AllTests { } diff --git a/ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcConstraintTest.java b/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcConstraintTest.java similarity index 100% rename from ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcConstraintTest.java rename to ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcConstraintTest.java diff --git a/ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcLinearProblemTest.java b/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcLinearProblemTest.java similarity index 100% rename from ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcLinearProblemTest.java rename to ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcLinearProblemTest.java diff --git a/ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcSolverTest.java b/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcSolverTest.java similarity index 100% rename from ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcSolverTest.java rename to ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcSolverTest.java diff --git a/ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcVariableTest.java b/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcVariableTest.java similarity index 100% rename from ilp/ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcVariableTest.java rename to ilp-cbc/src/test/java/com/patrikdufresne/ilp/cbc/CbcVariableTest.java diff --git a/ilp/ilp-core/.gitignore b/ilp-core/.gitignore similarity index 100% rename from ilp/ilp-core/.gitignore rename to ilp-core/.gitignore diff --git a/ilp-core/pom.xml b/ilp-core/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..c8e9c6eeaebf8424277aff9730112ec4b38b820a --- /dev/null +++ b/ilp-core/pom.xml @@ -0,0 +1,35 @@ + + 4.0.0 + + com.patrikdufresne + planimod-parent + ${revision} + + ilp-core + + + junit + junit + test + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + + test-jar + + + + + + + \ No newline at end of file diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/AbstractLinearProblem.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/AbstractLinearProblem.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/AbstractLinearProblem.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/AbstractLinearProblem.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteLinear.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteLinear.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteLinear.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteLinear.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteTerm.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteTerm.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteTerm.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/ConcreteTerm.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Constraint.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/Constraint.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Constraint.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/Constraint.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLast.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLast.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLast.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLast.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLastAlwaysDown.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLastAlwaysDown.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLastAlwaysDown.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/IBranchingTechniqueLastAlwaysDown.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IFeasibilityPumpHeuristic.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/IFeasibilityPumpHeuristic.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IFeasibilityPumpHeuristic.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/IFeasibilityPumpHeuristic.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPError.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPError.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPError.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/ILPError.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPException.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPException.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPException.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/ILPException.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPLogger.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPLogger.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPLogger.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/ILPLogger.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPPolicy.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPPolicy.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ILPPolicy.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/ILPPolicy.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IPersistentLinearProblem.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/IPersistentLinearProblem.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IPersistentLinearProblem.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/IPersistentLinearProblem.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IPreProcessorPass.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/IPreProcessorPass.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/IPreProcessorPass.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/IPreProcessorPass.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ImmutableLinear.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/ImmutableLinear.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/ImmutableLinear.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/ImmutableLinear.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Linear.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/Linear.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Linear.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/Linear.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/LinearProblem.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/LinearProblem.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/LinearProblem.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/LinearProblem.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Solver.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/Solver.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Solver.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/Solver.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/SolverFactory.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/SolverFactory.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/SolverFactory.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/SolverFactory.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/SolverOption.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/SolverOption.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/SolverOption.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/SolverOption.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Status.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/Status.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Status.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/Status.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Term.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/Term.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Term.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/Term.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/VarType.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/VarType.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/VarType.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/VarType.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Variable.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/Variable.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/Variable.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/Variable.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Bound.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Bound.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Bound.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/util/Bound.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/BoundSnapshot.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/util/BoundSnapshot.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/BoundSnapshot.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/util/BoundSnapshot.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/ConstraintSnapshot.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/util/ConstraintSnapshot.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/ConstraintSnapshot.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/util/ConstraintSnapshot.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Constraints.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Constraints.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Constraints.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/util/Constraints.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Linears.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Linears.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Linears.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/util/Linears.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/ValueSnapshot.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/util/ValueSnapshot.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/ValueSnapshot.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/util/ValueSnapshot.java diff --git a/ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Variables.java b/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Variables.java similarity index 100% rename from ilp/ilp-core/src/main/java/com/patrikdufresne/ilp/util/Variables.java rename to ilp-core/src/main/java/com/patrikdufresne/ilp/util/Variables.java diff --git a/ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/ConstraintTest.java b/ilp-core/src/test/java/com/patrikdufresne/ilp/ConstraintTest.java similarity index 100% rename from ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/ConstraintTest.java rename to ilp-core/src/test/java/com/patrikdufresne/ilp/ConstraintTest.java diff --git a/ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/LinearProblemTest.java b/ilp-core/src/test/java/com/patrikdufresne/ilp/LinearProblemTest.java similarity index 100% rename from ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/LinearProblemTest.java rename to ilp-core/src/test/java/com/patrikdufresne/ilp/LinearProblemTest.java diff --git a/ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/SolverTest.java b/ilp-core/src/test/java/com/patrikdufresne/ilp/SolverTest.java similarity index 100% rename from ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/SolverTest.java rename to ilp-core/src/test/java/com/patrikdufresne/ilp/SolverTest.java diff --git a/ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/VariableTest.java b/ilp-core/src/test/java/com/patrikdufresne/ilp/VariableTest.java similarity index 100% rename from ilp/ilp-core/src/test/java/com/patrikdufresne/ilp/VariableTest.java rename to ilp-core/src/test/java/com/patrikdufresne/ilp/VariableTest.java diff --git a/ilp/ilp-glpk/.gitignore b/ilp-glpk/.gitignore similarity index 100% rename from ilp/ilp-glpk/.gitignore rename to ilp-glpk/.gitignore diff --git a/ilp/ilp-glpk/pom.xml b/ilp-glpk/pom.xml similarity index 56% rename from ilp/ilp-glpk/pom.xml rename to ilp-glpk/pom.xml index 7bbe2fcce1340aa29ba5c36d349e133b0e190b80..563970a51ea6faa0afc2dfc49327e3ada97cfcbc 100644 --- a/ilp/ilp-glpk/pom.xml +++ b/ilp-glpk/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.patrikdufresne - ilp-parent + planimod-parent ${revision} ilp-glpk @@ -25,7 +25,6 @@ junit junit - 4.11 test @@ -42,40 +41,4 @@ test - - - - - com.googlecode.maven-java-formatter-plugin - maven-java-formatter-plugin - - - - format - - - - - ${project.basedir}/../../formatter.xml - CRLF - - - - - com.mycila.maven-license-plugin - maven-license-plugin - - - process-sources - - format - - - - -
license-header.txt
- - - - \ No newline at end of file diff --git a/ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKConstraint.java b/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKConstraint.java similarity index 100% rename from ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKConstraint.java rename to ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKConstraint.java diff --git a/ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLibrary.java b/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLibrary.java similarity index 100% rename from ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLibrary.java rename to ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLibrary.java diff --git a/ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblem.java b/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblem.java similarity index 100% rename from ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblem.java rename to ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblem.java diff --git a/ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolver.java b/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolver.java similarity index 100% rename from ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolver.java rename to ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolver.java diff --git a/ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverFactory.java b/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverFactory.java similarity index 100% rename from ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverFactory.java rename to ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverFactory.java diff --git a/ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverOption.java b/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverOption.java similarity index 100% rename from ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverOption.java rename to ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKSolverOption.java diff --git a/ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKVariable.java b/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKVariable.java similarity index 100% rename from ilp/ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKVariable.java rename to ilp-glpk/src/main/java/com/patrikdufresne/ilp/glpk/GLPKVariable.java diff --git a/ilp/ilp-glpk/src/main/resources/linux/x86_64/libglpk.so b/ilp-glpk/src/main/resources/linux/x86_64/libglpk.so similarity index 100% rename from ilp/ilp-glpk/src/main/resources/linux/x86_64/libglpk.so rename to ilp-glpk/src/main/resources/linux/x86_64/libglpk.so diff --git a/ilp/ilp-glpk/src/main/resources/linux/x86_64/libglpk_java.so b/ilp-glpk/src/main/resources/linux/x86_64/libglpk_java.so similarity index 100% rename from ilp/ilp-glpk/src/main/resources/linux/x86_64/libglpk_java.so rename to ilp-glpk/src/main/resources/linux/x86_64/libglpk_java.so diff --git a/ilp/ilp-glpk/src/main/resources/win/x86/glpk_4_51.dll b/ilp-glpk/src/main/resources/win/x86/glpk_4_51.dll similarity index 100% rename from ilp/ilp-glpk/src/main/resources/win/x86/glpk_4_51.dll rename to ilp-glpk/src/main/resources/win/x86/glpk_4_51.dll diff --git a/ilp/ilp-glpk/src/main/resources/win/x86/glpk_4_51_java.dll b/ilp-glpk/src/main/resources/win/x86/glpk_4_51_java.dll similarity index 100% rename from ilp/ilp-glpk/src/main/resources/win/x86/glpk_4_51_java.dll rename to ilp-glpk/src/main/resources/win/x86/glpk_4_51_java.dll diff --git a/ilp/ilp-glpk/src/main/resources/win/x86_64/glpk_4_51.dll b/ilp-glpk/src/main/resources/win/x86_64/glpk_4_51.dll similarity index 100% rename from ilp/ilp-glpk/src/main/resources/win/x86_64/glpk_4_51.dll rename to ilp-glpk/src/main/resources/win/x86_64/glpk_4_51.dll diff --git a/ilp/ilp-glpk/src/main/resources/win/x86_64/glpk_4_51_java.dll b/ilp-glpk/src/main/resources/win/x86_64/glpk_4_51_java.dll similarity index 100% rename from ilp/ilp-glpk/src/main/resources/win/x86_64/glpk_4_51_java.dll rename to ilp-glpk/src/main/resources/win/x86_64/glpk_4_51_java.dll diff --git a/ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/AllTests.java b/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/AllTests.java similarity index 86% rename from ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/AllTests.java rename to ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/AllTests.java index 42703de2ab1919c84665645b9069be29ef049ef2..4233eddd3da94920ce4154c00e113bccef50747a 100644 --- a/ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/AllTests.java +++ b/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/AllTests.java @@ -21,7 +21,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({ GLPKLinearProblemTest.class, GLPKSolverTest.class, GLPKVariableTest.class, GLPKConstraintTest.class }) +@Suite.SuiteClasses( { GLPKLinearProblemTest.class, GLPKSolverTest.class, GLPKVariableTest.class, GLPKConstraintTest.class }) public class AllTests { } diff --git a/ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKConstraintTest.java b/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKConstraintTest.java similarity index 100% rename from ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKConstraintTest.java rename to ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKConstraintTest.java diff --git a/ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblemTest.java b/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblemTest.java similarity index 100% rename from ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblemTest.java rename to ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKLinearProblemTest.java diff --git a/ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKSolverTest.java b/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKSolverTest.java similarity index 100% rename from ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKSolverTest.java rename to ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKSolverTest.java diff --git a/ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKVariableTest.java b/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKVariableTest.java similarity index 100% rename from ilp/ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKVariableTest.java rename to ilp-glpk/src/test/java/com/patrikdufresne/ilp/glpk/GLPKVariableTest.java diff --git a/ilp/ilp-core/pom.xml b/ilp/ilp-core/pom.xml deleted file mode 100644 index ef761a62ea31e9917deb1ba60c6c5d255dea92c4..0000000000000000000000000000000000000000 --- a/ilp/ilp-core/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - 4.0.0 - - com.patrikdufresne - ilp-parent - ${revision} - - ilp-core - - - junit - junit - 4.11 - test - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - - test-jar - - - - - - - com.googlecode.maven-java-formatter-plugin - maven-java-formatter-plugin - - - - format - - - - - ${project.basedir}/../../formatter.xml - CRLF - - - - - com.mycila.maven-license-plugin - maven-license-plugin - - - process-sources - - format - - - - -
license-header.txt
- - - - - \ No newline at end of file diff --git a/ilp/pom.xml b/ilp/pom.xml deleted file mode 100644 index 8ce9f8cbef639f25fe568c153956f13500b6d0cc..0000000000000000000000000000000000000000 --- a/ilp/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - 4.0.0 - - com.patrikdufresne - planimod-parent - ${revision} - - com.patrikdufresne - ilp-parent - pom - - - - patrikdufresne - http://nexus.patrikdufresne.com/content/repositories/public/ - - - - UTF-8 - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - - - - - ilp-core - ilp-glpk - ilp-cbc - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 41ce233f91c6f5109167e16cc1d89a33ed05aae5..4df02fa11d9ce317c7de1e7e8bc10a1552c03073 100644 --- a/pom.xml +++ b/pom.xml @@ -2,31 +2,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.patrikdufresne + + com.patrikdufresne + swt + 3.109.0.2 + planimod-parent ${revision} pom - planimod - http://patrikdufresne.com/fr/planimod - ilp + ilp-core + ilp-glpk + ilp-cbc planimod-icons com.patrikdufresne.planimod com.patrikdufresne.planimod-installation-package - - - - 1.8 - 1.8 - UTF-8 - 4.2.1 - - - - scm:git:http://git.patrikdufresne.com/pdsl/planimod.git - HEAD - @@ -34,42 +25,23 @@ http://nexus.patrikdufresne.com/content/groups/public/ - - - - org.eclipse.swt - org.eclipse.swt.win32.win32.x86 - ${swt.version} - provided - - - org.eclipse.swt - org.eclipse.swt.win32.win32.x86_64 - ${swt.version} - provided - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.x86 - ${swt.version} - provided - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.x86_64 - ${swt.version} - provided - - + + + com.mycila.maven-license-plugin maven-license-plugin - 1.9.0 - - - com.googlecode.maven-java-formatter-plugin - maven-java-formatter-plugin - 0.3.1 - - - - \ No newline at end of file + + + process-sources + + format + + + + +
license-header.txt
+ + + + +