Skip to content

Commit 6de83bc

Browse files
authored
Merge pull request #1229 from rmspacefish/mueller/explicit-no-file-option
explicit no file option for new sketch
2 parents ee0383b + 0cf43ce commit 6de83bc

File tree

4 files changed

+20
-2
lines changed

4 files changed

+20
-2
lines changed

io.sloeber.core/src/io/sloeber/core/api/CodeDescriptor.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
public class CodeDescriptor {
3636
public enum CodeTypes {
37-
defaultIno, defaultCPP, CustomTemplate, sample
37+
None, defaultIno, defaultCPP, CustomTemplate, sample
3838
}
3939

4040
static public final String DEFAULT_SKETCH_BASE = "sketch"; //$NON-NLS-1$
@@ -77,6 +77,10 @@ public void setReplacers(Map<String, String> myReplacers) {
7777
private CodeDescriptor(CodeTypes codeType) {
7878
myCodeType = codeType;
7979
}
80+
81+
public static CodeDescriptor createNone() {
82+
return new CodeDescriptor(CodeTypes.None);
83+
}
8084

8185
public static CodeDescriptor createDefaultIno() {
8286
return new CodeDescriptor(CodeTypes.defaultIno);
@@ -152,6 +156,8 @@ public Map<String, IPath> createFiles(IProject project, IProgressMonitor monito
152156

153157

154158
switch (myCodeType) {
159+
case None:
160+
break;
155161
case defaultIno:
156162
Helpers.addFileToProject(project, new Path(project.getName() + ".ino"),
157163
Stream.openContentStream("/io/sloeber/core/templates/" + DEFAULT_SKETCH_INO, false,replacers),

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

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public class Messages extends NLS {
127127
public static String ui_new_sketch_arduino_information_help;
128128
public static String ui_new_sketch_custom_template;
129129
public static String ui_new_sketch_custom_template_location;
130+
public static String ui_new_sketch_none;
130131
public static String ui_new_sketch_default_cpp;
131132
public static String ui_new_sketch_default_ino;
132133
public static String ui_new_sketch_error_failed_to_create_project;

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

+1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ ui_new_sketch_arduino_information=Arduino information
9898
ui_new_sketch_arduino_information_help=Provide the Arduino information.
9999
ui_new_sketch_custom_template=Custom template
100100
ui_new_sketch_custom_template_location=Custom Template Location
101+
ui_new_sketch_none=No file
101102
ui_new_sketch_default_cpp=Default cpp file
102103
ui_new_sketch_default_ino=Default ino file
103104
ui_new_sketch_error_failed_to_create_project=Failed to create project

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

+11-1
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,11 @@ public void handleEvent(Event event) {
132132
*/
133133
protected void SetControls() {
134134
switch (CodeTypes.values()[Math.max(0, myCodeSourceOptionsCombo.getSelectionIndex())]) {
135+
case None:
136+
myTemplateFolderEditor.setEnabled(false, myParentComposite);
137+
myExampleEditor.setEnabled(false);
138+
myCheckBoxUseCurrentLinkSample.setEnabled(false);
139+
break;
135140
case defaultIno:
136141
myTemplateFolderEditor.setEnabled(false, myParentComposite);
137142
myExampleEditor.setEnabled(false);
@@ -166,9 +171,10 @@ protected void validatePage() {
166171
return;
167172
}
168173
switch (CodeTypes.values()[Math.max(0, myCodeSourceOptionsCombo.getSelectionIndex())]) {
174+
case None:
169175
case defaultIno:
170176
case defaultCPP:
171-
setPageComplete(true);// default always works
177+
setPageComplete(true);// default and no file always works
172178
break;
173179
case CustomTemplate:
174180
IPath templateFolder = new Path(myTemplateFolderEditor.getStringValue());
@@ -205,6 +211,8 @@ private void restoreAllSelections() {
205211
public CodeDescriptor getCodeDescription() {
206212

207213
switch (CodeTypes.values()[myCodeSourceOptionsCombo.getSelectionIndex()]) {
214+
case None:
215+
return CodeDescriptor.createNone();
208216
case defaultIno:
209217
return CodeDescriptor.createDefaultIno();
210218
case defaultCPP:
@@ -224,6 +232,8 @@ public CodeDescriptor getCodeDescription() {
224232

225233
public static String getCodeTypeDescription(CodeTypes codeType) {
226234
switch (codeType) {
235+
case None:
236+
return Messages.ui_new_sketch_none;
227237
case defaultIno:
228238
return Messages.ui_new_sketch_default_ino;
229239
case defaultCPP:

0 commit comments

Comments
 (0)