/hg/icedtea-web: 2 new changesets
meyert at icedtea.classpath.org
meyert at icedtea.classpath.org
Sun Aug 19 07:53:58 PDT 2012
changeset 10fbfc9fbff0 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=10fbfc9fbff0
author: Thomas Meyer <thomas at m3y3r.de>
date: Sun Aug 19 16:49:54 2012 +0200
Fix some javadoc warnings
changeset 6e84854aecba in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6e84854aecba
author: Thomas Meyer <thomas at m3y3r.de>
date: Sun Aug 19 16:50:30 2012 +0200
Fix a small bug in the contain() method
diffstat:
ChangeLog | 13 +++++++
netx/net/sourceforge/jnlp/JNLPFile.java | 2 +-
netx/net/sourceforge/jnlp/LaunchHandler.java | 2 +-
netx/net/sourceforge/jnlp/PluginBridge.java | 2 +-
netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java | 2 +-
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 3 +-
netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java | 2 +-
plugin/icedteanp/java/sun/applet/PluginObjectStore.java | 20 ++++++----
8 files changed, 31 insertions(+), 15 deletions(-)
diffs (138 lines):
diff -r 4c7ca163824c -r 6e84854aecba ChangeLog
--- a/ChangeLog Fri Aug 17 17:16:25 2012 +0200
+++ b/ChangeLog Sun Aug 19 16:50:30 2012 +0200
@@ -1,3 +1,16 @@
+2012-08-19 Thomas Meyer <thomas at m3y3r.de>
+
+ * netx/net/sourceforge/jnlp/JNLPFile.java:
+ * netx/net/sourceforge/jnlp/LaunchHandler.java:
+ * netx/net/sourceforge/jnlp/PluginBridge.java:
+ * netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java:
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+ * netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java:
+ Fix javadoc warnings.
+ * plugin/icedteanp/java/sun/applet/PluginObjectStore.java (contains):
+ Fix a small bug that prevents the only user of this method
+ (PluginAppletSecurity line 1064) to work correctly.
+
2012-08-18 Jiri Vanek <jvanek at redhat.com>
added encodings reproducer (PR1108)
diff -r 4c7ca163824c -r 6e84854aecba netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java Fri Aug 17 17:16:25 2012 +0200
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java Sun Aug 19 16:50:30 2012 +0200
@@ -780,7 +780,7 @@
* jars it finds through getResourcesDescs(). If ever the implementation
* of that function should change to return copies of JARDescs objects,
* then the "jar == aJar" comparison below should change accordingly.
- * @param jar: the jar whose download options to get.
+ * @param jar the jar whose download options to get.
* @return the download options.
*/
public DownloadOptions getDownloadOptionsForJar(JARDesc jar) {
diff -r 4c7ca163824c -r 6e84854aecba netx/net/sourceforge/jnlp/LaunchHandler.java
--- a/netx/net/sourceforge/jnlp/LaunchHandler.java Fri Aug 17 17:16:25 2012 +0200
+++ b/netx/net/sourceforge/jnlp/LaunchHandler.java Sun Aug 19 16:50:30 2012 +0200
@@ -61,7 +61,7 @@
* but do not have everything required. This is a nice point to show the
* splash screen.
*
- * @param application the application instance that is starting
+ * @param file the JNLP file of the instance that is starting
*/
public void launchInitialized(JNLPFile file);
diff -r 4c7ca163824c -r 6e84854aecba netx/net/sourceforge/jnlp/PluginBridge.java
--- a/netx/net/sourceforge/jnlp/PluginBridge.java Fri Aug 17 17:16:25 2012 +0200
+++ b/netx/net/sourceforge/jnlp/PluginBridge.java Sun Aug 19 16:50:30 2012 +0200
@@ -211,7 +211,7 @@
}
/**
- * {@inheritdoc }
+ * {@inheritDoc }
*/
@Override
public DownloadOptions getDownloadOptionsForJar(JARDesc jar) {
diff -r 4c7ca163824c -r 6e84854aecba netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java Fri Aug 17 17:16:25 2012 +0200
+++ b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java Sun Aug 19 16:50:30 2012 +0200
@@ -58,7 +58,7 @@
* Returns a list of URLs that the resources might be downloadable from.
* The Resources may not be downloadable from any of them. The returned order is the order
* the urls should be attempted in.
- * @return
+ * @return a list of URLs that the resources might be downloadable from
*/
public List<URL> getUrls() {
List<URL> urls = new LinkedList<URL>();
diff -r 4c7ca163824c -r 6e84854aecba netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Aug 17 17:16:25 2012 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Sun Aug 19 16:50:30 2012 +0200
@@ -207,7 +207,8 @@
* Create a new JNLPClassLoader from the specified file.
*
* @param file the JNLP file
- * @param name of the application's main class
+ * @param policy the UpdatePolicy for this class loader
+ * @param mainName name of the application's main class
*/
protected JNLPClassLoader(JNLPFile file, UpdatePolicy policy, String mainName) throws LaunchException {
super(new URL[0], JNLPClassLoader.class.getClassLoader());
diff -r 4c7ca163824c -r 6e84854aecba netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java
--- a/netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java Fri Aug 17 17:16:25 2012 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java Sun Aug 19 16:50:30 2012 +0200
@@ -59,7 +59,7 @@
* Represents a Proxy Auto Config file. This object can be used to evaluate the
* proxy file to find the proxy for a given url.
*
- * @see http://en.wikipedia.org/wiki/Proxy_auto-config#The_PAC_file
+ * @see "http://en.wikipedia.org/wiki/Proxy_auto-config#The_PAC_file"
*/
public class RhinoBasedPacEvaluator implements PacEvaluator {
diff -r 4c7ca163824c -r 6e84854aecba plugin/icedteanp/java/sun/applet/PluginObjectStore.java
--- a/plugin/icedteanp/java/sun/applet/PluginObjectStore.java Fri Aug 17 17:16:25 2012 +0200
+++ b/plugin/icedteanp/java/sun/applet/PluginObjectStore.java Sun Aug 19 16:50:30 2012 +0200
@@ -45,9 +45,9 @@
enum PluginObjectStore {
INSTANCE;
- private HashMap<Integer, Object> objects = new HashMap<Integer, Object>();
- private HashMap<Integer, Integer> counts = new HashMap<Integer, Integer>();
- private HashMap<Object, Integer> identifiers = new HashMap<Object, Integer>();
+ private final Map<Integer, Object> objects = new HashMap<Integer, Object>();
+ private final Map<Integer, Integer> counts = new HashMap<Integer, Integer>();
+ private final Map<Object, Integer> identifiers = new HashMap<Object, Integer>();
private final Object lock = new Object();
private boolean wrapped = false;
@@ -64,20 +64,22 @@
}
public Integer getIdentifier(Object object) {
+ if (object == null)
+ return 0;
+
synchronized(lock) {
- if (object == null)
- return 0;
return identifiers.get(object);
}
}
public boolean contains(Object object) {
- synchronized(lock) {
- if (object == null)
+ if (object != null) {
+ synchronized(lock) {
return identifiers.containsKey(object);
+ }
+ }
+ return false;
- return false;
- }
}
public boolean contains(int identifier) {
More information about the distro-pkg-dev
mailing list