Skip to content

Commit eefc55d

Browse files
gcarcassigcarcassi
committed
vtype: last pass at current implementation classes
1 parent 7aedac2 commit eefc55d

26 files changed

Lines changed: 1358 additions & 1359 deletions

‎epics-vtype/vtype/src/main/java/org/epics/vtype/IAlarm.java‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
/**
2-
* Copyright (C) 2010-14 diirt developers. See COPYRIGHT.TXT
3-
* All rights reserved. Use is subject to license terms. See LICENSE.TXT
4-
*/
5-
package org.epics.vtype;
6-
7-
/**
8-
* Immutable Alarm implementation.
9-
*
10-
* @author carcassi
11-
*/
12-
class IAlarm extends Alarm {
13-
14-
private final AlarmSeverity severity;
15-
private final AlarmStatus status;
16-
private final String name;
17-
18-
IAlarm(AlarmSeverity severity, AlarmStatus status, String name) {
19-
VType.argumentNotNull("severity", severity);
20-
VType.argumentNotNull("status", status);
21-
VType.argumentNotNull("name", name);
22-
this.severity = severity;
23-
this.name = name;
24-
this.status = status;
25-
}
26-
27-
@Override
28-
public AlarmSeverity getSeverity() {
29-
return severity;
30-
}
31-
32-
@Override
33-
public AlarmStatus getStatus() {
34-
return status;
35-
}
36-
37-
@Override
38-
public String getName() {
39-
return name;
40-
}
41-
42-
}
1+
/**
2+
* Copyright (C) 2010-14 diirt developers. See COPYRIGHT.TXT
3+
* All rights reserved. Use is subject to license terms. See LICENSE.TXT
4+
*/
5+
package org.epics.vtype;
6+
7+
/**
8+
* Immutable {code Alarm} implementation.
9+
*
10+
* @author carcassi
11+
*/
12+
final class IAlarm extends Alarm {
13+
14+
private final AlarmSeverity severity;
15+
private final AlarmStatus status;
16+
private final String name;
17+
18+
IAlarm(AlarmSeverity severity, AlarmStatus status, String name) {
19+
VType.argumentNotNull("severity", severity);
20+
VType.argumentNotNull("status", status);
21+
VType.argumentNotNull("name", name);
22+
this.severity = severity;
23+
this.name = name;
24+
this.status = status;
25+
}
26+
27+
@Override
28+
public AlarmSeverity getSeverity() {
29+
return severity;
30+
}
31+
32+
@Override
33+
public AlarmStatus getStatus() {
34+
return status;
35+
}
36+
37+
@Override
38+
public String getName() {
39+
return name;
40+
}
41+
42+
}

‎epics-vtype/vtype/src/main/java/org/epics/vtype/IDisplay.java‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,70 @@
1-
/**
2-
* Copyright (C) 2010-14 diirt developers. See COPYRIGHT.TXT
3-
* All rights reserved. Use is subject to license terms. See LICENSE.TXT
4-
*/
5-
package org.epics.vtype;
6-
7-
import java.text.NumberFormat;
8-
import org.epics.util.stats.Range;
9-
10-
/**
11-
* Immutable Display implementation.
12-
*
13-
* @author carcassi
14-
*/
15-
class IDisplay extends Display {
16-
17-
private final Range displayRange;
18-
private final Range warningRange;
19-
private final Range alarmRange;
20-
private final Range controlRange;
21-
private final String unit;
22-
private final NumberFormat format;
23-
24-
public IDisplay(Range displayRange, Range warningRange, Range alarmRange,
25-
Range controlRange, String unit, NumberFormat format) {
26-
VType.argumentNotNull("displayRange", displayRange);
27-
VType.argumentNotNull("warningRange", warningRange);
28-
VType.argumentNotNull("alarmRange", alarmRange);
29-
VType.argumentNotNull("controlRange", controlRange);
30-
VType.argumentNotNull("unit", unit);
31-
VType.argumentNotNull("format", format);
32-
this.displayRange = displayRange;
33-
this.warningRange = warningRange;
34-
this.alarmRange = alarmRange;
35-
this.controlRange = controlRange;
36-
this.unit = unit;
37-
this.format = format;
38-
}
39-
40-
@Override
41-
public Range getDisplayRange() {
42-
return displayRange;
43-
}
44-
45-
@Override
46-
public Range getWarningRange() {
47-
return warningRange;
48-
}
49-
50-
@Override
51-
public Range getAlarmRange() {
52-
return alarmRange;
53-
}
54-
55-
@Override
56-
public Range getControlRange() {
57-
return controlRange;
58-
}
59-
60-
@Override
61-
public String getUnit() {
62-
return unit;
63-
}
64-
65-
@Override
66-
public NumberFormat getFormat() {
67-
return format;
68-
}
69-
70-
}
1+
/**
2+
* Copyright (C) 2010-14 diirt developers. See COPYRIGHT.TXT
3+
* All rights reserved. Use is subject to license terms. See LICENSE.TXT
4+
*/
5+
package org.epics.vtype;
6+
7+
import java.text.NumberFormat;
8+
import org.epics.util.stats.Range;
9+
10+
/**
11+
* Immutable {@code Display} implementation.
12+
*
13+
* @author carcassi
14+
*/
15+
final class IDisplay extends Display {
16+
17+
private final Range displayRange;
18+
private final Range warningRange;
19+
private final Range alarmRange;
20+
private final Range controlRange;
21+
private final String unit;
22+
private final NumberFormat format;
23+
24+
public IDisplay(Range displayRange, Range warningRange, Range alarmRange,
25+
Range controlRange, String unit, NumberFormat format) {
26+
VType.argumentNotNull("displayRange", displayRange);
27+
VType.argumentNotNull("warningRange", warningRange);
28+
VType.argumentNotNull("alarmRange", alarmRange);
29+
VType.argumentNotNull("controlRange", controlRange);
30+
VType.argumentNotNull("unit", unit);
31+
VType.argumentNotNull("format", format);
32+
this.displayRange = displayRange;
33+
this.warningRange = warningRange;
34+
this.alarmRange = alarmRange;
35+
this.controlRange = controlRange;
36+
this.unit = unit;
37+
this.format = format;
38+
}
39+
40+
@Override
41+
public Range getDisplayRange() {
42+
return displayRange;
43+
}
44+
45+
@Override
46+
public Range getWarningRange() {
47+
return warningRange;
48+
}
49+
50+
@Override
51+
public Range getAlarmRange() {
52+
return alarmRange;
53+
}
54+
55+
@Override
56+
public Range getControlRange() {
57+
return controlRange;
58+
}
59+
60+
@Override
61+
public String getUnit() {
62+
return unit;
63+
}
64+
65+
@Override
66+
public NumberFormat getFormat() {
67+
return format;
68+
}
69+
70+
}

