diff options
| author | Sven Gothel <[email protected]> | 2018-01-15 07:38:30 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2018-01-15 07:38:30 +0100 |
| commit | b69294ce38ddc471029ba3765dc870976a3d22c8 (patch) | |
| tree | c5ba1f885efc2fa5ecc1dbb845793910e406601e | |
| parent | d590c5df17650b3790bb434fb7529df874914a09 (diff) | |
| parent | 8a62985ca763c793ab75a69d2600cb9724a84402 (diff) | |
Merge remote-tracking branch 'remotes/hharrison/master'
| -rw-r--r-- | src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java | 16 | ||||
| -rw-r--r-- | www/index.html | 8 | ||||
| -rw-r--r-- | www/media/JaamSim_160x160.png | bin | 24749 -> 102921 bytes |
3 files changed, 11 insertions, 13 deletions
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java index 5da7974b0..9cc15c650 100644 --- a/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java +++ b/src/nativewindow/classes/com/jogamp/nativewindow/NativeWindowFactory.java @@ -82,28 +82,28 @@ public abstract class NativeWindowFactory { protected static final boolean DEBUG; /** OpenKODE/EGL type, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}.*/ - public static final String TYPE_EGL = ".egl".intern(); + public static final String TYPE_EGL = ".egl"; /** Microsoft Windows type, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}. */ - public static final String TYPE_WINDOWS = ".windows".intern(); + public static final String TYPE_WINDOWS = ".windows"; /** X11 type, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}. */ - public static final String TYPE_X11 = ".x11".intern(); + public static final String TYPE_X11 = ".x11"; /** Broadcom VC IV/EGL type, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}. */ - public static final String TYPE_BCM_VC_IV = ".bcm.vc.iv".intern(); + public static final String TYPE_BCM_VC_IV = ".bcm.vc.iv"; /** Android/EGL type, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}.*/ - public static final String TYPE_ANDROID = ".android".intern(); + public static final String TYPE_ANDROID = ".android"; /** Mac OS X type, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}. */ - public static final String TYPE_MACOSX = ".macosx".intern(); + public static final String TYPE_MACOSX = ".macosx"; /** Generic AWT type, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}. */ - public static final String TYPE_AWT = ".awt".intern(); + public static final String TYPE_AWT = ".awt"; /** Generic DEFAULT type, where platform implementation don't care, as retrieved with {@link #getNativeWindowType(boolean)}. String is canonical via {@link String#intern()}. */ - public static final String TYPE_DEFAULT = ".default".intern(); + public static final String TYPE_DEFAULT = ".default"; private static final String nativeWindowingTypePure; // canonical String via String.intern() private static final String nativeWindowingTypeCustom; // canonical String via String.intern() diff --git a/www/index.html b/www/index.html index b20ef6db4..99582a19e 100644 --- a/www/index.html +++ b/www/index.html @@ -259,11 +259,9 @@ <td width="50%"> <a href="http://jaamsim.com/"> - <img src="media/JaamSim_160x160.png" width="160" height="160" align="left" alt="Volume Viewer"></img>JaamSim</a> - is a discrete-event simulation environment developed by Ausenco as - the foundation of all our simulation applications. It includes - interactive 3d graphics, drag and drop model building, collada model - import and is fully open source (GPLv3). + <img src="media/JaamSim_160x160.png" width="160" height="145" align="left" alt="Volume Viewer"></img>JaamSim</a> + is a free and open source discrete-event simulation software which includes a drag-and-drop user interface, interactive + 3D graphics, input and output processing, and model development tools and editors. </td> </tr> <tr> diff --git a/www/media/JaamSim_160x160.png b/www/media/JaamSim_160x160.png Binary files differindex f6da6a589..e4569025f 100644 --- a/www/media/JaamSim_160x160.png +++ b/www/media/JaamSim_160x160.png |
