+ * Fractional-font aware implementation of Utilities.getTabbedTextWidth that determines if there + * are fractional character widths present in a font in order to return a more accurate pixel + * width for an input segment. + *
+ * + * @param s The segment of text for which a pixel width should be returned. + * @param metrics The metrics for the font in which the given segment will be drawn. + * @param x The x origin. + * @param expander The strategy for converting tabs into characters. + * @param startOffset The offset to apply before the text will be drawn. + * @return The width of the input segment in pixels with fractional character widths considered. + */ + private int getTabbedTextWidth(Segment s, FontMetrics metrics, float x, TabExpander expander, + int startOffset) { + + float additionalOffset = getPartialPixelWidth(metrics, x, expander, startOffset) * s.length(); + + return (int) Math.round( + Utilities.getTabbedTextWidth(s, metrics, x, expander, startOffset) + additionalOffset + ); + } + + /** + * Get any partial widths applied within a font. + * + *+ * Get any partial widths applied within a font, caching results for the latest requested font + * (as identified via a FontMetrics object). Note that this is calculated for a sample character + * and is only valid for extrapolation in a monospaced font (that one might want to use in an + * IDE). + *
+ * + * @param candidateMetrics The FontMetrics for which partial character pixel widths should be + * returned. + * @param x The x origin. + * @param expander The strategy for converting tabs into characters. + * @param startOffset The offset to apply before the text will be drawn. + * @return The partial width of a sample character within a font. + */ + private float getPartialPixelWidth(FontMetrics candidateMetrics, float x, TabExpander expander, + int startOffset) { + + // See https://github.com/sampottinger/processing/issues/103 + // Requires reference not object equality check + if (candidateMetrics != cachedPartialPixelWidthFont) { + float withFractional = Utilities.getTabbedTextWidth( + TEST_SEGMENT, + candidateMetrics, + x, + expander, + startOffset + ); + + int withoutFractional = (int) withFractional; + + partialPixelWidth = withFractional - withoutFractional; + cachedPartialPixelWidthFont = candidateMetrics; + } + + return partialPixelWidth; + } + protected void setNewSelectionWord( int line, int offset ) { if (getLineLength(line) == 0) { diff --git a/app/src/processing/app/tools/InstallCommander.java b/app/src/processing/app/tools/InstallCommander.java index 518789d4c..a846208da 100644 --- a/app/src/processing/app/tools/InstallCommander.java +++ b/app/src/processing/app/tools/InstallCommander.java @@ -161,4 +161,4 @@ public class InstallCommander implements Tool { list.append(jar.getAbsolutePath()); } } -} \ No newline at end of file +} diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java index 6780a5310..0e9ab769e 100644 --- a/app/src/processing/app/ui/Editor.java +++ b/app/src/processing/app/ui/Editor.java @@ -2898,7 +2898,6 @@ public abstract class Editor extends JFrame implements RunnerListener { * Show an exception in the editor status bar. */ public void statusError(Exception e) { - e.printStackTrace(); // if (e == null) { // System.err.println("Editor.statusError() was passed a null exception."); // return; @@ -2909,9 +2908,7 @@ public abstract class Editor extends JFrame implements RunnerListener { // Make sure something is printed into the console // Status bar is volatile - if (!re.isStackTraceEnabled()) { - System.err.println(re.getMessage()); - } + System.err.println(re.getMessage()); // Move the cursor to the line before updating the status bar, otherwise // status message might get hidden by a potential message caused by moving @@ -2940,6 +2937,8 @@ public abstract class Editor extends JFrame implements RunnerListener { textarea.getLineStopOffset(line) - 1); } } + } else { + e.printStackTrace(); } // Since this will catch all Exception types, spend some time figuring diff --git a/app/test/resources/annotations.expected b/app/test/resources/annotations.expected deleted file mode 100644 index 76d6b79a8..000000000 --- a/app/test/resources/annotations.expected +++ /dev/null @@ -1,53 +0,0 @@ -import processing.core.*; -import processing.data.*; -import processing.event.*; -import processing.opengl.*; - -import java.io.Serializable; - -import java.util.HashMap; -import java.util.ArrayList; -import java.io.File; -import java.io.BufferedReader; -import java.io.PrintWriter; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.IOException; - -public class annotations extends PApplet { - - - -public void setup() { - size(200,200); -} - -@Deprecated -public void banana() { - println("hey"); -} - -@SuppressWarnings({"serial", "rawtypes"}) -class Banana implements Serializable { - -} - -@SuppressWarnings("serial") -class Apple implements Serializable { - -} - -@javax.annotation.Generated(value = {"com.mrfeinberg.ImmortalAroma" -}, - comments="Shazam!", - date="2001-07-04T12:08:56.235-0700") -class Pear {} - static public void main(String[] passedArgs) { - String[] appletArgs = new String[] { "annotations" }; - if (passedArgs != null) { - PApplet.main(concat(appletArgs, passedArgs)); - } else { - PApplet.main(appletArgs); - } - } -} diff --git a/app/test/resources/bug1064.expected b/app/test/resources/bug1064.expected deleted file mode 100644 index d77173b44..000000000 --- a/app/test/resources/bug1064.expected +++ /dev/null @@ -1,29 +0,0 @@ -import processing.core.*; -import processing.data.*; -import processing.event.*; -import processing.opengl.*; - -import java.util.HashMap; -import java.util.ArrayList; -import java.io.File; -import java.io.BufferedReader; -import java.io.PrintWriter; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.IOException; - -public class bug1064 extends PApplet { - public void setup() { -// import "; - noLoop(); - } - - static public void main(String[] passedArgs) { - String[] appletArgs = new String[] { "bug1064" }; - if (passedArgs != null) { - PApplet.main(concat(appletArgs, passedArgs)); - } else { - PApplet.main(appletArgs); - } - } -} diff --git a/app/test/resources/bug136.expected b/app/test/resources/bug136.expected deleted file mode 100644 index 9909098a3..000000000 --- a/app/test/resources/bug136.expected +++ /dev/null @@ -1,41 +0,0 @@ -import processing.core.*; -import processing.data.*; -import processing.event.*; -import processing.opengl.*; - -import java.util.Collections; - -import java.util.HashMap; -import java.util.ArrayList; -import java.io.File; -import java.io.BufferedReader; -import java.io.PrintWriter; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.IOException; - -public class bug136 extends PApplet { - - -java.util.List alist = Collections.synchronizedList(new ArrayList()); - -public void setup() { -size(400, 200); -alist.add("hello"); -} - -public void draw() { -rect(width/4, height/4, width/2, height/2); -synchronized(alist) { -alist.get(0); -} -} - static public void main(String[] passedArgs) { - String[] appletArgs = new String[] { "bug136" }; - if (passedArgs != null) { - PApplet.main(concat(appletArgs, passedArgs)); - } else { - PApplet.main(appletArgs); - } - } -} diff --git a/app/test/resources/bug1362.expected b/app/test/resources/bug1362.expected deleted file mode 100644 index 00c81e622..000000000 --- a/app/test/resources/bug1362.expected +++ /dev/null @@ -1,29 +0,0 @@ -import processing.core.*; -import processing.data.*; -import processing.event.*; -import processing.opengl.*; - -import java.util.HashMap; -import java.util.ArrayList; -import java.io.File; -import java.io.BufferedReader; -import java.io.PrintWriter; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.IOException; - -public class bug1362 extends PApplet { - public void setup() { -if (true) {} else { new String(); } - noLoop(); - } - - static public void main(String[] passedArgs) { - String[] appletArgs = new String[] { "bug1362" }; - if (passedArgs != null) { - PApplet.main(concat(appletArgs, passedArgs)); - } else { - PApplet.main(appletArgs); - } - } -} diff --git a/app/test/resources/bug1442.expected b/app/test/resources/bug1442.expected deleted file mode 100644 index d48380587..000000000 --- a/app/test/resources/bug1442.expected +++ /dev/null @@ -1,28 +0,0 @@ -import processing.core.*; -import processing.data.*; -import processing.event.*; -import processing.opengl.*; - -import java.util.HashMap; -import java.util.ArrayList; -import java.io.File; -import java.io.BufferedReader; -import java.io.PrintWriter; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.IOException; - -public class bug1442 extends PApplet { - -public float a() { - return 1.0f; -} - static public void main(String[] passedArgs) { - String[] appletArgs = new String[] { "bug1442" }; - if (passedArgs != null) { - PApplet.main(concat(appletArgs, passedArgs)); - } else { - PApplet.main(appletArgs); - } - } -} diff --git a/app/test/resources/bug1511.expected b/app/test/resources/bug1511.expected deleted file mode 100644 index ca423630f..000000000 --- a/app/test/resources/bug1511.expected +++ /dev/null @@ -1,37 +0,0 @@ -import processing.core.*; -import processing.data.*; -import processing.event.*; -import processing.opengl.*; - -import java.io.StringWriter; - -import java.util.HashMap; -import java.util.ArrayList; -import java.io.File; -import java.io.BufferedReader; -import java.io.PrintWriter; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.IOException; - -public class bug1511 extends PApplet { - public void setup() { -// \u00df - -/** -* a -*/ - - - noLoop(); - } - - static public void main(String[] passedArgs) { - String[] appletArgs = new String[] { "bug1511" }; - if (passedArgs != null) { - PApplet.main(concat(appletArgs, passedArgs)); - } else { - PApplet.main(appletArgs); - } - } -} diff --git a/app/test/resources/bug1512.expected b/app/test/resources/bug1512.expected deleted file mode 100644 index bb2bd9aa0..000000000 --- a/app/test/resources/bug1512.expected +++ /dev/null @@ -1,29 +0,0 @@ -import processing.core.*; -import processing.data.*; -import processing.event.*; -import processing.opengl.*; - -import java.util.HashMap; -import java.util.ArrayList; -import java.io.File; -import java.io.BufferedReader; -import java.io.PrintWriter; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.IOException; - -public class bug1512 extends PApplet { - public void setup() { -println("oi/*"); - noLoop(); - } - - static public void main(String[] passedArgs) { - String[] appletArgs = new String[] { "bug1512" }; - if (passedArgs != null) { - PApplet.main(concat(appletArgs, passedArgs)); - } else { - PApplet.main(appletArgs); - } - } -} diff --git a/app/test/resources/bug1518a.expected b/app/test/resources/bug1518a.expected deleted file mode 100644 index 49c81c14c..000000000 --- a/app/test/resources/bug1518a.expected +++ /dev/null @@ -1,45 +0,0 @@ -import processing.core.*; -import processing.data.*; -import processing.event.*; -import processing.opengl.*; - -import java.util.ArrayList; -import java.util.List; - -import java.util.HashMap; -import java.util.ArrayList; -import java.io.File; -import java.io.BufferedReader; -import java.io.PrintWriter; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.IOException; - -public class bug1518a extends PApplet { - - - - -public void setup() -{ -ListCFBundleIconFile key in the Info.plist file.
LSUIElement key in the Info.plist file.
+ (Details)jnlplaunchernameLSMinimumSystemVersion key in the Info.plist
+ file.Contents/Java folder. It has to be present during execution of the application. This serves as option to deliver signed applications based upon JNLP files. The application can then be signed and the signature won't break when modifying the JNLP file.mainclassnameNSHighResolutionCapable key in the Info.plist
+ file.NSSupportsAutomaticGraphicsSwitching key in the Info.plist
+ Specifies a command-line option to be passed to the JVM at startup.
+Options may be named, which allows the bundled Java program +itself to override the option (e.g. to adjust heap settings). Changes will take effect upon restart of the +application. Assuming your CFBundleIdentifier (settable via the attribute identifier) +is com.oracle.appbundler. Then you can override a named option by calling +
| Attribute | @@ -148,6 +248,11 @@ Entries will be copied to the Contents/MacOS/ folder of the generated bThe option value. | Yes |
| name | +The option name. | +No | +
Specifies an environment variable set via LSEnvironment entry in the Info.plist file. See the + Apple Documentation for details.
+The string $APP_ROOT will be replaced by the application bundle path in all environment variables on runtime.
+| Attribute | +Description | +Required | +
| name | +The variable name. | +Yes | +
| value | +The variable value. | +Yes | +
Specifies the elements of the LSArchitecturePriority array in Info.plist. +(Details)
+| Attribute | +Description | +Required | +
| name | +The architecture name. | +Yes | +
Adds an arbitrary entry to the generated Info.plist.
+| Attribute | +Description | +Required | +
| key | +The entry's key. | +Yes | +
| value | +The entry's value. | +Yes | +
| type | +The entry's type. | +No (defaults to String) | +
Specifies a protocol for which the bundled application should be registered as a handler.
+| Attribute | +Description | +Required | +
| value | +The protocol scheme. | +Yes | +
Describes a document associated with your application.
+| Attribute | +Description | +Corresponding CFBundleDocumentTypes key | +Required | +
| contentTypes | +A comma-separated list of Uniform Type Identifiers defining each a supported file type. + If you reference custom filetypes, declare them using a typedeclaration. + If set, extensions and isPackage are ignored. See the UTI reference for a list of default UTIs. | +LSItemContentTypes | +Yes (or extensions) | +
| extensions | +A comma-separated list of filename extensions (minus the leading period) to map to this document type. | +CFBundleTypeExtensions | +Yes (or contentTypes) | +
| icon | +The name of the icon file (.icns) to associate with this OS X document type. | +CFBundleTypeIconFile | +No (But recommended) | +
| name | +The abstract name for the document type. | +CFBundleTypeName | +No (But recommended) | +
| role | +This key specifies the app's role with respect to the type. The value can be Editor, Viewer, Shell, or None. | +CFBundleTypeRole | +No (default: Editor) | +
| handlerRank | +Determines how Launch Services ranks this app among the apps that declare themselves editors or viewers of files of this type. The possible values are: Owner (this app is the creator of files of this type), Alternate (this app is a secondary viewer of files of this type), None (this app must never be used to open files of this type, but it accepts drops of files of this type), Default (default; this app doesn't accept drops of files of this type). | +LSHandlerRank | +No | +
| isPackage | +Specifies whether the document is distributed as a bundle. If set to true, the bundle directory is treated as a file. | +LSTypeIsPackage | +No (default: false) | +
| exportableTypes | +A comma-separated list of Uniform Type Identifiers defining a supported file type to which this document can export its content. + If you reference custom filetypes, declare them using a typedeclaration. + See also the Additional Document Type Considerations of the Document-Based App Programming Guide for Mac. + | NSExportableTypes | +No | +
Declares a new Uniform Type Identifier. +Required if you reference non-system UTIs in bundledocument's contentTypes or exportableTypes
. +| Attribute | +Description | +Corresponding UT...TypeDeclarations key | +Required | +
| identifier | +The unique UTI for the declared type. Following the reverse-DNS format beginning with com.companyName is a simple way to ensure uniqueness. | +UTTypeIdentifier | +Yes | +
| description | +A user-visible description of this type. | +UTTypeDescription | +No | +
| icon | +The name of the icon file (.icns) to associate with this UTI. | +UTTypeIconFile | +No | +
| referenceUrl | +The URL of a reference document describing this type. | +UTTypeReferenceURL | +No | +
| conformsTo | +A comma-separated list of UTIs to which this identifier conforms. + Although a custom UTI can conform to any UTI, public.data or com.apple.package must be at the root of the conformance hierarchy. | +UTTypeConformsTo | +No (defaults to public.data) | +
| extensions | +A comma-separated list of filename extensions (minus the leading period) to map to this UTI. | +UTTypeTagSpecification -> public.filename-extension | +No (but recommended) | +
| mimeTypes | +A comma-separated list of mime types which identify this UTI. | +UTTypeTagSpecification -> public.mime-type | +No | +
| osTypes | +Comma-separated list of four-character codes formerly used to identify types. + Only specify OSTypes if you really know what you're doing. | +UTTypeTagSpecification -> com.apple.ostype | +No | +
| imported | +If set to true, the declaration is listed under the UTImportedTypeDeclarations key. + Otherwise, it is listed under UTExportedTypeDeclarations. + If your code relies on third-party UTI types that may not be present on the system, you should declare those UTIs as imported types. | +- | +No | +
Generate a launcher for the "Swing Set" demo, bundling the JRE defined by the JAVA_HOME environment variable with the resulting executable.
@@ -187,9 +504,57 @@ environment variable with the resulting executable. <runtime dir="${env.JAVA_HOME}"/> <classpath file="/Library/Java/Demos/JFC/SwingSet2/SwingSet2.jar"/> <option value="-Dapple.laf.useScreenMenuBar=true"/> + <scheme value="mailto"/> </bundleapp> </target> +Generate a launcher for a JNLP File, copy it into the package and sign the package. You need to have a Developer ID Profile to sign the application.
+You can now dynamically modify the zip content (only the JNLP file), deliver it with your web service and the application should directly unpack and can be run
+
+<-- Define the appbundler task -->
+<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask"/>
+
+<-- Create the app bundle -->
+<target name="bundle-swingset" depends="package">
+
+ <mkdir dir="./app">
+
+ <bundleapp outputdirectory="./app"
+ name="SwingSet2"
+ displayname="SwingSet 2"
+ identifier="com.oracle.javax.swing.SwingSet2"
+ shortversion="1.0"
+ icon="icon.icns"
+ applicationCategory="public.app-category.developer-tools"
+ jnlplaunchername="Contents/_CodeSignature/SwingSet2.jnlp">
+
+ <value="-Xdock:icon=Contents/Resources/icon.icns" />
+ <option value="-Dapple.laf.useScreenMenuBar=true"/>
+ </bundleapp>
+
+ <!-- Optionally copy an original file -->
+ <copy todir="./SwingSet2.app/Contents/_CodeSignature" includeemptydirs="true" overwrite="false">
+ <fileset dir=".">
+ <include name="**/*.jnlp" />
+ </fileset>
+ </copy>
+
+ <!-- Sign File -->
+ <exec executable="codesign" os="Mac OS X" failonerror="true">
+ <arg value="-f" />
+ <arg value="--deep" />
+ <arg value="-s" />
+ <arg value="Developer ID Application" />
+ <arg value="./app/SwingSet2.app" />
+ </exec>
+
+ <zip destfile="./SwingSet2.app.zip" basedir="${copyroot}/app"></zip>
+</target>
+
++ +