Change default folder to src from root

Also externalize the text messages

Author: jan

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

@@ -161,6 +161,16 @@ public class Messages extends NLS {
 	public static String ui_put_in_version_control;
 	public static String target_maintain;
 	public static String Add_Targets_To_force_serial_disconnect_when_run;
+	public static String NewProjectSourceLocationPage_CodeInCustomFolder;
+
+	public static String NewProjectSourceLocationPage_CodeInRootFolder;
+
+	public static String NewProjectSourceLocationPage_CodeInSrcFolder;
+
+	public static String NewProjectSourceLocationPage_CustomSourceTextFieldError;
+
+	public static String NewProjectSourceLocationPage_ExplainText;
+
 	public static String ui_new_sketch_sketch_source_folder;
 
     public static String yes;

io.sloeber.ui/src/io/sloeber/ui/messages.properties

@@ -136,3 +136,8 @@ ui_put_in_version_control=Share in version control?
 target_maintain=Targets
 Add_Targets_To_force_serial_disconnect_when_run=Add targets that require the serial connection to be closed when build.
 Build_Error_Before_Upload=Build failed before upload.
+NewProjectSourceLocationPage_CodeInCustomFolder=put code in a custom folder
+NewProjectSourceLocationPage_CodeInRootFolder=Put Code in the root of the project
+NewProjectSourceLocationPage_CodeInSrcFolder=put code in the src folder
+NewProjectSourceLocationPage_CustomSourceTextFieldError=You must provide a text in the text field that matches a valid folder name
+NewProjectSourceLocationPage_ExplainText=You can separate the source code from the rest of the project content by putting it in a source folder.

io.sloeber.ui/src/io/sloeber/ui/wizard/newsketch/NewProjectSourceLocationPage.java

@@ -27,7 +27,7 @@ protected NewProjectSourceLocationPage(String pageName) {
 		super(pageName);
 		setTitle(Messages.ui_new_sketch_sketch_source_folder);
 		setDescription(
-				"You can seperate the source code from the rest of the project content by putting it in a source folder.");
+				Messages.NewProjectSourceLocationPage_ExplainText);
 	}
 
 	@Override
@@ -52,22 +52,22 @@ public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		};
 
-		RootFolderButton = new Button(usercomp, SWT.RADIO);
-		RootFolderButton.setText("Put Code in the root of the project");
-		RootFolderButton.addSelectionListener(selectionListener);
-
 		srcFolderButton = new Button(usercomp, SWT.RADIO);
-		srcFolderButton.setText("put code in the src folder");
+		srcFolderButton.setText(Messages.NewProjectSourceLocationPage_CodeInSrcFolder);
 		srcFolderButton.addSelectionListener(selectionListener);
 
+		RootFolderButton = new Button(usercomp, SWT.RADIO);
+		RootFolderButton.setText(Messages.NewProjectSourceLocationPage_CodeInRootFolder);
+		RootFolderButton.addSelectionListener(selectionListener);
+
 		customFolderButton = new Button(usercomp, SWT.RADIO);
-		customFolderButton.setText("put code in a custom folder");
+		customFolderButton.setText(Messages.NewProjectSourceLocationPage_CodeInCustomFolder);
 		customFolderButton.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				customFolderText.setEditable(true);
 				if (customFolderText.getText().isBlank()) {
-					setErrorMessage("You must provide a text in the text field that matches a valid folder name");
+					setErrorMessage(Messages.NewProjectSourceLocationPage_CustomSourceTextFieldError);
 					setPageComplete(false);
 				}
 			}
@@ -84,7 +84,7 @@ public void widgetDefaultSelected(SelectionEvent e) {
 			@Override
 			public void modifyText(ModifyEvent e) {
 				if (customFolderText.getText().isBlank()) {
-					setErrorMessage("You must provide a text in the text field that matches a valid folder name");
+					setErrorMessage(Messages.NewProjectSourceLocationPage_CustomSourceTextFieldError);
 					setPageComplete(false);
 				} else {
 					setErrorMessage(null);
@@ -93,7 +93,7 @@ public void modifyText(ModifyEvent e) {
 			}
 		});
 
-		String storedValue = ConfigurationPreferences.getString(LAST_USED_SOURCE_LOCATION, null);
+		String storedValue = ConfigurationPreferences.getString(LAST_USED_SOURCE_LOCATION, DEFAULT_FOLDER);
 		if (DEFAULT_FOLDER.equals(storedValue)) {
 			srcFolderButton.setSelection(true);
 		} else {