*: Fix the name of the mode (#198)

gaocegege · web-flow · commit 76afe79e65b7 · 2017-08-05T16:11:22.000+08:00
Signed-off-by: Ce Gao &lt;ce.gao@outlook.com&gt;
diff --git a/build.xml.template b/build.xml.template
@@ -14,7 +14,6 @@
 
     <!-- Version of the mode -->
     <property name="processing.r.version" value="@@version@@" />
-    <property name="processing.r.commit.id" value="@@commitid@@" />
 
     <!-- Folder -->
     <property name="try" value="try" />
@@ -149,7 +148,7 @@
         </copy>
         <!-- TODO: Configure the version in bash script. -->
         <replaceregexp file="${bundle}/mode.properties" flags="g" match="@@mode-version@@" replace="${processing.r.version}" />
-        <replaceregexp file="${bundle}/mode.properties" flags="g" match="@@pretty-version@@" replace="{processing.r.version}" />
+        <replaceregexp file="${bundle}/mode.properties" flags="g" match="@@pretty-version@@" replace="${processing.r.version}" />
     </target>
 
     <target name="install" depends="package">
diff --git a/docs/RLangMode.txt b/docs/RLangMode.txt
@@ -1,4 +1,4 @@
-name = R
+name = R for Processing
 authorList = [Processing.R Authors](https://github.com/gaocegege/Processing.R/blob/master/AUTHORS.md)
 url = https://github.com/gaocegege/Processing.R
 sentence = Processing in R Language
diff --git a/docs/RLangMode.zip b/docs/RLangMode.zip
diff --git a/examples/Basics/ThreeDimensionalCube/ThreeDimensionalCube.rpde b/examples/Basics/ThreeDimensionalCube/ThreeDimensionalCube.rpde
@@ -3,7 +3,7 @@ settings <- function() {
 }
 
 setup <- function() {
-    colorMode(1, 1)
+    colorMode(RGB, 1)
     frameRate(24)
 }
 
diff --git a/examples/Libraries/dxf/SimpleExport/sketch.properties b/examples/Libraries/dxf/SimpleExport/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/Libraries/grafica/DefaultPlot/sketch.properties b/examples/Libraries/grafica/DefaultPlot/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/Libraries/minim/PlayAFile/sketch.properties b/examples/Libraries/minim/PlayAFile/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/Libraries/sound/SineWave/sketch.properties b/examples/Libraries/sound/SineWave/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/Libraries/video/Loop/sketch.properties b/examples/Libraries/video/Loop/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/arc/arc1/sketch.properties b/examples/reference/arc/arc1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/arc/arc2/sketch.properties b/examples/reference/arc/arc2/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/arc/arc3/sketch.properties b/examples/reference/arc/arc3/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/arc/arc4/sketch.properties b/examples/reference/arc/arc4/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/beginContour/beginContour1/sketch.properties b/examples/reference/beginContour/beginContour1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/beginShape/beginShape1/sketch.properties b/examples/reference/beginShape/beginShape1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/beginShape/beginShape2/sketch.properties b/examples/reference/beginShape/beginShape2/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/beginShape/beginShape3/sketch.properties b/examples/reference/beginShape/beginShape3/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/beginShape/beginShape4/sketch.properties b/examples/reference/beginShape/beginShape4/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/beginShape/beginShape5/sketch.properties b/examples/reference/beginShape/beginShape5/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/bezier/bezier1/sketch.properties b/examples/reference/bezier/bezier1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/bezier/bezier2/sketch.properties b/examples/reference/bezier/bezier2/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/bezierPoint/bezierPoint1/sketch.properties b/examples/reference/bezierPoint/bezierPoint1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/bezierTangent/bezierTangent1/sketch.properties b/examples/reference/bezierTangent/bezierTangent1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/bezierTangent/bezierTangent2/sketch.properties b/examples/reference/bezierTangent/bezierTangent2/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/bezierVertex/bezierVertex1/sketch.properties b/examples/reference/bezierVertex/bezierVertex1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/bezierVertex/bezierVertex2/sketch.properties b/examples/reference/bezierVertex/bezierVertex2/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/box/box1/sketch.properties b/examples/reference/box/box1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/box/box2/sketch.properties b/examples/reference/box/box2/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/curve/curve1/sketch.properties b/examples/reference/curve/curve1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/curvePoint/curvePoint1/sketch.properties b/examples/reference/curvePoint/curvePoint1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/curveTangent/curveTangent1/sketch.properties b/examples/reference/curveTangent/curveTangent1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/curveTightness/curveTightness1/sketch.properties b/examples/reference/curveTightness/curveTightness1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/curveVertex/curveVertex1/sketch.properties b/examples/reference/curveVertex/curveVertex1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/ellipse/ellipse1/sketch.properties b/examples/reference/ellipse/ellipse1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/line/line1/sketch.properties b/examples/reference/line/line1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/line/line2/sketch.properties b/examples/reference/line/line2/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/line/line3/sketch.properties b/examples/reference/line/line3/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/noise/noise1/sketch.properties b/examples/reference/noise/noise1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/point/point1/sketch.properties b/examples/reference/point/point1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/point/point2/sketch.properties b/examples/reference/point/point2/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/quad/quad1/sketch.properties b/examples/reference/quad/quad1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/quadraticVertex/quadraticVertex1/sketch.properties b/examples/reference/quadraticVertex/quadraticVertex1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/quadraticVertex/quadraticVertex2/sketch.properties b/examples/reference/quadraticVertex/quadraticVertex2/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/rect/rect1/sketch.properties b/examples/reference/rect/rect1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/rect/rect2/sketch.properties b/examples/reference/rect/rect2/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/rect/rect3/sketch.properties b/examples/reference/rect/rect3/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/sphere/sphere1/sketch.properties b/examples/reference/sphere/sphere1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/examples/reference/triangle/triangle1/sketch.properties b/examples/reference/triangle/triangle1/sketch.properties
@@ -1,2 +1,2 @@
-mode=R Language
+mode=R
 mode.id=rprocessing.mode.RLangMode
diff --git a/resources/RLangMode.txt b/resources/RLangMode.txt
@@ -1,4 +1,4 @@
-name = R
+name = R for Processing
 authorList = [Processing.R Authors](https://github.com/gaocegege/Processing.R/blob/master/AUTHORS.md)
 url = https://github.com/gaocegege/Processing.R
 sentence = Processing in R Language
diff --git a/resources/mode.properties b/resources/mode.properties
@@ -1,4 +1,4 @@
-name = R
+name = R for Processing
 authors = [Processing.R Authors](https://github.com/gaocegege/Processing.R/blob/master/AUTHORS.md)
 url = https://github.com/gaocegege/Processing.R
 sentence = Processing in R Language
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -14,7 +14,7 @@ function log {
 }
 
 function help {
-  log "Usage: deploy.sh <version>"
+  log "Usage: deploy.sh <version> <full version>"
 }
 
 function deploy {
diff --git a/src/rprocessing/mode/RLangMode.java b/src/rprocessing/mode/RLangMode.java
@@ -118,6 +118,6 @@ public String[] getIgnorable() {
    */
   @Override
   public String getTitle() {
-    return "R Language";
+    return "R";
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name = R`
	`1`	`+name = R for Processing`
`2`	`2`	`authorList = [Processing.R Authors](https://github.com/gaocegege/Processing.R/blob/master/AUTHORS.md)`
`3`	`3`	`url = https://github.com/gaocegege/Processing.R`
`4`	`4`	`sentence = Processing in R Language`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ settings <- function() {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`setup <- function() {`
`6`		`- colorMode(1, 1)`
	`6`	`+ colorMode(RGB, 1)`
`7`	`7`	`frameRate(24)`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-mode=R Language`
	`1`	`+mode=R`
`2`	`2`	`mode.id=rprocessing.mode.RLangMode`