From a2c6667ed7334f431c930180104845ed418649c8 Mon Sep 17 00:00:00 2001 From: Casey Reas Date: Thu, 22 Sep 2011 21:35:02 +0000 Subject: [PATCH] Removed non-ASCII chars from PShapeSVG.java --- .../mode/javascript/JavaScriptEditor.java | 14 +++++++------- core/src/processing/core/PApplet.java | 3 ++- core/src/processing/core/PShape.java | 5 +++++ core/src/processing/core/PShapeSVG.java | 12 ++++++------ .../examples/Topics/Simulate/Flocking/Flocking.pde | 2 +- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/app/src/processing/mode/javascript/JavaScriptEditor.java b/app/src/processing/mode/javascript/JavaScriptEditor.java index a5423aa93..45d3022de 100644 --- a/app/src/processing/mode/javascript/JavaScriptEditor.java +++ b/app/src/processing/mode/javascript/JavaScriptEditor.java @@ -74,21 +74,21 @@ public class JavaScriptEditor extends Editor public JMenu buildSketchMenu () { - JMenuItem startServerItem = Base.newJMenuItem("Start server", 'R'); + JMenuItem startServerItem = Base.newJMenuItem("Start Server", 'R'); startServerItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handleStartServer(); } }); - JMenuItem stopServerItem = new JMenuItem("Stop server"); + JMenuItem stopServerItem = new JMenuItem("Stop Server"); stopServerItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handleStopServer(); } }); - JMenuItem copyServerAddressItem = new JMenuItem("Copy server address"); + JMenuItem copyServerAddressItem = new JMenuItem("Copy Server Address"); copyServerAddressItem.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e) { handleCopyServerAddress(); @@ -103,7 +103,7 @@ public class JavaScriptEditor extends Editor // } // ); - JMenuItem setServerPortItem = new JMenuItem("Set server port"); + JMenuItem setServerPortItem = new JMenuItem("Set Server Port"); setServerPortItem.addActionListener(new ActionListener(){ public void actionPerformed (ActionEvent e) { handleSetServerPort(); @@ -120,7 +120,7 @@ public class JavaScriptEditor extends Editor JMenu menu = new JMenu("JavaScript"); JMenuItem item; - item = new JMenuItem("Playback settings (directives)"); + item = new JMenuItem("Playback Settings (Directives)"); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handleShowDirectivesEditor(); @@ -130,7 +130,7 @@ public class JavaScriptEditor extends Editor menu.addSeparator(); - item = new JMenuItem("Start custom template"); + item = new JMenuItem("Start Custom Template"); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handleCreateCustomTemplate(); @@ -138,7 +138,7 @@ public class JavaScriptEditor extends Editor }); menu.add(item); - item = new JMenuItem("Show custom template"); + item = new JMenuItem("Show Custom Template"); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { handleOpenCustomTemplateFolder(); diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java index b46721ac7..7d78c98c2 100644 --- a/core/src/processing/core/PApplet.java +++ b/core/src/processing/core/PApplet.java @@ -5082,7 +5082,8 @@ public class PApplet extends Applet * returned from loadShape() is null. * * ( end auto-generated ) - * @webref shape:load_displaying + * + * @webref shape:loading_displaying * @param filename name of the file to load * @see PShape#PShape * @see PGraphics#shape(PShape, float, float, float, float) diff --git a/core/src/processing/core/PShape.java b/core/src/processing/core/PShape.java index 049932636..8432c3273 100644 --- a/core/src/processing/core/PShape.java +++ b/core/src/processing/core/PShape.java @@ -300,6 +300,7 @@ public class PShape implements PConstants { * joints. * * ( end auto-generated ) + * * @webref pshape:method * @usage web_application * @brief Enables the shape's style data and ignores the Processing styles @@ -1098,10 +1099,14 @@ public class PShape implements PConstants { * parameter for the size() function as shown in the example above. * * ( end auto-generated ) + * * @webref pshape:method * @usage web_application * @brief Rotates the shape around the y-axis * @param angle angle of rotation specified in radians + * @see PShape#rotate(float) + * @see PShape#rotateX(float) + * @see PShape#rotateZ(float) */ public void rotateY(float angle) { rotate(angle, 0, 1, 0); diff --git a/core/src/processing/core/PShapeSVG.java b/core/src/processing/core/PShapeSVG.java index ff8e945c5..47846db50 100644 --- a/core/src/processing/core/PShapeSVG.java +++ b/core/src/processing/core/PShapeSVG.java @@ -652,15 +652,15 @@ public class PShapeSVG extends PShape { break; // S - curve to shorthand (absolute) - // Draws a cubic Bézier curve from the current point to (x,y). The first + // Draws a cubic Bezier curve from the current point to (x,y). The first // control point is assumed to be the reflection of the second control // point on the previous command relative to the current point. // (x2,y2) is the second control point (i.e., the control point // at the end of the curve). S (uppercase) indicates that absolute // coordinates will follow; s (lowercase) indicates that relative // coordinates will follow. Multiple sets of coordinates may be specified - // to draw a polybézier. At the end of the command, the new current point - // becomes the final (x,y) coordinate pair used in the polybézier. + // to draw a polybezier. At the end of the command, the new current point + // becomes the final (x,y) coordinate pair used in the polybezier. case 'S': { // (If there is no previous command or if the previous command was not // an C, c, S or s, assume the first control point is coincident with @@ -714,12 +714,12 @@ public class PShapeSVG extends PShape { break; // Q - quadratic curve to (absolute) - // Draws a quadratic Bézier curve from the current point to (x,y) using + // Draws a quadratic Bezier curve from the current point to (x,y) using // (x1,y1) as the control point. Q (uppercase) indicates that absolute // coordinates will follow; q (lowercase) indicates that relative // coordinates will follow. Multiple sets of coordinates may be specified - // to draw a polybézier. At the end of the command, the new current point - // becomes the final (x,y) coordinate pair used in the polybézier. + // to draw a polybezier. At the end of the command, the new current point + // becomes the final (x,y) coordinate pair used in the polybezier. case 'Q': { ctrlX = PApplet.parseFloat(pathTokens[i + 1]); ctrlY = PApplet.parseFloat(pathTokens[i + 2]); diff --git a/java/examples/Topics/Simulate/Flocking/Flocking.pde b/java/examples/Topics/Simulate/Flocking/Flocking.pde index a9660cbca..5703caa0b 100644 --- a/java/examples/Topics/Simulate/Flocking/Flocking.pde +++ b/java/examples/Topics/Simulate/Flocking/Flocking.pde @@ -27,5 +27,5 @@ void draw() { // Add a new boid into the System void mousePressed() { - flock.addBoid(new Boid(new PVector(mouseX,mouseY),2.0f,0.05f)); + flock.addBoid(new Boid(new PVector(mouseX,mouseY), 2.0, 0.05)); }