RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

it removes trailing whitespaces.

Browse source
This commit is contained in:
Susana Montes Pedreira 2011-11-21 10:10:13 +01:00
parent 767d2a87aa
commit b4689b1cf4
16 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ganttzk/src/main/java/org/zkoss/ganttz/util/Emitter.java
View file

@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.List;
/**
*
*
* @author Óscar González Fernández <ogonzalez@igalia.com>
*/
public class Emitter<T> {

2
libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractedTaskDataDAO.java
View file

@ -110,7 +110,7 @@ public class SubcontractedTaskDataDAO extends
.createCriteria("taskSource","ts")
.createCriteria("schedulingData","data")
.add(Restrictions.eq("data.orderElement",orderElement));
TaskElement taskElement = (TaskElement) c.uniqueResult();
return (taskElement != null && taskElement.isSubcontracted()) ? ((Task) taskElement)
.getSubcontractedTaskData() : null;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunication.java
View file

@ -112,7 +112,7 @@ public class SubcontractorComunication extends BaseEntity {
public List<SubcontractorComunicationValue> getSubcontratorComunicationValues() {
return subcontratorComunicationValues;
}
public SubcontractorComunicationValue getLastSubcontratorComunicationValues(){
if (subcontratorComunicationValues.isEmpty()){
return null;

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunicationValue.java
View file

@ -30,7 +30,7 @@ import org.libreplan.business.INewObject;
/**
* Entity to represent each {@SubcontractorComunicationValue}.
*
*
* @author Susana Montes Pedreira <smontes@wirelessgalicia>
*/
public class SubcontractorComunicationValue implements INewObject {

2
libreplan-business/src/main/resources/db.changelog-1.2.xml
View file

@ -44,5 +44,5 @@
</column>
</createTable>
</changeSet>
</databaseChangeLog>

6
libreplan-business/src/test/java/org/libreplan/business/test/planner/daos/SubcontractorComunicationDAOTest.java
View file

@ -156,12 +156,12 @@ public class SubcontractorComunicationDAOTest {
order.setCode("code-" + UUID.randomUUID());
order.useSchedulingDataFor(orderVersion);
order.add(orderLine);
//add a basic calendar
BaseCalendar basicCalendar = BaseCalendarTest.createBasicCalendar();
calendarDAO.save(basicCalendar);
order.setCalendar(basicCalendar);
try {
orderDAO.save(order);
sessionFactory.getCurrentSession().flush();
@ -201,7 +201,7 @@ public class SubcontractorComunicationDAOTest {
taskElementDAO.flush();
sessionFactory.getCurrentSession().evict(task);
sessionFactory.getCurrentSession().evict(subcontractedTaskData);
subcontractedTaskDataDAO.save(subcontractedTaskData);
return subcontractedTaskData;
}

2
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
View file

@ -455,7 +455,7 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
this.planningState.getSaveCommand().save(beforeSaveActions, null);
}
}
private void reattachCalendar() {
if (planningState.getOrder().getCalendar() == null) {
return;

6
libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
View file

@ -103,11 +103,11 @@ import org.zkoss.zul.Messagebox;
/**
* Builds a command that saves the changes in the taskElements. It can be
* considered the final step in the conversation <br />
*
*
* In the save operation it is also kept the consistency of the
* LimitingResourceQueueDependencies with the Dependecies between the task of
* the planning gantt.
*
*
* @author Óscar González Fernández <ogonzalez@igalia.com>
* @author Javier Moran Rua <jmoran@igalia.com>
*/
@ -125,7 +125,7 @@ public class SaveCommandBuilder {
"/planner/index.zul;company_scheduling", ISaveCommand.class,
result);
}
public static void dontPoseAsTransientAndChildrenObjects(
Collection<? extends ResourceAllocation<?>> resourceAllocations) {
for (ResourceAllocation<?> each : resourceAllocations) {

8
libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java
View file

@ -142,7 +142,7 @@ public class ResourceLoadModel implements IResourceLoadModel {
allocationsFinder.lazilyGetResourcesIncluded(),
allocationsFinder.lazilyGetAssignmentsShown());
}
@Override
@Transactional(readOnly = true)
@ -643,7 +643,7 @@ public class ResourceLoadModel implements IResourceLoadModel {
}
return result;
}
private LoadTimeLine buildTimeLine(Collection<Criterion> criterions,
Task task, Resource resource, String type,
List<GenericResourceAllocation> allocationsSortedByStartDate,
@ -1044,7 +1044,7 @@ class PeriodBuilderFactory {
this.initDateFilter = initDateFilter;
this.endDateFilter = endDateFilter;
}
public List<LoadPeriod> build(LoadPeriodGeneratorFactory factory, List<? extends ResourceAllocation<?>> sortedByStartDate){
if (initDateFilter == null && endDateFilter == null) {
return PeriodsBuilder.build(factory, sortedByStartDate);
@ -1056,7 +1056,7 @@ class PeriodBuilderFactory {
private Date asDate(LocalDate date) {
return ResourceLoadModel.asDate(date);
}
}
class PeriodsBuilder {

4
libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadParameters.java
View file

@ -104,7 +104,7 @@ public class ResourceLoadParameters {
criteriaToShowList.clear();
criteriaToShowList.addAll(criteriaList);
}
public <T> Paginator<T> getEntities(Class<T> type,
Callable<List<T>> allEntities, IReattacher<T> reattacher) {
Validate.isTrue(
@ -119,7 +119,7 @@ public class ResourceLoadParameters {
allEntities, reattacher);
}
}
private <T> List<T> listOfType(Class<T> klass, Collection<?> objects) {
List<T> result = new ArrayList<T>();
for (Object each : objects) {

2
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationModel.java
View file

@ -39,7 +39,7 @@ public class CustomerComunicationModel implements ICustomerComunicationModel{
@Autowired
private ICustomerComunicationDAO customerComunicationDAO;
private FilterComunicationEnum currentFilter = FilterComunicationEnum.NOT_REVIEWED;
@Override

6
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationCRUDController.java
View file

@ -60,7 +60,7 @@ import org.zkoss.zul.SimpleListModel;
/**
* Controller for CRUD actions over a {@link SubcontractorComunication}
*
*
* @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
*/
@SuppressWarnings("serial")
@ -183,11 +183,11 @@ public class SubcontractorComunicationCRUDController extends GenericForwardCompo
private void appendLabel(Row row, String label) {
row.appendChild(new Label(label));
}
private void appendLabelWitTooltip(final Row row,final SubcontractorComunication subcontractorComunication) {
String lastValue = getLastValue(subcontractorComunication);
final Label compLabel = new Label(lastValue);
compLabel.setTooltip(pp);
compLabel.addEventListener(Events.ON_MOUSE_OVER,
new EventListener() {

2
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationModel.java
View file

@ -45,7 +45,7 @@ public class SubcontractorComunicationModel implements ISubcontractorComunicatio
@Autowired
private ISubcontractorComunicationDAO subcontractorComunicationDAO;
@Autowired
IOrderDAO orderDAO;

6
libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java
View file

@ -87,10 +87,10 @@ public class ReportAdvancesServiceREST implements IReportAdvancesService {
private IOrderElementDAO orderElementDAO;
@Autowired
private ISubcontractedTaskDataDAO subcontractedTaskDataDAO;
private ISubcontractedTaskDataDAO subcontractedTaskDataDAO;
@Autowired
private ISubcontractorComunicationDAO subcontractorComunicationDAO;
private ISubcontractorComunicationDAO subcontractorComunicationDAO;
@Autowired
private IOrderDAO orderDAO;
@ -215,7 +215,7 @@ public class ReportAdvancesServiceREST implements IReportAdvancesService {
createSubcontractorComunication(
orderElement,
orderElementWithAdvanceMeasurementsDTO.advanceMeasurements);
} catch (ValidationException e) {
instanceConstraintViolationsDTO = ConstraintViolationConverter

2
libreplan-webapp/src/main/webapp/subcontract/subcontractorComunications.zul
View file

@ -60,7 +60,7 @@
</columns>
</grid>
<popup id="pp">
<grid id="listingValues" width="300px" fixedLayout="true">
<columns>

10
libreplan-webapp/src/test/java/org/libreplan/web/test/ws/subcontract/ReportAdvancesServiceTest.java
View file

@ -242,7 +242,7 @@ public class ReportAdvancesServiceTest {
OrderElementWithAdvanceMeasurementsListDTO orderElementWithAdvanceMeasurementsListDTO = givenOrderElementWithAdvanceMeasurementsListDTO(
orderElementCode, values);
SubcontractorComunication subcontractorComunication = SubcontractorComunication.create();
SubcontractorComunication subcontractorComunication = SubcontractorComunication.create();
reportAdvancesService
.updateAdvances(orderElementWithAdvanceMeasurementsListDTO);
@ -270,7 +270,7 @@ public class ReportAdvancesServiceTest {
int currentComunications = subcontractorComunicationDAO.getAll().size();
assertThat((previousComunications+1), equalTo(currentComunications));
}
}
@Test
public void validAdvancesReportWithSeveralDates() {
@ -418,7 +418,7 @@ public class ReportAdvancesServiceTest {
Arrays.asList(associatedHoursGroup));
orderLine.getCurrentSchedulingData().requestedCreationOf(taskSource);
TaskSourceSynchronization mustAdd = TaskSource.mustAdd(taskSource);
mustAdd.apply(TaskSource.persistTaskSources(taskSourceDAO));
@ -436,10 +436,10 @@ public class ReportAdvancesServiceTest {
taskElementDAO.save(task);
task.dontPoseAsTransientObjectAnymore();
taskElementDAO.flush();
sessionFactory.getCurrentSession().evict(task);
sessionFactory.getCurrentSession().evict(subcontractedTaskData);
subcontractedTaskDataDAO.save(subcontractedTaskData);
return subcontractedTaskData;
}