Skip to content

Commit 9e6fac7

Browse files
committed
examples: Add examples into mode
Signed-off-by: Ce Gao <ce.gao@outlook.com>
1 parent 8d02cde commit 9e6fac7

File tree

9 files changed

+48
-41
lines changed

9 files changed

+48
-41
lines changed

build.xml.template

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,10 @@
4747
</classpath>
4848
</taskdef>
4949

50-
<target name="try" depends="build">
51-
<propertyfile file="build.number" />
52-
<!-- create the build.number file if it doesn't exist -->
53-
<buildnumber file="build.number" />
54-
<mkdir dir="${try}" />
55-
<jar jarfile="try/${mode.name}.jar" basedir="build">
56-
<manifest>
57-
<attribute name="Main-Class" value="rprocessing.Runner" />
58-
</manifest>
59-
<zipgroupfileset dir="${processing.classes.core}" includes="**/*.jar" />
60-
<zipgroupfileset dir="${lib}" includes="**/*.jar" />
61-
</jar>
50+
<target name="info">
51+
<echo>This is the R mode for Processing, powered by github.com/gaocegege</echo>
6252
</target>
53+
6354
<target name="build">
6455
<mkdir dir="build" />
6556
<javac destdir="build" includeantruntime="false">
@@ -72,55 +63,54 @@
7263
<fileset dir="src" excludes="**/*.java" />
7364
</copy>
7465
</target>
75-
<target name="info">
76-
<echo>This is the R mode for Processing, powered by github.com/gaocegege</echo>
66+
67+
<target name="try" depends="build">
68+
<propertyfile file="build.number" />
69+
<!-- create the build.number file if it doesn't exist -->
70+
<buildnumber file="build.number" />
71+
<mkdir dir="${try}" />
72+
<jar jarfile="try/${mode.name}.jar" basedir="build">
73+
<manifest>
74+
<attribute name="Main-Class" value="rprocessing.Runner" />
75+
</manifest>
76+
<zipgroupfileset dir="${processing.classes.core}" includes="**/*.jar" />
77+
<zipgroupfileset dir="${lib}" includes="**/*.jar" />
78+
</jar>
7779
</target>
78-
<!-- - - - - - - - - - - - - - - - - - - - - - -
79-
PACKAGE
80-
- - - - - - - - - - - - - - - - - - - - - - - -->
80+
8181
<target name="package" depends="build">
8282
<delete dir="${dist}" />
8383
<property name="bundle" value="${dist}/${mode.name}" />
8484
<mkdir dir="${bundle}" />
8585
<mkdir dir="${bundle}/mode" />
86+
<mkdir dir="${bundle}/examples" />
8687
<jar jarfile="${bundle}/mode/${mode.name}.jar" basedir="build" />
8788
<copy todir="${bundle}">
8889
<fileset dir="resources/" />
8990
</copy>
9091
<copy todir="${bundle}/mode">
9192
<fileset dir="lib/" />
9293
</copy>
94+
<copy todir="${bundle}/examples">
95+
<fileset dir="examples/" />
96+
</copy>
9397
<!-- TODO: Configure the version in bash script. -->
9498
<replaceregexp file="${bundle}/mode.properties" flags="g" match="@@version@@" replace="11" />
9599
<replaceregexp file="${bundle}/mode.properties" flags="g" match="@@pretty-version@@" replace="1" />
96100
</target>
97-
<!-- - - - - - - - - - - - - - - - - - - - - - -
98-
INSTALL
99-
- - - - - - - - - - - - - - - - - - - - - - - -->
101+
100102
<target name="install" depends="package">
101103
<delete dir="${processing.modes}/${mode.name}" />
102104
<mkdir dir="${processing.modes}/${mode.name}" />
103105
<copy todir="${processing.modes}/${mode.name}">
104106
<fileset dir="${dist}/${mode.name}" />
105107
</copy>
106108
</target>
107-
<!-- - - - - - - - - - - - - - - - - - - - - - -
108-
CLEAN
109-
- - - - - - - - - - - - - - - - - - - - - - - -->
110-
<target name="clean">
111-
<delete dir="${build}" />
112-
<delete dir="${dist}" />
113-
<delete dir="${try}" />
114-
</target>
115-
<!-- - - - - - - - - - - - - - - - - - - - - - -
116-
RUN
117-
- - - - - - - - - - - - - - - - - - - - - - - -->
109+
118110
<target name="run" depends="install">
119111
<exec executable="${processing.executable}" spawn="false" />
120112
</target>
121-
<!-- - - - - - - - - - - - - - - - - - - - - - -
122-
TEST
123-
- - - - - - - - - - - - - - - - - - - - - - - -->
113+
124114
<target name="test-compile" depends="build">
125115
<mkdir dir="${test.build.dir}"/>
126116
<javac srcdir="${test.src.dir}" destdir="${test.build.dir}" includeantruntime="false">
@@ -129,6 +119,7 @@
129119
</classpath>
130120
</javac>
131121
</target>
122+
132123
<target name="test" depends="test-compile">
133124
<jacoco:coverage destfile="${result.exec.file}">
134125
<junit printsummary="on" haltonfailure="yes" fork="true">
@@ -143,6 +134,7 @@
143134
</junit>
144135
</jacoco:coverage>
145136
</target>
137+
146138
<target name="report" depends="test">
147139
<!-- Step 3: Create coverage report -->
148140
<jacoco:report>
@@ -167,4 +159,11 @@
167159
<xml destfile="${result.report.dir}/report.xml"/>
168160
</jacoco:report>
169161
</target>
162+
163+
<target name="clean">
164+
<delete dir="${build}" />
165+
<delete dir="${dist}" />
166+
<delete dir="${try}" />
167+
<delete dir="${test.build.dir}" />
168+
</target>
170169
</project>

