Skip to content

Commit a53ec78

Browse files
author
Mike Burke
committed
Merge branch 'refs/heads/hotfix/enum_improvements' into sdl_android_parent/master
2 parents 97a7ddb + 3028ec4 commit a53ec78

File tree

124 files changed

+516
-972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+516
-972
lines changed

‎sdl_android_lib/src/com/smartdevicelink/proxy/RPCResponse.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
package com.smartdevicelink.proxy;
55

66
import java.util.Hashtable;
7+
78
import com.smartdevicelink.proxy.rpc.enums.Result;
8-
import com.smartdevicelink.util.DebugTool;
99

1010
/**
1111
* Result sent by SDL after an RPC is processed, consists of four parts:
@@ -130,13 +130,7 @@ public Result getResultCode() {
130130
if (obj instanceof Result) {
131131
return (Result) obj;
132132
} else if (obj instanceof String) {
133-
Result theCode = null;
134-
try {
135-
theCode = Result.valueForString((String) obj);
136-
} catch (Exception e) {
137-
DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + RPCResponse.KEY_RESULT_CODE, e);
138-
}
139-
return theCode;
133+
return Result.valueForString((String) obj);
140134
}
141135
return null;
142136
}

‎sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AirbagStatus.java

+8-57
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import com.smartdevicelink.proxy.RPCStruct;
66
import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
7-
import com.smartdevicelink.util.DebugTool;
87

98
public class AirbagStatus extends RPCStruct {
109
public static final String KEY_DRIVER_AIRBAG_DEPLOYED = "driverAirbagDeployed";
@@ -33,13 +32,7 @@ public VehicleDataEventStatus getDriverAirbagDeployed() {
3332
if (obj instanceof VehicleDataEventStatus) {
3433
return (VehicleDataEventStatus) obj;
3534
} else if (obj instanceof String) {
36-
VehicleDataEventStatus theCode = null;
37-
try {
38-
theCode = VehicleDataEventStatus.valueForString((String) obj);
39-
} catch (Exception e) {
40-
DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_DRIVER_AIRBAG_DEPLOYED, e);
41-
}
42-
return theCode;
35+
return VehicleDataEventStatus.valueForString((String) obj);
4336
}
4437
return null;
4538
}
@@ -55,13 +48,7 @@ public VehicleDataEventStatus getDriverSideAirbagDeployed() {
5548
if (obj instanceof VehicleDataEventStatus) {
5649
return (VehicleDataEventStatus) obj;
5750
} else if (obj instanceof String) {
58-
VehicleDataEventStatus theCode = null;
59-
try {
60-
theCode = VehicleDataEventStatus.valueForString((String) obj);
61-
} catch (Exception e) {
62-
DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_DRIVER_SIDE_AIRBAG_DEPLOYED, e);
63-
}
64-
return theCode;
51+
return VehicleDataEventStatus.valueForString((String) obj);
6552
}
6653
return null;
6754
}
@@ -77,13 +64,7 @@ public VehicleDataEventStatus getDriverCurtainAirbagDeployed() {
7764
if (obj instanceof VehicleDataEventStatus) {
7865
return (VehicleDataEventStatus) obj;
7966
} else if (obj instanceof String) {
80-
VehicleDataEventStatus theCode = null;
81-
try {
82-
theCode = VehicleDataEventStatus.valueForString((String) obj);
83-
} catch (Exception e) {
84-
DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, e);
85-
}
86-
return theCode;
67+
return VehicleDataEventStatus.valueForString((String) obj);
8768
}
8869
return null;
8970
}
@@ -99,13 +80,7 @@ public VehicleDataEventStatus getPassengerAirbagDeployed() {
9980
if (obj instanceof VehicleDataEventStatus) {
10081
return (VehicleDataEventStatus) obj;
10182
} else if (obj instanceof String) {
102-
VehicleDataEventStatus theCode = null;
103-
try {
104-
theCode = VehicleDataEventStatus.valueForString((String) obj);
105-
} catch (Exception e) {
106-
DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_PASSENGER_AIRBAG_DEPLOYED, e);
107-
}
108-
return theCode;
83+
return VehicleDataEventStatus.valueForString((String) obj);
10984
}
11085
return null;
11186
}
@@ -121,13 +96,7 @@ public VehicleDataEventStatus getPassengerCurtainAirbagDeployed() {
12196
if (obj instanceof VehicleDataEventStatus) {
12297
return (VehicleDataEventStatus) obj;
12398
} else if (obj instanceof String) {
124-
VehicleDataEventStatus theCode = null;
125-
try {
126-
theCode = VehicleDataEventStatus.valueForString((String) obj);
127-
} catch (Exception e) {
128-
DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED, e);
129-
}
130-
return theCode;
99+
return VehicleDataEventStatus.valueForString((String) obj);
131100
}
132101
return null;
133102
}
@@ -143,13 +112,7 @@ public VehicleDataEventStatus getDriverKneeAirbagDeployed() {
143112
if (obj instanceof VehicleDataEventStatus) {
144113
return (VehicleDataEventStatus) obj;
145114
} else if (obj instanceof String) {
146-
VehicleDataEventStatus theCode = null;
147-
try {
148-
theCode = VehicleDataEventStatus.valueForString((String) obj);
149-
} catch (Exception e) {
150-
DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, e);
151-
}
152-
return theCode;
115+
return VehicleDataEventStatus.valueForString((String) obj);
153116
}
154117
return null;
155118
}
@@ -165,13 +128,7 @@ public VehicleDataEventStatus getPassengerSideAirbagDeployed() {
165128
if (obj instanceof VehicleDataEventStatus) {
166129
return (VehicleDataEventStatus) obj;
167130
} else if (obj instanceof String) {
168-
VehicleDataEventStatus theCode = null;
169-
try {
170-
theCode = VehicleDataEventStatus.valueForString((String) obj);
171-
} catch (Exception e) {
172-
DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED, e);
173-
}
174-
return theCode;
131+
return VehicleDataEventStatus.valueForString((String) obj);
175132
}
176133
return null;
177134
}
@@ -187,13 +144,7 @@ public VehicleDataEventStatus getPassengerKneeAirbagDeployed() {
187144
if (obj instanceof VehicleDataEventStatus) {
188145
return (VehicleDataEventStatus) obj;
189146
} else if (obj instanceof String) {
190-
VehicleDataEventStatus theCode = null;
191-
try {
192-
theCode = VehicleDataEventStatus.valueForString((String) obj);
193-
} catch (Exception e) {
194-
DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED, e);
195-
}
196-
return theCode;
147+
return VehicleDataEventStatus.valueForString((String) obj);
197148
}
198149
return null;
199150
}

‎sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java

+3-22
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.smartdevicelink.proxy.rpc.enums.AudioType;
77
import com.smartdevicelink.proxy.rpc.enums.BitsPerSample;
88
import com.smartdevicelink.proxy.rpc.enums.SamplingRate;
9-
import com.smartdevicelink.util.DebugTool;
109

1110
/**
1211
* Describes different audio type configurations for PerformAudioPassThru, e.g. {8kHz,8-bit,PCM}
@@ -81,13 +80,7 @@ public SamplingRate getSamplingRate() {
8180
if (obj instanceof SamplingRate) {
8281
return (SamplingRate) obj;
8382
} else if (obj instanceof String) {
84-
SamplingRate theCode = null;
85-
try {
86-
theCode = SamplingRate.valueForString((String) obj);
87-
} catch (Exception e) {
88-
DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_SAMPLING_RATE, e);
89-
}
90-
return theCode;
83+
return SamplingRate.valueForString((String) obj);
9184
}
9285
return null;
9386
}
@@ -113,13 +106,7 @@ public BitsPerSample getBitsPerSample() {
113106
if (obj instanceof BitsPerSample) {
114107
return (BitsPerSample) obj;
115108
} else if (obj instanceof String) {
116-
BitsPerSample theCode = null;
117-
try {
118-
theCode = BitsPerSample.valueForString((String) obj);
119-
} catch (Exception e) {
120-
DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_BITS_PER_SAMPLE, e);
121-
}
122-
return theCode;
109+
return BitsPerSample.valueForString((String) obj);
123110
}
124111
return null;
125112
}
@@ -145,13 +132,7 @@ public AudioType getAudioType() {
145132
if (obj instanceof AudioType) {
146133
return (AudioType) obj;
147134
} else if (obj instanceof String) {
148-
AudioType theCode = null;
149-
try {
150-
theCode = AudioType.valueForString((String) obj);
151-
} catch (Exception e) {
152-
DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_AUDIO_TYPE, e);
153-
}
154-
return theCode;
135+
return AudioType.valueForString((String) obj);
155136
}
156137
return null;
157138
}

0 commit comments

Comments
 (0)