eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-15 03:15:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

js mode, setting server port via menu and sketch.properties added

Browse Source
This commit is contained in:
fjenett
2011-06-23 10:46:57 +00:00
parent e1e2598135
commit 6f318947a6
2 changed files with 198 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
app/src/processing/mode/javascript/JavaScriptEditor.java
View File

@@ -18,11 +18,13 @@ import processing.app.Formatter;
import processing.app.Mode;
import processing.mode.java.AutoFormat;
import javax.swing.*;
public class JavaScriptEditor extends Editor
{
final static String PROP_KEY_MODE = "mode";
final static String PROP_VAL_MODE = "JavaScript";
final static String PROP_KEY_SERVER_PORT = "js.server.port";
private JavaScriptMode jsMode;
private JavaScriptServer jsServer;
@@ -100,10 +102,18 @@ public class JavaScriptEditor extends Editor
// }
// }
// );
JMenuItem setServerPortItem = new JMenuItem("Set server port");
setServerPortItem.addActionListener(new ActionListener(){
public void actionPerformed (ActionEvent e) {
handleSetServerPort();
}
});
return buildSketchMenu(new JMenuItem[] {
startServerItem, stopServerItem, copyServerAddressItem
});
startServerItem, stopServerItem,
copyServerAddressItem, setServerPortItem
});
}
public JMenu buildModeMenu() {
@@ -244,6 +254,86 @@ public class JavaScriptEditor extends Editor
// - - - - - - - - - - - - - - - - - -
private void handleSetServerPort ()
{
statusEmpty();
String pString = null;
String msg = "Set the server port (1024 < port < 65535)";
int currentPort = -1;
if ( jsServer != null ) currentPort = jsServer.getPort();
if ( currentPort > 0 )
pString = JOptionPane.showInputDialog( msg, (currentPort+"") );
else
pString = JOptionPane.showInputDialog( msg );
if ( pString == null ) return;
int port = -1;
try {
port = Integer.parseInt(pString);
} catch ( Exception e ) {
// sending foobar? you lil' hacker you ...
statusError("That number was not okay ..");
return;
}
if ( port < 0 || port > 65535 )
{
statusError("That port number is out of range");
return;
}
createJavaScriptServer();
if ( jsServer != null )
{
jsServer.setPort(port);
}
saveSketchSettings();
}
private void saveSketchSettings ()
{
statusEmpty();
File sketchProps = getSketchPropertiesFile();
if ( !sketchProps.exists() )
{
try {
sketchProps.createNewFile();
} catch (IOException ioe) {
ioe.printStackTrace();
statusError( "Unable to create sketch properties file!" );
return;
}
}
Settings settings;
try {
settings = new Settings(sketchProps);
} catch ( IOException ioe ) {
ioe.printStackTrace();
return;
}
if ( settings == null )
{
statusError( "Unable to create sketch properties file!" );
return;
}
settings.set( PROP_KEY_MODE, PROP_VAL_MODE );
if ( jsServer != null )
{
int port = jsServer.getPort();
if ( port > 0 ) settings.set( PROP_KEY_SERVER_PORT, (port+"") );
}
settings.save();
}
private void handleCreateCustomTemplate ()
{
Sketch sketch = getSketch();
@@ -270,12 +360,6 @@ public class JavaScriptEditor extends Editor
"folder from the sketch." );
}
private File getCustomTemplateFolder ()
{
return new File( sketch.getFolder(),
JavaScriptBuild.TEMPLATE_FOLDER_NAME );
}
private void handleOpenCustomTemplateFolder ()
{
File tjs = getCustomTemplateFolder();
@@ -292,14 +376,14 @@ public class JavaScriptEditor extends Editor
private void handleCopyServerAddress ()
{
if ( jsServer != null && jsServer.isRunning() )
{
java.awt.datatransfer.StringSelection stringSelection =
new java.awt.datatransfer.StringSelection( jsServer.getAddress() );
java.awt.datatransfer.Clipboard clipboard =
java.awt.Toolkit.getDefaultToolkit().getSystemClipboard();
clipboard.setContents( stringSelection, null );
}
if ( jsServer != null && jsServer.isRunning() )
{
java.awt.datatransfer.StringSelection stringSelection =
new java.awt.datatransfer.StringSelection( jsServer.getAddress() );
java.awt.datatransfer.Clipboard clipboard =
java.awt.Toolkit.getDefaultToolkit().getSystemClipboard();
clipboard.setContents( stringSelection, null );
}
}
private void handleShowDirectivesEditor ()
@@ -341,6 +425,23 @@ public class JavaScriptEditor extends Editor
handleStartServer();
}
}
private File getExportFolder ()
{
return new File( getSketch().getFolder(),
JavaScriptBuild.EXPORTED_FOLDER_NAME );
}
private File getSketchPropertiesFile ()
{
return new File( getSketch().getFolder(), "sketch.properties");
}
private File getCustomTemplateFolder ()
{
return new File( getSketch().getFolder(),
JavaScriptBuild.TEMPLATE_FOLDER_NAME );
}
/**
* Replacement for RUN:
@@ -351,8 +452,7 @@ public class JavaScriptEditor extends Editor
statusEmpty();
if ( !handleExport( false ) ) return;
File serverRoot = new File( sketch.getFolder(),
JavaScriptBuild.EXPORTED_FOLDER_NAME );
File serverRoot = getExportFolder();
// if server hung or something else went wrong .. stop it.
if ( jsServer != null &&
@@ -364,22 +464,7 @@ public class JavaScriptEditor extends Editor
if ( jsServer == null )
{
jsServer = new JavaScriptServer( serverRoot );
File sketchFolder = getSketch().getFolder();
File sketchProps = new File(sketchFolder, "sketch.properties");
if ( sketchProps.exists() ) {
try {
Settings props = new Settings(sketchProps);
String portString = props.get("server.port");
if ( portString != null && !portString.trim().equals("") )
{
int port = Integer.parseInt(portString);
jsServer.setPort(port);
}
} catch ( IOException ioe ) {
statusError(ioe);
}
}
jsServer = createJavaScriptServer();
jsServer.start();
while ( !jsServer.isRunning() ) {}
@@ -399,6 +484,30 @@ public class JavaScriptEditor extends Editor
toolbar.activate(JavaScriptToolbar.RUN);
}
private JavaScriptServer createJavaScriptServer ()
{
if ( jsServer != null ) return jsServer;
jsServer = new JavaScriptServer( getExportFolder() );
File sketchProps = getSketchPropertiesFile();
if ( sketchProps.exists() ) {
try {
Settings props = new Settings(sketchProps);
String portString = props.get( PROP_KEY_SERVER_PORT );
if ( portString != null && !portString.trim().equals("") )
{
int port = Integer.parseInt(portString);
jsServer.setPort(port);
}
} catch ( IOException ioe ) {
statusError(ioe);
}
}
return jsServer;
}
/**
* Replacement for STOP: stop server.
*/

