Skip to content

Commit 042f4e7

Browse files
author
jantje
committed
Cleaning up the messages
1 parent a531b92 commit 042f4e7

File tree

8 files changed

+72
-139
lines changed

8 files changed

+72
-139
lines changed

‎io.sloeber.core/src/io/sloeber/core/communication/Messages.java

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,29 @@
33
import org.eclipse.osgi.util.NLS;
44

55
public class Messages extends NLS {
6-
private static final String BUNDLE_NAME = "io.sloeber.core.communication.messages"; //$NON-NLS-1$
7-
public static String ArduinoSerial_23;
8-
public static String ArduinoSerial_Comport_Appeared_and_disappeared;
9-
public static String ArduinoSerial_Comport_is_not_behaving_as_expected;
10-
public static String ArduinoSerial_comport_not_found;
11-
public static String ArduinoSerial_Comport_reset_took;
12-
public static String ArduinoSerial_Continuing_to_use;
13-
public static String ArduinoSerial_Ending_reset;
14-
public static String ArduinoSerial_exception_while_opening_seral_port;
15-
public static String ArduinoSerial_Flushing_buffer;
16-
public static String ArduinoSerial_From_Now_Onwards;
17-
public static String ArduinoSerial_miliseconds;
18-
public static String ArduinoSerial_reset_dtr_toggle;
19-
public static String ArduinoSerial_reset_failed;
20-
public static String ArduinoSerial_Unable_To_Open_Port;
21-
public static String ArduinoSerial_unable_to_open_serial_port;
22-
public static String ArduinoSerial_Using_1200bps_touch;
23-
public static String ArduinoSerial_Using_comport;
6+
private static final String BUNDLE_NAME = "io.sloeber.core.communication.messages"; //$NON-NLS-1$
7+
public static String ArduinoSerial_23;
8+
public static String ArduinoSerial_Comport_Appeared_and_disappeared;
9+
public static String ArduinoSerial_Comport_is_not_behaving_as_expected;
10+
public static String ArduinoSerial_comport_not_found;
11+
public static String ArduinoSerial_Comport_reset_took;
12+
public static String ArduinoSerial_Continuing_to_use;
13+
public static String ArduinoSerial_Ending_reset;
14+
public static String ArduinoSerial_exception_while_opening_seral_port;
15+
public static String ArduinoSerial_From_Now_Onwards;
16+
public static String ArduinoSerial_miliseconds;
17+
public static String ArduinoSerial_reset_dtr_toggle;
18+
public static String ArduinoSerial_reset_failed;
19+
public static String ArduinoSerial_Unable_To_Open_Port;
20+
public static String ArduinoSerial_unable_to_open_serial_port;
21+
public static String ArduinoSerial_Using_1200bps_touch;
22+
public static String ArduinoSerial_Using_comport;
2423

25-
static {
26-
// initialize resource bundle
27-
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
28-
}
24+
static {
25+
// initialize resource bundle
26+
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
27+
}
2928

30-
private Messages() {
31-
}
29+
private Messages() {
30+
}
3231
}

‎io.sloeber.core/src/io/sloeber/core/communication/messages.properties

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@ ArduinoSerial_23=Toggling DTR
22
ArduinoSerial_Comport_Appeared_and_disappeared=Comport appeared and disappeared with same name
33
ArduinoSerial_Comport_is_not_behaving_as_expected=Comport is not behaving as expected
44
ArduinoSerial_comport_not_found=Com port not found. Skipping reset
5-
ArduinoSerial_Comport_reset_took=Comport reset took
6-
ArduinoSerial_Continuing_to_use=Continuing to use
5+
ArduinoSerial_Comport_reset_took=Comport reset took
6+
ArduinoSerial_Continuing_to_use=Continuing to use
77
ArduinoSerial_Ending_reset=Ending reset
8-
ArduinoSerial_exception_while_opening_seral_port=Exception while opening Serial port
9-
ArduinoSerial_Flushing_buffer=Flushing buffer
8+
ArduinoSerial_exception_while_opening_seral_port=Exception while opening Serial port
109
ArduinoSerial_From_Now_Onwards=\ from now onwards
1110
ArduinoSerial_miliseconds=ms
1211
ArduinoSerial_reset_dtr_toggle=Starting reset using DTR toggle process
1312
ArduinoSerial_reset_failed=reset using 1200bps touch failed
14-
ArduinoSerial_Unable_To_Open_Port=Unable to open Serial port
15-
ArduinoSerial_unable_to_open_serial_port=Unable to open Serial port
16-
ArduinoSerial_Using_1200bps_touch=Forcing reset using 1200bps open/close on port
17-
ArduinoSerial_Using_comport=Using comport
13+
ArduinoSerial_Unable_To_Open_Port=Unable to open Serial port
14+
ArduinoSerial_unable_to_open_serial_port=Unable to open Serial port
15+
ArduinoSerial_Using_1200bps_touch=Forcing reset using 1200bps open/close on port
16+
ArduinoSerial_Using_comport=Using comport

