Project

General

Profile

« Previous | Next » 

Revision 54129

renamed parameter

View differences:

DateRangeCollectRecordsJobNode.java
29 29
	private String eprParam;
30 30
	private String fromDateParam;
31 31
	private String untilDateParam;
32
	private String from;
33
	private String until;
32
	private String overrideFrom;
33
	private String overrideUntil;
34 34

  
35 35
	@Override
36 36
	protected String execute(final NodeToken token) throws Exception {
37 37
		final String profile = serviceLocator.getService(ISLookUpService.class).getResourceProfile(datasourceId);
38 38
		final Document doc = new SAXReader().read(new StringReader(profile));
39 39
		final Node ifcNode = doc.selectSingleNode("//INTERFACE[@id='" + datasourceInterface + "']");
40
		final String fromDate = StringUtils.isNoneBlank(from) ? from : token.getEnv().getAttribute(getFromDateParam());
41
		final String untilDate = StringUtils.isNoneBlank(until) ? until :token.getEnv().getAttribute(getUntilDateParam());
40
		final String fromDate = StringUtils.isNoneBlank(overrideFrom) ? overrideFrom : token.getEnv().getAttribute(getFromDateParam());
41
		final String untilDate = StringUtils.isNoneBlank(overrideUntil) ? overrideUntil :token.getEnv().getAttribute(getUntilDateParam());
42 42

  
43 43
		final InterfaceDescriptor interfaceDescriptor = InterfaceDescriptor.newInstance(ifcNode);
44 44

  
......
89 89
		this.eprParam = eprParam;
90 90
	}
91 91

  
92
	public String getFrom() {
93
		return from;
92
	public String getOverrideFrom() {
93
		return overrideFrom;
94 94
	}
95 95

  
96
	public void setFrom(String from) {
97
		this.from = from;
96
	public void setOverrideFrom(String overrideFrom) {
97
		this.overrideFrom = overrideFrom;
98 98
	}
99 99

  
100
	public String getUntil() {
101
		return until;
100
	public String getOverrideUntil() {
101
		return overrideUntil;
102 102
	}
103 103

  
104
	public void setUntil(String until) {
105
		this.until = until;
104
	public void setOverrideUntil(String overrideUntil) {
105
		this.overrideUntil = overrideUntil;
106 106
	}
107 107
}

Also available in: Unified diff