examples/hello-processing.R renamed to examples/Basics/BasicOperations/BasicOperations.rpde

File renamed without changes.

examples/object-oriented.R renamed to examples/Basics/ObjectOrientedProgramming/ObjectOrientedProgramming.rpde

File renamed without changes.

examples/3d-cube.R renamed to examples/Basics/ThreeDimensionalCube/ThreeDimensionalCube.rpde

File renamed without changes.

examples/trigonometry.R renamed to examples/Basics/Trigonometry/trigonometry.rpde

File renamed without changes.

src/rprocessing/mode/RLangMode.java

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
*/
1818
public class RLangMode extends Mode {
1919

20-
private static final boolean VERBOSE = Boolean
21-
.parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
20+
private static final boolean VERBOSE = Boolean.parseBoolean(System
21+
.getenv("VERBOSE_RLANG_MODE"));
2222

2323
/**
2424
* If the environment variable SKETCH_RUNNER_FIRST is equal to the string "true", then
2525
* {@link RLangMode} expects that the {@link SketchRunner} is already running and waiting
2626
* to be communicated with (as when you're debugging it in Eclipse, for example).
2727
*/
28-
public static final boolean SKETCH_RUNNER_FIRST = Boolean
29-
.parseBoolean(System.getenv("SKETCH_RUNNER_FIRST"));
28+
public static final boolean SKETCH_RUNNER_FIRST = Boolean.parseBoolean(System
29+
.getenv("SKETCH_RUNNER_FIRST"));
3030

3131
private final SketchServiceManager sketchServiceManager;
3232

@@ -51,8 +51,8 @@ public SketchServiceManager getSketchServiceManager() {
5151
* @see processing.app.Mode#createEditor(processing.app.Base, java.lang.String, processing.app.ui.EditorState)
5252
*/
5353
@Override
54-
public Editor createEditor(Base base, final String path,
55-
final EditorState state) throws EditorException {
54+
public Editor createEditor(Base base, final String path, final EditorState state)
55+
throws EditorException {
5656
// Lazily start the sketch running service only when an editor is required.
5757
if (!sketchServiceManager.isStarted()) {
5858
sketchServiceManager.start();
@@ -73,7 +73,7 @@ public Editor createEditor(Base base, final String path,
7373
@Override
7474
public String getDefaultExtension() {
7575
// TODO: Finish this function.
76-
return "todo";
76+
return "rpde";
7777
}
7878

7979
@Override
@@ -89,6 +89,14 @@ public String[] getExtensions() {
8989
return new String[] { getDefaultExtension(), getModuleExtension() };
9090
}
9191

92+
/**
93+
* @see processing.app.Mode#getExampleCategoryFolders()
94+
*/
95+
@Override
96+
public File[] getExampleCategoryFolders() {
97+
return new File[] { new File(examplesFolder, "Basics") };
98+
}
99+
92100
/**
93101
* @see processing.app.Mode#getIgnorable()
94102
*/

0 commit comments

Comments
 (0)