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

Fix visibility issues in OpenJDK 1.7.

Browse source 
Not it's not possible to access private members from a static context.

FEA: ItEr77S04BugFixing
This commit is contained in:
Jacobo Aragunde Pérez 2012-11-08 12:19:28 +01:00
parent 9ed9595482
commit c563997424
6 changed files with 58 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libreplan-business/src/main/java/org/libreplan/business/common/BaseEntity.java
View file

@ -110,7 +110,7 @@ public abstract class BaseEntity implements INewObject {
}
protected static <T extends BaseEntity> T create(T baseEntity) {
baseEntity.newObject = true;
baseEntity.setNewObject(true);
return baseEntity;
}

4
libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java
View file

@ -67,7 +67,7 @@ public abstract class IntegrationEntity extends BaseEntity {
T integrationEntity, String code) {
BaseEntity.create(integrationEntity);
integrationEntity.code = code;
integrationEntity.setCode(code);
return integrationEntity;
@ -82,7 +82,7 @@ public abstract class IntegrationEntity extends BaseEntity {
T integrationEntity) {
BaseEntity.create(integrationEntity);
integrationEntity.code = generateCode();
integrationEntity.setCode(generateCode());
return integrationEntity;

6
libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java
View file

@ -136,7 +136,7 @@ public abstract class TaskElement extends BaseEntity {
protected static <T extends TaskElement> T create(T taskElement,
TaskSource taskSource) {
taskElement.taskSource = taskSource;
taskElement.setTaskSource(taskSource);
taskElement.updateDeadlineFromOrderElement();
taskElement.setName(taskElement.getOrderElement().getName());
taskElement.updateAdvancePercentageFromOrderElement();
@ -218,6 +218,10 @@ public abstract class TaskElement extends BaseEntity {
return taskSource;
}
protected void setTaskSource(TaskSource taskSource) {
this.taskSource = taskSource;
}
protected void copyDependenciesTo(TaskElement result) {
for (Dependency dependency : getDependenciesWithThisOrigin()) {
Dependency.create(result, dependency.getDestination(),

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

@ -98,7 +98,7 @@ public abstract class AllocationModification {
.unmodifiableList(new ArrayList<Resource>(resources));
}
private boolean hasNoResources() {
protected boolean hasNoResources() {
return resourcesOnWhichApplyAllocation.isEmpty();
}

56
libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java
View file

@ -107,18 +107,18 @@ public abstract class OrderElementTemplate extends BaseEntity implements
.getInitDate());
Days fromBeginningToEnd = daysBetween(order.getInitDate(), origin
.getDeadline());
beingBuilt.materialAssignments = copyMaterialAssignmentsFrom(beingBuilt, origin
.getMaterialAssignments());
beingBuilt.criterionRequirements = copyDirectCriterionRequirements(
beingBuilt, origin.getDirectCriterionRequirement());
beingBuilt.labels = new HashSet<Label>(origin.getLabels());
beingBuilt.qualityForms = origin.getQualityForms();
beingBuilt.advanceAssignmentTemplates = copyDirectAdvanceAssignments(
beingBuilt, origin.getDirectAdvanceAssignments());
beingBuilt.infoComponent = infoComponentCopied;
beingBuilt.schedulingStateType = origin.getSchedulingStateType();
beingBuilt.setMaterialAssignments(copyMaterialAssignmentsFrom(beingBuilt, origin
.getMaterialAssignments()));
beingBuilt.setCriterionRequirements(copyDirectCriterionRequirements(
beingBuilt, origin.getDirectCriterionRequirement()));
beingBuilt.addLabels(origin.getLabels());
beingBuilt.setQualityForms(origin.getQualityForms());
beingBuilt.setAdvanceAssignmentTemplates(copyDirectAdvanceAssignments(
beingBuilt, origin.getDirectAdvanceAssignments()));
beingBuilt.setInfoComponent(infoComponentCopied);
beingBuilt.setSchedulingStateType(origin.getSchedulingStateType());
assignDates(beingBuilt, fromBeginningToStart, fromBeginningToEnd);
beingBuilt.origin = origin;
beingBuilt.setOrigin(origin);
return create(beingBuilt);
}
@ -155,7 +155,7 @@ public abstract class OrderElementTemplate extends BaseEntity implements
}
public static <T extends OrderElementTemplate> T createNew(T beingBuilt) {
beingBuilt.infoComponent = new InfoComponent();
beingBuilt.setInfoComponent(new InfoComponent());
assignDates(beingBuilt, null, null);
return create(beingBuilt);
}
@ -314,6 +314,10 @@ public abstract class OrderElementTemplate extends BaseEntity implements
return schedulingStateType;
}
protected void setSchedulingStateType(SchedulingState.Type schedulingStateType) {
this.schedulingStateType = schedulingStateType;
}
public OrderLineGroupTemplate getParent() {
return parent;
}
@ -322,13 +326,17 @@ public abstract class OrderElementTemplate extends BaseEntity implements
this.parent = parent;
}
private InfoComponent getInfoComponent() {
protected InfoComponent getInfoComponent() {
if (infoComponent == null) {
infoComponent = new InfoComponent();
}
return infoComponent;
}
protected void setInfoComponent(InfoComponent infoComponent) {
this.infoComponent = infoComponent;
}
/**
* @return a description of the type or template this object is
*/
@ -388,6 +396,10 @@ public abstract class OrderElementTemplate extends BaseEntity implements
return Collections.unmodifiableSet(materialAssignments);
}
protected void setMaterialAssignments(Set<MaterialAssignmentTemplate> materialAssigments) {
this.materialAssignments = materialAssignments;
}
public void addMaterialAssignment(
MaterialAssignmentTemplate materialAssignment) {
Validate.notNull(materialAssignment);
@ -429,6 +441,11 @@ public abstract class OrderElementTemplate extends BaseEntity implements
this.labels.add(label);
}
public void addLabels(Collection<Label> labels){
Validate.notNull(labels);
this.labels.addAll(labels);
}
public void removeLabel(Label label) {
this.labels.remove(label);
}
@ -437,6 +454,10 @@ public abstract class OrderElementTemplate extends BaseEntity implements
return Collections.unmodifiableSet(qualityForms);
}
protected void setQualityForms(Set<QualityForm> qualityForms) {
this.qualityForms = qualityForms;
}
public void addQualityForm(QualityForm qualityForm) {
qualityForms.add(qualityForm);
}
@ -450,6 +471,11 @@ public abstract class OrderElementTemplate extends BaseEntity implements
return Collections.unmodifiableSet(advanceAssignmentTemplates);
}
protected void setAdvanceAssignmentTemplates(
Set<AdvanceAssignmentTemplate> advanceAssignmentTemplates) {
this.advanceAssignmentTemplates = advanceAssignmentTemplates;
}
public boolean isRoot() {
return getParent() == null;
}
@ -497,6 +523,10 @@ public abstract class OrderElementTemplate extends BaseEntity implements
return Collections.unmodifiableSet(criterionRequirements);
}
protected void setCriterionRequirements(Set<CriterionRequirement> criterionRequirements) {
this.criterionRequirements = criterionRequirements;
}
public abstract List<HoursGroup> getHoursGroups();
public abstract Integer getWorkHours();

8
libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineGroupTemplate.java
View file

@ -115,7 +115,7 @@ public class OrderLineGroupTemplate extends OrderElementTemplate implements
OrderElementTemplate.create(beingBuilt, group);
List<OrderElementTemplate> result = buildChildrenTemplates(beingBuilt,
group.getChildren());
beingBuilt.children = result;
beingBuilt.setChildren(result);
beingBuilt.propagateIndirectCriterionRequirements();
return beingBuilt;
}
@ -129,7 +129,7 @@ public class OrderLineGroupTemplate extends OrderElementTemplate implements
* and it's needed to propagate its criteria while preserving the original
* value of 'valid' field in {@link IndirectCriterionRequirement}
*/
private void propagateIndirectCriterionRequirements() {
protected void propagateIndirectCriterionRequirements() {
propagateIndirectCriterionRequirementsForOrderLineGroup(this);
propagateIndirectCriterionRequirementsForOrderLines(this);
}
@ -212,6 +212,10 @@ public class OrderLineGroupTemplate extends OrderElementTemplate implements
return Collections.unmodifiableList(children);
}
protected void setChildren(List<OrderElementTemplate> children) {
this.children = children;
}
@Override
public ITreeParentNode<OrderElementTemplate> toContainer() {
return this;