Skip to content

Commit ad543ce

Browse files
Fix fomratting per code review
1 parent 78ca0bf commit ad543ce

2 files changed

Lines changed: 20 additions & 78 deletions

File tree

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,6 @@ public void testOnSystemCapabilityUpdatedForDISPLAYS() {
733733
assertNotNull(systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY, null, false));
734734

735735
List<DisplayCapability> newCaps = createDisplayCapabilityList(TestValues.GENERAL_DISPLAYCAPABILITIES, TestValues.GENERAL_BUTTONCAPABILITIES_LIST, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
736-
;
737736

738737
SystemCapability systemCapability = new SystemCapability();
739738
systemCapability.setSystemCapabilityType(SystemCapabilityType.DISPLAYS);

base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java

Lines changed: 20 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public Alert() {
182182
}
183183

184184
/**
185-
* <p>Constructs a new Alert object indicated by the Hashtable parameter</p>
185+
* Constructs a new Alert object indicated by the Hashtable parameter
186186
*
187187
* @param hash The Hashtable to use
188188
*/
@@ -191,72 +191,47 @@ public Alert(Hashtable<String, Object> hash) {
191191
}
192192

193193
/**
194-
* Gets the text which is displayed in the first field of the display during
195-
* the Alert
194+
* Gets the text which is displayed in the first field of the display during the Alert
196195
*
197-
* @return String - a String value representing the text which is displayed
198-
* in the first field during the Alert
196+
* @return String - a String value representing the text which is displayed in the first field during the Alert
199197
*/
200198
public String getAlertText1() {
201199
return getString(KEY_ALERT_TEXT_1);
202200
}
203201

204202
/**
205-
* Sets the String to be displayed in the first field of the display during
206-
* the Alert
203+
* Sets the String to be displayed in the first field of the display during the Alert
207204
*
208-
* @param alertText1 String Value
209-
* <p>
210-
* : </b></p>
211-
* <ul>
212-
* <li>Length is limited to what is indicated in <i>
213-
* {@linkplain RegisterAppInterface}</i> response</li>
214-
* <li>If omitted, top display line will be cleared</li>
215-
* <li>Text is always centered</li>
216-
* </ul>
205+
* @param alertText1 a String value representing the text which is displayed in the first field during the Alert
217206
*/
218207
public Alert setAlertText1(String alertText1) {
219208
setParameters(KEY_ALERT_TEXT_1, alertText1);
220209
return this;
221210
}
222211

223212
/**
224-
* Gets the text which is displayed in the second field of the display
225-
* during the Alert
213+
* Gets the text which is displayed in the second field of the display during the Alert
226214
*
227-
* @return String -a String value representing the text which is displayed
228-
* in the second field during the Alert
215+
* @return String -a String value representing the text which is displayed in the second field during the Alert
229216
*/
230217
public String getAlertText2() {
231218
return getString(KEY_ALERT_TEXT_2);
232219
}
233220

234221
/**
235-
* Sets the String to be displayed in the second field of the display during
236-
* the Alert
222+
* Sets the String to be displayed in the second field of the display during the Alert
237223
*
238-
* @param alertText2 String Value
239-
* <p>
240-
* : </b></p>
241-
* <ul>
242-
* <li>Only permitted if HMI supports a second display line</li>
243-
* <li>Length is limited to what is indicated in <i>
244-
* {@linkplain RegisterAppInterface}</i> response</li>
245-
* <li>If omitted, second display line will be cleared</li>
246-
* <li>Text is always centered</li>
247-
* </ul>
224+
* @param alertText2 a String value representing the text which is displayed in the third field during the Alert
248225
*/
249226
public Alert setAlertText2(String alertText2) {
250227
setParameters(KEY_ALERT_TEXT_2, alertText2);
251228
return this;
252229
}
253230

254231
/**
255-
* Gets the text which is displayed in the third field of the display during
256-
* the Alert
232+
* Gets the text which is displayed in the third field of the display during the Alert
257233
*
258-
* @return String -a String value representing the text which is displayed
259-
* in the third field during the Alert
234+
* @return String -a String value representing the text which is displayed in the third field during the Alert
260235
* @since SmartDeviceLink 2.0
261236
*/
262237
public String getAlertText3() {
@@ -267,16 +242,7 @@ public String getAlertText3() {
267242
* Sets the String to be displayed in the third field of the display during
268243
* the Alert
269244
*
270-
* @param alertText3 String Value
271-
* <p>
272-
* s: </b></p>
273-
* <ul>
274-
* <li>Only permitted if HMI supports a third display line</li>
275-
* <li>Length is limited to what is indicated in <i>
276-
* {@linkplain RegisterAppInterface}</i> response</li>
277-
* <li>If omitted, third display line will be cleared</li>
278-
* <li>Text is always centered</li>
279-
* </ul>
245+
* @param alertText3 a String value representing the text which is displayed in the third field during the Alert
280246
* @since SmartDeviceLink 2.0
281247
*/
282248
public Alert setAlertText3(String alertText3) {
@@ -310,27 +276,19 @@ public Alert setTtsChunks(List<TTSChunk> ttsChunks) {
310276
/**
311277
* Gets the duration of the displayed portion of the alert, in milliseconds
312278
*
313-
* @return Integer -an Integer value representing the duration of the
314-
* displayed portion of the alert, in milliseconds
279+
* @return Integer -an Integer value representing the duration of the displayed portion of the alert, in milliseconds
315280
*/
316281
public Integer getDuration() {
317282
return getInteger(KEY_DURATION);
318283
}
319284

320285
/**
321-
* <p>Sets the duration of the displayed portion of the alert, in milliseconds.
286+
* Sets the duration of the displayed portion of the alert, in milliseconds.
322287
* After this amount of time has passed, the display fields alertText1 and
323288
* alertText2 will revert to what was displayed in those fields before the
324-
* alert began</p>
289+
* alert began
325290
*
326-
* @param duration the Integer values representing the duration time, in
327-
* milliseconds
328-
* <p>
329-
* <b>Notes: </b></p>
330-
* <ul>
331-
* <li>Min Value: 3000; Max Value: 10000</li>
332-
* <li>If omitted, the default is 5000 milliseconds</li>
333-
* </ul>
291+
* @param duration -an Integer value representing the duration of the displayed portion of the alert, in milliseconds
334292
*/
335293
public Alert setDuration(Integer duration) {
336294
setParameters(KEY_DURATION, duration);
@@ -351,10 +309,7 @@ public Boolean getPlayTone() {
351309
* Sets whether the alert tone should be played before the TTS (if any) is
352310
* spoken
353311
*
354-
* @param playTone a Boolean value which specifies whether the alert tone should
355-
* be played before the TTS (if any) is spoken
356-
*
357-
* <p> <b>Notes: </b>If omitted, default is true</p>
312+
* @param playTone a Boolean value which specifies whether the alert tone should be played before the TTS (if any) is spoken. <p> <b>Notes: </b>If omitted, default is true</p>
358313
*/
359314
public Alert setPlayTone(Boolean playTone) {
360315
setParameters(KEY_PLAY_TONE, playTone);
@@ -364,8 +319,7 @@ public Alert setPlayTone(Boolean playTone) {
364319
/**
365320
* Gets the SoftButton List object
366321
*
367-
* @return List<SoftButton> -a List<SoftButton> representing the List
368-
* object
322+
* @return List<SoftButton> -a List<SoftButton> representing the List object
369323
* @since SmartDeviceLink 2.0
370324
*/
371325
@SuppressWarnings("unchecked")
@@ -376,15 +330,7 @@ public List<SoftButton> getSoftButtons() {
376330
/**
377331
* Sets the SoftButtons
378332
*
379-
* @param softButtons a List<SoftButton> value
380-
* <p>
381-
* <b>Notes: </b></p>
382-
* <ul>
383-
* <li>If omitted on supported displays, the alert will not have
384-
* any SoftButton</li>
385-
* <li>ArrayMin: 0</li>
386-
* <li>ArrayMax: 4</li>
387-
* </ul>
333+
* @param softButtons a List<SoftButton> value. If omitted on supported displays, the alert will not have any SoftButton. ArrayMin: 0. ArrayMax: 4.
388334
* @since SmartDeviceLink 2.0
389335
*/
390336
public Alert setSoftButtons(List<SoftButton> softButtons) {
@@ -438,10 +384,7 @@ public Alert setCancelID(Integer cancelID) {
438384
* <p>Sets the Image
439385
* If provided, defines the image to be shown along with the alert</p>
440386
*
441-
* @param alertIcon <p>an Image object representing the Image shown along with the alert</p>
442-
* <p>
443-
* <b>Notes: </b>If omitted on supported displays, no (or the
444-
* default if applicable) icon will be displayed</p>
387+
* @param alertIcon an Image object representing the Image shown along with the alert. <b>Notes: </b>If omitted on supported displays, no (or the default if applicable) icon will be displayed</p>
445388
*/
446389
public Alert setAlertIcon(Image alertIcon) {
447390
setParameters(KEY_ALERT_ICON, alertIcon);

0 commit comments

Comments
 (0)