54
app/src/processing/mode/javascript/JavaScriptServer.java
View File

@@ -77,11 +77,64 @@ class JavaScriptServer implements HttpConstants, Runnable
// http://stackoverflow.com/questions/434718/sockets-discover-port-availability-using-java
// http://stackoverflow.com/questions/2675362/how-to-find-an-available-port
if ( port >= 0 )
{
if ( !available(port) )
{
System.err.println( "JavaScriptServer: " +
"that port ("+port+") seems to be taken " +
"or is out of range (0-65535)");
port = -1;
}
}
thread = null;
thread = new Thread(this, "ProcessingJSServer");
thread.start();
}
/**
* Checks to see if a specific port is available.
* http://mina.apache.org/
* http://stackoverflow.com/questions/434718/sockets-discover-port-availability-using-java
*/
public static boolean available (int port)
{
// http://en.wikipedia.org/wiki/Port_number
// http://en.wikipedia.org/wiki/Ephemeral_port
if (port < 0 || port > 65535)
{
//throw new IllegalArgumentException( "Invalid start port: " + port );
return false;
}
ServerSocket ss = null;
DatagramSocket ds = null;
try {
ss = new ServerSocket(port);
ss.setReuseAddress(true);
ds = new DatagramSocket(port);
ds.setReuseAddress(true);
return true;
} catch (IOException e) {
} finally {
if (ds != null) {
ds.close();
}
if (ss != null) {
try {
ss.close();
} catch (IOException e) {
/* should not be thrown */
}
}
}
return false;
}
public void restart ()
{
if ( running )
@@ -136,6 +189,7 @@ class JavaScriptServer implements HttpConstants, Runnable
else
{
server = new ServerSocket( port );
//System.out.println( server.getLocalPort() );
}
} catch ( IOException ioe ) {