Skip to content

Commit 92b9dbe

Browse files
committed
put external in separate line in template files
1 parent 10dbfad commit 92b9dbe

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

src/processing/mode/android/AndroidBuild.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@ private void writeFragmentActivity(final File srcDirectory,
11151115
HashMap<String, String> replaceMap = new HashMap<String, String>();
11161116
replaceMap.put("@@package_name@@", getPackageName());
11171117
replaceMap.put("@@sketch_class_name@@", sketchClassName);
1118-
replaceMap.put("@@external@@", external ? "\n sketch.setExternal(true);" : "");
1118+
replaceMap.put("@@external@@", external ? "sketch.setExternal(true);" : "");
11191119

11201120
AndroidMode.createFileFromTemplate(javaTemplate, javaFile, replaceMap);
11211121
}
@@ -1129,7 +1129,7 @@ private void writeWallpaperService(final File srcDirectory,
11291129
HashMap<String, String> replaceMap = new HashMap<String, String>();
11301130
replaceMap.put("@@package_name@@", getPackageName());
11311131
replaceMap.put("@@sketch_class_name@@", sketchClassName);
1132-
replaceMap.put("@@external@@", external ? "\n sketch.setExternal(true);" : "");
1132+
replaceMap.put("@@external@@", external ? "sketch.setExternal(true);" : "");
11331133

11341134
AndroidMode.createFileFromTemplate(javaTemplate, javaFile, replaceMap);
11351135
}
@@ -1144,7 +1144,7 @@ private void writeWatchFaceGLESService(final File srcDirectory,
11441144
replaceMap.put("@@watchface_classs@@", "PWatchFaceGLES");
11451145
replaceMap.put("@@package_name@@", getPackageName());
11461146
replaceMap.put("@@sketch_class_name@@", sketchClassName);
1147-
replaceMap.put("@@external@@", external ? "\n sketch.setExternal(true);" : "");
1147+
replaceMap.put("@@external@@", external ? "sketch.setExternal(true);" : "");
11481148

11491149
AndroidMode.createFileFromTemplate(javaTemplate, javaFile, replaceMap);
11501150
}
@@ -1159,7 +1159,7 @@ private void writeWatchFaceCanvasService(final File srcDirectory,
11591159
replaceMap.put("@@watchface_classs@@", "PWatchFaceCanvas");
11601160
replaceMap.put("@@package_name@@", getPackageName());
11611161
replaceMap.put("@@sketch_class_name@@", sketchClassName);
1162-
replaceMap.put("@@external@@", external ? "\n sketch.setExternal(true);" : "");
1162+
replaceMap.put("@@external@@", external ? "sketch.setExternal(true);" : "");
11631163

11641164
AndroidMode.createFileFromTemplate(javaTemplate, javaFile, replaceMap);
11651165
}
@@ -1173,7 +1173,7 @@ private void writeVRActivity(final File srcDirectory, String[] permissions,
11731173
HashMap<String, String> replaceMap = new HashMap<String, String>();
11741174
replaceMap.put("@@package_name@@", getPackageName());
11751175
replaceMap.put("@@sketch_class_name@@", sketchClassName);
1176-
replaceMap.put("@@external@@", external ? "\n sketch.setExternal(true);" : "");
1176+
replaceMap.put("@@external@@", external ? "sketch.setExternal(true);" : "");
11771177

11781178
AndroidMode.createFileFromTemplate(javaTemplate, javaFile, replaceMap);
11791179
}

templates/VRActivity.java.tmpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ public class MainActivity extends PVR {
99
@Override
1010
public void onCreate(Bundle savedInstanceState) {
1111
super.onCreate(savedInstanceState);
12-
PApplet sketch = new @@sketch_class_name@@();@@external@@
12+
PApplet sketch = new @@sketch_class_name@@();
13+
@@external@@
1314
setSketch(sketch);
1415
}
1516
}

templates/WallpaperService.java.tmpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import processing.core.PApplet;
66
public class MainService extends PWallpaper {
77
@Override
88
public PApplet createSketch() {
9-
PApplet sketch = new @@sketch_class_name@@();@@external@@
9+
PApplet sketch = new @@sketch_class_name@@();
10+
@@external@@
1011
return sketch;
1112
}
1213
}

templates/WatchFaceService.java.tmpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import processing.core.PApplet;
66
public class MainService extends @@watchface_classs@@ {
77
@Override
88
public PApplet createSketch() {
9-
PApplet sketch = new @@sketch_class_name@@();@@external@@
9+
PApplet sketch = new @@sketch_class_name@@();
10+
@@external@@
1011
return sketch;
1112
}
1213
}

0 commit comments

Comments
 (0)