eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moving platform classes to new names/packages

Browse Source
This commit is contained in:
Ben Fry
2013-07-21 12:27:55 -04:00
parent 52d25b3efb
commit 2b3345061f
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/linux/Platform.java → app/src/processing/app/linux/LinuxPlatform.java
+1 -1
View File
@@ -28,7 +28,7 @@ import processing.app.Base;
import processing.app.Preferences;
public class Platform extends processing.app.Platform {
public class LinuxPlatform extends processing.app.Platform {
public void init(Base base) {
super.init(base);
app/src/processing/app/macosx/Platform.java → app/src/processing/app/platform/MacPlatform.java
+2 -2
View File
@@ -20,7 +20,7 @@
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package processing.app.macosx;
package processing.app.platform;
import java.io.File;
import java.io.FileNotFoundException;
@@ -33,7 +33,7 @@ import processing.app.Base;
/**
* Platform handler for Mac OS X.
*/
public class Platform extends processing.app.Platform {
public class MacPlatform extends processing.app.Platform {
// Removing for 2.0b8 because Quaqua doesn't have OS X 10.8 version.
/*
app/src/processing/app/macosx/ThinkDifferent.java → app/src/processing/app/platform/ThinkDifferent.java
+1 -1
View File
@@ -19,7 +19,7 @@
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package processing.app.macosx;
package processing.app.platform;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
app/src/processing/app/windows/Platform.java → app/src/processing/app/windows/WindowsPlatform.java
+11 -11
View File
@@ -36,7 +36,7 @@ import com.sun.jna.platform.win32.WinNT.HRESULT;
import processing.app.Base;
import processing.app.Preferences;
import processing.app.windows.Registry.REGISTRY_ROOT_KEY;
import processing.app.windows.WindowsRegistry.REGISTRY_ROOT_KEY;
import processing.core.PApplet;
@@ -44,7 +44,7 @@ import processing.core.PApplet;
* Platform-specific glue for Windows.
*
*/
public class Platform extends processing.app.Platform {
public class WindowsPlatform extends processing.app.Platform {
static final String APP_NAME = "Processing";
static final String REG_OPEN_COMMAND =
@@ -136,7 +136,7 @@ public class Platform extends processing.app.Platform {
if (Preferences.getBoolean("platform.auto_file_type_associations")) {
// Check the key that should be set by a previous run of Processing
String knownCommand =
Registry.getStringValue(REGISTRY_ROOT_KEY.CURRENT_USER,
WindowsRegistry.getStringValue(REGISTRY_ROOT_KEY.CURRENT_USER,
"Software\\Classes\\" + REG_DOC + "\\shell\\open\\command", "");
// If the association hasn't been set, or it's not correct, set it.
if (knownCommand == null || !knownCommand.equals(REG_OPEN_COMMAND)) {
@@ -197,18 +197,18 @@ public class Platform extends processing.app.Platform {
final String docPrefix = "Software\\Classes\\" + REG_DOC;
// First create the .pde association
if (Registry.createKey(rootKey, "Software\\Classes", ".pde") &&
Registry.setStringValue(rootKey, "Software\\Classes\\.pde", "", REG_DOC) &&
if (WindowsRegistry.createKey(rootKey, "Software\\Classes", ".pde") &&
WindowsRegistry.setStringValue(rootKey, "Software\\Classes\\.pde", "", REG_DOC) &&
// Now give files with a .pde extension a name for the explorer
Registry.createKey(rootKey, "Software\\Classes", REG_DOC) &&
Registry.setStringValue(rootKey, docPrefix, "", APP_NAME + " Source Code") &&
WindowsRegistry.createKey(rootKey, "Software\\Classes", REG_DOC) &&
WindowsRegistry.setStringValue(rootKey, docPrefix, "", APP_NAME + " Source Code") &&
// Now associate the 'open' command with the current processing.exe
Registry.createKey(rootKey, docPrefix, "shell") &&
Registry.createKey(rootKey, docPrefix + "\\shell", "open") &&
Registry.createKey(rootKey, docPrefix + "\\shell\\open", "command") &&
Registry.setStringValue(rootKey, docPrefix + "\\shell\\open\\command", "", REG_OPEN_COMMAND)) {
WindowsRegistry.createKey(rootKey, docPrefix, "shell") &&
WindowsRegistry.createKey(rootKey, docPrefix + "\\shell", "open") &&
WindowsRegistry.createKey(rootKey, docPrefix + "\\shell\\open", "command") &&
WindowsRegistry.setStringValue(rootKey, docPrefix + "\\shell\\open\\command", "", REG_OPEN_COMMAND)) {
// everything ok
// hooray!
app/src/processing/app/windows/Registry.java → app/src/processing/app/windows/WindowsRegistry.java
+1 -1
View File
@@ -22,7 +22,7 @@ import com.sun.jna.ptr.IntByReference;
* Not sure of where this code came from originally, but it was hacked on
* 20 July 2013 to make updates for use with JNA 3.5.2's platform classes.
*/
public class Registry {
public class WindowsRegistry {
static public enum REGISTRY_ROOT_KEY {
CLASSES_ROOT, CURRENT_USER, LOCAL_MACHINE, USERS
};