changed Java block comments, did away with 'doesNotUnderstand' service class silliness
diff --git a/weinre.application/src/weinre/application/GUIMain.java b/weinre.application/src/weinre/application/GUIMain.java
index fad134e..47f52f7 100644
--- a/weinre.application/src/weinre/application/GUIMain.java
+++ b/weinre.application/src/weinre/application/GUIMain.java
@@ -32,10 +32,7 @@
import weinre.server.Main;
import weinre.server.ServerSettings;
-
-/**
- *
- */
+//-------------------------------------------------------------------
public class GUIMain extends Main {
private Display display;
private Shell shell;
@@ -45,26 +42,20 @@
private Color red;
private GUIPreferences preferences;
- /**
- *
- */
+ //---------------------------------------------------------------
static public void main(String[] args) {
GUIMain main = new GUIMain(args);
main.run();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public GUIMain(String[] args) {
super(args);
preferences = new GUIPreferences();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void run() {
uiBuild();
@@ -81,16 +72,12 @@
exit();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public GUIPreferences getPreferences() {
return preferences;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void uiBuild() {
Display.setAppName("weinre");
Display.setAppVersion("???");
@@ -160,9 +147,7 @@
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void createMenuBar() {
// Menu menu = new Menu(shell, SWT.BAR);
// shell.setMenuBar(menu);
@@ -172,9 +157,7 @@
// editMenuItem.setText("Edit");
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void uiRun() {
shell.open();
@@ -185,9 +168,7 @@
display.dispose();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public CTabItem createTabItem(CTabFolder tabFolder, String text) {
CTabItem tabItem = new CTabItem(tabFolder, SWT.NONE);
tabItem.setText(text);
@@ -206,9 +187,7 @@
return tabItem;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void fillParent(Control control, int marginT, int marginR, int marginB, int marginL ) {
FormLayout formLayout = new FormLayout();
@@ -228,9 +207,7 @@
control.setLayoutData(formData);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void serverStarted() {
debugger.getDisplay().asyncExec(new Runnable() {
public void run() {
@@ -240,9 +217,7 @@
});
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String getBrowserURL() {
String result;
@@ -257,9 +232,7 @@
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void addServerConsoleMessage(final String line, final boolean stdout) {
if (null == console) return;
@@ -286,9 +259,7 @@
}
- /**
- *
- */
+ //---------------------------------------------------------------
@Override
public int severeError(final String message) {
if (null == display) return super.severeError(message);
@@ -318,9 +289,7 @@
return 0;
}
- /**
- *
- */
+ //---------------------------------------------------------------
private Font getMonospaceFont(Control control) {
FontData[] fontData = control.getDisplay().getFontList(null, true);
@@ -341,6 +310,7 @@
return new Font(control.getDisplay(), fontFound);
}
+ //---------------------------------------------------------------
private FontData findFontNamed(FontData[] fontData, String name) {
for (FontData fontDatum: fontData) {
if (fontDatum.getStyle() != SWT.NORMAL) continue;
@@ -350,6 +320,7 @@
return null;
}
+ //---------------------------------------------------------------
@SuppressWarnings("unused")
private void dumpFontData(FontData[] fontData) {
for (FontData fontDatum: fontData) {
diff --git a/weinre.application/src/weinre/application/GUIPreferences.java b/weinre.application/src/weinre/application/GUIPreferences.java
index 9163ce3..7b6fd54 100644
--- a/weinre.application/src/weinre/application/GUIPreferences.java
+++ b/weinre.application/src/weinre/application/GUIPreferences.java
@@ -20,16 +20,12 @@
import weinre.server.Main;
-/**
- *
- */
+//-------------------------------------------------------------------
public class GUIPreferences {
private Properties properties;
private String fileName;
- /**
- *
- */
+ //---------------------------------------------------------------
public GUIPreferences() {
super();
@@ -55,16 +51,12 @@
loadFromFile();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String getBoundsKey(Shell shell, String name) {
return "bounds-" + name + "-" + ShellSizeTracker.getMonitorSetupKey(shell.getDisplay());
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void loadFromFile() {
properties.clear();
@@ -76,9 +68,7 @@
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void saveToFile() {
if (null == fileName) return;
@@ -90,17 +80,13 @@
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String getPreference(String key) {
if (null == properties) loadFromFile();
return properties.getProperty(key);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public JSONObject getPreferenceFromJSON(String key) throws IOException {
String val = getPreference(key);
if (null == val) return null;
@@ -112,16 +98,12 @@
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void setPreference(String key, String val) {
properties.setProperty(key, val);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void setPreference(String key, JSONObject json) throws IOException {
String val = json.toString();
diff --git a/weinre.application/src/weinre/application/ShellSizeTracker.java b/weinre.application/src/weinre/application/ShellSizeTracker.java
index 0880faa..b661b6e 100644
--- a/weinre.application/src/weinre/application/ShellSizeTracker.java
+++ b/weinre.application/src/weinre/application/ShellSizeTracker.java
@@ -17,9 +17,7 @@
import org.eclipse.swt.widgets.Monitor;
import org.eclipse.swt.widgets.Shell;
-/**
- *
- */
+//-------------------------------------------------------------------
public class ShellSizeTracker {
private String name;
@@ -30,9 +28,7 @@
private Point lastLocation;
private long lastChange;
- /**
- *
- */
+ //---------------------------------------------------------------
static public String getMonitorSetupKey(final Display display) {
StringBuffer keyBuffer = new StringBuffer();
@@ -59,9 +55,7 @@
return keyBuffer.toString();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public ShellSizeTracker(String name, final Shell shell, GUIPreferences preferences) {
super();
@@ -81,9 +75,7 @@
startWaiterThread();
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void shellMoved() {
dirty = true;
lastChange = System.currentTimeMillis();
@@ -91,9 +83,7 @@
lastSize = shell.getSize();
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void checkForChanges() {
if (!dirty) return;
if (shell.isDisposed()) return;
@@ -122,9 +112,7 @@
}
- /**
- *
- */
+ //---------------------------------------------------------------
private Thread startWaiterThread() {
Runnable runnable = new Runnable() {
public void run() {
diff --git a/weinre.build/scripts/build-client-html.py b/weinre.build/scripts/build-client-html.py
index c71d57c..a2b83a7 100644
--- a/weinre.build/scripts/build-client-html.py
+++ b/weinre.build/scripts/build-client-html.py
@@ -14,8 +14,6 @@
import optparse
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
def main():
if len(sys.argv) < 2:
error("expecting parameters [web directory]")
@@ -33,8 +31,6 @@
createIndexFile(iFileName, oFileName, moduleDir)
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
def createIndexFile(iFileName, oFileName, moduleDir):
with open(iFileName) as iFile: lines = iFile.readlines()
@@ -86,8 +82,6 @@
log("created %s" % oFileName)
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
def getModules(moduleDir):
modules = []
@@ -98,25 +92,18 @@
modules.append("weinre/client/%s" % module)
return modules
-
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
def log(message):
message = "%s: %s" % (PROGRAM_NAME, message)
print >>sys.stderr, message
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
def error(message):
log(message)
sys.exit(-1)
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
PROGRAM_NAME = os.path.basename(sys.argv[0])
main()
diff --git a/weinre.build/scripts/build-css-properties.py b/weinre.build/scripts/build-css-properties.py
index 5dded6c..f4e73e5 100644
--- a/weinre.build/scripts/build-css-properties.py
+++ b/weinre.build/scripts/build-css-properties.py
@@ -45,22 +45,16 @@
log("generated css properties in: " + oFileName)
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
def log(message):
message = "%s: %s" % (PROGRAM_NAME, message)
print >>sys.stderr, message
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
def error(message):
log(message)
sys.exit(-1)
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
PROGRAM_NAME = os.path.basename(sys.argv[0])
main()
diff --git a/weinre.build/scripts/build-target-scripts.py b/weinre.build/scripts/build-target-scripts.py
index e887b1c..391ac6a 100644
--- a/weinre.build/scripts/build-target-scripts.py
+++ b/weinre.build/scripts/build-target-scripts.py
@@ -14,13 +14,9 @@
import optparse
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
def main():
#----------------------------------------------------------------
- # parse args
- #----------------------------------------------------------------
if len(sys.argv) < 4:
error("expecting parameters piecesHtmlFile srcDir outputDir")
@@ -35,14 +31,10 @@
if not os.path.isdir(oDirName): error("output directory not a directory: '" + oDirName + "'")
#----------------------------------------------------------------
- # read the "pieces" file
- #----------------------------------------------------------------
with open(iFileName, "r") as iFile:
lines = iFile.readlines()
#----------------------------------------------------------------
- # get the scripts from the pieces file
- #----------------------------------------------------------------
scripts = []
scriptNames = {}
scriptSrc = {}
@@ -68,20 +60,14 @@
# log("read: %s" % scriptFile)
#----------------------------------------------------------------
- # write the target-script.js file
- #----------------------------------------------------------------
oFileName = os.path.join(oDirName, "target-script.js")
writeMergedFile(oFileName, scripts, scriptNames, scriptSrc)
#----------------------------------------------------------------
- # write the target-script-min.js file
- #----------------------------------------------------------------
oFileName = os.path.join(oDirName, "target-script-min.js")
writeMergedFile(oFileName, scripts, scriptNames, scriptMin)
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
def writeMergedFile(oFileName, scripts, scriptNames, srcs):
lines = []
@@ -104,9 +90,6 @@
log("generated: %s" % oFileName)
-
-#--------------------------------------------------------------------
-#
#--------------------------------------------------------------------
def min(script):
patternCommentC = re.compile(r"/\*.*?\*/", re.MULTILINE + re.DOTALL)
@@ -122,22 +105,16 @@
return script
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
def log(message):
message = "%s: %s" % (PROGRAM_NAME, message)
print >>sys.stderr, message
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
def error(message):
log(message)
sys.exit(-1)
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
PROGRAM_NAME = os.path.basename(sys.argv[0])
main()
diff --git a/weinre.build/scripts/collect-all-json-idl.py b/weinre.build/scripts/collect-all-json-idl.py
index 936a057..3ee17bc 100644
--- a/weinre.build/scripts/collect-all-json-idl.py
+++ b/weinre.build/scripts/collect-all-json-idl.py
@@ -14,8 +14,6 @@
import optparse
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
def main():
if len(sys.argv) < 3:
error("expecting parameters outputFile inputDir")
@@ -50,22 +48,16 @@
log("generated collected json idls in: " + oFileName)
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
def log(message):
message = "%s: %s" % (PROGRAM_NAME, message)
print >>sys.stderr, message
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
def error(message):
log(message)
sys.exit(-1)
#--------------------------------------------------------------------
-#
-#--------------------------------------------------------------------
PROGRAM_NAME = os.path.basename(sys.argv[0])
main()
diff --git a/weinre.server.android/src/weinre/server/android/MainActivity.java b/weinre.server.android/src/weinre/server/android/MainActivity.java
index 6f7c044..26a7fe8 100644
--- a/weinre.server.android/src/weinre/server/android/MainActivity.java
+++ b/weinre.server.android/src/weinre/server/android/MainActivity.java
@@ -6,7 +6,7 @@
import weinre.server.Main;
import weinre.server.android.R;
-//-----------------------------------------------------------------------------
+//---------------------------------------------------------------------------------
public class MainActivity extends Activity {
private Main main;
diff --git a/weinre.server/src/weinre/server/BasicService.java b/weinre.server/src/weinre/server/BasicService.java
index fbc5e7e..9265520 100644
--- a/weinre.server/src/weinre/server/BasicService.java
+++ b/weinre.server/src/weinre/server/BasicService.java
@@ -12,28 +12,22 @@
import org.apache.wink.json4j.JSONArray;
-
+//-------------------------------------------------------------------
public abstract class BasicService {
public static String lastActivePanelName;
- /**
- *
- */
+ //---------------------------------------------------------------
public BasicService() {
super();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String getInterfaceName() {
return getClass().getSimpleName();
}
- /**
- * forwards all requests to connected peers
- */
+ //---------------------------------------------------------------
public void __doesNotUnderstand(Channel channel, String methodName, JSONArray args) throws IOException {
Connector connector = channel.getConnector();
if (null == connector) return;
diff --git a/weinre.server/src/weinre/server/Channel.java b/weinre.server/src/weinre/server/Channel.java
index 831ced8..86ca840 100644
--- a/weinre.server/src/weinre/server/Channel.java
+++ b/weinre.server/src/weinre/server/Channel.java
@@ -19,9 +19,7 @@
import org.apache.wink.json4j.JSONException;
import org.apache.wink.json4j.JSONObject;
-/**
- *
- */
+//-------------------------------------------------------------------
public class Channel {
private String pathPrefix;
@@ -35,9 +33,7 @@
private String remoteHost;
private String remoteAddress;
- /**
- *
- */
+ //---------------------------------------------------------------
public Channel(String pathPrefix, String name, String remoteHost, String remoteAddress) {
this.pathPrefix = pathPrefix;
this.name = name;
@@ -51,37 +47,27 @@
this.lastRead = System.currentTimeMillis();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public Connector getConnector() {
return connector;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String getRemoteHost() {
return remoteHost;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String getRemoteAddress() {
return remoteAddress;
}
- /**
- *
- */
+ //---------------------------------------------------------------
protected void _setConnector(Connector connector) {
this.connector = connector;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void sendCallback(String intfName, String callbackId, Object... args) throws IOException {
if (callbackId == null) return;
@@ -92,9 +78,7 @@
sendEvent(intfName, "sendCallback", innerArgs.toArray());
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void sendEvent(String intfName, String methodName, Object... args) {
Main.debug(getName() + ": send " + intfName + "." + methodName + "()");
@@ -119,16 +103,11 @@
this.postResponse(responseString);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public Object getService(String name) {
try {
return getService_(name);
}
- catch (ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
catch (InstantiationException e) {
throw new RuntimeException(e);
}
@@ -137,29 +116,29 @@
}
}
- /**
- * @throws IllegalAccessException
- * @throws InstantiationException
- *
- */
+ //---------------------------------------------------------------
@SuppressWarnings("rawtypes")
- private Object getService_(String name) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
- Object result = serviceMap.get(name);
- if (null != result) return result;
+ private Object getService_(String name) throws InstantiationException, IllegalAccessException {
+ if (serviceMap.containsKey(name)) return serviceMap.get(name);
String klassName = "weinre.server.service." + name;
- Class klass = Class.forName(klassName);
- if (null == klass) throw new ClassNotFoundException("class not found: " + klassName);
+ Class klass = null;
+ try {
+ klass = Class.forName(klassName);
+ }
+ catch (ClassNotFoundException e) {
+ Main.debug("service class not found: " + klassName);
+ serviceMap.put(name, null);
+ return null;
+ }
- result = klass.newInstance();
+ Object result = klass.newInstance();
serviceMap.put(name, result);
Main.debug("loaded service class: " + klassName);
return result;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void close() {
isClosed = true;
requestQueue.shutdown();
@@ -168,62 +147,46 @@
ChannelManager.$.deregisterChannel(name);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public boolean isClosed() {
return isClosed;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String getPathPrefix() {
return pathPrefix;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String getName() {
return name;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public long getLastRead() {
return lastRead;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void updateLastRead() {
lastRead = System.currentTimeMillis();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void postRequest(String json) {
if (isClosed()) return;
requestQueue.add(json);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void postResponse(String json) {
if (isClosed()) return;
responseQueue.add(json);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public List<String> getRequests(int timeoutSeconds) throws InterruptedException {
if (isClosed()) return new LinkedList<String>();
@@ -232,9 +195,7 @@
return result;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public List<String> getResponses(int timeoutSeconds) throws InterruptedException {
if (isClosed()) return new LinkedList<String>();
@@ -243,9 +204,7 @@
return result;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String toString() {
return getClass().getName() + "{" + pathPrefix + ":" + name + "}";
}
diff --git a/weinre.server/src/weinre/server/ChannelManager.java b/weinre.server/src/weinre/server/ChannelManager.java
index 34d7624..277be1d 100644
--- a/weinre.server/src/weinre/server/ChannelManager.java
+++ b/weinre.server/src/weinre/server/ChannelManager.java
@@ -12,9 +12,7 @@
import java.util.List;
import java.util.Map;
-/**
- *
- */
+//-------------------------------------------------------------------
public class ChannelManager {
static final public ChannelManager $ = new ChannelManager();
@@ -22,9 +20,7 @@
private Map<String, Channel> channelMap;
private List<ChannelManagerEventListener> eventListeners;
- /**
- *
- */
+ //---------------------------------------------------------------
private ChannelManager() {
super();
@@ -32,50 +28,36 @@
eventListeners = new ArrayList<ChannelManagerEventListener>();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void addEventListener(ChannelManagerEventListener listener) {
eventListeners.add(listener);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void removeEventListener(ChannelManagerEventListener listener) {
eventListeners.add(listener);
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void fireRegisteredEvent(Channel channel) {
for (ChannelManagerEventListener listener: eventListeners) {
listener.channelRegistered(channel);
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void fireDeregisteredEvent(Channel channel) {
for (ChannelManagerEventListener listener: eventListeners) {
listener.channelDeregistered(channel);
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
public Channel getChannel(String channelName) {
return channelMap.get(channelName);
}
- /**
- * This version of getChannel() double-checks that the remoteAddress
- * this request came from matches the original remoteAddress the
- * channel was created with.
- */
+ //---------------------------------------------------------------
public Channel getChannel(String channelName, String remoteAddress) {
Channel channel = getChannel(channelName);
if (null == channel) return null;
@@ -85,16 +67,12 @@
return channel;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public List<Channel> getChannels() {
return new ArrayList<Channel>(channelMap.values());
}
- /**
- *
- */
+ //---------------------------------------------------------------
public Channel registerChannel(String pathPrefix, String channelName, String remoteHost, String remoteAddress) {
if (channelMap.containsKey(channelName)) return null;
@@ -106,9 +84,7 @@
return channel;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public Channel deregisterChannel(String channelName) {
Channel channel = getChannel(channelName);
if (null == channel) return null;
diff --git a/weinre.server/src/weinre/server/ChannelManagerEventListener.java b/weinre.server/src/weinre/server/ChannelManagerEventListener.java
index 0abca17..e97ef7c 100644
--- a/weinre.server/src/weinre/server/ChannelManagerEventListener.java
+++ b/weinre.server/src/weinre/server/ChannelManagerEventListener.java
@@ -7,18 +7,12 @@
package weinre.server;
-/**
- *
- */
+//-------------------------------------------------------------------
public interface ChannelManagerEventListener {
- /**
- *
- */
+ //---------------------------------------------------------------
public void channelRegistered(Channel channel);
- /**
- *
- */
+ //---------------------------------------------------------------
public void channelDeregistered(Channel channel);
}
diff --git a/weinre.server/src/weinre/server/Client.java b/weinre.server/src/weinre/server/Client.java
index a9e09ba..e14bfaf 100644
--- a/weinre.server/src/weinre/server/Client.java
+++ b/weinre.server/src/weinre/server/Client.java
@@ -11,38 +11,28 @@
import org.apache.wink.json4j.JSONException;
import org.apache.wink.json4j.JSONObject;
-/**
- *
- */
+//-------------------------------------------------------------------
public class Client extends Connector {
private Target connectedTarget;
- /**
- *
- */
+ //---------------------------------------------------------------
public Client(Channel channel) {
super(channel);
_register();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public boolean isClient() {
return true;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public Target getConnectedTarget() {
return connectedTarget;
}
- /**
- *
- */
+ //---------------------------------------------------------------
protected void _connect(Target target) {
if (null == target) return;
@@ -56,9 +46,7 @@
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
protected void _disconnect(Target target) {
if (null == target) return;
@@ -72,9 +60,7 @@
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
public JSONObject getDescription() {
JSONObject result = new JSONObject();
diff --git a/weinre.server/src/weinre/server/ConnectionManager.java b/weinre.server/src/weinre/server/ConnectionManager.java
index 39cbcc2..0d27e2f 100644
--- a/weinre.server/src/weinre/server/ConnectionManager.java
+++ b/weinre.server/src/weinre/server/ConnectionManager.java
@@ -13,9 +13,7 @@
import java.util.List;
import java.util.Map;
-/**
- *
- */
+//-------------------------------------------------------------------
public class ConnectionManager {
static final public ConnectionManager $ = new ConnectionManager();
@@ -24,9 +22,7 @@
private Map<String,Target> targetMap;
private boolean listening = false;
- /**
- *
- */
+ //---------------------------------------------------------------
private ConnectionManager() {
super();
@@ -34,9 +30,7 @@
targetMap = Collections.synchronizedMap(new HashMap<String,Target>());
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void startChannelListener() {
if (listening) return;
listening = true;
@@ -58,55 +52,41 @@
});
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void addClient(Client client) {
clientMap.put(client.getName(), client);
_sendAllClientsEvent("WeinreClientEvents", "clientRegistered", client.getDescription());
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void addTarget(Target target) {
targetMap.put(target.getName(), target);
_sendAllClientsEvent("WeinreClientEvents", "targetRegistered", target.getDescription());
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void _removeClient(Client client) {
_sendAllClientsEvent("WeinreClientEvents", "clientUnregistered", client.getName());
clientMap.remove(client.getName());
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void _removeTarget(Target target) {
_sendAllClientsEvent("WeinreClientEvents", "targetUnregistered", target.getName());
targetMap.remove(target.getName());
}
- /**
- *
- */
+ //---------------------------------------------------------------
public Client getClient(String id) {
return clientMap.get(id);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public Target getTarget(String id) {
return targetMap.get(id);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public List<Client> getClients() {
List<Client> result = new ArrayList<Client>();
@@ -115,9 +95,7 @@
return result;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public List<Target> getTargets() {
List<Target> result = new ArrayList<Target>();
@@ -126,9 +104,7 @@
return result;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void connect(Client client, Target target) {
if ((client == null) || (target == null)) return;
@@ -143,9 +119,7 @@
_sendConnectionCreatedEvent(client, target);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void disconnect(Client client, Target target) {
if ((client == null) || (target == null)) return;
@@ -155,23 +129,17 @@
_sendConnectionDestroyedEvent(client, target);
}
- /*
- *
- */
+ //---------------------------------------------------------------
private void _sendConnectionCreatedEvent(Client client, Target target) {
_sendConnectionEvent(client, target, "connectionCreated");
}
- /*
- *
- */
+ //---------------------------------------------------------------
private void _sendConnectionDestroyedEvent(Client client, Target target) {
_sendConnectionEvent(client, target, "connectionDestroyed");
}
- /*
- *
- */
+ //---------------------------------------------------------------
private void _sendConnectionEvent(Client client, Target target, String message) {
String clientName = client.getChannel().getName();
String targetName = target.getChannel().getName();
@@ -180,18 +148,14 @@
target.getChannel().sendEvent("WeinreTargetEvents", message, clientName, targetName);
}
- /*
- *
- */
+ //---------------------------------------------------------------
private void _sendAllClientsEvent(String intfName, String message, Object... args) {
for (Client aClient: getClients()) {
aClient.getChannel().sendEvent(intfName, message, args);
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
protected void closeConnector(Connector connector) {
if (null == connector) return;
@@ -199,9 +163,7 @@
if (connector.isTarget()) _closeTarget((Target)connector);
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void _closeClient(Client client) {
if (null == client) return;
@@ -213,9 +175,7 @@
_removeClient(client);
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void _closeTarget(Target target) {
if (null == target) return;
diff --git a/weinre.server/src/weinre/server/Connector.java b/weinre.server/src/weinre/server/Connector.java
index 6fde384..b428ca0 100644
--- a/weinre.server/src/weinre/server/Connector.java
+++ b/weinre.server/src/weinre/server/Connector.java
@@ -14,18 +14,14 @@
import org.apache.wink.json4j.JSONObject;
-/**
- *
- */
+//-------------------------------------------------------------------
abstract public class Connector {
static final protected Lock Lock = new ReentrantLock();
private Channel channel;
- /**
- *
- */
+ //---------------------------------------------------------------
public Connector(Channel channel) {
super();
@@ -33,31 +29,23 @@
channel._setConnector(this);
}
- /**
- *
- */
+ //---------------------------------------------------------------
protected void _register() {
if (isClient()) ConnectionManager.$.addClient((Client) this);
if (isTarget()) ConnectionManager.$.addTarget((Target) this);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public Channel getChannel() {
return channel;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String getName() {
return channel.getName();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public List<Connector> getConnections() {
List<Connector> result = new ArrayList<Connector>();
@@ -79,35 +67,25 @@
return result;
}
- /**
- *
- */
+ //---------------------------------------------------------------
abstract public JSONObject getDescription();
- /**
- *
- */
+ //---------------------------------------------------------------
public boolean isClosed() {
return channel.isClosed();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public boolean isClient() {
return false;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public boolean isTarget() {
return false;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String toString() {
return getClass().getName() + "{" + channel + "}";
}
diff --git a/weinre.server/src/weinre/server/ConsoleOutputStream.java b/weinre.server/src/weinre/server/ConsoleOutputStream.java
index e531ddd..dc62c2d 100644
--- a/weinre.server/src/weinre/server/ConsoleOutputStream.java
+++ b/weinre.server/src/weinre/server/ConsoleOutputStream.java
@@ -11,9 +11,7 @@
import java.io.OutputStream;
import java.io.PrintStream;
-/**
- *
- */
+//-------------------------------------------------------------------
public class ConsoleOutputStream extends OutputStream {
private Main main;
@@ -21,16 +19,12 @@
private StringBuffer stringBuffer;
private boolean stdout;
- /**
- *
- */
+ //---------------------------------------------------------------
static public PrintStream newPrintStream(Main main, PrintStream originalStream, boolean stdout) {
return new PrintStream(new ConsoleOutputStream(main, originalStream, stdout));
}
- /**
- *
- */
+ //---------------------------------------------------------------
public ConsoleOutputStream(Main main, PrintStream originalStream, boolean stdout) {
this.main = main;
this.originalStream = originalStream;
@@ -38,6 +32,7 @@
this.stringBuffer = new StringBuffer();
}
+ //---------------------------------------------------------------
@Override
public void write(int c) throws IOException {
if (c == 0x0D) return;
@@ -52,9 +47,7 @@
_writeLine(line);
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void _writeLine(String line) {
originalStream.println(line);
diff --git a/weinre.server/src/weinre/server/Main.java b/weinre.server/src/weinre/server/Main.java
index a4fc13d..8d30889 100644
--- a/weinre.server/src/weinre/server/Main.java
+++ b/weinre.server/src/weinre/server/Main.java
@@ -16,11 +16,7 @@
import weinre.server.http.HttpServer;
-
-
-/**
- *
- */
+//-------------------------------------------------------------------
public class Main {
private static ServerSettings Settings;
@@ -30,32 +26,29 @@
private PrintStream consoleStdout;
private PrintStream consoleStderr;
- /**
- *
- */
+ //---------------------------------------------------------------
static public void main(String[] args) throws Throwable {
Main main = new Main(args);
main.run();
}
- /**
- *
- */
+ //---------------------------------------------------------------
static public ServerSettings getSettings() {
return Settings;
}
- /**
- *
- */
+ //---------------------------------------------------------------
+ static public boolean isDebug() {
+ return Settings.getVerbose();
+ }
+
+ //---------------------------------------------------------------
static public void warn( String message ) { Logger.warn(message); }
static public void info( String message ) { Logger.info(message); }
static public void debug( String message ) { Logger.debug(message); }
- /**
- *
- */
+ //---------------------------------------------------------------
public Main(String[] args) {
super();
@@ -69,18 +62,14 @@
System.setErr(consoleStderr);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void run() throws Throwable, Exception {
httpServerStart();
httpServerWaitTillDone();
exit();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public int exit() {
if (null != server) {
try {
@@ -103,9 +92,7 @@
return 0;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void httpServerStart() {
// get the default logger - this should be the first thing to touch the log
Logger defaultLog = Log.getLog();
@@ -131,9 +118,7 @@
MessageHandler.start();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void httpServerWaitTillDone() {
try {
server.join();
@@ -143,21 +128,15 @@
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void serverStarted() {
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void addServerConsoleMessage(String line, boolean stdout) {
}
- /**
- *
- */
+ //---------------------------------------------------------------
public int severeError(String message) {
Logger.warn(message);
Logger.warn("exiting...");
diff --git a/weinre.server/src/weinre/server/MessageHandler.java b/weinre.server/src/weinre/server/MessageHandler.java
index 3dcfc77..29942b2 100644
--- a/weinre.server/src/weinre/server/MessageHandler.java
+++ b/weinre.server/src/weinre/server/MessageHandler.java
@@ -16,14 +16,10 @@
import org.apache.wink.json4j.JSONException;
import org.apache.wink.json4j.JSONObject;
-/**
- *
- */
+//-------------------------------------------------------------------
public class MessageHandler {
- /**
- *
- */
+ //---------------------------------------------------------------
static public void start() {
final MessageHandler messageHandler = new MessageHandler();
@@ -45,15 +41,11 @@
thread.start();
}
- /**
- *
- */
+ //---------------------------------------------------------------
private MessageHandler() {
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void handleMessages() throws InterruptedException {
List<Channel> channels = ChannelManager.$.getChannels();
@@ -116,15 +108,17 @@
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
@SuppressWarnings({ "rawtypes", "unchecked" })
private void serviceMethodInvoker(Channel channel, String intfName, String methodName, JSONArray argsJSON) {
Object service;
- String methodSignature = intfName + "." + methodName + "(" + argsJSON.toString() + ")";
- Main.debug(channel.getName() + ": recv " + methodSignature);
+ String methodSignature = intfName + "." + methodName + "()";
+
+ if (Main.isDebug()) {
+ String methodSignatureParms = intfName + "." + methodName + "(" + argsJSON.toString() + ")";
+ Main.debug(channel.getName() + ": recv " + methodSignatureParms);
+ }
try {
service = channel.getService(intfName);
@@ -134,6 +128,11 @@
return;
}
+ if (null == service) {
+ redirectToConnections(channel, intfName, methodName, argsJSON);
+ return;
+ }
+
Class serviceClass = service.getClass();
List<Object> args = new ArrayList<Object>(argsJSON);
@@ -145,6 +144,7 @@
Main.warn("invalid number of parameters specified for : " + methodSignature);
return;
}
+
args.add(0, channel);
try {
@@ -167,41 +167,21 @@
return;
}
-
- Method dnuMethod;
- try {
- dnuMethod = serviceClass.getMethod("__doesNotUnderstand", Channel.class, String.class, JSONArray.class);
- }
- catch (SecurityException e) {
- Main.warn("security exception looking up method __doesNotUnderstand invoking : " + methodSignature + "; " + e);
- return;
- }
- catch (NoSuchMethodException e) {
- Main.warn("no __doesNotUnderstand method found while invoking : " + methodSignature + "; " + e);
- return;
- }
-
- Object[] dnuArgs = new Object[3];
- dnuArgs[0] = channel;
- dnuArgs[1] = methodName;
- try {
- dnuArgs[2] = new JSONArray(args);
- } catch (JSONException e1) {
- throw new RuntimeException(e1);
- }
-
- try {
- dnuMethod.invoke(service, dnuArgs);
- }
- catch (IllegalArgumentException e) {
- Main.warn("illegal argument exception invoking __doesNotUnderstand invoking: " + methodSignature + "; " + e);
- }
- catch (IllegalAccessException e) {
- Main.warn("illegal access exception invoking __doesNotUnderstand invoking: " + methodSignature + "; " + e);
- }
- catch (InvocationTargetException e) {
- Main.warn("invocation target exception invoking __doesNotUnderstand invoking: " + methodSignature + "; " + e);
- }
+
+ Main.warn("no method found to invoke for: " + methodSignature);
}
+
+ //---------------------------------------------------------------
+ private void redirectToConnections(Channel channel, String interfaceName, String methodName, JSONArray args) {
+ Connector connector = channel.getConnector();
+ if (null == connector) return;
+
+ List<Connector> connections = connector.getConnections();
+
+ for (Connector connection: connections) {
+ connection.getChannel().sendEvent(interfaceName, methodName, args.toArray());
+ }
+ }
+
}
diff --git a/weinre.server/src/weinre/server/MessageQueue.java b/weinre.server/src/weinre/server/MessageQueue.java
index 1464097..09937ea 100644
--- a/weinre.server/src/weinre/server/MessageQueue.java
+++ b/weinre.server/src/weinre/server/MessageQueue.java
@@ -27,9 +27,7 @@
private boolean closed;
private Object closeLock;
- /**
- *
- */
+ //---------------------------------------------------------------
public MessageQueue() {
super();
@@ -38,9 +36,7 @@
closeLock = new Object();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void shutdown() {
synchronized(closeLock) {
if (closed) return;
@@ -50,9 +46,7 @@
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void add(E item) {
synchronized(closeLock) {
if (closed) throw new IllegalStateException("the blocking queue is closed");
@@ -61,9 +55,7 @@
queue.add(item);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public List<E> getAll(int timeout, TimeUnit timeUnit) throws InterruptedException {
synchronized(closeLock) {
if (closed) throw new IllegalStateException("the blocking queue is closed");
@@ -91,9 +83,7 @@
return result;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String toString() {
return getClass().getName() + "{" + queue.size() + "}";
}
diff --git a/weinre.server/src/weinre/server/ScriptEventQueue.java b/weinre.server/src/weinre/server/ScriptEventQueue.java
index 9e25cf3..9a32497 100644
--- a/weinre.server/src/weinre/server/ScriptEventQueue.java
+++ b/weinre.server/src/weinre/server/ScriptEventQueue.java
@@ -12,9 +12,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-/**
- *
- */
+//-------------------------------------------------------------------
public class ScriptEventQueue {
static public ScriptEventQueue $ = new ScriptEventQueue();
@@ -22,9 +20,7 @@
private BlockingQueue<String> queue;
private AtomicBoolean closed;
- /**
- *
- */
+ //---------------------------------------------------------------
private ScriptEventQueue() {
super();
@@ -32,32 +28,24 @@
this.closed = new AtomicBoolean(false);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void close() {
closed.set(true);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public boolean isClosed() {
return closed.get();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void add(String item) {
if (isClosed()) return;
queue.add(item);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String getNext() {
if (isClosed()) return null;
diff --git a/weinre.server/src/weinre/server/ServerConsoleUpdater.java b/weinre.server/src/weinre/server/ServerConsoleUpdater.java
index f34a641..db395f3 100644
--- a/weinre.server/src/weinre/server/ServerConsoleUpdater.java
+++ b/weinre.server/src/weinre/server/ServerConsoleUpdater.java
@@ -7,21 +7,15 @@
package weinre.server;
-/**
- *
- */
+//-------------------------------------------------------------------
public class ServerConsoleUpdater {
- /**
- *
- */
+ //---------------------------------------------------------------
public ServerConsoleUpdater() {
super();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public boolean addServerConsoleMessage(String message, boolean stdout) {
return false;
}
diff --git a/weinre.server/src/weinre/server/ServerSettings.java b/weinre.server/src/weinre/server/ServerSettings.java
index 506ef21..b7a63b5 100644
--- a/weinre.server/src/weinre/server/ServerSettings.java
+++ b/weinre.server/src/weinre/server/ServerSettings.java
@@ -25,9 +25,7 @@
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
-/**
- *
- */
+//-------------------------------------------------------------------
public class ServerSettings {
final static private String BoundHostAllConstant = "-all-";
@@ -41,26 +39,20 @@
private int deathTimeoutSeconds;
private Properties fileProperties;
- /**
- *
- */
+ //---------------------------------------------------------------
static public ServerSettings getOptions(String[] commandLine) {
ServerSettings settings = new ServerSettings();
return settings.parse(commandLine);
}
- /**
- *
- */
+ //---------------------------------------------------------------
private ServerSettings() {
super();
fileProperties = fromPropertiesFile();
}
- /**
- *
- */
+ //---------------------------------------------------------------
private Options getOptions() {
Options options = new Options();
@@ -77,9 +69,7 @@
return options;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public Map<String,Object> asProperties() {
Map<String,Object> result = new HashMap<String,Object>();
@@ -95,9 +85,7 @@
return result;
}
- /**
- *
- */
+ //---------------------------------------------------------------
private Properties fromPropertiesFile() {
Properties result = Utility.readPropertiesFile("server.properties");
@@ -110,10 +98,7 @@
return result;
}
-
- /**
- *
- */
+ //---------------------------------------------------------------
private ServerSettings parse(String[] commandLineArgs) {
Options options = getOptions();
@@ -150,9 +135,7 @@
return this;
}
- /**
- *
- */
+ //---------------------------------------------------------------
private int getIntFromOption(CommandLine commandLine, String name, int defaultValue, int min, int max) {
int result = defaultValue;
@@ -178,9 +161,7 @@
return result;
}
- /**
- *
- */
+ //---------------------------------------------------------------
private String getStringFromOption(CommandLine commandLine, String name, String defaultValue) {
String stringValue = commandLine.getOptionValue(name);
if (null == stringValue) {
@@ -192,9 +173,7 @@
return stringValue;
}
- /**
- *
- */
+ //---------------------------------------------------------------
private boolean getBooleanFromOption(CommandLine commandLine, String name, boolean defaultValue) {
boolean result = defaultValue;
@@ -210,37 +189,27 @@
return result;
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void error(String message) {
System.out.println("error with command-line option: " + message);
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void printHelp(Options options) {
new HelpFormatter().printHelp("java -jar weinre.jar [options]", options);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public int getHttpPort() {
return httpPort;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String getBoundHost() {
return boundHost;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String[] getBoundHosts() {
if (getBoundHostValue() != null) {
return new String[] { getBoundHost() };
@@ -266,62 +235,46 @@
return hosts.toArray(new String[]{});
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String getBoundHostValue() {
if (BoundHostAllConstant.equals(boundHost)) return null;
return boundHost;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public boolean getVerbose() {
return verbose;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public int getReadTimeoutSeconds() {
return readTimeoutSeconds;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public int getDeathTimeoutSeconds() {
return deathTimeoutSeconds;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public boolean useProxy() {
return false; // useProxy;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public boolean reuseAddr() {
return reuseAddr;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String getNiceHostName() {
String hostName = getBoundHostValue();
if (null == hostName) return "localhost";
return hostName;
}
- /**
- *
- */
+ //---------------------------------------------------------------
@SuppressWarnings("unused")
private String getSuperNiceHostName() {
String hostName = getBoundHost();
diff --git a/weinre.server/src/weinre/server/Target.java b/weinre.server/src/weinre/server/Target.java
index 6661610..54920ff 100644
--- a/weinre.server/src/weinre/server/Target.java
+++ b/weinre.server/src/weinre/server/Target.java
@@ -15,17 +15,13 @@
import org.apache.wink.json4j.JSONException;
import org.apache.wink.json4j.JSONObject;
-/**
- *
- */
+//-------------------------------------------------------------------
public class Target extends Connector {
private List<Client> connectedClients;
private String url;
- /**
- *
- */
+ //---------------------------------------------------------------
public Target(Channel channel, String url) {
super(channel);
@@ -35,23 +31,17 @@
}
- /**
- *
- */
+ //---------------------------------------------------------------
public String getURL() {
return this.url;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public boolean isTarget() {
return true;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public List<Client> getConnectedClients() {
List<Client> result = new LinkedList<Client>();
@@ -66,9 +56,7 @@
return result;
}
- /**
- *
- */
+ //---------------------------------------------------------------
protected void _connect(Client client) {
if (null == client) return;
@@ -84,9 +72,7 @@
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
protected void _disconnect(Client client) {
if (null == client) return;
@@ -102,9 +88,7 @@
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
public JSONObject getDescription() {
JSONObject result = new JSONObject();
@@ -120,5 +104,4 @@
return result;
}
-
}
diff --git a/weinre.server/src/weinre/server/Utility.java b/weinre.server/src/weinre/server/Utility.java
index 6c55e4a..260cc2b 100644
--- a/weinre.server/src/weinre/server/Utility.java
+++ b/weinre.server/src/weinre/server/Utility.java
@@ -14,21 +14,15 @@
import java.security.SecureRandom;
import java.util.Properties;
-/**
- *
- */
+//-------------------------------------------------------------------
public class Utility {
static private int SequenceNumber = 1 + new SecureRandom().nextInt(Integer.MAX_VALUE - 1);
- /**
- * class may not be instantiated
- */
+ //---------------------------------------------------------------
private Utility() {}
- /**
- *
- */
+ //---------------------------------------------------------------
static public synchronized int getNextSequenceNumber() {
int result = SequenceNumber;
@@ -37,9 +31,7 @@
return result;
}
- /**
- *
- */
+ //---------------------------------------------------------------
static public String reverse(String string) {
char[] responseChars = string.toCharArray();
@@ -51,9 +43,7 @@
return String.valueOf(responseChars);
}
- /**
- *
- */
+ //---------------------------------------------------------------
static public byte[] reverse(byte[] data, int offset, int length) {
byte[] response = new byte[length];
@@ -64,9 +54,7 @@
return response;
}
- /**
- *
- */
+ //---------------------------------------------------------------
static public Properties readPropertiesFile(String fileName) {
Properties result = new Properties();
@@ -101,9 +89,7 @@
return result;
}
- /**
- *
- */
+ //---------------------------------------------------------------
static public void writePropertiesFile(String fileName, Properties properties) {
String userHome = System.getProperty("user.home");
if (null == userHome) {
diff --git a/weinre.server/src/weinre/server/WatchDog.java b/weinre.server/src/weinre/server/WatchDog.java
index 3338524..9aa6553 100644
--- a/weinre.server/src/weinre/server/WatchDog.java
+++ b/weinre.server/src/weinre/server/WatchDog.java
@@ -9,16 +9,12 @@
import java.util.List;
-/**
- *
- */
+//-------------------------------------------------------------------
public class WatchDog {
public static long ChannelLivelinessTimeout = 5000;
- /**
- *
- */
+ //---------------------------------------------------------------
static public void start() {
final WatchDog watchDog = new WatchDog();
@@ -32,16 +28,12 @@
thread.start();
}
- /**
- *
- */
+ //---------------------------------------------------------------
private WatchDog() {
super();
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void run() {
while(true) {
sleep();
@@ -50,9 +42,7 @@
}
}
- /**
- * Note that this is the only place channels are closed, and eventually, connectors also.
- */
+ //---------------------------------------------------------------
private void checkForDeadChannels() {
List<Channel> channels = ChannelManager.$.getChannels();
@@ -68,9 +58,7 @@
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void sleep() {
try {
Thread.sleep(1000);
diff --git a/weinre.server/src/weinre/server/http/ClassPathResourceHandler.java b/weinre.server/src/weinre/server/http/ClassPathResourceHandler.java
index 3e10c27..13b0072 100644
--- a/weinre.server/src/weinre/server/http/ClassPathResourceHandler.java
+++ b/weinre.server/src/weinre/server/http/ClassPathResourceHandler.java
@@ -14,25 +14,19 @@
import org.eclipse.jetty.server.handler.ResourceHandler;
import org.eclipse.jetty.util.resource.Resource;
-/**
- *
- */
+//-------------------------------------------------------------------
public class ClassPathResourceHandler extends ResourceHandler {
private String pathPrefix;
- /**
- *
- */
+ //---------------------------------------------------------------
public ClassPathResourceHandler(String pathPrefix) {
super();
this.pathPrefix = pathPrefix;
}
- /**
- *
- */
+ //---------------------------------------------------------------
public Resource getResource(String path) throws MalformedURLException {
if ((path == null) || !path.startsWith("/")) {
throw new MalformedURLException(path);
diff --git a/weinre.server/src/weinre/server/http/DebugHandler.java b/weinre.server/src/weinre/server/http/DebugHandler.java
index 0bf649c..13e3f77 100644
--- a/weinre.server/src/weinre/server/http/DebugHandler.java
+++ b/weinre.server/src/weinre/server/http/DebugHandler.java
@@ -29,9 +29,7 @@
*/
public class DebugHandler extends HandlerWrapper {
- /**
- *
- */
+ //---------------------------------------------------------------
public void handle(String target, Request request, HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws IOException, ServletException {
try {
getHandler().handle(target, request, servletRequest, servletResponse);
@@ -45,9 +43,7 @@
dump(System.out, target, request, response);
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void dump(PrintStream oStream, String target, Request request, Response response) {
oStream.println("----------------------------------------------------------");
oStream.println("target: " + target);
@@ -60,9 +56,7 @@
oStream.println(" status: " + response.getStatus());
}
- /**
- *
- */
+ //---------------------------------------------------------------
@SuppressWarnings("rawtypes")
private void dumpHeaders(PrintStream oStream, Request request) {
Enumeration e = request.getHeaderNames();
diff --git a/weinre.server/src/weinre/server/http/FilteredRequestLogHandler.java b/weinre.server/src/weinre/server/http/FilteredRequestLogHandler.java
index 329f1fb..3a4fad1 100644
--- a/weinre.server/src/weinre/server/http/FilteredRequestLogHandler.java
+++ b/weinre.server/src/weinre/server/http/FilteredRequestLogHandler.java
@@ -16,14 +16,10 @@
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.RequestLogHandler;
-/**
- *
- */
+//-------------------------------------------------------------------
public class FilteredRequestLogHandler extends RequestLogHandler {
- /**
- *
- */
+ //---------------------------------------------------------------
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
int status = baseRequest.getResponse().getStatus();
diff --git a/weinre.server/src/weinre/server/http/HttpServer.java b/weinre.server/src/weinre/server/http/HttpServer.java
index c5f8013..21fc684 100644
--- a/weinre.server/src/weinre/server/http/HttpServer.java
+++ b/weinre.server/src/weinre/server/http/HttpServer.java
@@ -21,12 +21,13 @@
import weinre.server.Main;
import weinre.server.ServerSettings;
-
+//-------------------------------------------------------------------
public class HttpServer {
private Main main;
private ServerSettings settings;
+ //---------------------------------------------------------------
public HttpServer(Main main, ServerSettings settings) {
super();
@@ -34,6 +35,7 @@
this.settings = settings;
}
+ //---------------------------------------------------------------
public Server run() throws Exception {
String hostName = settings.getBoundHostValue();
String niceHostName = settings.getNiceHostName();
diff --git a/weinre.server/src/weinre/server/http/HttpSocketHandler.java b/weinre.server/src/weinre/server/http/HttpSocketHandler.java
index e85c5b2..df8a0e5 100644
--- a/weinre.server/src/weinre/server/http/HttpSocketHandler.java
+++ b/weinre.server/src/weinre/server/http/HttpSocketHandler.java
@@ -28,17 +28,12 @@
import weinre.server.Main;
import weinre.server.Utility;
-
-/**
- *
- */
+//-------------------------------------------------------------------
public class HttpSocketHandler extends AbstractHandler {
private String pathPrefix;
private int pathPrefixParts;
- /**
- *
- */
+ //---------------------------------------------------------------
public HttpSocketHandler(String pathPrefix) {
super();
@@ -46,9 +41,7 @@
this.pathPrefixParts = pathPrefix.split("/").length;
}
- /**
- *
- */
+ //---------------------------------------------------------------
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
// ! * pathPrefix*
@@ -121,18 +114,14 @@
response.sendError(405);
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void setCORSHeaders(HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Max-Age", "600");
response.setHeader("Access-Control-Allow-Methods", "GET, POST");
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void setCacheHeaders(HttpServletResponse response) {
response.setHeader("Pragma", "no-cache");
response.setHeader("Expires", "0");
@@ -140,17 +129,13 @@
response.setHeader("Cache-Control", "no-store");
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void handleOptions(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
response.setStatus(200);
response.setContentType("text/plain");
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void handleCreate(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
String channelName = "" + Utility.getNextSequenceNumber();
@@ -164,9 +149,7 @@
oStream.close();
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void handleGet(String channelName, String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
Channel channel = ChannelManager.$.getChannel(channelName, request.getRemoteAddr());
if (null == channel) {
@@ -193,9 +176,7 @@
oStream.close();
}
- /**
- *
- */
+ //---------------------------------------------------------------
private void printJSONList(ServletOutputStream oStream, List<String> json) throws IOException {
try {
oStream.print(new JSONArray(json).toString());
@@ -205,9 +186,7 @@
}
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void handlePost(String channelName, String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
Channel channel = ChannelManager.$.getChannel(channelName, request.getRemoteAddr());
if (null == channel) {
@@ -239,9 +218,7 @@
response.getOutputStream().close();
}
- /**
- *
- */
+ //---------------------------------------------------------------
private String readRequestBody(InputStream is) throws IOException {
StringBuffer stringBuffer = new StringBuffer();
Reader reader = new InputStreamReader(is, "UTF-8");
diff --git a/weinre.server/src/weinre/server/http/ProxyServer.java b/weinre.server/src/weinre/server/http/ProxyServer.java
index ccb2c38..e290bd7 100644
--- a/weinre.server/src/weinre/server/http/ProxyServer.java
+++ b/weinre.server/src/weinre/server/http/ProxyServer.java
@@ -22,16 +22,18 @@
import weinre.server.Main;
import weinre.server.ServerSettings;
-
+//-------------------------------------------------------------------
public class ProxyServer {
private ServerSettings settings;
+ //---------------------------------------------------------------
public ProxyServer(ServerSettings settings) {
super();
this.settings = settings;
}
+ //---------------------------------------------------------------
public void run() throws Exception {
SelectChannelConnector connector = new SelectChannelConnector();
diff --git a/weinre.server/src/weinre/server/service/ApplicationCache.java b/weinre.server/src/weinre/server/service/ApplicationCache.java
deleted file mode 100644
index b967c8d..0000000
--- a/weinre.server/src/weinre/server/service/ApplicationCache.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class ApplicationCache extends BasicService {
-
- public ApplicationCache() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/ApplicationCacheNotify.java b/weinre.server/src/weinre/server/service/ApplicationCacheNotify.java
deleted file mode 100644
index 17ca6a7..0000000
--- a/weinre.server/src/weinre/server/service/ApplicationCacheNotify.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class ApplicationCacheNotify extends BasicService {
-
- public ApplicationCacheNotify() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/BrowserDebugger.java b/weinre.server/src/weinre/server/service/BrowserDebugger.java
deleted file mode 100644
index 92104e1..0000000
--- a/weinre.server/src/weinre/server/service/BrowserDebugger.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class BrowserDebugger extends BasicService {
-
- public BrowserDebugger() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/CSS.java b/weinre.server/src/weinre/server/service/CSS.java
deleted file mode 100644
index 5de4667..0000000
--- a/weinre.server/src/weinre/server/service/CSS.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class CSS extends BasicService {
-
- public CSS() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/Console.java b/weinre.server/src/weinre/server/service/Console.java
deleted file mode 100644
index d7f1583..0000000
--- a/weinre.server/src/weinre/server/service/Console.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class Console extends BasicService {
-
- public Console() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/ConsoleNotify.java b/weinre.server/src/weinre/server/service/ConsoleNotify.java
deleted file mode 100644
index 0c4fd5b..0000000
--- a/weinre.server/src/weinre/server/service/ConsoleNotify.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class ConsoleNotify extends BasicService {
-
- public ConsoleNotify() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/DOM.java b/weinre.server/src/weinre/server/service/DOM.java
deleted file mode 100644
index 7090eae..0000000
--- a/weinre.server/src/weinre/server/service/DOM.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class DOM extends BasicService {
-
- public DOM() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/DOMNotify.java b/weinre.server/src/weinre/server/service/DOMNotify.java
deleted file mode 100644
index 4371b08..0000000
--- a/weinre.server/src/weinre/server/service/DOMNotify.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class DOMNotify extends BasicService {
-
- public DOMNotify() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/DOMStorage.java b/weinre.server/src/weinre/server/service/DOMStorage.java
deleted file mode 100644
index 7316434..0000000
--- a/weinre.server/src/weinre/server/service/DOMStorage.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class DOMStorage extends BasicService {
-
- public DOMStorage() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/DOMStorageNotify.java b/weinre.server/src/weinre/server/service/DOMStorageNotify.java
deleted file mode 100644
index e39e9a8..0000000
--- a/weinre.server/src/weinre/server/service/DOMStorageNotify.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class DOMStorageNotify extends BasicService {
-
- public DOMStorageNotify() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/Database.java b/weinre.server/src/weinre/server/service/Database.java
deleted file mode 100644
index e231089..0000000
--- a/weinre.server/src/weinre/server/service/Database.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class Database extends BasicService {
-
- public Database() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/DatabaseNotify.java b/weinre.server/src/weinre/server/service/DatabaseNotify.java
deleted file mode 100644
index 86eb797..0000000
--- a/weinre.server/src/weinre/server/service/DatabaseNotify.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class DatabaseNotify extends BasicService {
-
- public DatabaseNotify() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/Debugger.java b/weinre.server/src/weinre/server/service/Debugger.java
deleted file mode 100644
index ba68e82..0000000
--- a/weinre.server/src/weinre/server/service/Debugger.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class Debugger extends BasicService {
-
- public Debugger() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/DebuggerNotify.java b/weinre.server/src/weinre/server/service/DebuggerNotify.java
deleted file mode 100644
index ed4595c..0000000
--- a/weinre.server/src/weinre/server/service/DebuggerNotify.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class DebuggerNotify extends BasicService {
-
- public DebuggerNotify() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/FileSystem.java b/weinre.server/src/weinre/server/service/FileSystem.java
deleted file mode 100644
index 17a4917..0000000
--- a/weinre.server/src/weinre/server/service/FileSystem.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class FileSystem extends BasicService {
-
- public FileSystem() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/FileSystemNotify.java b/weinre.server/src/weinre/server/service/FileSystemNotify.java
deleted file mode 100644
index eae3783..0000000
--- a/weinre.server/src/weinre/server/service/FileSystemNotify.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class FileSystemNotify extends BasicService {
-
- public FileSystemNotify() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/InjectedScript.java b/weinre.server/src/weinre/server/service/InjectedScript.java
deleted file mode 100644
index 6eb568b..0000000
--- a/weinre.server/src/weinre/server/service/InjectedScript.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class InjectedScript extends BasicService {
-
- public InjectedScript() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/InjectedScriptHost.java b/weinre.server/src/weinre/server/service/InjectedScriptHost.java
deleted file mode 100644
index 48f3a31..0000000
--- a/weinre.server/src/weinre/server/service/InjectedScriptHost.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class InjectedScriptHost extends BasicService {
-
- public InjectedScriptHost() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/Inspector.java b/weinre.server/src/weinre/server/service/Inspector.java
deleted file mode 100644
index 69d88af..0000000
--- a/weinre.server/src/weinre/server/service/Inspector.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class Inspector extends BasicService {
-
- public Inspector() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/InspectorBackend.java b/weinre.server/src/weinre/server/service/InspectorBackend.java
deleted file mode 100644
index af8fe9c..0000000
--- a/weinre.server/src/weinre/server/service/InspectorBackend.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.wink.json4j.JSONArray;
-
-import weinre.server.Channel;
-import weinre.server.Connector;
-
-
-public abstract class InspectorBackend {
-
- public static String lastActivePanelName;
-
- /**
- *
- */
- public InspectorBackend() {
- super();
- }
-
- /**
- *
- */
- public String getInterfaceName() {
- return getClass().getSimpleName();
- }
-
- /**
- * forwards all requests to connected peers
- */
- public void __doesNotUnderstand(Channel channel, String methodName, JSONArray args) throws IOException {
- Connector connector = channel.getConnector();
- if (null == connector) return;
-
- List<Connector> connections = connector.getConnections();
-
- for (Connector connection: connections) {
- connection.getChannel().sendEvent(getInterfaceName(), methodName, args.toArray());
- }
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/InspectorFrontendHost.java b/weinre.server/src/weinre/server/service/InspectorFrontendHost.java
deleted file mode 100644
index 575dc03..0000000
--- a/weinre.server/src/weinre/server/service/InspectorFrontendHost.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class InspectorFrontendHost extends BasicService {
-
- public InspectorFrontendHost() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/InspectorNotify.java b/weinre.server/src/weinre/server/service/InspectorNotify.java
deleted file mode 100644
index 03eb7ac..0000000
--- a/weinre.server/src/weinre/server/service/InspectorNotify.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class InspectorNotify extends BasicService {
-
- public InspectorNotify() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/Network.java b/weinre.server/src/weinre/server/service/Network.java
deleted file mode 100644
index 45a6ab2..0000000
--- a/weinre.server/src/weinre/server/service/Network.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import java.io.IOException;
-
-import weinre.server.Channel;
-import weinre.server.Main;
-
-
-public class Network {
-
- public Network() {
- super();
- }
-
- public void cachedResources(Channel channel, String callbackId) throws IOException {
- Main.warn(getClass().getName() + ".cachedResources() not implemented");
-
-// channel.sendCallback("WiNetwork", callbackId, /*Object resources*/ (Object) null);
- }
-
-
- public void resourceContent(Channel channel, Long frameId, String url, Boolean base64Encode, String callbackId) throws IOException {
- Main.warn(getClass().getName() + ".resourceContent() not implemented");
-
-// channel.sendCallback("WiNetwork", callbackId, /*String content*/ (Object) null);
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/NetworkNotify.java b/weinre.server/src/weinre/server/service/NetworkNotify.java
deleted file mode 100644
index 51e616c..0000000
--- a/weinre.server/src/weinre/server/service/NetworkNotify.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class NetworkNotify extends BasicService {
-
- public NetworkNotify() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/Profiler.java b/weinre.server/src/weinre/server/service/Profiler.java
deleted file mode 100644
index 7670a35..0000000
--- a/weinre.server/src/weinre/server/service/Profiler.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class Profiler extends BasicService {
-
- public Profiler() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/ProfilerNotify.java b/weinre.server/src/weinre/server/service/ProfilerNotify.java
deleted file mode 100644
index 82d1e5a..0000000
--- a/weinre.server/src/weinre/server/service/ProfilerNotify.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class ProfilerNotify extends BasicService {
-
- public ProfilerNotify() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/Runtime.java b/weinre.server/src/weinre/server/service/Runtime.java
deleted file mode 100644
index 394e131..0000000
--- a/weinre.server/src/weinre/server/service/Runtime.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class Runtime extends BasicService {
-
- public Runtime() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/TimelineNotify.java b/weinre.server/src/weinre/server/service/TimelineNotify.java
deleted file mode 100644
index 320405b..0000000
--- a/weinre.server/src/weinre/server/service/TimelineNotify.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2011 IBM Corporation
- */
-
-package weinre.server.service;
-
-import weinre.server.BasicService;
-
-public class TimelineNotify extends BasicService {
-
- public TimelineNotify() {
- super();
- }
-
-}
diff --git a/weinre.server/src/weinre/server/service/WeinreClientCommands.java b/weinre.server/src/weinre/server/service/WeinreClientCommands.java
index 0de4882..c6563bb 100644
--- a/weinre.server/src/weinre/server/service/WeinreClientCommands.java
+++ b/weinre.server/src/weinre/server/service/WeinreClientCommands.java
@@ -18,15 +18,10 @@
import weinre.server.Main;
import weinre.server.Target;
-
-/**
- *
- */
+//-------------------------------------------------------------------
public class WeinreClientCommands {
- /**
- *
- */
+ //---------------------------------------------------------------
public void registerClient(Channel channel, String callbackId) throws IOException {
Client client = new Client(channel);
@@ -34,9 +29,7 @@
channel.sendEvent("WeinreClientEvents", "serverProperties", Main.getSettings().asProperties());
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void getTargets(Channel channel, String callbackId) throws IOException {
List<Target> targets = ConnectionManager.$.getTargets();
JSONArray targetResults = new JSONArray();
@@ -48,9 +41,7 @@
channel.sendCallback("WeinreClientEvents", callbackId, targetResults);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void getClients(Channel channel, String callbackId) throws IOException {
List<Client> clients = ConnectionManager.$.getClients();
JSONArray clientResults = new JSONArray();
@@ -62,9 +53,7 @@
channel.sendCallback("WeinreClientEvents", callbackId, clientResults);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void connectTarget(Channel channel, String clientId, String targetId, String callbackId) {
Client client = ConnectionManager.$.getClient(clientId);
if (client == null) return;
@@ -75,9 +64,7 @@
ConnectionManager.$.connect(client, target);
}
- /**
- *
- */
+ //---------------------------------------------------------------
public void disconnectTarget(Channel channel, String clientId, String callbackId) {
Client client = ConnectionManager.$.getClient(clientId);
if (client == null) return;
diff --git a/weinre.server/src/weinre/server/service/WeinreTargetCommands.java b/weinre.server/src/weinre/server/service/WeinreTargetCommands.java
index 10a80d2..b209504 100644
--- a/weinre.server/src/weinre/server/service/WeinreTargetCommands.java
+++ b/weinre.server/src/weinre/server/service/WeinreTargetCommands.java
@@ -15,24 +15,17 @@
import weinre.server.Main;
import weinre.server.Target;
-
-/**
- *
- */
+//-------------------------------------------------------------------
public class WeinreTargetCommands {
- /**
- *
- */
+ //---------------------------------------------------------------
public void registerTarget(Channel channel, String url, String callbackId) throws IOException {
Target target = new Target(channel, url);
channel.sendCallback("WeinreTargetEvents", callbackId, target.getName());
}
- /**
- *
- */
+ //---------------------------------------------------------------
@SuppressWarnings("unchecked")
public void sendClientCallback(Channel channel, String clientCallbackId, Object args, String callbackId) throws IOException {
Object[] argsArray;
@@ -58,9 +51,7 @@
channel.sendCallback("WeinreClientEvents", clientCallbackId, argsArray);
}
- /**
- *
- */
+ //---------------------------------------------------------------
private String getCallbackConnectorId(String callbackId) {
int index = callbackId.indexOf("::");
return callbackId.substring(0, index);