‎io.sloeber.core/src/io/sloeber/core/managers/Messages.java

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,29 @@
33
import org.eclipse.osgi.util.NLS;
44

55
public class Messages extends NLS {
6-
private static final String BUNDLE_NAME = "io.sloeber.core.managers.messages"; //$NON-NLS-1$
7-
public static String Manager_Cant_create_folder;
8-
public static String Manager_Cant_extract_file;
9-
public static String Manager_Downloading_make_exe;
10-
public static String Manager_Failed_to_download;
11-
public static String Manager_Failed_to_extract;
12-
public static String Manager_File_already_exists;
13-
public static String Manager_File_exists;
14-
public static String Manager_Format_not_supported;
15-
public static String Manager_is_outside;
16-
public static String Manager_links_to_absolute_path;
17-
public static String Manager_no_single_root_folder;
18-
public static String Manager_no_single_root_folder_while_file;
19-
public static String Manager_unable_to_create_file;
20-
public static String Manager_unable_to_write_to_file;
21-
public static String Manager_Warning_file;
22-
public static String Manager_will_not_work;
23-
public static String Platform_loading_boards;
24-
public static String Platform_loading_platform;
25-
public static String Tool_no_valid_system;
26-
public static String ToolDependency_Tool_not_found;
6+
private static final String BUNDLE_NAME = "io.sloeber.core.managers.messages"; //$NON-NLS-1$
7+
public static String Manager_Cant_create_folder;
8+
public static String Manager_Cant_extract_file;
9+
public static String Manager_Failed_to_download;
10+
public static String Manager_Failed_to_extract;
11+
public static String Manager_File_already_exists;
12+
public static String Manager_File_exists;
13+
public static String Manager_Format_not_supported;
14+
public static String Manager_is_outside;
15+
public static String Manager_links_to_absolute_path;
16+
public static String Manager_no_single_root_folder;
17+
public static String Manager_no_single_root_folder_while_file;
18+
public static String Manager_Warning_file;
19+
public static String Platform_loading_boards;
20+
public static String Platform_loading_platform;
21+
public static String Tool_no_valid_system;
22+
public static String ToolDependency_Tool_not_found;
2723

28-
static {
29-
// initialize resource bundle
30-
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
31-
}
24+
static {
25+
// initialize resource bundle
26+
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
27+
}
3228

33-
private Messages() {
34-
}
29+
private Messages() {
30+
}
3531
}

‎io.sloeber.core/src/io/sloeber/core/managers/messages.properties

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
Manager_Cant_create_folder=Can't create folder
2-
Manager_Cant_extract_file=Can't extract file
3-
Manager_Downloading_make_exe=downloading make.exe
4-
Manager_Failed_to_download=Failed to download.
5-
Manager_Failed_to_extract=Failed to extract tar.bz2.
1+
Manager_Cant_create_folder=Can't create folder
2+
Manager_Cant_extract_file=Can't extract file
3+
Manager_Failed_to_download=Failed to download.
4+
Manager_Failed_to_extract=Failed to extract tar.bz2.
65
Manager_File_already_exists=, file already exists\!
76
Manager_File_exists=, a file with the same name exists\!
87
Manager_Format_not_supported=Archive format not supported.
9-
Manager_is_outside=\ is outside
10-
Manager_links_to_absolute_path=\ links to an absolute path
8+
Manager_is_outside=\ is outside
9+
Manager_links_to_absolute_path=\ links to an absolute path
1110
Manager_no_single_root_folder=Invalid archive: it must contain a single root folder
12-
Manager_no_single_root_folder_while_file=Invalid archive: it must contain a single root folder while file
13-
Manager_unable_to_create_file=Unable to create file :
14-
Manager_unable_to_write_to_file=Unable to write tofile file :
15-
Manager_Warning_file=Warning: file
16-
Manager_will_not_work=\ will not work
11+
Manager_no_single_root_folder_while_file=Invalid archive: it must contain a single root folder while file
12+
Manager_Warning_file=Warning: file
1713
Platform_loading_boards=Loading boards.txt
1814
Platform_loading_platform=Loading platform.txt
19-
Tool_no_valid_system=No valid system found for
15+
Tool_no_valid_system=No valid system found for
2016
ToolDependency_Tool_not_found=Tool not found %s %s