‎epics-vtype/vtype/src/main/java/org/epics/vtype/IEnumDisplay.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
/**
2-
* Copyright (C) 2010-14 diirt developers. See COPYRIGHT.TXT
3-
* All rights reserved. Use is subject to license terms. See LICENSE.TXT
4-
*/
5-
package org.epics.vtype;
6-
7-
import java.util.List;
8-
9-
/**
10-
* Immutable EnumDisplay implementation.
11-
*
12-
* @author carcassi
13-
*/
14-
class IEnumDisplay extends EnumDisplay {
15-
16-
private final List<String> choices;
17-
18-
IEnumDisplay(List<String> choices) {
19-
VType.argumentNotNull("choices", choices);
20-
this.choices = choices;
21-
}
22-
23-
@Override
24-
public List<String> getChoices() {
25-
return choices;
26-
}
27-
28-
}
1+
/**
2+
* Copyright (C) 2010-14 diirt developers. See COPYRIGHT.TXT
3+
* All rights reserved. Use is subject to license terms. See LICENSE.TXT
4+
*/
5+
package org.epics.vtype;
6+
7+
import java.util.List;
8+
9+
/**
10+
* Immutable {@code EnumDisplay} implementation.
11+
*
12+
* @author carcassi
13+
*/
14+
final class IEnumDisplay extends EnumDisplay {
15+
16+
private final List<String> choices;
17+
18+
IEnumDisplay(List<String> choices) {
19+
VType.argumentNotNull("choices", choices);
20+
this.choices = choices;
21+
}
22+
23+
@Override
24+
public List<String> getChoices() {
25+
return choices;
26+
}
27+
28+
}

‎epics-vtype/vtype/src/main/java/org/epics/vtype/ITime.java‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
/**
2-
* Copyright (C) 2010-14 diirt developers. See COPYRIGHT.TXT
3-
* All rights reserved. Use is subject to license terms. See LICENSE.TXT
4-
*/
5-
package org.epics.vtype;
6-
7-
import java.time.Instant;
8-
9-
/**
10-
* Immutable Time implementation.
11-
*
12-
* @author carcassi
13-
*/
14-
class ITime extends Time {
15-
16-
private final Instant timestamp;
17-
private final Integer userTag;
18-
private final boolean valid;
19-
20-
ITime(Instant timestamp, Integer userTag, boolean valid) {
21-
VType.argumentNotNull("timestamp", timestamp);
22-
this.timestamp = timestamp;
23-
this.userTag = userTag;
24-
this.valid = valid;
25-
}
26-
27-
@Override
28-
public Instant getTimestamp() {
29-
return timestamp;
30-
}
31-
32-
@Override
33-
public Integer getUserTag() {
34-
return userTag;
35-
}
36-
37-
@Override
38-
public boolean isValid() {
39-
return valid;
40-
}
41-
42-
}
1+
/**
2+
* Copyright (C) 2010-14 diirt developers. See COPYRIGHT.TXT
3+
* All rights reserved. Use is subject to license terms. See LICENSE.TXT
4+
*/
5+
package org.epics.vtype;
6+
7+
import java.time.Instant;
8+
9+
/**
10+
* Immutable {@code Time} implementation.
11+
*
12+
* @author carcassi
13+
*/
14+
final class ITime extends Time {
15+
16+
private final Instant timestamp;
17+
private final Integer userTag;
18+
private final boolean valid;
19+
20+
ITime(Instant timestamp, Integer userTag, boolean valid) {
21+
VType.argumentNotNull("timestamp", timestamp);
22+
this.timestamp = timestamp;
23+
this.userTag = userTag;
24+
this.valid = valid;
25+
}
26+
27+
@Override
28+
public Instant getTimestamp() {
29+
return timestamp;
30+
}
31+
32+
@Override
33+
public Integer getUserTag() {
34+
return userTag;
35+
}
36+
37+
@Override
38+
public boolean isValid() {
39+
return valid;
40+
}
41+
42+
}

0 commit comments

Comments
 (0)