‎io.sloeber.core/src/io/sloeber/core/tools/Messages.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,24 @@
44

55
public class Messages extends NLS {
66
private static final String BUNDLE_NAME = "io.sloeber.core.tools.messages"; //$NON-NLS-1$
7-
public static String And_Configuration;
87
public static String Boards_Failed_to_read_boards;
98
public static String Boards_Get_menu_item_name_from_id_did_not_find;
109
public static String Boards_name;
1110
public static String Boards_not_found;
12-
public static String Helpers__in_boards_invalid;
1311
public static String Helpers_boards_file;
1412
public static String Helpers_Boards_id;
1513
public static String Helpers_Create_folder_failed;
1614
public static String Helpers_delete_folder_failed;
1715
public static String Helpers_Error_parsing;
1816
public static String Helpers_File_does_not_exists;
19-
public static String Helpers_File_missing;
2017
public static String Helpers_Invalid_boards_config;
2118
public static String Helpers_IO_exception;
2219
public static String Helpers_menu;
2320
public static String Helpers_No_boards_txt_found;
2421
public static String Helpers_The_project;
25-
public static String Helpers_Value_for_key;
2622
public static String Helpers_tool_reference_missing;
2723
public static String Helpers_link_folder;
2824
public static String Helpers_is_empty;
29-
public static String Helpers_Could_not_add_folder;
30-
public static String Helpers_To_include_path;
3125
public static String Helpers_The_folder;
3226
public static String Helpers_No_command_for;
3327
public static String Helpers_ProblemInProgrammerFie;
@@ -39,10 +33,8 @@ public class Messages extends NLS {
3933
public static String command_output;
4034
public static String failed_to_remove_lib;
4135
public static String import_lib_failed;
42-
public static String Is_Not_valid_for_project;
4336
public static String security_login;
4437
public static String security_password;
45-
public static String The_lib;
4638
public static String getMenuItemIDFromMenuItemName;
4739

4840
static {

‎io.sloeber.core/src/io/sloeber/core/tools/messages.properties

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
1-
And_Configuration=\ and configuration
21
Boards_Failed_to_read_boards=Failed to read arduino boards file
32
Boards_Get_menu_item_name_from_id_did_not_find=getMenuItemNameFromMenuItemID did not find menu item with ID ${MENUITEMID} menu ID ${MENUID} for board ${BOARDID}
43
Boards_name=\ name
54
Boards_not_found=\ not found
6-
Helpers__in_boards_invalid=\ in boards.txt is invalid:
75
Helpers_boards_file=\nBoardsfile:
86
Helpers_Boards_id=\nBoardID:
97
Helpers_Create_folder_failed=Could not create folder
108
Helpers_delete_folder_failed=failed to delete the folder
119
Helpers_Error_parsing=Error parsing
1210
Helpers_File_does_not_exists=\ file does not exist.
13-
Helpers_File_missing=Your setup is corrupt following file is missing
1411
Helpers_Invalid_boards_config=\ has an invalid arduino board configuration.\nConfiguration:
1512
Helpers_IO_exception=\ I/O exception.
1613
Helpers_menu=menu.
1714
Helpers_No_boards_txt_found=No boards.txt files found in the arduino hardware folders. I looked in:\n
1815
Helpers_The_project=The project
1916
Helpers_The_folder=The folder
20-
Helpers_Value_for_key=the value for key
2117
Helpers_tool_reference_missing=failed to find ${TOOL} reference in ${FILE} for ${BOARD}:
2218
Helpers_link_folder=The folder you want to link to '
2319
Helpers_is_empty=' does not contain any files.
24-
Helpers_Could_not_add_folder=Could not add folder
25-
Helpers_To_include_path= to include path in project:
2620
Helpers_No_command_for=echo no command for
2721
Helpers_ProblemInProgrammerFie=The programmer tool for this uploader is not defined in the programmers.txt file.
2822
command_aborted=\ execution aborted
@@ -33,8 +27,6 @@ command_launching=Launching
3327
command_output=Output:
3428
failed_to_remove_lib=Failed to remove library
3529
import_lib_failed=Failed to import library
36-
Is_Not_valid_for_project=\ is not valid for the project
3730
security_login=login
3831
security_password=password
39-
The_lib=The library
4032
getMenuItemIDFromMenuItemName=getMenuItemIDFromMenuItemName did not find menu item with name "${MENUITEMNAME}" for menu ID "${MENUID}" and for boardID "${BOARDID}"!

‎io.sloeber.ui/src/io/sloeber/ui/Messages.java

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,10 @@ public class Messages extends NLS {
99

1010
public static String error_adding_arduino_code;
1111
public static String error_no_platform_files_found;
12-
public static String error_make_finder_failed;
13-
public static String error_make_is_not_found;
1412
public static String error_no_Arduino_project_selected;
1513
public static String error_no_host_name;
1614
public static String error_failed_to_import_library_in_project;
1715

18-
public static String ui_build_config;
19-
public static String ui_debug_binaries;
20-
public static String ui_dont_touch;
21-
public static String ui_some_bla_bla;
2216
public static String ui_Adopting_arduino_libraries;
2317
public static String ui_Alternative_size;
2418
public static String ui_Apend_c_cpp;
@@ -32,7 +26,6 @@ public class Messages extends NLS {
3226
public static String ui_open_serial_with_monitor;
3327
public static String ui_build_before_upload;
3428
public static String ui_auto_import_libraries;
35-
public static String ui_category;
3629

3730
public static String ui_import_arduino_libraries_in_project;
3831
public static String ui_import_arduino_libraries_in_project_help;
@@ -42,11 +35,7 @@ public class Messages extends NLS {
4235
public static String ui_import_subfolder_to_import_to;
4336
public static String ui_installing_arduino_libraries;
4437
public static String ui_installing_platforms;
45-
public static String ui_looking_for_make;
4638

47-
public static String ui_make_is_found;
48-
49-
public static String ui_name;
5039
public static String ui_new_sketch_arduino_information;
5140
public static String ui_new_sketch_arduino_information_help;
5241
public static String ui_new_sketch_custom_template;
@@ -57,22 +46,21 @@ public class Messages extends NLS {
5746
public static String ui_new_sketch_error_folder_must_contain_sketch_cpp;
5847
public static String ui_new_sketch_link_to_sample_code;
5948
public static String ui_new_sketch_sample_sketch;
60-
public static String ui_new_sketch_Select_additional_configurations;
61-
public static String ui_new_sketch_Select_additional_configurations_help;
49+
6250
public static String ui_new_sketch_select_example_code;
6351
public static String ui_new_sketch_selecy_code;
6452
public static String ui_new_sketch_sketch_template_folder;
6553
public static String ui_new_sketch_sketch_template_location;
6654
public static String ui_new_sketch_these_settings_cn_be_changed_later;
6755
public static String ui_new_sketch_title;
6856
public static String ui_new_sketch_title_help;
69-
public static String ui_new_sketch_use_current_settings_as_default;
57+
7058
public static String ui_port;
7159
public static String ui_private_hardware_path;
7260
public static String ui_private_hardware_path_help;
7361
public static String ui_private_lib_path;
7462
public static String ui_private_lib_path_help;
75-
public static String ui_remove;
63+
7664
public static String ui_sec_login;
7765
public static String ui_sec_login_and_password;
7866
public static String ui_sec_password;
@@ -81,15 +69,10 @@ public class Messages extends NLS {
8169
public static String ui_select_folder;
8270
public static String ui_show_all_warnings;
8371
public static String ui_url_for_package_index_file;
84-
public static String ui_version;
72+
8573
public static String ui_workspace_settings;
86-
public static String ui_make_what;
87-
public static String ui_make_test;
88-
public static String ui_success;
89-
public static String ui_warning;
90-
public static String ui_create_a;
74+
9175
public static String ui_error_select_arduino_project;
92-
public static String error;
9376

9477
public static String json_browser_fail;
9578

@@ -111,11 +94,11 @@ public class Messages extends NLS {
11194
public static String ArduinoUploadProjectHandler_The_Names_Are;
11295
public static String ArduinoUploadProjectHandler_Upload_for_project;
11396
public static String BuildHandler_Build_Code_of_project;
114-
public static String BuildHandler_Failed_to_build;
97+
11598
public static String BuildHandler_No_Project_found;
116-
public static String BuildHandler_Start_Build_Activator;
99+
117100
public static String ReattachLibraries_no_project_found;
118-
public static String UploadProjectHandler_build_failed;
101+
119102
public static String pleaseWaitForInstallerJob;
120103
public static String buildBeforeUpload;
121104
public static String doYouWantToBuildBeforeUpload;

0 commit comments

Comments
 (0)