() {
+ @Override
+ public ModifiableClassLoaderRepository run() {
+ return instantiator != null ? instantiator.getClassLoaderRepository() : null;
+ }
+ });
+ }
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java Wed Jun 19 11:04:39 2013 +0100
@@ -27,12 +27,14 @@
import static com.sun.jmx.defaults.JmxProperties.MBEANSERVER_LOGGER;
+import java.security.Permission;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
+import javax.management.MBeanPermission;
import javax.management.ObjectName;
import javax.management.loading.PrivateClassLoader;
@@ -300,7 +302,19 @@
}
public final ClassLoader getClassLoader(ObjectName name) {
- return loadersWithNames.get(name);
+ ClassLoader instance = loadersWithNames.get(name);
+ if (instance != null) {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ Permission perm =
+ new MBeanPermission(instance.getClass().getName(),
+ null,
+ name,
+ "getClassLoader");
+ sm.checkPermission(perm);
+ }
+ }
+ return instance;
}
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java Wed Jun 19 11:04:39 2013 +0100
@@ -33,6 +33,7 @@
import javax.management.MBeanException;
import javax.management.openmbean.OpenDataException;
import javax.management.openmbean.OpenType;
+import sun.reflect.misc.MethodUtil;
final class ConvertingMethod {
static ConvertingMethod from(Method m) {
@@ -189,7 +190,7 @@
"from open values: " + e;
throw new MBeanException(e, msg);
}
- final Object javaReturn = method.invoke(obj, javaParams);
+ final Object javaReturn = MethodUtil.invoke(method, obj, javaParams);
try {
return returnMapping.toOpenValue(javaReturn);
} catch (OpenDataException e) {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java Wed Jun 19 11:04:39 2013 +0100
@@ -74,6 +74,8 @@
import javax.management.openmbean.TabularData;
import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
+import sun.reflect.misc.MethodUtil;
+import sun.reflect.misc.ReflectUtil;
/**
* A converter between Java types and the limited set of classes
@@ -299,6 +301,7 @@
private static > MXBeanMapping
makeEnumMapping(Class enumClass, Class fake) {
+ ReflectUtil.checkPackageAccess(enumClass);
return new EnumMapping(Util.>cast(enumClass));
}
@@ -423,6 +426,7 @@
(c.getName().equals("com.sun.management.GcInfo") &&
c.getClassLoader() == null);
+ ReflectUtil.checkPackageAccess(c);
final List methods =
MBeanAnalyzer.eliminateCovariantMethods(Arrays.asList(c.getMethods()));
final SortedMap getterMap = newSortedMap();
@@ -828,7 +832,7 @@
Object[] values = new Object[getters.length];
for (int i = 0; i < getters.length; i++) {
try {
- Object got = getters[i].invoke(value, (Object[]) null);
+ Object got = MethodUtil.invoke(getters[i], value, (Object[]) null);
values[i] = getterMappings[i].toOpenValue(got);
} catch (Exception e) {
throw openDataException("Error calling getter for " +
@@ -1011,7 +1015,7 @@
MXBeanMapping[] converters)
throws InvalidObjectException {
try {
- return fromMethod.invoke(null, cd);
+ return MethodUtil.invoke(fromMethod, null, new Object[] {cd});
} catch (Exception e) {
final String msg = "Failed to invoke from(CompositeData)";
throw invalidObjectException(msg, e);
@@ -1107,13 +1111,15 @@
throws InvalidObjectException {
Object o;
try {
- o = getTargetClass().newInstance();
+ final Class targetClass = getTargetClass();
+ ReflectUtil.checkPackageAccess(targetClass);
+ o = targetClass.newInstance();
for (int i = 0; i < itemNames.length; i++) {
if (cd.containsKey(itemNames[i])) {
Object openItem = cd.get(itemNames[i]);
Object javaItem =
converters[i].fromOpenValue(openItem);
- setters[i].invoke(o, javaItem);
+ MethodUtil.invoke(setters[i], o, new Object[] {javaItem});
}
}
} catch (Exception e) {
@@ -1363,6 +1369,7 @@
}
try {
+ ReflectUtil.checkPackageAccess(max.constructor.getDeclaringClass());
return max.constructor.newInstance(params);
} catch (Exception e) {
final String msg =
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java Wed Jun 19 11:04:39 2013 +0100
@@ -228,6 +228,11 @@
MXBeanIntrospector.getInstance().getAnalyzer(interfaceClass);
}
+ public static void testComplianceMBeanInterface(Class interfaceClass)
+ throws NotCompliantMBeanException{
+ StandardMBeanIntrospector.getInstance().getAnalyzer(interfaceClass);
+ }
+
/**
* Basic method for testing if a given class is a JMX compliant
* Standard MBean. This method is only called by the legacy code
@@ -248,6 +253,7 @@
throws NotCompliantMBeanException {
if (mbeanInterface == null)
mbeanInterface = getStandardMBeanInterface(baseClass);
+ ReflectUtil.checkPackageAccess(mbeanInterface);
MBeanIntrospector introspector = StandardMBeanIntrospector.getInstance();
return getClassMBeanInfo(introspector, baseClass, mbeanInterface);
}
@@ -372,13 +378,19 @@
for (Annotation a : annots) {
Class c = a.annotationType();
Method[] elements = c.getMethods();
+ boolean packageAccess = false;
for (Method element : elements) {
DescriptorKey key = element.getAnnotation(DescriptorKey.class);
if (key != null) {
String name = key.value();
Object value;
try {
- value = element.invoke(a);
+ // Avoid checking access more than once per annotation
+ if (!packageAccess) {
+ ReflectUtil.checkPackageAccess(c);
+ packageAccess = true;
+ }
+ value = MethodUtil.invoke(element, a, null);
} catch (RuntimeException e) {
// we don't expect this - except for possibly
// security exceptions?
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java Wed Jun 19 11:04:39 2013 +0100
@@ -32,6 +32,7 @@
import java.io.ObjectInputStream;
import java.security.AccessController;
import java.security.Permission;
+import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
import java.util.List;
import java.util.Set;
@@ -227,8 +228,16 @@
clr = new ClassLoaderRepositorySupport();
instantiator = new MBeanInstantiator(clr);
}
+
+ final MBeanInstantiator fInstantiator = instantiator;
this.secureClr = new
- SecureClassLoaderRepository(instantiator.getClassLoaderRepository());
+ SecureClassLoaderRepository(AccessController.doPrivileged(new PrivilegedAction() {
+ @Override
+ public ClassLoaderRepository run() {
+ return fInstantiator.getClassLoaderRepository();
+ }
+ })
+ );
if (delegate == null)
delegate = new MBeanServerDelegateImpl();
if (outer == null)
@@ -1242,8 +1251,14 @@
class loader. The ClassLoaderRepository knows how
to handle that case. */
ClassLoader myLoader = outerShell.getClass().getClassLoader();
- final ModifiableClassLoaderRepository loaders =
- instantiator.getClassLoaderRepository();
+ final ModifiableClassLoaderRepository loaders = AccessController.doPrivileged(new PrivilegedAction() {
+
+ @Override
+ public ModifiableClassLoaderRepository run() {
+ return instantiator.getClassLoaderRepository();
+ }
+ });
+
if (loaders != null) {
loaders.addClassLoader(myLoader);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java Wed Jun 19 11:04:39 2013 +0100
@@ -33,7 +33,12 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Modifier;
+import java.security.AccessControlContext;
+import java.security.AccessController;
import java.security.Permission;
+import java.security.Permissions;
+import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
import java.util.Map;
import java.util.logging.Level;
@@ -127,9 +132,8 @@
// Retrieve the class loader from the repository
ClassLoader loader = null;
- synchronized(this) {
- if (clr!=null)
- loader = clr.getClassLoader(aLoader);
+ synchronized (this) {
+ loader = getClassLoader(aLoader);
}
if (loader == null) {
throw new InstanceNotFoundException("The loader named " +
@@ -429,8 +433,7 @@
try {
ClassLoader instance = null;
- if (clr!=null)
- instance = clr.getClassLoader(loaderName);
+ instance = getClassLoader(loaderName);
if (instance == null)
throw new ClassNotFoundException(className);
theClass = Class.forName(className, false, instance);
@@ -622,6 +625,7 @@
* Return the Default Loader Repository used by this instantiator object.
**/
public ModifiableClassLoaderRepository getClassLoaderRepository() {
+ checkMBeanPermission((String)null, null, null, "getClassLoaderRepository");
return clr;
}
@@ -733,9 +737,19 @@
String member,
ObjectName objectName,
String actions) {
+ if (clazz != null) {
+ checkMBeanPermission(clazz.getName(), member, objectName, actions);
+ }
+ }
+
+ private static void checkMBeanPermission(String classname,
+ String member,
+ ObjectName objectName,
+ String actions)
+ throws SecurityException {
SecurityManager sm = System.getSecurityManager();
- if (clazz != null && sm != null) {
- Permission perm = new MBeanPermission(clazz.getName(),
+ if (sm != null) {
+ Permission perm = new MBeanPermission(classname,
member,
objectName,
actions);
@@ -751,4 +765,22 @@
throw new IllegalAccessException("Class is not public and can't be instantiated");
}
}
+
+ private ClassLoader getClassLoader(final ObjectName name) {
+ if(clr == null){
+ return null;
+ }
+ // Restrict to getClassLoader permission only
+ Permissions permissions = new Permissions();
+ permissions.add(new MBeanPermission("*", null, name, "getClassLoader"));
+ ProtectionDomain protectionDomain = new ProtectionDomain(null, permissions);
+ ProtectionDomain[] domains = {protectionDomain};
+ AccessControlContext ctx = new AccessControlContext(domains);
+ ClassLoader loader = AccessController.doPrivileged(new PrivilegedAction() {
+ public ClassLoader run() {
+ return clr.getClassLoader(name);
+ }
+ }, ctx);
+ return loader;
+ }
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java Wed Jun 19 11:04:39 2013 +0100
@@ -51,6 +51,7 @@
import javax.management.NotCompliantMBeanException;
import javax.management.NotificationBroadcaster;
import javax.management.ReflectionException;
+import sun.reflect.misc.ReflectUtil;
/**
* An introspector for MBeans of a certain type. There is one instance
@@ -175,7 +176,8 @@
/**
* Get the methods to be analyzed to build the MBean interface.
*/
- List getMethods(final Class mbeanType) {
+ final List getMethods(final Class mbeanType) {
+ ReflectUtil.checkPackageAccess(mbeanType);
return Arrays.asList(mbeanType.getMethods());
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java Wed Jun 19 11:04:39 2013 +0100
@@ -30,7 +30,7 @@
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectStreamClass;
-import java.io.StreamCorruptedException;
+import sun.reflect.misc.ReflectUtil;
/**
* This class deserializes an object in the context of a specific class loader.
@@ -61,6 +61,7 @@
return super.resolveClass(aClass);
} else {
String name = aClass.getName();
+ ReflectUtil.checkPackageAccess(name);
// Query the class loader ...
return Class.forName(name, false, loader);
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java Wed Jun 19 11:04:39 2013 +0100
@@ -38,6 +38,7 @@
import javax.management.NotCompliantMBeanException;
import javax.management.NotificationBroadcaster;
import javax.management.NotificationBroadcasterSupport;
+import sun.reflect.misc.MethodUtil;
/**
* @since 1.6
@@ -108,7 +109,7 @@
Object invokeM2(Method m, Object target, Object[] args, Object cookie)
throws InvocationTargetException, IllegalAccessException,
MBeanException {
- return m.invoke(target, args);
+ return MethodUtil.invoke(m, target, args);
}
@Override
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java
--- a/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -397,6 +397,20 @@
if (nextSeq < nextSequenceNumber()) {
candidate = notificationAt(nextSeq);
+ // Skip security check if NotificationBufferFilter is not overloaded
+ if (!(filter instanceof ServerNotifForwarder.NotifForwarderBufferFilter)) {
+ try {
+ ServerNotifForwarder.checkMBeanPermission(this.mBeanServer,
+ candidate.getObjectName(),"addNotificationListener");
+ } catch (InstanceNotFoundException | SecurityException e) {
+ if (logger.debugOn()) {
+ logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e);
+ }
+ ++nextSeq;
+ continue;
+ }
+ }
+
if (logger.debugOn()) {
logger.debug("fetchNotifications", "candidate: " +
candidate);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
--- a/jdk/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -226,8 +226,9 @@
* why we add the found notifications to a supplied List rather than
* just returning a boolean.
*/
- private final NotificationBufferFilter bufferFilter =
- new NotificationBufferFilter() {
+ private final NotifForwarderBufferFilter bufferFilter = new NotifForwarderBufferFilter();
+
+ final class NotifForwarderBufferFilter implements NotificationBufferFilter {
public void apply(List targetedNotifs,
ObjectName source, Notification notif) {
// We proceed in two stages here, to avoid holding the listenerMap
@@ -366,9 +367,16 @@
* Explicitly check the MBeanPermission for
* the current access control context.
*/
- public void checkMBeanPermission(
+ public final void checkMBeanPermission(
final ObjectName name, final String actions)
throws InstanceNotFoundException, SecurityException {
+ checkMBeanPermission(mbeanServer,name,actions);
+ }
+
+ static void checkMBeanPermission(
+ final MBeanServer mbs, final ObjectName name, final String actions)
+ throws InstanceNotFoundException, SecurityException {
+
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
AccessControlContext acc = AccessController.getContext();
@@ -378,7 +386,7 @@
new PrivilegedExceptionAction() {
public ObjectInstance run()
throws InstanceNotFoundException {
- return mbeanServer.getObjectInstance(name);
+ return mbs.getObjectInstance(name);
}
});
} catch (PrivilegedActionException e) {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java
--- a/jdk/src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java Wed Jun 19 11:04:39 2013 +0100
@@ -25,6 +25,8 @@
package com.sun.jmx.remote.util;
+import sun.reflect.misc.ReflectUtil;
+
public class OrderClassLoaders extends ClassLoader {
public OrderClassLoaders(ClassLoader cl1, ClassLoader cl2) {
super(cl1);
@@ -32,9 +34,10 @@
this.cl2 = cl2;
}
- protected Class findClass(String name) throws ClassNotFoundException {
+ protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
+ ReflectUtil.checkPackageAccess(name);
try {
- return super.findClass(name);
+ return super.loadClass(name, resolve);
} catch (ClassNotFoundException cne) {
if (cl2 != null) {
return cl2.loadClass(name);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java
--- a/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java Wed Jun 19 11:04:39 2013 +0100
@@ -396,7 +396,7 @@
// do we need to begin with the first token?
if(proto.charAt(0) != WILDCARD_TOKEN &&
- !value.toString().toLowerCase(Locale.ENGLISH).startsWith(
+ !value.toLowerCase(Locale.ENGLISH).startsWith(
subStrs.nextToken().toLowerCase(Locale.ENGLISH))) {
if(debug) {
System.out.println("faild initial test");
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AbstractDataLine.java
--- a/jdk/src/share/classes/com/sun/media/sound/AbstractDataLine.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AbstractDataLine.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,12 @@
package com.sun.media.sound;
-import java.util.Vector;
-
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.Control;
import javax.sound.sampled.DataLine;
import javax.sound.sampled.LineEvent;
import javax.sound.sampled.LineUnavailableException;
-import javax.sound.sampled.Mixer;
/**
@@ -46,13 +43,13 @@
// DEFAULTS
// default format
- protected /*final*/ AudioFormat defaultFormat;
+ private final AudioFormat defaultFormat;
// default buffer size in bytes
- protected /*final*/ int defaultBufferSize;
+ private final int defaultBufferSize;
// the lock for synchronization
- protected Object lock = new Object();
+ protected final Object lock = new Object();
// STATE
@@ -103,7 +100,7 @@
// DATA LINE METHODS
- public void open(AudioFormat format, int bufferSize) throws LineUnavailableException {
+ public final void open(AudioFormat format, int bufferSize) throws LineUnavailableException {
//$$fb 2001-10-09: Bug #4517739: avoiding deadlock by synchronizing to mixer !
synchronized (mixer) {
if (Printer.trace) Printer.trace("> AbstractDataLine.open(format, bufferSize) (class: "+getClass().getName());
@@ -152,7 +149,7 @@
}
- public void open(AudioFormat format) throws LineUnavailableException {
+ public final void open(AudioFormat format) throws LineUnavailableException {
open(format, AudioSystem.NOT_SPECIFIED);
}
@@ -181,7 +178,7 @@
}
- public void start() {
+ public final void start() {
//$$fb 2001-10-09: Bug #4517739: avoiding deadlock by synchronizing to mixer !
synchronized(mixer) {
if (Printer.trace) Printer.trace("> "+getClass().getName()+".start() - AbstractDataLine");
@@ -205,7 +202,7 @@
}
- public void stop() {
+ public final void stop() {
//$$fb 2001-10-09: Bug #4517739: avoiding deadlock by synchronizing to mixer !
synchronized(mixer) {
@@ -249,16 +246,16 @@
// in MixerSourceLine and MixerClip, and I want to touch as little
// code as possible to change isStarted() back to isRunning().
- public boolean isRunning() {
+ public final boolean isRunning() {
return started;
}
- public boolean isActive() {
+ public final boolean isActive() {
return active;
}
- public long getMicrosecondPosition() {
+ public final long getMicrosecondPosition() {
long microseconds = getLongFramePosition();
if (microseconds != AudioSystem.NOT_SPECIFIED) {
@@ -268,26 +265,26 @@
}
- public AudioFormat getFormat() {
+ public final AudioFormat getFormat() {
return format;
}
- public int getBufferSize() {
+ public final int getBufferSize() {
return bufferSize;
}
/**
* This implementation does NOT change the buffer size
*/
- public int setBufferSize(int newSize) {
+ public final int setBufferSize(int newSize) {
return getBufferSize();
}
/**
* This implementation returns AudioSystem.NOT_SPECIFIED.
*/
- public float getLevel() {
+ public final float getLevel() {
return (float)AudioSystem.NOT_SPECIFIED;
}
@@ -304,7 +301,7 @@
// it to isStartedRunning(). This is part of backing out the
// change denied in RFE 4297981.
- protected boolean isStartedRunning() {
+ final boolean isStartedRunning() {
return running;
}
@@ -312,7 +309,7 @@
* This method sets the active state and generates
* events if it changes.
*/
- protected void setActive(boolean active) {
+ final void setActive(boolean active) {
if (Printer.trace) Printer.trace("> AbstractDataLine: setActive(" + active + ")");
@@ -351,7 +348,7 @@
* This method sets the started state and generates
* events if it changes.
*/
- protected void setStarted(boolean started) {
+ final void setStarted(boolean started) {
if (Printer.trace) Printer.trace("> AbstractDataLine: setStarted(" + started + ")");
@@ -388,7 +385,7 @@
* This method generates a STOP event and sets the started state to false.
* It is here for historic reasons when an EOM event existed.
*/
- protected void setEOM() {
+ final void setEOM() {
if (Printer.trace) Printer.trace("> AbstractDataLine: setEOM()");
//$$fb 2002-04-21: sometimes, 2 STOP events are generated.
@@ -408,7 +405,7 @@
* line is open, this should return quietly because the values
* requested will match the current ones.
*/
- public void open() throws LineUnavailableException {
+ public final void open() throws LineUnavailableException {
if (Printer.trace) Printer.trace("> "+getClass().getName()+".open() - AbstractDataLine");
@@ -422,7 +419,7 @@
* This should also stop the line. The closed line should not be running or active.
* After we close the line, we reset the format and buffer size to the defaults.
*/
- public void close() {
+ public final void close() {
//$$fb 2001-10-09: Bug #4517739: avoiding deadlock by synchronizing to mixer !
synchronized (mixer) {
if (Printer.trace) Printer.trace("> "+getClass().getName()+".close() - in AbstractDataLine.");
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AbstractLine.java
--- a/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,12 @@
package com.sun.media.sound;
+import java.util.Map;
import java.util.Vector;
+import java.util.WeakHashMap;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.Control;
-import javax.sound.sampled.Mixer;
import javax.sound.sampled.Line;
import javax.sound.sampled.LineEvent;
import javax.sound.sampled.LineListener;
@@ -43,28 +44,17 @@
*/
abstract class AbstractLine implements Line {
- protected Line.Info info;
+ protected final Line.Info info;
protected Control[] controls;
- protected AbstractMixer mixer;
+ AbstractMixer mixer;
private boolean open = false;
- private Vector listeners = new Vector();
+ private final Vector listeners = new Vector();
/**
- * Global event thread
+ * Contains event dispatcher per thread group.
*/
- private static final EventDispatcher eventDispatcher;
-
- static {
- // create and start the global event thread
-
- // $$kk: 12.21.98:
- // 1) probably don't want a single global event queue
- // 2) need a way to stop this thread when the engine is done
-
- eventDispatcher = new EventDispatcher();
- eventDispatcher.start();
- }
-
+ private static final Map dispatchers =
+ new WeakHashMap<>();
/**
* Constructs a new AbstractLine.
@@ -85,18 +75,17 @@
// LINE METHODS
- public Line.Info getLineInfo() {
+ public final Line.Info getLineInfo() {
return info;
}
- public boolean isOpen() {
+ public final boolean isOpen() {
return open;
}
- public void addLineListener(LineListener listener) {
-
+ public final void addLineListener(LineListener listener) {
synchronized(listeners) {
if ( ! (listeners.contains(listener)) ) {
listeners.addElement(listener);
@@ -109,7 +98,7 @@
* Removes an audio listener.
* @param listener listener to remove
*/
- public void removeLineListener(LineListener listener) {
+ public final void removeLineListener(LineListener listener) {
listeners.removeElement(listener);
}
@@ -120,8 +109,7 @@
* array of length 0.
* @return control set
*/
- public Control[] getControls() {
-
+ public final Control[] getControls() {
Control[] returnedArray = new Control[controls.length];
for (int i = 0; i < controls.length; i++) {
@@ -132,8 +120,7 @@
}
- public boolean isControlSupported(Control.Type controlType) {
-
+ public final boolean isControlSupported(Control.Type controlType) {
// protect against a NullPointerException
if (controlType == null) {
return false;
@@ -149,8 +136,7 @@
}
- public Control getControl(Control.Type controlType) {
-
+ public final Control getControl(Control.Type controlType) {
// protect against a NullPointerException
if (controlType != null) {
@@ -172,7 +158,7 @@
* This method sets the open state and generates
* events if it changes.
*/
- protected void setOpen(boolean open) {
+ final void setOpen(boolean open) {
if (Printer.trace) Printer.trace("> "+getClass().getName()+" (AbstractLine): setOpen(" + open + ") this.open: " + this.open);
@@ -200,8 +186,8 @@
/**
* Send line events.
*/
- protected void sendEvents(LineEvent event) {
- eventDispatcher.sendAudioEvents(event, listeners);
+ final void sendEvents(LineEvent event) {
+ getEventDispatcher().sendAudioEvents(event, listeners);
}
@@ -227,12 +213,23 @@
// $$kk: 06.03.99: returns the mixer used in construction.
// this is a hold-over from when there was a public method like
// this on line and should be fixed!!
- protected AbstractMixer getMixer() {
+ final AbstractMixer getMixer() {
return mixer;
}
- protected EventDispatcher getEventDispatcher() {
- return eventDispatcher;
+ final EventDispatcher getEventDispatcher() {
+ // create and start the global event thread
+ //TODO need a way to stop this thread when the engine is done
+ final ThreadGroup tg = Thread.currentThread().getThreadGroup();
+ synchronized (dispatchers) {
+ EventDispatcher eventDispatcher = dispatchers.get(tg);
+ if (eventDispatcher == null) {
+ eventDispatcher = new EventDispatcher();
+ dispatchers.put(tg, eventDispatcher);
+ eventDispatcher.start();
+ }
+ return eventDispatcher;
+ }
}
// ABSTRACT METHODS
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java
--- a/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -60,12 +60,12 @@
// DEVICE ATTRIBUTES
- private MidiDevice.Info info;
+ private final MidiDevice.Info info;
// DEVICE STATE
- protected /*private*/ boolean open = false;
+ private boolean open = false;
private int openRefCount;
/** List of Receivers and Transmitters that opened the device implicitely.
@@ -102,7 +102,7 @@
// MIDI DEVICE METHODS
- public MidiDevice.Info getDeviceInfo() {
+ public final MidiDevice.Info getDeviceInfo() {
return info;
}
@@ -111,7 +111,7 @@
* opened the the device implicitly from closing it. The only way to close the device after
* this call is a call to close().
*/
- public void open() throws MidiUnavailableException {
+ public final void open() throws MidiUnavailableException {
if (Printer.trace) Printer.trace("> AbstractMidiDevice: open()");
synchronized(this) {
openRefCount = -1;
@@ -159,7 +159,7 @@
}
- public void close() {
+ public final void close() {
if (Printer.trace) Printer.trace("> AbstractMidiDevice: close()");
synchronized (this) {
doClose();
@@ -181,7 +181,7 @@
* @param object The object that might have been opening the device implicitely (for now,
* this may be a Transmitter or receiver).
*/
- public void closeInternal(Object object) {
+ public final void closeInternal(Object object) {
if (Printer.trace) Printer.trace("> AbstractMidiDevice: closeInternal()");
synchronized(this) {
if (getOpenKeepingObjects().remove(object)) {
@@ -197,7 +197,7 @@
}
- public void doClose() {
+ public final void doClose() {
if (Printer.trace) Printer.trace("> AbstractMidiDevice: doClose()");
synchronized(this) {
if (isOpen()) {
@@ -209,7 +209,7 @@
}
- public boolean isOpen() {
+ public final boolean isOpen() {
return open;
}
@@ -329,7 +329,7 @@
// HELPER METHODS
- long getId() {
+ final long getId() {
return id;
}
@@ -339,7 +339,8 @@
/** Retrieve a Receiver and open the device implicitly.
This method is called by MidiSystem.getReceiver().
*/
- public Receiver getReceiverReferenceCounting() throws MidiUnavailableException {
+ public final Receiver getReceiverReferenceCounting()
+ throws MidiUnavailableException {
/* Keep this order of commands! If getReceiver() throws an exception,
openInternal() should not be called!
*/
@@ -355,7 +356,8 @@
/** Retrieve a Transmitter and open the device implicitly.
This method is called by MidiSystem.getTransmitter().
*/
- public Transmitter getTransmitterReferenceCounting() throws MidiUnavailableException {
+ public final Transmitter getTransmitterReferenceCounting()
+ throws MidiUnavailableException {
/* Keep this order of commands! If getTransmitter() throws an exception,
openInternal() should not be called!
*/
@@ -422,7 +424,7 @@
/** Return the internal list of Transmitters, possibly creating it first.
*/
- protected TransmitterList getTransmitterList() {
+ final TransmitterList getTransmitterList() {
synchronized (traRecLock) {
if (transmitterList == null) {
transmitterList = new TransmitterList();
@@ -462,7 +464,7 @@
/**
* close this device if discarded by the garbage collector
*/
- protected void finalize() {
+ protected final void finalize() {
close();
}
@@ -534,7 +536,7 @@
* Also, it has some optimizations regarding sending to the Receivers,
* for known Receivers, and managing itself in the TransmitterList.
*/
- protected class BasicTransmitter implements MidiDeviceTransmitter {
+ class BasicTransmitter implements MidiDeviceTransmitter {
private Receiver receiver = null;
TransmitterList tlist = null;
@@ -546,7 +548,7 @@
this.tlist = tlist;
}
- public void setReceiver(Receiver receiver) {
+ public final void setReceiver(Receiver receiver) {
if (tlist != null && this.receiver != receiver) {
if (Printer.debug) Printer.debug("Transmitter "+toString()+": set receiver "+receiver);
tlist.receiverChanged(this, this.receiver, receiver);
@@ -554,7 +556,7 @@
}
}
- public Receiver getReceiver() {
+ public final Receiver getReceiver() {
return receiver;
}
@@ -564,7 +566,7 @@
* Therefore, subclasses that override this method must call
* 'super.close()'.
*/
- public void close() {
+ public final void close() {
AbstractMidiDevice.this.closeInternal(this);
if (tlist != null) {
tlist.receiverChanged(this, this.receiver, null);
@@ -573,7 +575,7 @@
}
}
- public MidiDevice getMidiDevice() {
+ public final MidiDevice getMidiDevice() {
return AbstractMidiDevice.this;
}
@@ -583,9 +585,9 @@
/**
* a class to manage a list of transmitters
*/
- class TransmitterList {
+ final class TransmitterList {
- private ArrayList transmitters = new ArrayList();
+ private final ArrayList transmitters = new ArrayList();
private MidiOutDevice.MidiOutReceiver midiOutReceiver;
// how many transmitters must be present for optimized
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java
--- a/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
*/
public abstract class AbstractMidiDeviceProvider extends MidiDeviceProvider {
- private static boolean enabled;
+ private static final boolean enabled;
/**
* Create objects representing all MIDI output devices on the system.
@@ -52,7 +52,7 @@
}
- synchronized void readDeviceInfos() {
+ final synchronized void readDeviceInfos() {
Info[] infos = getInfoCache();
MidiDevice[] devices = getDeviceCache();
if (!enabled) {
@@ -118,7 +118,7 @@
}
- public MidiDevice.Info[] getDeviceInfo() {
+ public final MidiDevice.Info[] getDeviceInfo() {
readDeviceInfos();
Info[] infos = getInfoCache();
MidiDevice.Info[] localArray = new MidiDevice.Info[infos.length];
@@ -127,7 +127,7 @@
}
- public MidiDevice getDevice(MidiDevice.Info info) {
+ public final MidiDevice getDevice(MidiDevice.Info info) {
if (info instanceof Info) {
readDeviceInfos();
MidiDevice[] devices = getDeviceCache();
@@ -164,7 +164,7 @@
this.index = index;
}
- boolean equalStrings(Info info) {
+ final boolean equalStrings(Info info) {
return (info != null
&& getName().equals(info.getName())
&& getVendor().equals(info.getVendor())
@@ -172,11 +172,11 @@
&& getVersion().equals(info.getVersion()));
}
- int getIndex() {
+ final int getIndex() {
return index;
}
- void setIndex(int index) {
+ final void setIndex(int index) {
this.index = index;
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AbstractMixer.java
--- a/jdk/src/share/classes/com/sun/media/sound/AbstractMixer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AbstractMixer.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,14 +27,9 @@
import java.util.Vector;
-import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.Control;
-import javax.sound.sampled.DataLine;
import javax.sound.sampled.Mixer;
import javax.sound.sampled.Line;
-import javax.sound.sampled.LineEvent;
-import javax.sound.sampled.LineListener;
import javax.sound.sampled.LineUnavailableException;
/**
@@ -95,13 +90,13 @@
/**
* Source lines (ports) currently open
*/
- protected Vector sourceLines = new Vector();
+ private final Vector sourceLines = new Vector();
/**
* Target lines currently open.
*/
- protected Vector targetLines = new Vector();
+ private final Vector targetLines = new Vector();
/**
@@ -133,19 +128,19 @@
// MIXER METHODS
- public Mixer.Info getMixerInfo() {
+ public final Mixer.Info getMixerInfo() {
return mixerInfo;
}
- public Line.Info[] getSourceLineInfo() {
+ public final Line.Info[] getSourceLineInfo() {
Line.Info[] localArray = new Line.Info[sourceLineInfo.length];
System.arraycopy(sourceLineInfo, 0, localArray, 0, sourceLineInfo.length);
return localArray;
}
- public Line.Info[] getTargetLineInfo() {
+ public final Line.Info[] getTargetLineInfo() {
Line.Info[] localArray = new Line.Info[targetLineInfo.length];
System.arraycopy(targetLineInfo, 0, localArray, 0, targetLineInfo.length);
@@ -153,7 +148,7 @@
}
- public Line.Info[] getSourceLineInfo(Line.Info info) {
+ public final Line.Info[] getSourceLineInfo(Line.Info info) {
int i;
Vector vec = new Vector();
@@ -174,7 +169,7 @@
}
- public Line.Info[] getTargetLineInfo(Line.Info info) {
+ public final Line.Info[] getTargetLineInfo(Line.Info info) {
int i;
Vector vec = new Vector();
@@ -195,7 +190,7 @@
}
- public boolean isLineSupported(Line.Info info) {
+ public final boolean isLineSupported(Line.Info info) {
int i;
@@ -227,7 +222,7 @@
protected abstract void implClose();
- public Line[] getSourceLines() {
+ public final Line[] getSourceLines() {
Line[] localLines;
@@ -244,7 +239,7 @@
}
- public Line[] getTargetLines() {
+ public final Line[] getTargetLines() {
Line[] localLines;
@@ -264,7 +259,7 @@
/**
* Default implementation always throws an exception.
*/
- public void synchronize(Line[] lines, boolean maintainSync) {
+ public final void synchronize(Line[] lines, boolean maintainSync) {
throw new IllegalArgumentException("Synchronization not supported by this mixer.");
}
@@ -272,7 +267,7 @@
/**
* Default implementation always throws an exception.
*/
- public void unsynchronize(Line[] lines) {
+ public final void unsynchronize(Line[] lines) {
throw new IllegalArgumentException("Synchronization not supported by this mixer.");
}
@@ -280,7 +275,8 @@
/**
* Default implementation always returns false.
*/
- public boolean isSynchronizationSupported(Line[] lines, boolean maintainSync) {
+ public final boolean isSynchronizationSupported(Line[] lines,
+ boolean maintainSync) {
return false;
}
@@ -290,14 +286,14 @@
/**
* This implementation tries to open the mixer with its current format and buffer size settings.
*/
- public synchronized void open() throws LineUnavailableException {
+ public final synchronized void open() throws LineUnavailableException {
open(true);
}
/**
* This implementation tries to open the mixer with its current format and buffer size settings.
*/
- protected synchronized void open(boolean manual) throws LineUnavailableException {
+ final synchronized void open(boolean manual) throws LineUnavailableException {
if (Printer.trace) Printer.trace(">> AbstractMixer: open()");
if (!isOpen()) {
implOpen();
@@ -322,7 +318,7 @@
* The mixer may be opened at a format different than the line's
* format if it is a DataLine.
*/
- protected synchronized void open(Line line) throws LineUnavailableException {
+ final synchronized void open(Line line) throws LineUnavailableException {
if (Printer.trace) Printer.trace(">> AbstractMixer: open(line = " + line + ")");
@@ -367,7 +363,7 @@
* open target lines, if it exists in either.
* If the list is now empty, closes the mixer.
*/
- protected synchronized void close(Line line) {
+ final synchronized void close(Line line) {
if (Printer.trace) Printer.trace(">> AbstractMixer: close(" + line + ")");
@@ -396,7 +392,7 @@
/**
* Close all lines and then close this mixer.
*/
- public synchronized void close() {
+ public final synchronized void close() {
if (Printer.trace) Printer.trace(">> AbstractMixer: close()");
if (isOpen()) {
// close all source lines
@@ -423,7 +419,7 @@
/**
* Starts the mixer.
*/
- protected synchronized void start(Line line) {
+ final synchronized void start(Line line) {
if (Printer.trace) Printer.trace(">> AbstractMixer: start(" + line + ")");
@@ -447,7 +443,7 @@
/**
* Stops the mixer if this was the last running line.
*/
- protected synchronized void stop(Line line) {
+ final synchronized void stop(Line line) {
if (Printer.trace) Printer.trace(">> AbstractMixer: stop(" + line + ")");
@@ -501,7 +497,7 @@
* Right now this just checks whether it's supported, but should
* check whether it actually belongs to this mixer....
*/
- boolean isSourceLine(Line.Info info) {
+ final boolean isSourceLine(Line.Info info) {
for (int i = 0; i < sourceLineInfo.length; i++) {
if (info.matches(sourceLineInfo[i])) {
@@ -518,7 +514,7 @@
* Right now this just checks whether it's supported, but should
* check whether it actually belongs to this mixer....
*/
- boolean isTargetLine(Line.Info info) {
+ final boolean isTargetLine(Line.Info info) {
for (int i = 0; i < targetLineInfo.length; i++) {
if (info.matches(targetLineInfo[i])) {
@@ -535,7 +531,7 @@
* matches the one specified, or null if no matching Line.Info
* object is found.
*/
- Line.Info getLineInfo(Line.Info info) {
+ final Line.Info getLineInfo(Line.Info info) {
if (info == null) {
return null;
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AiffFileFormat.java
--- a/jdk/src/share/classes/com/sun/media/sound/AiffFileFormat.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AiffFileFormat.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
* @author Jan Borgersen
*/
-class AiffFileFormat extends AudioFileFormat {
+final class AiffFileFormat extends AudioFileFormat {
static final int AIFF_MAGIC = 1179603533;
@@ -62,13 +62,13 @@
//$$fb 2001-07-13: added management of header size in this class
/** header size in bytes */
- private int headerSize=AIFF_HEADERSIZE;
+ private final int headerSize=AIFF_HEADERSIZE;
/** comm chunk size in bytes, inclusive magic and length field */
- private int commChunkSize=26;
+ private final int commChunkSize=26;
/** FVER chunk size in bytes, inclusive magic and length field */
- private int fverChunkSize=0;
+ private final int fverChunkSize=0;
AiffFileFormat( AudioFileFormat aff ) {
this( aff.getType(), aff.getByteLength(), aff.getFormat(), aff.getFrameLength() );
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AiffFileReader.java
--- a/jdk/src/share/classes/com/sun/media/sound/AiffFileReader.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AiffFileReader.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,28 +25,17 @@
package com.sun.media.sound;
-import java.util.Vector;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.EOFException;
import java.net.URL;
-import java.net.MalformedURLException;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.DataInputStream;
-import java.io.FileInputStream;
-import java.io.DataOutputStream;
-import java.io.FileOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.SequenceInputStream;
import javax.sound.sampled.AudioFileFormat;
+import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.UnsupportedAudioFileException;
@@ -58,19 +47,10 @@
* @author Jan Borgersen
* @author Florian Bomers
*/
-public class AiffFileReader extends SunFileReader {
+public final class AiffFileReader extends SunFileReader {
private static final int MAX_READ_LENGTH = 8;
-
- /**
- * AIFF parser type
- */
- public static final AudioFileFormat.Type types[] = {
- AudioFileFormat.Type.AIFF
- };
-
-
/**
* Constructs a new AiffParser object.
*/
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AiffFileWriter.java
--- a/jdk/src/share/classes/com/sun/media/sound/AiffFileWriter.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AiffFileWriter.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -50,21 +50,13 @@
*
* @author Jan Borgersen
*/
-public class AiffFileWriter extends SunFileWriter {
-
- /**
- * AIFF type
- */
- private static final AudioFileFormat.Type aiffTypes[] = {
- AudioFileFormat.Type.AIFF
- };
-
+public final class AiffFileWriter extends SunFileWriter {
/**
* Constructs a new AiffFileWriter object.
*/
public AiffFileWriter() {
- super(aiffTypes);
+ super(new AudioFileFormat.Type[]{AudioFileFormat.Type.AIFF});
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AlawCodec.java
--- a/jdk/src/share/classes/com/sun/media/sound/AlawCodec.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AlawCodec.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,12 @@
package com.sun.media.sound;
-import java.io.InputStream;
import java.io.IOException;
-
import java.util.Vector;
import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.AudioInputStream;
/**
@@ -40,12 +38,12 @@
*
* @author Kara Kytle
*/
-public class AlawCodec extends SunCodec {
+public final class AlawCodec extends SunCodec {
/* Tables used for A-law decoding */
- final static byte ALAW_TABH[] = new byte[256];
- final static byte ALAW_TABL[] = new byte[256];
+ private static final byte[] ALAW_TABH = new byte[256];
+ private static final byte[] ALAW_TABL = new byte[256];
private static final AudioFormat.Encoding[] alawEncodings = { AudioFormat.Encoding.ALAW, AudioFormat.Encoding.PCM_SIGNED };
@@ -256,7 +254,7 @@
}
- class AlawCodecStream extends AudioInputStream {
+ final class AlawCodecStream extends AudioInputStream {
// tempBuffer required only for encoding (when encode is true)
private static final int tempBufferSize = 64;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AuFileFormat.java
--- a/jdk/src/share/classes/com/sun/media/sound/AuFileFormat.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AuFileFormat.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
* @author Jan Borgersen
*/
-class AuFileFormat extends AudioFileFormat {
+final class AuFileFormat extends AudioFileFormat {
// magic numbers
static final int AU_SUN_MAGIC = 0x2e736e64;
@@ -60,7 +60,7 @@
static final int AU_HEADERSIZE = 24;
- int auType;
+ private int auType;
AuFileFormat( AudioFileFormat aff ) {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AuFileReader.java
--- a/jdk/src/share/classes/com/sun/media/sound/AuFileReader.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AuFileReader.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,28 +25,17 @@
package com.sun.media.sound;
-import java.util.Vector;
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.EOFException;
import java.net.URL;
-import java.net.MalformedURLException;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.DataInputStream;
-import java.io.FileInputStream;
-import java.io.DataOutputStream;
-import java.io.FileOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.SequenceInputStream;
import javax.sound.sampled.AudioFileFormat;
+import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.UnsupportedAudioFileException;
@@ -58,16 +47,7 @@
* @author Jan Borgersen
* @author Florian Bomers
*/
-public class AuFileReader extends SunFileReader {
-
- /**
- * AU reader type
- */
-
- public static final AudioFileFormat.Type types[] = {
- AudioFileFormat.Type.AU
- };
-
+public final class AuFileReader extends SunFileReader {
/**
* Constructs a new AuFileReader object.
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AuFileWriter.java
--- a/jdk/src/share/classes/com/sun/media/sound/AuFileWriter.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AuFileWriter.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,28 +49,18 @@
*
* @author Jan Borgersen
*/
-public class AuFileWriter extends SunFileWriter {
+public final class AuFileWriter extends SunFileWriter {
//$$fb value for length field if length is not known
public final static int UNKNOWN_SIZE=-1;
/**
- * AU type
- */
- private static final AudioFileFormat.Type auTypes[] = {
- AudioFileFormat.Type.AU
- };
-
-
- /**
* Constructs a new AuFileWriter object.
*/
public AuFileWriter() {
- super(auTypes);
+ super(new AudioFileFormat.Type[]{AudioFileFormat.Type.AU});
}
-
-
public AudioFileFormat.Type[] getAudioFileTypes(AudioInputStream stream) {
AudioFileFormat.Type[] filetypes = new AudioFileFormat.Type[types.length];
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java
--- a/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
*
* @author Karl Helgason
*/
-public class AudioFileSoundbankReader extends SoundbankReader {
+public final class AudioFileSoundbankReader extends SoundbankReader {
public Soundbank getSoundbank(URL url)
throws InvalidMidiDataException, IOException {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java
--- a/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@
private static class AudioFloatLSBFilter extends AudioFloatConverter {
- private AudioFloatConverter converter;
+ private final AudioFloatConverter converter;
final private int offset;
@@ -61,8 +61,7 @@
private byte[] mask_buffer;
- public AudioFloatLSBFilter(AudioFloatConverter converter,
- AudioFormat format) {
+ AudioFloatLSBFilter(AudioFloatConverter converter, AudioFormat format) {
int bits = format.getSampleSizeInBits();
boolean bigEndian = format.isBigEndian();
this.converter = converter;
@@ -740,7 +739,7 @@
final int xbytes;
- public AudioFloatConversion32xSL(int xbytes) {
+ AudioFloatConversion32xSL(int xbytes) {
this.xbytes = xbytes;
}
@@ -781,7 +780,7 @@
final int xbytes;
- public AudioFloatConversion32xSB(int xbytes) {
+ AudioFloatConversion32xSB(int xbytes) {
this.xbytes = xbytes;
}
@@ -823,7 +822,7 @@
final int xbytes;
- public AudioFloatConversion32xUL(int xbytes) {
+ AudioFloatConversion32xUL(int xbytes) {
this.xbytes = xbytes;
}
@@ -866,7 +865,7 @@
final int xbytes;
- public AudioFloatConversion32xUB(int xbytes) {
+ AudioFloatConversion32xUB(int xbytes) {
this.xbytes = xbytes;
}
@@ -1008,49 +1007,51 @@
private AudioFormat format;
- public AudioFormat getFormat() {
+ public final AudioFormat getFormat() {
return format;
}
public abstract float[] toFloatArray(byte[] in_buff, int in_offset,
float[] out_buff, int out_offset, int out_len);
- public float[] toFloatArray(byte[] in_buff, float[] out_buff,
+ public final float[] toFloatArray(byte[] in_buff, float[] out_buff,
int out_offset, int out_len) {
return toFloatArray(in_buff, 0, out_buff, out_offset, out_len);
}
- public float[] toFloatArray(byte[] in_buff, int in_offset,
+ public final float[] toFloatArray(byte[] in_buff, int in_offset,
float[] out_buff, int out_len) {
return toFloatArray(in_buff, in_offset, out_buff, 0, out_len);
}
- public float[] toFloatArray(byte[] in_buff, float[] out_buff, int out_len) {
+ public final float[] toFloatArray(byte[] in_buff, float[] out_buff,
+ int out_len) {
return toFloatArray(in_buff, 0, out_buff, 0, out_len);
}
- public float[] toFloatArray(byte[] in_buff, float[] out_buff) {
+ public final float[] toFloatArray(byte[] in_buff, float[] out_buff) {
return toFloatArray(in_buff, 0, out_buff, 0, out_buff.length);
}
public abstract byte[] toByteArray(float[] in_buff, int in_offset,
int in_len, byte[] out_buff, int out_offset);
- public byte[] toByteArray(float[] in_buff, int in_len, byte[] out_buff,
- int out_offset) {
+ public final byte[] toByteArray(float[] in_buff, int in_len,
+ byte[] out_buff, int out_offset) {
return toByteArray(in_buff, 0, in_len, out_buff, out_offset);
}
- public byte[] toByteArray(float[] in_buff, int in_offset, int in_len,
- byte[] out_buff) {
+ public final byte[] toByteArray(float[] in_buff, int in_offset, int in_len,
+ byte[] out_buff) {
return toByteArray(in_buff, in_offset, in_len, out_buff, 0);
}
- public byte[] toByteArray(float[] in_buff, int in_len, byte[] out_buff) {
+ public final byte[] toByteArray(float[] in_buff, int in_len,
+ byte[] out_buff) {
return toByteArray(in_buff, 0, in_len, out_buff, 0);
}
- public byte[] toByteArray(float[] in_buff, byte[] out_buff) {
+ public final byte[] toByteArray(float[] in_buff, byte[] out_buff) {
return toByteArray(in_buff, 0, in_buff.length, out_buff, 0);
}
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java
--- a/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -42,19 +42,19 @@
*
* @author Karl Helgason
*/
-public class AudioFloatFormatConverter extends FormatConversionProvider {
+public final class AudioFloatFormatConverter extends FormatConversionProvider {
private static class AudioFloatFormatConverterInputStream extends
InputStream {
- private AudioFloatConverter converter;
+ private final AudioFloatConverter converter;
- private AudioFloatInputStream stream;
+ private final AudioFloatInputStream stream;
private float[] readfloatbuffer;
- private int fsize = 0;
+ private final int fsize;
- public AudioFloatFormatConverterInputStream(AudioFormat targetFormat,
+ AudioFloatFormatConverterInputStream(AudioFormat targetFormat,
AudioFloatInputStream stream) {
this.stream = stream;
converter = AudioFloatConverter.getConverter(targetFormat);
@@ -116,17 +116,17 @@
private static class AudioFloatInputStreamChannelMixer extends
AudioFloatInputStream {
- private int targetChannels;
+ private final int targetChannels;
- private int sourceChannels;
+ private final int sourceChannels;
- private AudioFloatInputStream ais;
+ private final AudioFloatInputStream ais;
- private AudioFormat targetFormat;
+ private final AudioFormat targetFormat;
private float[] conversion_buffer;
- public AudioFloatInputStreamChannelMixer(AudioFloatInputStream ais,
+ AudioFloatInputStreamChannelMixer(AudioFloatInputStream ais,
int targetChannels) {
this.sourceChannels = ais.getFormat().getChannels();
this.targetChannels = targetChannels;
@@ -226,37 +226,37 @@
private static class AudioFloatInputStreamResampler extends
AudioFloatInputStream {
- private AudioFloatInputStream ais;
+ private final AudioFloatInputStream ais;
- private AudioFormat targetFormat;
+ private final AudioFormat targetFormat;
private float[] skipbuffer;
private SoftAbstractResampler resampler;
- private float[] pitch = new float[1];
+ private final float[] pitch = new float[1];
- private float[] ibuffer2;
+ private final float[] ibuffer2;
- private float[][] ibuffer;
+ private final float[][] ibuffer;
private float ibuffer_index = 0;
private int ibuffer_len = 0;
- private int nrofchannels = 0;
+ private final int nrofchannels;
private float[][] cbuffer;
- private int buffer_len = 512;
+ private final int buffer_len = 512;
- private int pad;
+ private final int pad;
- private int pad2;
+ private final int pad2;
- private float[] ix = new float[1];
+ private final float[] ix = new float[1];
- private int[] ox = new int[1];
+ private final int[] ox = new int[1];
private float[][] mark_ibuffer = null;
@@ -264,7 +264,7 @@
private int mark_ibuffer_len = 0;
- public AudioFloatInputStreamResampler(AudioFloatInputStream ais,
+ AudioFloatInputStreamResampler(AudioFloatInputStream ais,
AudioFormat format) {
this.ais = ais;
AudioFormat sourceFormat = ais.getFormat();
@@ -468,8 +468,9 @@
}
- private Encoding[] formats = { Encoding.PCM_SIGNED, Encoding.PCM_UNSIGNED,
- Encoding.PCM_FLOAT };
+ private final Encoding[] formats = {Encoding.PCM_SIGNED,
+ Encoding.PCM_UNSIGNED,
+ Encoding.PCM_FLOAT};
public AudioInputStream getAudioInputStream(Encoding targetEncoding,
AudioInputStream sourceStream) {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java
--- a/jdk/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,14 +48,14 @@
private int pos = 0;
private int markpos = 0;
- private AudioFloatConverter converter;
- private AudioFormat format;
- private byte[] buffer;
- private int buffer_offset;
- private int buffer_len;
- private int framesize_pc;
+ private final AudioFloatConverter converter;
+ private final AudioFormat format;
+ private final byte[] buffer;
+ private final int buffer_offset;
+ private final int buffer_len;
+ private final int framesize_pc;
- public BytaArrayAudioFloatInputStream(AudioFloatConverter converter,
+ BytaArrayAudioFloatInputStream(AudioFloatConverter converter,
byte[] buffer, int offset, int len) {
this.converter = converter;
this.format = converter.getFormat();
@@ -125,12 +125,12 @@
private static class DirectAudioFloatInputStream
extends AudioFloatInputStream {
- private AudioInputStream stream;
+ private final AudioInputStream stream;
private AudioFloatConverter converter;
- private int framesize_pc; // framesize / channels
+ private final int framesize_pc; // framesize / channels
private byte[] buffer;
- public DirectAudioFloatInputStream(AudioInputStream stream) {
+ DirectAudioFloatInputStream(AudioInputStream stream) {
converter = AudioFloatConverter.getConverter(stream.getFormat());
if (converter == null) {
AudioFormat format = stream.getFormat();
@@ -255,11 +255,11 @@
public abstract int read(float[] b, int off, int len) throws IOException;
- public int read(float[] b) throws IOException {
+ public final int read(float[] b) throws IOException {
return read(b, 0, b.length);
}
- public float read() throws IOException {
+ public final float read() throws IOException {
float[] b = new float[1];
int ret = read(b, 0, 1);
if (ret == -1 || ret == 0)
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java
--- a/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
*
* @author Karl Helgason
*/
-public class AudioSynthesizerPropertyInfo {
+public final class AudioSynthesizerPropertyInfo {
/**
* Constructs a AudioSynthesizerPropertyInfo object with a given
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/DLSInfo.java
--- a/jdk/src/share/classes/com/sun/media/sound/DLSInfo.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/DLSInfo.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
*
* @author Karl Helgason
*/
-public class DLSInfo {
+public final class DLSInfo {
/**
* (INAM) Title or subject.
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/DLSInstrument.java
--- a/jdk/src/share/classes/com/sun/media/sound/DLSInstrument.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/DLSInstrument.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,15 +40,15 @@
*
* @author Karl Helgason
*/
-public class DLSInstrument extends ModelInstrument {
+public final class DLSInstrument extends ModelInstrument {
- protected int preset = 0;
- protected int bank = 0;
- protected boolean druminstrument = false;
- protected byte[] guid = null;
- protected DLSInfo info = new DLSInfo();
- protected List regions = new ArrayList();
- protected List modulators = new ArrayList();
+ int preset = 0;
+ int bank = 0;
+ boolean druminstrument = false;
+ byte[] guid = null;
+ DLSInfo info = new DLSInfo();
+ List regions = new ArrayList();
+ List modulators = new ArrayList();
public DLSInstrument() {
super(null, null, null, null);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/DLSModulator.java
--- a/jdk/src/share/classes/com/sun/media/sound/DLSModulator.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/DLSModulator.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
*
* @author Karl Helgason
*/
-public class DLSModulator {
+public final class DLSModulator {
// DLS1 Destinations
public static final int CONN_DST_NONE = 0x000; // 0
@@ -102,12 +102,12 @@
public static final int DST_FORMAT_CENT = 1;
public static final int DST_FORMAT_TIMECENT = 2;
public static final int DST_FORMAT_PERCENT = 3;
- protected int source;
- protected int control;
- protected int destination;
- protected int transform;
- protected int scale;
- protected int version = 1;
+ int source;
+ int control;
+ int destination;
+ int transform;
+ int scale;
+ int version = 1;
public int getControl() {
return control;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/DLSRegion.java
--- a/jdk/src/share/classes/com/sun/media/sound/DLSRegion.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/DLSRegion.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,21 +36,21 @@
*
* @author Karl Helgason
*/
-public class DLSRegion {
+public final class DLSRegion {
public final static int OPTION_SELFNONEXCLUSIVE = 0x0001;
- protected List modulators = new ArrayList();
- protected int keyfrom;
- protected int keyto;
- protected int velfrom;
- protected int velto;
- protected int options;
- protected int exclusiveClass;
- protected int fusoptions;
- protected int phasegroup;
- protected long channel;
- protected DLSSample sample = null;
- protected DLSSampleOptions sampleoptions;
+ List modulators = new ArrayList();
+ int keyfrom;
+ int keyto;
+ int velfrom;
+ int velto;
+ int options;
+ int exclusiveClass;
+ int fusoptions;
+ int phasegroup;
+ long channel;
+ DLSSample sample = null;
+ DLSSampleOptions sampleoptions;
public List getModulators() {
return modulators;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/DLSSample.java
--- a/jdk/src/share/classes/com/sun/media/sound/DLSSample.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/DLSSample.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,13 +40,13 @@
*
* @author Karl Helgason
*/
-public class DLSSample extends SoundbankResource {
+public final class DLSSample extends SoundbankResource {
- protected byte[] guid = null;
- protected DLSInfo info = new DLSInfo();
- protected DLSSampleOptions sampleoptions;
- protected ModelByteBuffer data;
- protected AudioFormat format;
+ byte[] guid = null;
+ DLSInfo info = new DLSInfo();
+ DLSSampleOptions sampleoptions;
+ ModelByteBuffer data;
+ AudioFormat format;
public DLSSample(Soundbank soundBank) {
super(soundBank, null, AudioInputStream.class);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/DLSSampleLoop.java
--- a/jdk/src/share/classes/com/sun/media/sound/DLSSampleLoop.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/DLSSampleLoop.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,13 +29,13 @@
*
* @author Karl Helgason
*/
-public class DLSSampleLoop {
+public final class DLSSampleLoop {
public final static int LOOP_TYPE_FORWARD = 0;
public final static int LOOP_TYPE_RELEASE = 1;
- protected long type;
- protected long start;
- protected long length;
+ long type;
+ long start;
+ long length;
public long getLength() {
return length;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/DLSSampleOptions.java
--- a/jdk/src/share/classes/com/sun/media/sound/DLSSampleOptions.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/DLSSampleOptions.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,13 +34,13 @@
*
* @author Karl Helgason
*/
-public class DLSSampleOptions {
+public final class DLSSampleOptions {
- protected int unitynote;
- protected short finetune;
- protected int attenuation;
- protected long options;
- protected List loops = new ArrayList();
+ int unitynote;
+ short finetune;
+ int attenuation;
+ long options;
+ List loops = new ArrayList();
public int getAttenuation() {
return attenuation;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java
--- a/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@
*
* @author Karl Helgason
*/
-public class DLSSoundbank implements Soundbank {
+public final class DLSSoundbank implements Soundbank {
static private class DLSID {
long i1;
@@ -69,7 +69,7 @@
private DLSID() {
}
- public DLSID(long i1, int s1, int s2, int x1, int x2, int x3, int x4,
+ DLSID(long i1, int s1, int s2, int x1, int x2, int x3, int x4,
int x5, int x6, int x7, int x8) {
this.i1 = i1;
this.s1 = s1;
@@ -174,10 +174,10 @@
private long major = -1;
private long minor = -1;
- private DLSInfo info = new DLSInfo();
+ private final DLSInfo info = new DLSInfo();
- private List instruments = new ArrayList();
- private List samples = new ArrayList();
+ private final List instruments = new ArrayList();
+ private final List samples = new ArrayList();
private boolean largeFormat = false;
private File sampleFile;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java
--- a/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@
*
* @author Karl Helgason
*/
-public class DLSSoundbankReader extends SoundbankReader {
+public final class DLSSoundbankReader extends SoundbankReader {
public Soundbank getSoundbank(URL url)
throws InvalidMidiDataException, IOException {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/DataPusher.java
--- a/jdk/src/share/classes/com/sun/media/sound/DataPusher.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/DataPusher.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,13 +37,13 @@
* @author Florian Bomers
*/
-public class DataPusher implements Runnable {
+public final class DataPusher implements Runnable {
private static final int AUTO_CLOSE_TIME = 5000;
private static final boolean DEBUG = false;
- private SourceDataLine source = null;
- private AudioFormat format = null;
+ private final SourceDataLine source;
+ private final AudioFormat format;
// stream as source data
private AudioInputStream ais = null;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java
--- a/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
*
* @author Florian Bomers
*/
-class DirectAudioDevice extends AbstractMixer {
+final class DirectAudioDevice extends AbstractMixer {
// CONSTANTS
private static final int CLIP_BUFFER_TIME = 1000; // in milliseconds
@@ -335,8 +335,8 @@
* but isFormatSupported() also returns true
* for formats with wrong endianness.
*/
- private static class DirectDLI extends DataLine.Info {
- AudioFormat[] hardwareFormats;
+ private static final class DirectDLI extends DataLine.Info {
+ final AudioFormat[] hardwareFormats;
private DirectDLI(Class clazz, AudioFormat[] formatArray,
AudioFormat[] hardwareFormatArray,
@@ -370,12 +370,12 @@
* Private inner class as base class for direct lines
*/
private static class DirectDL extends AbstractDataLine implements EventDispatcher.LineMonitor {
- protected int mixerIndex;
- protected int deviceID;
+ protected final int mixerIndex;
+ protected final int deviceID;
protected long id;
protected int waitTime;
protected volatile boolean flushing = false;
- protected boolean isSource; // true for SourceDataLine, false for TargetDataLine
+ protected final boolean isSource; // true for SourceDataLine, false for TargetDataLine
protected volatile long bytePosition;
protected volatile boolean doIO = false; // true in between start() and stop() calls
protected volatile boolean stoppedWritten = false; // true if a write occured in stopped state
@@ -387,10 +387,10 @@
protected int softwareConversionSize = 0;
protected AudioFormat hardwareFormat;
- private Gain gainControl = new Gain();
- private Mute muteControl = new Mute();
- private Balance balanceControl = new Balance();
- private Pan panControl = new Pan();
+ private final Gain gainControl = new Gain();
+ private final Mute muteControl = new Mute();
+ private final Balance balanceControl = new Balance();
+ private final Pan panControl = new Pan();
private float leftGain, rightGain;
protected volatile boolean noService = false; // do not run the nService method
@@ -829,7 +829,7 @@
/////////////////// CONTROLS /////////////////////////////
- protected class Gain extends FloatControl {
+ protected final class Gain extends FloatControl {
private float linearGain = 1.0f;
@@ -862,7 +862,7 @@
} // class Gain
- private class Mute extends BooleanControl {
+ private final class Mute extends BooleanControl {
private Mute() {
super(BooleanControl.Type.MUTE, false, "True", "False");
@@ -874,7 +874,7 @@
}
} // class Mute
- private class Balance extends FloatControl {
+ private final class Balance extends FloatControl {
private Balance() {
super(FloatControl.Type.BALANCE, -1.0f, 1.0f, (1.0f / 128.0f), -1, 0.0f,
@@ -893,7 +893,7 @@
} // class Balance
- private class Pan extends FloatControl {
+ private final class Pan extends FloatControl {
private Pan() {
super(FloatControl.Type.PAN, -1.0f, 1.0f, (1.0f / 128.0f), -1, 0.0f,
@@ -918,7 +918,8 @@
/**
* Private inner class representing a SourceDataLine
*/
- private static class DirectSDL extends DirectDL implements SourceDataLine {
+ private static final class DirectSDL extends DirectDL
+ implements SourceDataLine {
// CONSTRUCTOR
private DirectSDL(DataLine.Info info,
@@ -934,7 +935,8 @@
/**
* Private inner class representing a TargetDataLine
*/
- private static class DirectTDL extends DirectDL implements TargetDataLine {
+ private static final class DirectTDL extends DirectDL
+ implements TargetDataLine {
// CONSTRUCTOR
private DirectTDL(DataLine.Info info,
@@ -1012,7 +1014,9 @@
* Private inner class representing a Clip
* This clip is realized in software only
*/
- private static class DirectClip extends DirectDL implements Clip, Runnable, AutoClosingClip {
+ private static final class DirectClip extends DirectDL
+ implements Clip, Runnable, AutoClosingClip {
+
private Thread thread;
private byte[] audioData = null;
private int frameSize; // size of one frame in bytes
@@ -1045,7 +1049,7 @@
byte[] newData = new byte[bufferSize];
System.arraycopy(data, offset, newData, 0, bufferSize);
- open(format, data, bufferSize / format.getFrameSize());
+ open(format, newData, bufferSize / format.getFrameSize());
}
// this method does not copy the data array
@@ -1443,7 +1447,7 @@
* which allows retrieval of the internal array
*/
private static class DirectBAOS extends ByteArrayOutputStream {
- public DirectBAOS() {
+ DirectBAOS() {
super();
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java
--- a/jdk/src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
package com.sun.media.sound;
-import java.util.Vector;
-
import javax.sound.sampled.Mixer;
import javax.sound.sampled.spi.MixerProvider;
@@ -36,7 +34,7 @@
*
* @author Florian Bomers
*/
-public class DirectAudioDeviceProvider extends MixerProvider {
+public final class DirectAudioDeviceProvider extends MixerProvider {
// STATIC VARIABLES
@@ -66,16 +64,17 @@
* Required public no-arg constructor.
*/
public DirectAudioDeviceProvider() {
- //if (Printer.trace) Printer.trace("DirectAudioDeviceProvider: constructor");
- if (Platform.isDirectAudioEnabled()) {
- init();
- } else {
- infos = new DirectAudioDeviceInfo[0];
- devices = new DirectAudioDevice[0];
+ synchronized (DirectAudioDeviceProvider.class) {
+ if (Platform.isDirectAudioEnabled()) {
+ init();
+ } else {
+ infos = new DirectAudioDeviceInfo[0];
+ devices = new DirectAudioDevice[0];
+ }
}
}
- private synchronized static void init() {
+ private static void init() {
// get the number of input devices
int numDevices = nGetNumDevices();
@@ -94,36 +93,39 @@
}
public Mixer.Info[] getMixerInfo() {
- Mixer.Info[] localArray = new Mixer.Info[infos.length];
- System.arraycopy(infos, 0, localArray, 0, infos.length);
- return localArray;
+ synchronized (DirectAudioDeviceProvider.class) {
+ Mixer.Info[] localArray = new Mixer.Info[infos.length];
+ System.arraycopy(infos, 0, localArray, 0, infos.length);
+ return localArray;
+ }
}
public Mixer getMixer(Mixer.Info info) {
- // if the default device is asked, we provide the mixer
- // with SourceDataLine's
- if (info == null) {
+ synchronized (DirectAudioDeviceProvider.class) {
+ // if the default device is asked, we provide the mixer
+ // with SourceDataLine's
+ if (info == null) {
+ for (int i = 0; i < infos.length; i++) {
+ Mixer mixer = getDevice(infos[i]);
+ if (mixer.getSourceLineInfo().length > 0) {
+ return mixer;
+ }
+ }
+ }
+ // otherwise get the first mixer that matches
+ // the requested info object
for (int i = 0; i < infos.length; i++) {
- Mixer mixer = getDevice(infos[i]);
- if (mixer.getSourceLineInfo().length > 0) {
- return mixer;
+ if (infos[i].equals(info)) {
+ return getDevice(infos[i]);
}
}
}
- // otherwise get the first mixer that matches
- // the requested info object
- for (int i = 0; i < infos.length; i++) {
- if (infos[i].equals(info)) {
- return getDevice(infos[i]);
- }
- }
-
throw new IllegalArgumentException("Mixer " + info.toString() + " not supported by this provider.");
}
- private Mixer getDevice(DirectAudioDeviceInfo info) {
+ private static Mixer getDevice(DirectAudioDeviceInfo info) {
int index = info.getIndex();
if (devices[index] == null) {
devices[index] = new DirectAudioDevice(info);
@@ -139,12 +141,12 @@
* making native references to a particular device.
* This constructor is called from native.
*/
- static class DirectAudioDeviceInfo extends Mixer.Info {
- private int index;
- private int maxSimulLines;
+ static final class DirectAudioDeviceInfo extends Mixer.Info {
+ private final int index;
+ private final int maxSimulLines;
// For ALSA, the deviceID contains the encoded card index, device index, and sub-device-index
- private int deviceID;
+ private final int deviceID;
private DirectAudioDeviceInfo(int index, int deviceID, int maxSimulLines,
String name, String vendor,
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java
--- a/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
*
* @author Karl Helgason
*/
-public class EmergencySoundbank {
+public final class EmergencySoundbank {
private final static String[] general_midi_instruments = {
"Acoustic Grand Piano",
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/EventDispatcher.java
--- a/jdk/src/share/classes/com/sun/media/sound/EventDispatcher.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/EventDispatcher.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,16 @@
package com.sun.media.sound;
-import java.util.EventObject;
import java.util.ArrayList;
import java.util.List;
-import javax.sound.sampled.Clip;
-import javax.sound.sampled.Line;
+import javax.sound.midi.ControllerEventListener;
+import javax.sound.midi.MetaEventListener;
+import javax.sound.midi.MetaMessage;
+import javax.sound.midi.ShortMessage;
import javax.sound.sampled.LineEvent;
import javax.sound.sampled.LineListener;
-import javax.sound.midi.MetaMessage;
-import javax.sound.midi.ShortMessage;
-import javax.sound.midi.MetaEventListener;
-import javax.sound.midi.ControllerEventListener;
-
/**
@@ -49,7 +45,7 @@
* @author Kara Kytle
* @author Florian Bomers
*/
-class EventDispatcher implements Runnable {
+final class EventDispatcher implements Runnable {
/**
* time of inactivity until the auto closing clips
@@ -61,7 +57,7 @@
/**
* List of events
*/
- private ArrayList eventQueue = new ArrayList();
+ private final ArrayList eventQueue = new ArrayList();
/**
@@ -73,12 +69,12 @@
/*
* support for auto-closing Clips
*/
- private ArrayList autoClosingClips = new ArrayList();
+ private final ArrayList autoClosingClips = new ArrayList();
/*
* support for monitoring data lines
*/
- private ArrayList lineMonitors = new ArrayList();
+ private final ArrayList lineMonitors = new ArrayList();
/**
* Approximate interval between calls to LineMonitor.checkLine
@@ -105,7 +101,7 @@
* Invoked when there is at least one event in the queue.
* Implement this as a callback to process one event.
*/
- protected void processEvent(EventInfo eventInfo) {
+ void processEvent(EventInfo eventInfo) {
int count = eventInfo.getListenerCount();
// process an LineEvent
@@ -166,7 +162,7 @@
* exclusive access over the code where an event is removed from the
*queue.
*/
- protected void dispatchEvents() {
+ void dispatchEvents() {
EventInfo eventInfo = null;
@@ -388,8 +384,8 @@
*/
private class EventInfo {
- private Object event;
- private Object[] listeners;
+ private final Object event;
+ private final Object[] listeners;
/**
* Create a new instance of this event Info class
@@ -421,8 +417,8 @@
*/
private class ClipInfo {
- private AutoClosingClip clip;
- private long expiration;
+ private final AutoClosingClip clip;
+ private final long expiration;
/**
* Create a new instance of this clip Info class
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/FFT.java
--- a/jdk/src/share/classes/com/sun/media/sound/FFT.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/FFT.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,11 +31,11 @@
*/
public final class FFT {
- private double[] w;
- private int fftFrameSize;
- private int sign;
- private int[] bitm_array;
- private int fftFrameSize2;
+ private final double[] w;
+ private final int fftFrameSize;
+ private final int sign;
+ private final int[] bitm_array;
+ private final int fftFrameSize2;
// Sign = -1 is FFT, 1 is IFFT (inverse FFT)
// Data = Interlaced double array to be transformed.
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/FastShortMessage.java
--- a/jdk/src/share/classes/com/sun/media/sound/FastShortMessage.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/FastShortMessage.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,13 +35,13 @@
final class FastShortMessage extends ShortMessage {
private int packedMsg;
- public FastShortMessage(int packedMsg) throws InvalidMidiDataException {
+ FastShortMessage(int packedMsg) throws InvalidMidiDataException {
this.packedMsg = packedMsg;
getDataLength(packedMsg & 0xFF); // to check for validity
}
/** Creates a FastShortMessage from this ShortMessage */
- public FastShortMessage(ShortMessage msg) {
+ FastShortMessage(ShortMessage msg) {
this.packedMsg = msg.getStatus()
| (msg.getData1() << 8)
| (msg.getData2() << 16);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java
--- a/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,14 +36,16 @@
import javax.sound.midi.Soundbank;
import javax.sound.midi.spi.SoundbankReader;
+import sun.reflect.misc.ReflectUtil;
+
/**
- * JarSoundbankReader is used to read sounbank object from jar files.
+ * JarSoundbankReader is used to read soundbank object from jar files.
*
* @author Karl Helgason
*/
-public class JARSoundbankReader extends SoundbankReader {
+public final class JARSoundbankReader extends SoundbankReader {
- public boolean isZIP(URL url) {
+ private static boolean isZIP(URL url) {
boolean ok = false;
try {
InputStream stream = url.openStream();
@@ -81,14 +83,14 @@
while (line != null) {
if (!line.startsWith("#")) {
try {
- Class c = Class.forName(line.trim(), true, ucl);
- Object o = c.newInstance();
- if (o instanceof Soundbank) {
+ Class c = Class.forName(line.trim(), false, ucl);
+ if (Soundbank.class.isAssignableFrom(c)) {
+ Object o = ReflectUtil.newInstance(c);
soundbanks.add((Soundbank) o);
}
- } catch (ClassNotFoundException e) {
- } catch (InstantiationException e) {
- } catch (IllegalAccessException e) {
+ } catch (ClassNotFoundException ignored) {
+ } catch (InstantiationException ignored) {
+ } catch (IllegalAccessException ignored) {
}
}
line = r.readLine();
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/JDK13Services.java
--- a/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,16 +31,6 @@
import java.util.Map;
import java.util.Properties;
-import javax.sound.sampled.spi.AudioFileReader;
-import javax.sound.sampled.spi.AudioFileWriter;
-import javax.sound.sampled.spi.FormatConversionProvider;
-import javax.sound.sampled.spi.MixerProvider;
-
-import javax.sound.midi.spi.MidiFileReader;
-import javax.sound.midi.spi.MidiFileWriter;
-import javax.sound.midi.spi.SoundbankReader;
-import javax.sound.midi.spi.MidiDeviceProvider;
-
import javax.sound.midi.Receiver;
import javax.sound.midi.Sequencer;
import javax.sound.midi.Synthesizer;
@@ -62,7 +52,7 @@
*
* @author Matthias Pfisterer
*/
-public class JDK13Services {
+public final class JDK13Services {
/** The default for the length of the period to hold the cache.
This value is given in milliseconds. It is equivalent to
@@ -80,7 +70,7 @@
Class objects of the provider type (MixerProvider, MidiDeviceProvider
...) are used as keys. The values are instances of ProviderCache.
*/
- private static Map providersCacheMap = new HashMap();
+ private static final Map providersCacheMap = new HashMap();
/** The length of the period to hold the cache.
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java
--- a/jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
*
* @author Matthias Pfisterer
*/
-class JSSecurityManager {
+final class JSSecurityManager {
/** Prevent instantiation.
*/
@@ -73,30 +73,6 @@
}
}
-
- static void loadLibrary(final String libName) {
- try {
- if (hasSecurityManager()) {
- if(Printer.debug) Printer.debug("using security manager to load library");
- PrivilegedAction action = new PrivilegedAction() {
- public Void run() {
- System.loadLibrary(libName);
- return null;
- }
- };
- AccessController.doPrivileged(action);
- } else {
- if(Printer.debug) Printer.debug("not using security manager to load library");
- System.loadLibrary(libName);
- }
- if (Printer.debug) Printer.debug("loaded library " + libName);
- } catch (UnsatisfiedLinkError e2) {
- if (Printer.err)Printer.err("UnsatisfiedLinkError loading native library " + libName);
- throw(e2);
- }
- }
-
-
static String getProperty(final String propertyName) {
String propertyValue;
if (hasSecurityManager()) {
@@ -189,83 +165,13 @@
if(Printer.trace)Printer.trace("<< JSSecurityManager: loadPropertiesImpl() completed");
}
-
- private static ThreadGroup getTopmostThreadGroup() {
- ThreadGroup topmostThreadGroup;
- if(hasSecurityManager()) {
- try {
- // invoke the privileged action using 1.2 security
- PrivilegedAction action = new PrivilegedAction() {
- public ThreadGroup run() {
- try {
- return getTopmostThreadGroupImpl();
- } catch (Throwable t) {
- return null;
- }
- }
- };
- topmostThreadGroup = AccessController.doPrivileged(action);
- if(Printer.debug)Printer.debug("Got topmost thread group with JDK 1.2 security");
- } catch (Exception e) {
- if(Printer.debug)Printer.debug("Exception getting topmost thread group with JDK 1.2 security");
- // try without using JDK 1.2 security
- topmostThreadGroup = getTopmostThreadGroupImpl();
- }
- } else {
- // not JDK 1.2 security, assume we already have permission
- topmostThreadGroup = getTopmostThreadGroupImpl();
- }
- return topmostThreadGroup;
- }
-
-
- private static ThreadGroup getTopmostThreadGroupImpl() {
- if(Printer.trace)Printer.trace(">> JSSecurityManager: getTopmostThreadGroupImpl()");
- ThreadGroup g = Thread.currentThread().getThreadGroup();
- while ((g.getParent() != null) && (g.getParent().getParent() != null)) {
- g = g.getParent();
- }
- if(Printer.trace)Printer.trace("<< JSSecurityManager: getTopmostThreadGroupImpl() completed");
- return g;
- }
-
-
- /** Create a Thread in the topmost ThreadGroup.
+ /** Create a Thread in the current ThreadGroup.
*/
static Thread createThread(final Runnable runnable,
final String threadName,
final boolean isDaemon, final int priority,
final boolean doStart) {
- Thread thread = null;
- if(hasSecurityManager()) {
- PrivilegedAction action = new PrivilegedAction() {
- public Thread run() {
- try {
- return createThreadImpl(runnable, threadName,
- isDaemon, priority,
- doStart);
- } catch (Throwable t) {
- return null;
- }
- }
- };
- thread = AccessController.doPrivileged(action);
- if(Printer.debug) Printer.debug("created thread with JDK 1.2 security");
- } else {
- if(Printer.debug)Printer.debug("not using JDK 1.2 security");
- thread = createThreadImpl(runnable, threadName, isDaemon, priority,
- doStart);
- }
- return thread;
- }
-
-
- private static Thread createThreadImpl(Runnable runnable,
- String threadName,
- boolean isDaemon, int priority,
- boolean doStart) {
- ThreadGroup threadGroup = getTopmostThreadGroupImpl();
- Thread thread = new Thread(threadGroup, runnable);
+ Thread thread = new Thread(runnable);
if (threadName != null) {
thread.setName(threadName);
}
@@ -279,7 +185,6 @@
return thread;
}
-
static List getProviders(final Class providerClass) {
List p = new ArrayList<>();
// ServiceLoader creates "lazy" iterator instance, so it doesn't,
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java
--- a/jdk/src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,25 +28,19 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.applet.AudioClip;
-import java.lang.InterruptedException;
import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.Mixer;
import javax.sound.sampled.Clip;
-import javax.sound.sampled.Control;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.DataLine;
import javax.sound.sampled.SourceDataLine;
import javax.sound.sampled.LineEvent;
import javax.sound.sampled.LineListener;
-import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.UnsupportedAudioFileException;
-
import javax.sound.midi.MidiSystem;
import javax.sound.midi.MidiFileFormat;
import javax.sound.midi.MetaMessage;
@@ -63,7 +57,7 @@
* @author Florian Bomers
*/
-public class JavaSoundAudioClip implements AudioClip, MetaEventListener, LineListener {
+public final class JavaSoundAudioClip implements AudioClip, MetaEventListener, LineListener {
private static final boolean DEBUG = false;
private static final int BUFFER_SIZE = 16384; // number of bytes written each time to the source data line
@@ -476,7 +470,7 @@
* which allows retrieval of the internal array
*/
private static class DirectBAOS extends ByteArrayOutputStream {
- public DirectBAOS() {
+ DirectBAOS() {
super();
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java
--- a/jdk/src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
*
* @author Alex Menkov
*/
-public class MidiDeviceReceiverEnvelope implements MidiDeviceReceiver {
+public final class MidiDeviceReceiverEnvelope implements MidiDeviceReceiver {
private final MidiDevice device;
private final Receiver receiver;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java
--- a/jdk/src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
*
* @author Alex Menkov
*/
-public class MidiDeviceTransmitterEnvelope implements MidiDeviceTransmitter {
+public final class MidiDeviceTransmitterEnvelope implements MidiDeviceTransmitter {
private final MidiDevice device;
private final Transmitter transmitter;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/MidiInDevice.java
--- a/jdk/src/share/classes/com/sun/media/sound/MidiInDevice.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/MidiInDevice.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,6 @@
package com.sun.media.sound;
-import java.util.ArrayList;
-import java.util.List;
-
import javax.sound.midi.*;
@@ -39,7 +36,7 @@
* @author Kara Kytle
* @author Florian Bomers
*/
-class MidiInDevice extends AbstractMidiDevice implements Runnable {
+final class MidiInDevice extends AbstractMidiDevice implements Runnable {
private Thread midiInThread = null;
@@ -127,7 +124,7 @@
* An own class to distinguish the class name from
* the transmitter of other devices
*/
- private class MidiInTransmitter extends BasicTransmitter {
+ private final class MidiInTransmitter extends BasicTransmitter {
private MidiInTransmitter() {
super();
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java
--- a/jdk/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
package com.sun.media.sound;
import javax.sound.midi.MidiDevice;
-import javax.sound.midi.spi.MidiDeviceProvider;
/**
@@ -35,15 +34,15 @@
* @author Kara Kytle
* @author Florian Bomers
*/
-public class MidiInDeviceProvider extends AbstractMidiDeviceProvider {
+public final class MidiInDeviceProvider extends AbstractMidiDeviceProvider {
/** Cache of info objects for all MIDI output devices on the system. */
- static Info[] infos = null;
+ private static Info[] infos = null;
/** Cache of open MIDI input devices on the system. */
- static MidiDevice[] devices = null;
+ private static MidiDevice[] devices = null;
- private static boolean enabled;
+ private static final boolean enabled;
// STATIC
@@ -106,8 +105,8 @@
* previous instance may still exist and be open / in use / etc.,
* the new instance will not reflect that state...
*/
- static class MidiInDeviceInfo extends AbstractMidiDeviceProvider.Info {
- private Class providerClass;
+ static final class MidiInDeviceInfo extends AbstractMidiDeviceProvider.Info {
+ private final Class providerClass;
private MidiInDeviceInfo(int index, Class providerClass) {
super(nGetName(index), nGetVendor(index), nGetDescription(index), nGetVersion(index), index);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/MidiOutDevice.java
--- a/jdk/src/share/classes/com/sun/media/sound/MidiOutDevice.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/MidiOutDevice.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
* @author Kara Kytle
* @author Florian Bomers
*/
-class MidiOutDevice extends AbstractMidiDevice {
+final class MidiOutDevice extends AbstractMidiDevice {
// CONSTRUCTOR
@@ -101,7 +101,7 @@
// INNER CLASSES
- class MidiOutReceiver extends AbstractReceiver {
+ final class MidiOutReceiver extends AbstractReceiver {
void implSend(final MidiMessage message, final long timeStamp) {
final int length = message.getLength();
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java
--- a/jdk/src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
package com.sun.media.sound;
import javax.sound.midi.MidiDevice;
-import javax.sound.midi.spi.MidiDeviceProvider;
/**
@@ -35,15 +34,15 @@
* @author Kara Kytle
* @author Florian Bomers
*/
-public class MidiOutDeviceProvider extends AbstractMidiDeviceProvider {
+public final class MidiOutDeviceProvider extends AbstractMidiDeviceProvider {
/** Cache of info objects for all MIDI output devices on the system. */
- static Info[] infos = null;
+ private static Info[] infos = null;
/** Cache of open MIDI output devices on the system. */
- static MidiDevice[] devices = null;
+ private static MidiDevice[] devices = null;
- private static boolean enabled;
+ private final static boolean enabled;
// STATIC
@@ -104,8 +103,8 @@
* previous instance may still exist and be open / in use / etc.,
* the new instance will not reflect that state...
*/
- static class MidiOutDeviceInfo extends AbstractMidiDeviceProvider.Info {
- private Class providerClass;
+ static final class MidiOutDeviceInfo extends AbstractMidiDeviceProvider.Info {
+ private final Class providerClass;
private MidiOutDeviceInfo(int index, Class providerClass) {
super(nGetName(index), nGetVendor(index), nGetDescription(index), nGetVersion(index), index);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/MidiUtils.java
--- a/jdk/src/share/classes/com/sun/media/sound/MidiUtils.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/MidiUtils.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,12 +36,17 @@
*
* @author Florian Bomers
*/
-public class MidiUtils {
+public final class MidiUtils {
public final static int DEFAULT_TEMPO_MPQ = 500000; // 120bpm
public final static int META_END_OF_TRACK_TYPE = 0x2F;
public final static int META_TEMPO_TYPE = 0x51;
+ /**
+ * Suppresses default constructor, ensuring non-instantiability.
+ */
+ private MidiUtils() {
+ }
/** return true if the passed message is Meta End Of Track */
public static boolean isMetaEndOfTrack(MidiMessage midiMsg) {
@@ -262,7 +267,7 @@
}
- public static class TempoCache {
+ public static final class TempoCache {
long[] ticks;
int[] tempos; // in MPQ
// index in ticks/tempos at the snapshot
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java
--- a/jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
*
* @author Karl Helgason
*/
-public class ModelByteBuffer {
+public final class ModelByteBuffer {
private ModelByteBuffer root = this;
private File file;
@@ -49,12 +49,12 @@
private class RandomFileInputStream extends InputStream {
- private RandomAccessFile raf;
+ private final RandomAccessFile raf;
private long left;
private long mark = 0;
private long markleft = 0;
- public RandomFileInputStream() throws IOException {
+ RandomFileInputStream() throws IOException {
raf = new RandomAccessFile(root.file, "r");
raf.seek(root.fileoffset + arrayOffset());
left = capacity();
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java
--- a/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,18 +36,18 @@
*
* @author Karl Helgason
*/
-public class ModelByteBufferWavetable implements ModelWavetable {
+public final class ModelByteBufferWavetable implements ModelWavetable {
private class Buffer8PlusInputStream extends InputStream {
- private boolean bigendian;
- private int framesize_pc;
+ private final boolean bigendian;
+ private final int framesize_pc;
int pos = 0;
int pos2 = 0;
int markpos = 0;
int markpos2 = 0;
- public Buffer8PlusInputStream() {
+ Buffer8PlusInputStream() {
framesize_pc = format.getFrameSize() / format.getChannels();
bigendian = format.isBigEndian();
}
@@ -127,7 +127,7 @@
private float loopStart = -1;
private float loopLength = -1;
- private ModelByteBuffer buffer;
+ private final ModelByteBuffer buffer;
private ModelByteBuffer buffer8 = null;
private AudioFormat format = null;
private float pitchcorrection = 0;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java
--- a/jdk/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
*
* @author Karl Helgason
*/
-public class ModelConnectionBlock {
+public final class ModelConnectionBlock {
//
// source1 * source2 * scale -> destination
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/ModelDestination.java
--- a/jdk/src/share/classes/com/sun/media/sound/ModelDestination.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelDestination.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
*
* @author Karl Helgason
*/
-public class ModelDestination {
+public final class ModelDestination {
public static final ModelIdentifier DESTINATION_NONE = null;
public static final ModelIdentifier DESTINATION_KEYNUMBER
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java
--- a/jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
*
* @author Karl Helgason
*/
-public class ModelIdentifier {
+public final class ModelIdentifier {
/*
* Object Variable
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java
--- a/jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -69,7 +69,7 @@
}
// Get General MIDI 2 Alias patch for this instrument.
- public Patch getPatchAlias() {
+ public final Patch getPatchAlias() {
Patch patch = getPatch();
int program = patch.getProgram();
int bank = patch.getBank();
@@ -87,7 +87,7 @@
// Return name of all the keys.
// This information is generated from ModelPerformer.getName()
// returned from getPerformers().
- public String[] getKeys() {
+ public final String[] getKeys() {
String[] keys = new String[128];
for (ModelPerformer performer : getPerformers()) {
for (int k = performer.getKeyFrom(); k <= performer.getKeyTo(); k++) {
@@ -104,7 +104,7 @@
// Return what channels this instrument will probably response
// on General MIDI synthesizer.
- public boolean[] getChannels() {
+ public final boolean[] getChannels() {
boolean percussion = false;
if (getPatch() instanceof ModelPatch)
percussion = ((ModelPatch)getPatch()).isPercussion();
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java
--- a/jdk/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
*
* @author Karl Helgason
*/
-public class ModelInstrumentComparator implements Comparator {
+public final class ModelInstrumentComparator implements Comparator {
public int compare(Instrument arg0, Instrument arg1) {
Patch p0 = arg0.getPatch();
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java
--- a/jdk/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,9 +33,9 @@
*
* @author Karl Helgason
*/
-public class ModelMappedInstrument extends ModelInstrument {
+public final class ModelMappedInstrument extends ModelInstrument {
- private ModelInstrument ins;
+ private final ModelInstrument ins;
public ModelMappedInstrument(ModelInstrument ins, Patch patch) {
super(ins.getSoundbank(), patch, ins.getName(), ins.getDataClass());
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/ModelPatch.java
--- a/jdk/src/share/classes/com/sun/media/sound/ModelPatch.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelPatch.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
*
* @author Karl Helgason
*/
-public class ModelPatch extends Patch {
+public final class ModelPatch extends Patch {
private boolean percussion = false;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/ModelPerformer.java
--- a/jdk/src/share/classes/com/sun/media/sound/ModelPerformer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelPerformer.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,9 +33,9 @@
*
* @author Karl Helgason
*/
-public class ModelPerformer {
+public final class ModelPerformer {
- private List oscillators = new ArrayList();
+ private final List oscillators = new ArrayList();
private List connectionBlocks
= new ArrayList();
private int keyFrom = 0;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/ModelSource.java
--- a/jdk/src/share/classes/com/sun/media/sound/ModelSource.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelSource.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
*
* @author Karl Helgason
*/
-public class ModelSource {
+public final class ModelSource {
public static final ModelIdentifier SOURCE_NONE = null;
public static final ModelIdentifier SOURCE_NOTEON_KEYNUMBER =
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/ModelStandardDirector.java
--- a/jdk/src/share/classes/com/sun/media/sound/ModelStandardDirector.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelStandardDirector.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
*
* @author Karl Helgason
*/
-public class ModelStandardDirector implements ModelDirector {
+public final class ModelStandardDirector implements ModelDirector {
ModelPerformer[] performers;
ModelDirectedPlayer player;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java
--- a/jdk/src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
*
* @author Karl Helgason
*/
-public class ModelStandardIndexedDirector implements ModelDirector {
+public final class ModelStandardIndexedDirector implements ModelDirector {
ModelPerformer[] performers;
ModelDirectedPlayer player;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/ModelStandardTransform.java
--- a/jdk/src/share/classes/com/sun/media/sound/ModelStandardTransform.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/ModelStandardTransform.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
*
* @author Karl Helgason
*/
-public class ModelStandardTransform implements ModelTransform {
+public final class ModelStandardTransform implements ModelTransform {
public static final boolean DIRECTION_MIN2MAX = false;
public static final boolean DIRECTION_MAX2MIN = true;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java
--- a/jdk/src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,12 @@
package com.sun.media.sound;
-import java.io.InputStream;
import java.io.IOException;
-
import java.util.Vector;
import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.AudioInputStream;
/**
@@ -40,7 +38,7 @@
*
* @author Jan Borgersen
*/
-public class PCMtoPCMCodec extends SunCodec {
+public final class PCMtoPCMCodec extends SunCodec {
private static final AudioFormat.Encoding[] inputEncodings = {
@@ -356,7 +354,7 @@
private final int PCM_UNSIGNED_BE2SIGNED_LE = 7;
private final int PCM_SIGNED_BE2UNSIGNED_LE = 8;
- private int sampleSizeInBytes = 0;
+ private final int sampleSizeInBytes;
private int conversionType = 0;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/Platform.java
--- a/jdk/src/share/classes/com/sun/media/sound/Platform.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/Platform.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
package com.sun.media.sound;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.StringTokenizer;
@@ -35,7 +37,7 @@
* @author Kara Kytle
* @author Florian Bomers
*/
-class Platform {
+final class Platform {
// STATIC FINAL CHARACTERISTICS
@@ -157,7 +159,13 @@
try {
// load the main library
- JSSecurityManager.loadLibrary(libNameMain);
+ AccessController.doPrivileged(new PrivilegedAction() {
+ @Override
+ public Void run() {
+ System.loadLibrary(libNameMain);
+ return null;
+ }
+ });
// just for the heck of it...
loadedLibs |= LIB_MAIN;
} catch (SecurityException e) {
@@ -171,9 +179,16 @@
// the string is the libraries, separated by white space
StringTokenizer st = new StringTokenizer(extraLibs);
while (st.hasMoreTokens()) {
- String lib = st.nextToken();
+ final String lib = st.nextToken();
try {
- JSSecurityManager.loadLibrary(lib);
+ AccessController.doPrivileged(new PrivilegedAction() {
+ @Override
+ public Void run() {
+ System.loadLibrary(lib);
+ return null;
+ }
+ });
+
if (lib.equals(libNameALSA)) {
loadedLibs |= LIB_ALSA;
if (Printer.debug) Printer.debug("Loaded ALSA lib successfully.");
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/PortMixer.java
--- a/jdk/src/share/classes/com/sun/media/sound/PortMixer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/PortMixer.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
*
* @author Florian Bomers
*/
-class PortMixer extends AbstractMixer {
+final class PortMixer extends AbstractMixer {
// CONSTANTS
private static final int SRC_UNKNOWN = 0x01;
@@ -228,8 +228,10 @@
/**
* Private inner class representing a Port for the PortMixer.
*/
- private static class PortMixerPort extends AbstractLine implements Port {
- private int portIndex;
+ private static final class PortMixerPort extends AbstractLine
+ implements Port {
+
+ private final int portIndex;
private long id;
// CONSTRUCTOR
@@ -342,9 +344,9 @@
/**
* Private inner class representing a BooleanControl for PortMixerPort
*/
- private static class BoolCtrl extends BooleanControl {
+ private static final class BoolCtrl extends BooleanControl {
// the handle to the native control function
- private long controlID;
+ private final long controlID;
private boolean closed = false;
private static BooleanControl.Type createType(String name) {
@@ -386,7 +388,7 @@
/**
* inner class for custom types
*/
- private static class BCT extends BooleanControl.Type {
+ private static final class BCT extends BooleanControl.Type {
private BCT(String name) {
super(name);
}
@@ -396,7 +398,7 @@
/**
* Private inner class representing a CompoundControl for PortMixerPort
*/
- private static class CompCtrl extends CompoundControl {
+ private static final class CompCtrl extends CompoundControl {
private CompCtrl(String name, Control[] controls) {
super(new CCT(name), controls);
}
@@ -404,7 +406,7 @@
/**
* inner class for custom compound control types
*/
- private static class CCT extends CompoundControl.Type {
+ private static final class CCT extends CompoundControl.Type {
private CCT(String name) {
super(name);
}
@@ -414,9 +416,9 @@
/**
* Private inner class representing a BooleanControl for PortMixerPort
*/
- private static class FloatCtrl extends FloatControl {
+ private static final class FloatCtrl extends FloatControl {
// the handle to the native control function
- private long controlID;
+ private final long controlID;
private boolean closed = false;
// predefined float control types. See also Ports.h
@@ -462,7 +464,7 @@
/**
* inner class for custom types
*/
- private static class FCT extends FloatControl.Type {
+ private static final class FCT extends FloatControl.Type {
private FCT(String name) {
super(name);
}
@@ -472,7 +474,7 @@
/**
* Private inner class representing a port info
*/
- private static class PortInfo extends Port.Info {
+ private static final class PortInfo extends Port.Info {
private PortInfo(String name, boolean isSource) {
super(Port.class, name, isSource);
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/PortMixerProvider.java
--- a/jdk/src/share/classes/com/sun/media/sound/PortMixerProvider.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/PortMixerProvider.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
package com.sun.media.sound;
-import java.util.Vector;
-
import javax.sound.sampled.Mixer;
import javax.sound.sampled.spi.MixerProvider;
@@ -36,7 +34,7 @@
*
* @author Florian Bomers
*/
-public class PortMixerProvider extends MixerProvider {
+public final class PortMixerProvider extends MixerProvider {
// STATIC VARIABLES
@@ -66,16 +64,17 @@
* Required public no-arg constructor.
*/
public PortMixerProvider() {
- //if (Printer.trace) Printer.trace("PortMixerProvider: constructor");
- if (Platform.isPortsEnabled()) {
- init();
- } else {
- infos = new PortMixerInfo[0];
- devices = new PortMixer[0];
+ synchronized (PortMixerProvider.class) {
+ if (Platform.isPortsEnabled()) {
+ init();
+ } else {
+ infos = new PortMixerInfo[0];
+ devices = new PortMixer[0];
+ }
}
}
- private static synchronized void init() {
+ private static void init() {
// get the number of input devices
int numDevices = nGetNumDevices();
@@ -95,23 +94,28 @@
}
public Mixer.Info[] getMixerInfo() {
- Mixer.Info[] localArray = new Mixer.Info[infos.length];
- System.arraycopy(infos, 0, localArray, 0, infos.length);
- return localArray;
+ synchronized (PortMixerProvider.class) {
+ Mixer.Info[] localArray = new Mixer.Info[infos.length];
+ System.arraycopy(infos, 0, localArray, 0, infos.length);
+ return localArray;
+ }
}
public Mixer getMixer(Mixer.Info info) {
- for (int i = 0; i < infos.length; i++) {
- if (infos[i].equals(info)) {
- return getDevice(infos[i]);
+ synchronized (PortMixerProvider.class) {
+ for (int i = 0; i < infos.length; i++) {
+ if (infos[i].equals(info)) {
+ return getDevice(infos[i]);
+ }
}
}
- throw new IllegalArgumentException("Mixer " + info.toString() + " not supported by this provider.");
+ throw new IllegalArgumentException("Mixer " + info.toString()
+ + " not supported by this provider.");
}
- private Mixer getDevice(PortMixerInfo info) {
+ private static Mixer getDevice(PortMixerInfo info) {
int index = info.getIndex();
if (devices[index] == null) {
devices[index] = new PortMixer(info);
@@ -127,8 +131,8 @@
* making native references to a particular device.
* This constructor is called from native.
*/
- static class PortMixerInfo extends Mixer.Info {
- private int index;
+ static final class PortMixerInfo extends Mixer.Info {
+ private final int index;
private PortMixerInfo(int index, String name, String vendor, String description, String version) {
super("Port " + name, vendor, description, version);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/Printer.java
--- a/jdk/src/share/classes/com/sun/media/sound/Printer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/Printer.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
* @author David Rivas
* @author Kara Kytle
*/
-class Printer {
+final class Printer {
static final boolean err = false;
static final boolean debug = false;
@@ -68,6 +68,12 @@
release = on;
}*/
+ /**
+ * Suppresses default constructor, ensuring non-instantiability.
+ */
+ private Printer() {
+ }
+
public static void err(String str) {
if (err)
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java
--- a/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
*
* @author Karl Helgason
*/
-public class RIFFInvalidDataException extends InvalidDataException {
+public final class RIFFInvalidDataException extends InvalidDataException {
private static final long serialVersionUID = 1L;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java
--- a/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
*
* @author Karl Helgason
*/
-public class RIFFInvalidFormatException extends InvalidFormatException {
+public final class RIFFInvalidFormatException extends InvalidFormatException {
private static final long serialVersionUID = 1L;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/RIFFReader.java
--- a/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,11 +33,11 @@
*
* @author Karl Helgason
*/
-public class RIFFReader extends InputStream {
+public final class RIFFReader extends InputStream {
- private RIFFReader root;
+ private final RIFFReader root;
private long filepointer = 0;
- private String fourcc;
+ private final String fourcc;
private String riff_type = null;
private long ckSize = 0;
private InputStream stream;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/RIFFWriter.java
--- a/jdk/src/share/classes/com/sun/media/sound/RIFFWriter.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/RIFFWriter.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
*
* @author Karl Helgason
*/
-public class RIFFWriter extends OutputStream {
+public final class RIFFWriter extends OutputStream {
private interface RandomAccessWriter {
@@ -60,11 +60,11 @@
RandomAccessFile raf;
- public RandomAccessFileWriter(File file) throws FileNotFoundException {
+ RandomAccessFileWriter(File file) throws FileNotFoundException {
this.raf = new RandomAccessFile(file, "rw");
}
- public RandomAccessFileWriter(String name) throws FileNotFoundException {
+ RandomAccessFileWriter(String name) throws FileNotFoundException {
this.raf = new RandomAccessFile(name, "rw");
}
@@ -107,9 +107,9 @@
int length = 0;
int pos = 0;
byte[] s;
- OutputStream stream;
+ final OutputStream stream;
- public RandomAccessByteWriter(OutputStream stream) {
+ RandomAccessByteWriter(OutputStream stream) {
this.stream = stream;
}
@@ -163,8 +163,8 @@
}
private int chunktype = 0; // 0=RIFF, 1=LIST; 2=CHUNK
private RandomAccessWriter raf;
- private long chunksizepointer;
- private long startpointer;
+ private final long chunksizepointer;
+ private final long startpointer;
private RIFFWriter childchunk = null;
private boolean open = true;
private boolean writeoverride = false;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
--- a/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,13 @@
package com.sun.media.sound;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
import javax.sound.midi.*;
@@ -46,7 +45,8 @@
/* TODO:
* - rename PlayThread to PlayEngine (because isn't a thread)
*/
-class RealTimeSequencer extends AbstractMidiDevice implements Sequencer, AutoConnectSequencer {
+final class RealTimeSequencer extends AbstractMidiDevice
+ implements Sequencer, AutoConnectSequencer {
// STATIC VARIABLES
@@ -58,7 +58,8 @@
* Event Dispatcher thread. Should be using a shared event
* dispatcher instance with a factory in EventDispatcher
*/
- private static final EventDispatcher eventDispatcher;
+ private static final Map dispatchers =
+ new WeakHashMap<>();
/**
* All RealTimeSequencers share this info object.
@@ -66,11 +67,11 @@
static final RealTimeSequencerInfo info = new RealTimeSequencerInfo();
- private static Sequencer.SyncMode[] masterSyncModes = { Sequencer.SyncMode.INTERNAL_CLOCK };
- private static Sequencer.SyncMode[] slaveSyncModes = { Sequencer.SyncMode.NO_SYNC };
+ private static final Sequencer.SyncMode[] masterSyncModes = { Sequencer.SyncMode.INTERNAL_CLOCK };
+ private static final Sequencer.SyncMode[] slaveSyncModes = { Sequencer.SyncMode.NO_SYNC };
- private static Sequencer.SyncMode masterSyncMode = Sequencer.SyncMode.INTERNAL_CLOCK;
- private static Sequencer.SyncMode slaveSyncMode = Sequencer.SyncMode.NO_SYNC;
+ private static final Sequencer.SyncMode masterSyncMode = Sequencer.SyncMode.INTERNAL_CLOCK;
+ private static final Sequencer.SyncMode slaveSyncMode = Sequencer.SyncMode.NO_SYNC;
/**
@@ -100,7 +101,7 @@
private boolean[] trackSolo = null;
/** tempo cache for getMicrosecondPosition */
- private MidiUtils.TempoCache tempoCache = new MidiUtils.TempoCache();
+ private final MidiUtils.TempoCache tempoCache = new MidiUtils.TempoCache();
/**
* True if the sequence is running.
@@ -121,7 +122,7 @@
/**
* List of tracks to which we're recording
*/
- private List recordingTracks = new ArrayList();
+ private final List recordingTracks = new ArrayList();
private long loopStart = 0;
@@ -132,13 +133,13 @@
/**
* Meta event listeners
*/
- private ArrayList metaEventListeners = new ArrayList();
+ private final ArrayList metaEventListeners = new ArrayList();
/**
* Control change listeners
*/
- private ArrayList controllerEventListeners = new ArrayList();
+ private final ArrayList controllerEventListeners = new ArrayList();
/** automatic connection support */
@@ -151,16 +152,9 @@
Receiver autoConnectedReceiver = null;
- static {
- // create and start the global event thread
- eventDispatcher = new EventDispatcher();
- eventDispatcher.start();
- }
-
-
/* ****************************** CONSTRUCTOR ****************************** */
- protected RealTimeSequencer() throws MidiUnavailableException {
+ RealTimeSequencer() throws MidiUnavailableException {
super(info);
if (Printer.trace) Printer.trace(">> RealTimeSequencer CONSTRUCTOR");
@@ -574,7 +568,7 @@
return returnedModes;
}
- protected int getTrackCount() {
+ int getTrackCount() {
Sequence seq = getSequence();
if (seq != null) {
// $$fb wish there was a nicer way to get the number of tracks...
@@ -872,7 +866,7 @@
if (Printer.trace) Printer.trace("<< RealTimeSequencer: implClose() completed");
}
- protected void implStart() {
+ void implStart() {
if (Printer.trace) Printer.trace(">> RealTimeSequencer: implStart()");
if (playThread == null) {
@@ -889,7 +883,7 @@
}
- protected void implStop() {
+ void implStop() {
if (Printer.trace) Printer.trace(">> RealTimeSequencer: implStop()");
if (playThread == null) {
@@ -905,22 +899,36 @@
if (Printer.trace) Printer.trace("<< RealTimeSequencer: implStop() completed");
}
+ private static EventDispatcher getEventDispatcher() {
+ // create and start the global event thread
+ //TODO need a way to stop this thread when the engine is done
+ final ThreadGroup tg = Thread.currentThread().getThreadGroup();
+ synchronized (dispatchers) {
+ EventDispatcher eventDispatcher = dispatchers.get(tg);
+ if (eventDispatcher == null) {
+ eventDispatcher = new EventDispatcher();
+ dispatchers.put(tg, eventDispatcher);
+ eventDispatcher.start();
+ }
+ return eventDispatcher;
+ }
+ }
/**
* Send midi player events.
* must not be synchronized on "this"
*/
- protected void sendMetaEvents(MidiMessage message) {
+ void sendMetaEvents(MidiMessage message) {
if (metaEventListeners.size() == 0) return;
//if (Printer.debug) Printer.debug("sending a meta event");
- eventDispatcher.sendAudioEvents(message, metaEventListeners);
+ getEventDispatcher().sendAudioEvents(message, metaEventListeners);
}
/**
* Send midi player events.
*/
- protected void sendControllerEvents(MidiMessage message) {
+ void sendControllerEvents(MidiMessage message) {
int size = controllerEventListeners.size();
if (size == 0) return;
@@ -942,7 +950,7 @@
}
}
}
- eventDispatcher.sendAudioEvents(message, sendToListeners);
+ getEventDispatcher().sendAudioEvents(message, sendToListeners);
}
@@ -1024,7 +1032,7 @@
}
- class SequencerReceiver extends AbstractReceiver {
+ final class SequencerReceiver extends AbstractReceiver {
void implSend(MidiMessage message, long timeStamp) {
if (recording) {
@@ -1092,7 +1100,7 @@
// easier to deal with than turning all the
// ints into objects to use a Vector
int [] controllers;
- ControllerEventListener listener;
+ final ControllerEventListener listener;
private ControllerListElement(ControllerEventListener listener, int[] controllers) {
@@ -1197,7 +1205,7 @@
static class RecordingTrack {
- private Track track;
+ private final Track track;
private int channel;
RecordingTrack(Track track, int channel) {
@@ -1237,15 +1245,15 @@
}
- class PlayThread implements Runnable {
+ final class PlayThread implements Runnable {
private Thread thread;
- private Object lock = new Object();
+ private final Object lock = new Object();
/** true if playback is interrupted (in close) */
boolean interrupted = false;
boolean isPumping = false;
- private DataPump dataPump = new DataPump();
+ private final DataPump dataPump = new DataPump();
PlayThread() {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java
--- a/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
*
* @author Florian Bomers
*/
-public class RealTimeSequencerProvider extends MidiDeviceProvider {
+public final class RealTimeSequencerProvider extends MidiDeviceProvider {
public MidiDevice.Info[] getDeviceInfo() {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java
--- a/jdk/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,5 +29,5 @@
*
* @author Karl Helgason
*/
-public class SF2GlobalRegion extends SF2Region {
+public final class SF2GlobalRegion extends SF2Region {
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SF2Instrument.java
--- a/jdk/src/share/classes/com/sun/media/sound/SF2Instrument.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SF2Instrument.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,16 +36,16 @@
*
* @author Karl Helgason
*/
-public class SF2Instrument extends ModelInstrument {
+public final class SF2Instrument extends ModelInstrument {
- protected String name = "";
- protected int preset = 0;
- protected int bank = 0;
- protected long library = 0;
- protected long genre = 0;
- protected long morphology = 0;
- protected SF2GlobalRegion globalregion = null;
- protected List regions
+ String name = "";
+ int preset = 0;
+ int bank = 0;
+ long library = 0;
+ long genre = 0;
+ long morphology = 0;
+ SF2GlobalRegion globalregion = null;
+ List regions
= new ArrayList();
public SF2Instrument() {
@@ -730,7 +730,7 @@
return msrc;
}
- protected static ModelDestination convertDestination(int dst,
+ static ModelDestination convertDestination(int dst,
double[] amountcorrection, ModelSource[] extrasrc) {
ModelIdentifier id = null;
switch (dst) {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java
--- a/jdk/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,9 @@
*
* @author Karl Helgason
*/
-public class SF2InstrumentRegion extends SF2Region {
+public final class SF2InstrumentRegion extends SF2Region {
- protected SF2Layer layer;
+ SF2Layer layer;
public SF2Layer getLayer() {
return layer;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SF2Layer.java
--- a/jdk/src/share/classes/com/sun/media/sound/SF2Layer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SF2Layer.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,11 +34,11 @@
*
* @author Karl Helgason
*/
-public class SF2Layer extends SoundbankResource {
+public final class SF2Layer extends SoundbankResource {
- protected String name = "";
- protected SF2GlobalRegion globalregion = null;
- protected List regions = new ArrayList();
+ String name = "";
+ SF2GlobalRegion globalregion = null;
+ List regions = new ArrayList();
public SF2Layer(SF2Soundbank soundBank) {
super(soundBank, null, null);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SF2LayerRegion.java
--- a/jdk/src/share/classes/com/sun/media/sound/SF2LayerRegion.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SF2LayerRegion.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,9 @@
*
* @author Karl Helgason
*/
-public class SF2LayerRegion extends SF2Region {
+public final class SF2LayerRegion extends SF2Region {
- protected SF2Sample sample;
+ SF2Sample sample;
public SF2Sample getSample() {
return sample;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SF2Modulator.java
--- a/jdk/src/share/classes/com/sun/media/sound/SF2Modulator.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SF2Modulator.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
*
* @author Karl Helgason
*/
-public class SF2Modulator {
+public final class SF2Modulator {
public final static int SOURCE_NONE = 0;
public final static int SOURCE_NOTE_ON_VELOCITY = 2;
@@ -49,11 +49,11 @@
public final static int SOURCE_TYPE_SWITCH = 1024 * 3;
public final static int TRANSFORM_LINEAR = 0;
public final static int TRANSFORM_ABSOLUTE = 2;
- protected int sourceOperator;
- protected int destinationOperator;
- protected short amount;
- protected int amountSourceOperator;
- protected int transportOperator;
+ int sourceOperator;
+ int destinationOperator;
+ short amount;
+ int amountSourceOperator;
+ int transportOperator;
public short getAmount() {
return amount;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SF2Sample.java
--- a/jdk/src/share/classes/com/sun/media/sound/SF2Sample.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SF2Sample.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,18 +36,18 @@
*
* @author Karl Helgason
*/
-public class SF2Sample extends SoundbankResource {
+public final class SF2Sample extends SoundbankResource {
- protected String name = "";
- protected long startLoop = 0;
- protected long endLoop = 0;
- protected long sampleRate = 44100;
- protected int originalPitch = 60;
- protected byte pitchCorrection = 0;
- protected int sampleLink = 0;
- protected int sampleType = 0;
- protected ModelByteBuffer data;
- protected ModelByteBuffer data24;
+ String name = "";
+ long startLoop = 0;
+ long endLoop = 0;
+ long sampleRate = 44100;
+ int originalPitch = 60;
+ byte pitchCorrection = 0;
+ int sampleLink = 0;
+ int sampleType = 0;
+ ModelByteBuffer data;
+ ModelByteBuffer data24;
public SF2Sample(Soundbank soundBank) {
super(soundBank, null, AudioInputStream.class);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java
--- a/jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -50,40 +50,40 @@
*
* @author Karl Helgason
*/
-public class SF2Soundbank implements Soundbank {
+public final class SF2Soundbank implements Soundbank {
// version of the Sound Font RIFF file
- protected int major = 2;
- protected int minor = 1;
+ int major = 2;
+ int minor = 1;
// target Sound Engine
- protected String targetEngine = "EMU8000";
+ String targetEngine = "EMU8000";
// Sound Font Bank Name
- protected String name = "untitled";
+ String name = "untitled";
// Sound ROM Name
- protected String romName = null;
+ String romName = null;
// Sound ROM Version
- protected int romVersionMajor = -1;
- protected int romVersionMinor = -1;
+ int romVersionMajor = -1;
+ int romVersionMinor = -1;
// Date of Creation of the Bank
- protected String creationDate = null;
+ String creationDate = null;
// Sound Designers and Engineers for the Bank
- protected String engineers = null;
+ String engineers = null;
// Product for which the Bank was intended
- protected String product = null;
+ String product = null;
// Copyright message
- protected String copyright = null;
+ String copyright = null;
// Comments
- protected String comments = null;
+ String comments = null;
// The SoundFont tools used to create and alter the bank
- protected String tools = null;
+ String tools = null;
// The Sample Data loaded from the SoundFont
private ModelByteBuffer sampleData = null;
private ModelByteBuffer sampleData24 = null;
private File sampleFile = null;
private boolean largeFormat = false;
- private List instruments = new ArrayList();
- private List layers = new ArrayList();
- private List samples = new ArrayList();
+ private final List instruments = new ArrayList();
+ private final List layers = new ArrayList();
+ private final List samples = new ArrayList();
public SF2Soundbank() {
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java
--- a/jdk/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
*
* @author Karl Helgason
*/
-public class SF2SoundbankReader extends SoundbankReader {
+public final class SF2SoundbankReader extends SoundbankReader {
public Soundbank getSoundbank(URL url)
throws InvalidMidiDataException, IOException {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@
float samplerateconv = 1;
float pitchcorrection = 0;
- public ModelAbstractResamplerStream() {
+ ModelAbstractResamplerStream() {
pad = getPadding();
pad2 = getPadding() * 2;
ibuffer = new float[2][sector_size + pad2];
@@ -384,7 +384,7 @@
float in_end, float[] pitch, float pitchstep, float[] out,
int[] out_offset, int out_end);
- public SoftResamplerStreamer openStreamer() {
+ public final SoftResamplerStreamer openStreamer() {
return new ModelAbstractResamplerStream();
}
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
*
* @author Karl Helgason
*/
-public class SoftAudioBuffer {
+public final class SoftAudioBuffer {
private int size;
private float[] buffer;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,13 +34,13 @@
*
* @author Karl Helgason
*/
-public class SoftAudioPusher implements Runnable {
+public final class SoftAudioPusher implements Runnable {
private volatile boolean active = false;
private SourceDataLine sourceDataLine = null;
private Thread audiothread;
- private AudioInputStream ais;
- private byte[] buffer;
+ private final AudioInputStream ais;
+ private final byte[] buffer;
public SoftAudioPusher(SourceDataLine sourceDataLine, AudioInputStream ais,
int workbuffersizer) {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftChannel.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@
*
* @author Karl Helgason
*/
-public class SoftChannel implements MidiChannel, ModelDirectedPlayer {
+public final class SoftChannel implements MidiChannel, ModelDirectedPlayer {
private static boolean[] dontResetControls = new boolean[128];
static {
@@ -90,15 +90,15 @@
private static final int RPN_NULL_VALUE = (127 << 7) + 127;
private int rpn_control = RPN_NULL_VALUE;
private int nrpn_control = RPN_NULL_VALUE;
- protected double portamento_time = 1; // keyschanges per control buffer time
- protected int[] portamento_lastnote = new int[128];
- protected int portamento_lastnote_ix = 0;
+ double portamento_time = 1; // keyschanges per control buffer time
+ int[] portamento_lastnote = new int[128];
+ int portamento_lastnote_ix = 0;
private boolean portamento = false;
private boolean mono = false;
private boolean mute = false;
private boolean solo = false;
private boolean solomute = false;
- private Object control_mutex;
+ private final Object control_mutex;
private int channel;
private SoftVoice[] voices;
private int bank;
@@ -111,21 +111,21 @@
private int pitchbend;
private double[] co_midi_pitch = new double[1];
private double[] co_midi_channel_pressure = new double[1];
- protected SoftTuning tuning = new SoftTuning();
- protected int tuning_bank = 0;
- protected int tuning_program = 0;
- protected SoftInstrument current_instrument = null;
- protected ModelChannelMixer current_mixer = null;
- protected ModelDirector current_director = null;
+ SoftTuning tuning = new SoftTuning();
+ int tuning_bank = 0;
+ int tuning_program = 0;
+ SoftInstrument current_instrument = null;
+ ModelChannelMixer current_mixer = null;
+ ModelDirector current_director = null;
// Controller Destination Settings
- protected int cds_control_number = -1;
- protected ModelConnectionBlock[] cds_control_connections = null;
- protected ModelConnectionBlock[] cds_channelpressure_connections = null;
- protected ModelConnectionBlock[] cds_polypressure_connections = null;
- protected boolean sustain = false;
- protected boolean[][] keybasedcontroller_active = null;
- protected double[][] keybasedcontroller_value = null;
+ int cds_control_number = -1;
+ ModelConnectionBlock[] cds_control_connections = null;
+ ModelConnectionBlock[] cds_channelpressure_connections = null;
+ ModelConnectionBlock[] cds_polypressure_connections = null;
+ boolean sustain = false;
+ boolean[][] keybasedcontroller_active = null;
+ double[][] keybasedcontroller_value = null;
private class MidiControlObject implements SoftControl {
double[] pitch = co_midi_pitch;
@@ -336,7 +336,7 @@
}
- protected void initVoice(SoftVoice voice, SoftPerformer p, int voiceID,
+ void initVoice(SoftVoice voice, SoftPerformer p, int voiceID,
int noteNumber, int velocity, int delay, ModelConnectionBlock[] connectionBlocks,
ModelChannelMixer channelmixer, boolean releaseTriggered) {
if (voice.active) {
@@ -414,7 +414,7 @@
/* A special noteOn with delay parameter, which is used to
* start note within control buffers.
*/
- protected void noteOn(int noteNumber, int velocity, int delay) {
+ void noteOn(int noteNumber, int velocity, int delay) {
noteNumber = restrict7Bit(noteNumber);
velocity = restrict7Bit(velocity);
noteOn_internal(noteNumber, velocity, delay);
@@ -707,7 +707,7 @@
}
}
- protected void applyInstrumentCustomization() {
+ void applyInstrumentCustomization() {
if (cds_control_connections == null
&& cds_channelpressure_connections == null
&& cds_polypressure_connections == null) {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftChannelProxy.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftChannelProxy.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftChannelProxy.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
*
* @author Karl Helgason
*/
-public class SoftChannelProxy implements MidiChannel {
+public final class SoftChannelProxy implements MidiChannel {
private MidiChannel channel = null;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftChorus.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,11 +32,11 @@
*
* @author Karl Helgason
*/
-public class SoftChorus implements SoftAudioProcessor {
+public final class SoftChorus implements SoftAudioProcessor {
private static class VariableDelay {
- private float[] delaybuffer;
+ private final float[] delaybuffer;
private int rovepos = 0;
private float gain = 1;
private float rgain = 0;
@@ -44,7 +44,7 @@
private float lastdelay = 0;
private float feedback = 0;
- public VariableDelay(int maxbuffersize) {
+ VariableDelay(int maxbuffersize) {
delaybuffer = new float[maxbuffersize];
}
@@ -119,10 +119,10 @@
private double phase_step = 0;
private double depth = 0;
private VariableDelay vdelay;
- private double samplerate;
- private double controlrate;
+ private final double samplerate;
+ private final double controlrate;
- public LFODelay(double samplerate, double controlrate) {
+ LFODelay(double samplerate, double controlrate) {
this.samplerate = samplerate;
this.controlrate = controlrate;
// vdelay = new VariableDelay((int)(samplerate*4));
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftCubicResampler.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftCubicResampler.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftCubicResampler.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
*
* @author Karl Helgason
*/
-public class SoftCubicResampler extends SoftAbstractResampler {
+public final class SoftCubicResampler extends SoftAbstractResampler {
public int getPadding() {
return 3;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
*
* @author Karl Helgason
*/
-public class SoftEnvelopeGenerator implements SoftProcess {
+public final class SoftEnvelopeGenerator implements SoftProcess {
public final static int EG_OFF = 0;
public final static int EG_DELAY = 1;
@@ -42,23 +42,23 @@
public final static int EG_END = 8;
int max_count = 10;
int used_count = 0;
- private int[] stage = new int[max_count];
- private int[] stage_ix = new int[max_count];
- private double[] stage_v = new double[max_count];
- private int[] stage_count = new int[max_count];
- private double[][] on = new double[max_count][1];
- private double[][] active = new double[max_count][1];
- private double[][] out = new double[max_count][1];
- private double[][] delay = new double[max_count][1];
- private double[][] attack = new double[max_count][1];
- private double[][] hold = new double[max_count][1];
- private double[][] decay = new double[max_count][1];
- private double[][] sustain = new double[max_count][1];
- private double[][] release = new double[max_count][1];
- private double[][] shutdown = new double[max_count][1];
- private double[][] release2 = new double[max_count][1];
- private double[][] attack2 = new double[max_count][1];
- private double[][] decay2 = new double[max_count][1];
+ private final int[] stage = new int[max_count];
+ private final int[] stage_ix = new int[max_count];
+ private final double[] stage_v = new double[max_count];
+ private final int[] stage_count = new int[max_count];
+ private final double[][] on = new double[max_count][1];
+ private final double[][] active = new double[max_count][1];
+ private final double[][] out = new double[max_count][1];
+ private final double[][] delay = new double[max_count][1];
+ private final double[][] attack = new double[max_count][1];
+ private final double[][] hold = new double[max_count][1];
+ private final double[][] decay = new double[max_count][1];
+ private final double[][] sustain = new double[max_count][1];
+ private final double[][] release = new double[max_count][1];
+ private final double[][] shutdown = new double[max_count][1];
+ private final double[][] release2 = new double[max_count][1];
+ private final double[][] attack2 = new double[max_count][1];
+ private final double[][] decay2 = new double[max_count][1];
private double control_time = 0;
public void reset() {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftFilter.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
*
* @author Karl Helgason
*/
-public class SoftFilter {
+public final class SoftFilter {
public final static int FILTERTYPE_LP6 = 0x00;
public final static int FILTERTYPE_LP12 = 0x01;
@@ -55,7 +55,7 @@
// 0x30 = NP, Notch or Band Elimination Filter
//
private int filtertype = FILTERTYPE_LP6;
- private float samplerate;
+ private final float samplerate;
private float x1;
private float x2;
private float y1;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,12 +32,12 @@
*
* @author Karl Helgason
*/
-public class SoftInstrument extends Instrument {
+public final class SoftInstrument extends Instrument {
private SoftPerformer[] performers;
private ModelPerformer[] modelperformers;
- private Object data;
- private ModelInstrument ins;
+ private final Object data;
+ private final ModelInstrument ins;
public SoftInstrument(ModelInstrument ins) {
super(ins.getSoundbank(), ins.getPatch(), ins.getName(),
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
*
* @author Karl Helgason
*/
-public class SoftJitterCorrector extends AudioInputStream {
+public final class SoftJitterCorrector extends AudioInputStream {
private static class JitterStream extends InputStream {
@@ -48,7 +48,7 @@
int writepos = 0;
int readpos = 0;
byte[][] buffers;
- Object buffers_mutex = new Object();
+ private final Object buffers_mutex = new Object();
// Adapative Drift Statistics
int w_count = 1000;
@@ -112,7 +112,7 @@
}
}
- public JitterStream(AudioInputStream s, int buffersize,
+ JitterStream(AudioInputStream s, int buffersize,
int smallbuffersize) {
this.w_count = 10 * (buffersize / smallbuffersize);
if (w_count < 100)
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
*
* @author Karl Helgason
*/
-public class SoftLanczosResampler extends SoftAbstractResampler {
+public final class SoftLanczosResampler extends SoftAbstractResampler {
float[][] sinc_table;
int sinc_table_fsize = 2000;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftLimiter.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftLimiter.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftLimiter.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
*
* @author Karl Helgason
*/
-public class SoftLimiter implements SoftAudioProcessor {
+public final class SoftLimiter implements SoftAudioProcessor {
float lastmax = 0;
float gain = 1;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
*
* @author Karl Helgason
*/
-public class SoftLinearResampler extends SoftAbstractResampler {
+public final class SoftLinearResampler extends SoftAbstractResampler {
public int getPadding() {
return 2;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
*
* @author Karl Helgason
*/
-public class SoftLinearResampler2 extends SoftAbstractResampler {
+public final class SoftLinearResampler2 extends SoftAbstractResampler {
public int getPadding() {
return 2;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,21 +29,21 @@
*
* @author Karl Helgason
*/
-public class SoftLowFrequencyOscillator implements SoftProcess {
+public final class SoftLowFrequencyOscillator implements SoftProcess {
- private int max_count = 10;
+ private final int max_count = 10;
private int used_count = 0;
- private double[][] out = new double[max_count][1];
- private double[][] delay = new double[max_count][1];
- private double[][] delay2 = new double[max_count][1];
- private double[][] freq = new double[max_count][1];
- private int[] delay_counter = new int[max_count];
- private double[] sin_phase = new double[max_count];
- private double[] sin_stepfreq = new double[max_count];
- private double[] sin_step = new double[max_count];
+ private final double[][] out = new double[max_count][1];
+ private final double[][] delay = new double[max_count][1];
+ private final double[][] delay2 = new double[max_count][1];
+ private final double[][] freq = new double[max_count][1];
+ private final int[] delay_counter = new int[max_count];
+ private final double[] sin_phase = new double[max_count];
+ private final double[] sin_stepfreq = new double[max_count];
+ private final double[] sin_step = new double[max_count];
private double control_time = 0;
private double sin_factor = 0;
- private static double PI2 = 2.0 * Math.PI;
+ private static final double PI2 = 2.0 * Math.PI;
public SoftLowFrequencyOscillator() {
// If sin_step is 0 then sin_stepfreq must be -INF
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
*
* @author Karl Helgason
*/
-public class SoftMainMixer {
+public final class SoftMainMixer {
// A private class thats contains a ModelChannelMixer and it's private buffers.
// This becomes necessary when we want to have separate delay buffers for each channel mixer.
@@ -67,13 +67,13 @@
public final static int CHANNEL_RIGHT_DRY = 11;
public final static int CHANNEL_SCRATCH1 = 12;
public final static int CHANNEL_SCRATCH2 = 13;
- protected boolean active_sensing_on = false;
+ boolean active_sensing_on = false;
private long msec_last_activity = -1;
private boolean pusher_silent = false;
private int pusher_silent_count = 0;
private long sample_pos = 0;
- protected boolean readfully = true;
- private Object control_mutex;
+ boolean readfully = true;
+ private final Object control_mutex;
private SoftSynthesizer synth;
private float samplerate = 44100;
private int nrofchannels = 2;
@@ -84,7 +84,7 @@
private SoftAudioProcessor agc;
private long msec_buffer_len = 0;
private int buffer_len = 0;
- protected TreeMap midimessages = new TreeMap();
+ TreeMap midimessages = new TreeMap();
private int delay_midievent = 0;
private int max_delay_midievent = 0;
double last_volume_left = 1.0;
@@ -97,7 +97,7 @@
private Set registeredMixers = null;
private Set stoppedMixers = null;
private SoftChannelMixerContainer[] cur_registeredMixers = null;
- protected SoftControl co_master = new SoftControl() {
+ SoftControl co_master = new SoftControl() {
double[] balance = co_master_balance;
double[] volume = co_master_volume;
@@ -438,7 +438,7 @@
delay_midievent = 0;
}
- protected void processAudioBuffers() {
+ void processAudioBuffers() {
if(synth.weakstream != null && synth.weakstream.silent_samples != 0)
{
@@ -859,16 +859,16 @@
InputStream in = new InputStream() {
- private SoftAudioBuffer[] buffers = SoftMainMixer.this.buffers;
- private int nrofchannels
+ private final SoftAudioBuffer[] buffers = SoftMainMixer.this.buffers;
+ private final int nrofchannels
= SoftMainMixer.this.synth.getFormat().getChannels();
- private int buffersize = buffers[0].getSize();
- private byte[] bbuffer = new byte[buffersize
+ private final int buffersize = buffers[0].getSize();
+ private final byte[] bbuffer = new byte[buffersize
* (SoftMainMixer.this.synth.getFormat()
.getSampleSizeInBits() / 8)
* nrofchannels];
private int bbuffer_pos = 0;
- private byte[] single = new byte[1];
+ private final byte[] single = new byte[1];
public void fillBuffer() {
/*
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@
*
* @author Karl Helgason
*/
-public class SoftMidiAudioFileReader extends AudioFileReader {
+public final class SoftMidiAudioFileReader extends AudioFileReader {
public static final Type MIDI = new Type("MIDI", "mid");
private static AudioFormat format = new AudioFormat(44100, 16, 2, true, false);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftMixingClip.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftMixingClip.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftMixingClip.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
*
* @author Karl Helgason
*/
-public class SoftMixingClip extends SoftMixingDataLine implements Clip {
+public final class SoftMixingClip extends SoftMixingDataLine implements Clip {
private AudioFormat format;
@@ -50,7 +50,7 @@
private byte[] data;
- private InputStream datastream = new InputStream() {
+ private final InputStream datastream = new InputStream() {
public int read() throws IOException {
byte[] b = new byte[1];
@@ -162,7 +162,7 @@
private AudioFloatInputStream afis;
- protected SoftMixingClip(SoftMixingMixer mixer, DataLine.Info info) {
+ SoftMixingClip(SoftMixingMixer mixer, DataLine.Info info) {
super(mixer, info);
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -50,22 +50,22 @@
"Chorus Send") {
};
- protected static class AudioFloatInputStreamResampler extends
+ protected static final class AudioFloatInputStreamResampler extends
AudioFloatInputStream {
- private AudioFloatInputStream ais;
+ private final AudioFloatInputStream ais;
- private AudioFormat targetFormat;
+ private final AudioFormat targetFormat;
private float[] skipbuffer;
private SoftAbstractResampler resampler;
- private float[] pitch = new float[1];
+ private final float[] pitch = new float[1];
- private float[] ibuffer2;
+ private final float[] ibuffer2;
- private float[][] ibuffer;
+ private final float[][] ibuffer;
private float ibuffer_index = 0;
@@ -75,15 +75,15 @@
private float[][] cbuffer;
- private int buffer_len = 512;
+ private final int buffer_len = 512;
- private int pad;
+ private final int pad;
- private int pad2;
+ private final int pad2;
- private float[] ix = new float[1];
+ private final float[] ix = new float[1];
- private int[] ox = new int[1];
+ private final int[] ox = new int[1];
private float[][] mark_ibuffer = null;
@@ -294,7 +294,7 @@
}
- private class Gain extends FloatControl {
+ private final class Gain extends FloatControl {
private Gain() {
@@ -308,7 +308,7 @@
}
}
- private class Mute extends BooleanControl {
+ private final class Mute extends BooleanControl {
private Mute() {
super(BooleanControl.Type.MUTE, false, "True", "False");
@@ -320,7 +320,7 @@
}
}
- private class ApplyReverb extends BooleanControl {
+ private final class ApplyReverb extends BooleanControl {
private ApplyReverb() {
super(BooleanControl.Type.APPLY_REVERB, false, "True", "False");
@@ -333,7 +333,7 @@
}
- private class Balance extends FloatControl {
+ private final class Balance extends FloatControl {
private Balance() {
super(FloatControl.Type.BALANCE, -1.0f, 1.0f, (1.0f / 128.0f), -1,
@@ -347,7 +347,7 @@
}
- private class Pan extends FloatControl {
+ private final class Pan extends FloatControl {
private Pan() {
super(FloatControl.Type.PAN, -1.0f, 1.0f, (1.0f / 128.0f), -1,
@@ -365,7 +365,7 @@
}
- private class ReverbSend extends FloatControl {
+ private final class ReverbSend extends FloatControl {
private ReverbSend() {
super(FloatControl.Type.REVERB_SEND, -80f, 6.0206f, 80f / 128.0f,
@@ -379,7 +379,7 @@
}
- private class ChorusSend extends FloatControl {
+ private final class ChorusSend extends FloatControl {
private ChorusSend() {
super(CHORUS_SEND, -80f, 6.0206f, 80f / 128.0f, -1, -80f, "dB",
@@ -393,43 +393,43 @@
}
- private Gain gain_control = new Gain();
+ private final Gain gain_control = new Gain();
- private Mute mute_control = new Mute();
+ private final Mute mute_control = new Mute();
- private Balance balance_control = new Balance();
+ private final Balance balance_control = new Balance();
- private Pan pan_control = new Pan();
+ private final Pan pan_control = new Pan();
- private ReverbSend reverbsend_control = new ReverbSend();
+ private final ReverbSend reverbsend_control = new ReverbSend();
- private ChorusSend chorussend_control = new ChorusSend();
+ private final ChorusSend chorussend_control = new ChorusSend();
- private ApplyReverb apply_reverb = new ApplyReverb();
+ private final ApplyReverb apply_reverb = new ApplyReverb();
- private Control[] controls;
+ private final Control[] controls;
- protected float leftgain = 1;
+ float leftgain = 1;
- protected float rightgain = 1;
+ float rightgain = 1;
- protected float eff1gain = 0;
+ float eff1gain = 0;
- protected float eff2gain = 0;
+ float eff2gain = 0;
- protected List listeners = new ArrayList();
+ List listeners = new ArrayList();
- protected Object control_mutex;
+ final Object control_mutex;
- protected SoftMixingMixer mixer;
+ SoftMixingMixer mixer;
- protected DataLine.Info info;
+ DataLine.Info info;
protected abstract void processControlLogic();
protected abstract void processAudioLogic(SoftAudioBuffer[] buffers);
- protected SoftMixingDataLine(SoftMixingMixer mixer, DataLine.Info info) {
+ SoftMixingDataLine(SoftMixingMixer mixer, DataLine.Info info) {
this.mixer = mixer;
this.info = info;
this.control_mutex = mixer.control_mutex;
@@ -440,7 +440,7 @@
calcVolume();
}
- protected void calcVolume() {
+ final void calcVolume() {
synchronized (control_mutex) {
double gain = Math.pow(10.0, gain_control.getValue() / 20.0);
if (mute_control.getValue())
@@ -466,7 +466,7 @@
}
}
- protected void sendEvent(LineEvent event) {
+ final void sendEvent(LineEvent event) {
if (listeners.size() == 0)
return;
LineListener[] listener_array = listeners
@@ -476,23 +476,23 @@
}
}
- public void addLineListener(LineListener listener) {
+ public final void addLineListener(LineListener listener) {
synchronized (control_mutex) {
listeners.add(listener);
}
}
- public void removeLineListener(LineListener listener) {
+ public final void removeLineListener(LineListener listener) {
synchronized (control_mutex) {
listeners.add(listener);
}
}
- public javax.sound.sampled.Line.Info getLineInfo() {
+ public final javax.sound.sampled.Line.Info getLineInfo() {
return info;
}
- public Control getControl(Type control) {
+ public final Control getControl(Type control) {
if (control != null) {
for (int i = 0; i < controls.length; i++) {
if (controls[i].getType() == control) {
@@ -504,11 +504,11 @@
+ control);
}
- public Control[] getControls() {
+ public final Control[] getControls() {
return Arrays.copyOf(controls, controls.length);
}
- public boolean isControlSupported(Type control) {
+ public final boolean isControlSupported(Type control) {
if (control != null) {
for (int i = 0; i < controls.length; i++) {
if (controls[i].getType() == control) {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
*
* @author Karl Helgason
*/
-public class SoftMixingMainMixer {
+public final class SoftMixingMainMixer {
public final static int CHANNEL_LEFT = 0;
@@ -63,23 +63,23 @@
public final static int CHANNEL_CHANNELMIXER_RIGHT = 15;
- private SoftMixingMixer mixer;
+ private final SoftMixingMixer mixer;
- private AudioInputStream ais;
+ private final AudioInputStream ais;
- private SoftAudioBuffer[] buffers;
+ private final SoftAudioBuffer[] buffers;
- private SoftAudioProcessor reverb;
+ private final SoftAudioProcessor reverb;
- private SoftAudioProcessor chorus;
+ private final SoftAudioProcessor chorus;
- private SoftAudioProcessor agc;
+ private final SoftAudioProcessor agc;
- private int nrofchannels;
+ private final int nrofchannels;
- private Object control_mutex;
+ private final Object control_mutex;
- private List openLinesList = new ArrayList();
+ private final List openLinesList = new ArrayList();
private SoftMixingDataLine[] openLines = new SoftMixingDataLine[0];
@@ -87,7 +87,7 @@
return ais;
}
- protected void processAudioBuffers() {
+ void processAudioBuffers() {
for (int i = 0; i < buffers.length; i++) {
buffers[i].clear();
}
@@ -162,20 +162,20 @@
InputStream in = new InputStream() {
- private SoftAudioBuffer[] buffers = SoftMixingMainMixer.this.buffers;
+ private final SoftAudioBuffer[] buffers = SoftMixingMainMixer.this.buffers;
- private int nrofchannels = SoftMixingMainMixer.this.mixer
+ private final int nrofchannels = SoftMixingMainMixer.this.mixer
.getFormat().getChannels();
- private int buffersize = buffers[0].getSize();
+ private final int buffersize = buffers[0].getSize();
- private byte[] bbuffer = new byte[buffersize
+ private final byte[] bbuffer = new byte[buffersize
* (SoftMixingMainMixer.this.mixer.getFormat()
.getSampleSizeInBits() / 8) * nrofchannels];
private int bbuffer_pos = 0;
- private byte[] single = new byte[1];
+ private final byte[] single = new byte[1];
public void fillBuffer() {
processAudioBuffers();
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,27 +48,27 @@
*
* @author Karl Helgason
*/
-public class SoftMixingMixer implements Mixer {
+public final class SoftMixingMixer implements Mixer {
private static class Info extends Mixer.Info {
- public Info() {
+ Info() {
super(INFO_NAME, INFO_VENDOR, INFO_DESCRIPTION, INFO_VERSION);
}
}
- protected static final String INFO_NAME = "Gervill Sound Mixer";
+ static final String INFO_NAME = "Gervill Sound Mixer";
- protected static final String INFO_VENDOR = "OpenJDK Proposal";
+ static final String INFO_VENDOR = "OpenJDK Proposal";
- protected static final String INFO_DESCRIPTION = "Software Sound Mixer";
+ static final String INFO_DESCRIPTION = "Software Sound Mixer";
- protected static final String INFO_VERSION = "1.0";
+ static final String INFO_VERSION = "1.0";
- protected final static Mixer.Info info = new Info();
+ static final Mixer.Info info = new Info();
- protected Object control_mutex = this;
+ final Object control_mutex = this;
- protected boolean implicitOpen = false;
+ boolean implicitOpen = false;
private boolean open = false;
@@ -82,15 +82,15 @@
private AudioInputStream pusher_stream = null;
- private float controlrate = 147f;
+ private final float controlrate = 147f;
- private long latency = 100000; // 100 msec
+ private final long latency = 100000; // 100 msec
- private boolean jitter_correction = false;
+ private final boolean jitter_correction = false;
- private List listeners = new ArrayList();
+ private final List listeners = new ArrayList();
- private javax.sound.sampled.Line.Info[] sourceLineInfo;
+ private final javax.sound.sampled.Line.Info[] sourceLineInfo;
public SoftMixingMixer() {
@@ -516,11 +516,11 @@
}
}
- protected float getControlRate() {
+ float getControlRate() {
return controlrate;
}
- protected SoftMixingMainMixer getMainMixer() {
+ SoftMixingMainMixer getMainMixer() {
if (!isOpen())
return null;
return mainmixer;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,13 +33,13 @@
*
* @author Karl Helgason
*/
-public class SoftMixingMixerProvider extends MixerProvider {
+public final class SoftMixingMixerProvider extends MixerProvider {
static SoftMixingMixer globalmixer = null;
static Thread lockthread = null;
- protected final static Object mutex = new Object();
+ static final Object mutex = new Object();
public Mixer getMixer(Info info) {
if (!(info == null || info == SoftMixingMixer.info)) {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,8 +41,8 @@
*
* @author Karl Helgason
*/
-public class SoftMixingSourceDataLine extends SoftMixingDataLine implements
- SourceDataLine {
+public final class SoftMixingSourceDataLine extends SoftMixingDataLine
+ implements SourceDataLine {
private boolean open = false;
@@ -72,7 +72,7 @@
AudioFloatInputStream {
AudioFloatInputStream ais;
- public NonBlockingFloatInputStream(AudioFloatInputStream ais) {
+ NonBlockingFloatInputStream(AudioFloatInputStream ais) {
this.ais = ais;
}
@@ -120,7 +120,7 @@
}
- protected SoftMixingSourceDataLine(SoftMixingMixer mixer, DataLine.Info info) {
+ SoftMixingSourceDataLine(SoftMixingMixer mixer, DataLine.Info info) {
super(mixer, info);
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftPerformer.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftPerformer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftPerformer.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
*
* @author Karl Helgason
*/
-public class SoftPerformer {
+public final class SoftPerformer {
static ModelConnectionBlock[] defaultconnections
= new ModelConnectionBlock[42];
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftPointResampler.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftPointResampler.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftPointResampler.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
*
* @author Karl Helgason
*/
-public class SoftPointResampler extends SoftAbstractResampler {
+public final class SoftPointResampler extends SoftAbstractResampler {
public int getPadding() {
return 100;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftProvider.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftProvider.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftProvider.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,10 +34,10 @@
*
* @author Karl Helgason
*/
-public class SoftProvider extends MidiDeviceProvider {
+public final class SoftProvider extends MidiDeviceProvider {
- protected final static Info softinfo = SoftSynthesizer.info;
- private static Info[] softinfos = {softinfo};
+ static final Info softinfo = SoftSynthesizer.info;
+ private static final Info[] softinfos = {softinfo};
public MidiDevice.Info[] getDeviceInfo() {
return Arrays.copyOf(softinfos, softinfos.length);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,13 +36,13 @@
*
* @author Karl Helgason
*/
-public class SoftReceiver implements MidiDeviceReceiver {
+public final class SoftReceiver implements MidiDeviceReceiver {
- protected boolean open = true;
- private Object control_mutex;
- private SoftSynthesizer synth;
- protected TreeMap midimessages;
- protected SoftMainMixer mainmixer;
+ boolean open = true;
+ private final Object control_mutex;
+ private final SoftSynthesizer synth;
+ TreeMap midimessages;
+ SoftMainMixer mainmixer;
public SoftReceiver(SoftSynthesizer synth) {
this.control_mutex = synth.control_mutex;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftReverb.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftReverb.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftReverb.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,14 +33,14 @@
*
* @author Karl Helgason
*/
-public class SoftReverb implements SoftAudioProcessor {
+public final class SoftReverb implements SoftAudioProcessor {
private final static class Delay {
private float[] delaybuffer;
private int rovepos = 0;
- public Delay() {
+ Delay() {
delaybuffer = null;
}
@@ -77,7 +77,7 @@
private int rovepos = 0;
private float feedback;
- public AllPass(int size) {
+ AllPass(int size) {
delaybuffer = new float[size];
delaybuffersize = size;
}
@@ -127,7 +127,7 @@
private float filtercoeff1 = 0;
private float filtercoeff2 = 1;
- public Comb(int size) {
+ Comb(int size) {
delaybuffer = new float[size];
delaybuffersize = size;
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftShortMessage.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftShortMessage.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftShortMessage.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
*
* @author Karl Helgason
*/
-public class SoftShortMessage extends ShortMessage {
+public final class SoftShortMessage extends ShortMessage {
int channel = 0;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
*
* @author Karl Helgason
*/
-public class SoftSincResampler extends SoftAbstractResampler {
+public final class SoftSincResampler extends SoftAbstractResampler {
float[][][] sinc_table;
int sinc_scale_size = 100;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -66,10 +66,10 @@
*
* @author Karl Helgason
*/
-public class SoftSynthesizer implements AudioSynthesizer,
+public final class SoftSynthesizer implements AudioSynthesizer,
ReferenceCountingDevice {
- protected static class WeakAudioStream extends InputStream
+ protected static final class WeakAudioStream extends InputStream
{
private volatile AudioInputStream stream;
public SoftAudioPusher pusher = null;
@@ -166,39 +166,39 @@
}
private static class Info extends MidiDevice.Info {
- public Info() {
+ Info() {
super(INFO_NAME, INFO_VENDOR, INFO_DESCRIPTION, INFO_VERSION);
}
}
- protected static final String INFO_NAME = "Gervill";
- protected static final String INFO_VENDOR = "OpenJDK";
- protected static final String INFO_DESCRIPTION = "Software MIDI Synthesizer";
- protected static final String INFO_VERSION = "1.0";
- protected final static MidiDevice.Info info = new Info();
+ static final String INFO_NAME = "Gervill";
+ static final String INFO_VENDOR = "OpenJDK";
+ static final String INFO_DESCRIPTION = "Software MIDI Synthesizer";
+ static final String INFO_VERSION = "1.0";
+ final static MidiDevice.Info info = new Info();
private static SourceDataLine testline = null;
private static Soundbank defaultSoundBank = null;
- protected WeakAudioStream weakstream = null;
+ WeakAudioStream weakstream = null;
- protected Object control_mutex = this;
+ final Object control_mutex = this;
- protected int voiceIDCounter = 0;
+ int voiceIDCounter = 0;
// 0: default
// 1: DLS Voice Allocation
- protected int voice_allocation_mode = 0;
+ int voice_allocation_mode = 0;
- protected boolean load_default_soundbank = false;
- protected boolean reverb_light = true;
- protected boolean reverb_on = true;
- protected boolean chorus_on = true;
- protected boolean agc_on = true;
+ boolean load_default_soundbank = false;
+ boolean reverb_light = true;
+ boolean reverb_on = true;
+ boolean chorus_on = true;
+ boolean agc_on = true;
- protected SoftChannel[] channels;
- protected SoftChannelProxy[] external_channels = null;
+ SoftChannel[] channels;
+ SoftChannelProxy[] external_channels = null;
private boolean largemode = false;
@@ -371,7 +371,7 @@
this.format = format;
}
- protected void removeReceiver(Receiver recv) {
+ void removeReceiver(Receiver recv) {
boolean perform_close = false;
synchronized (control_mutex) {
if (recvslist.remove(recv)) {
@@ -383,13 +383,13 @@
close();
}
- protected SoftMainMixer getMainMixer() {
+ SoftMainMixer getMainMixer() {
if (!isOpen())
return null;
return mainmixer;
}
- protected SoftInstrument findInstrument(int program, int bank, int channel) {
+ SoftInstrument findInstrument(int program, int bank, int channel) {
// Add support for GM2 banks 0x78 and 0x79
// as specified in DLS 2.2 in Section 1.4.6
@@ -450,31 +450,31 @@
return null;
}
- protected int getVoiceAllocationMode() {
+ int getVoiceAllocationMode() {
return voice_allocation_mode;
}
- protected int getGeneralMidiMode() {
+ int getGeneralMidiMode() {
return gmmode;
}
- protected void setGeneralMidiMode(int gmmode) {
+ void setGeneralMidiMode(int gmmode) {
this.gmmode = gmmode;
}
- protected int getDeviceID() {
+ int getDeviceID() {
return deviceid;
}
- protected float getControlRate() {
+ float getControlRate() {
return controlrate;
}
- protected SoftVoice[] getVoices() {
+ SoftVoice[] getVoices() {
return voices;
}
- protected SoftTuning getTuning(Patch patch) {
+ SoftTuning getTuning(Patch patch) {
String t_id = patchToString(patch);
SoftTuning tuning = tunings.get(t_id);
if (tuning == null) {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftTuning.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftTuning.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftTuning.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,10 +35,10 @@
*
* @author Karl Helgason
*/
-public class SoftTuning {
+public final class SoftTuning {
private String name = null;
- private double[] tuning = new double[128];
+ private final double[] tuning = new double[128];
private Patch patch = null;
public SoftTuning() {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SoftVoice.java
--- a/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
*
* @author Karl Helgason
*/
-public class SoftVoice extends VoiceStatus {
+public final class SoftVoice extends VoiceStatus {
public int exclusiveClass = 0;
public boolean releaseTriggered = false;
@@ -44,32 +44,32 @@
private int noteOn_velocity = 0;
private int noteOff_velocity = 0;
private int delay = 0;
- protected ModelChannelMixer channelmixer = null;
- protected double tunedKey = 0;
- protected SoftTuning tuning = null;
- protected SoftChannel stealer_channel = null;
- protected ModelConnectionBlock[] stealer_extendedConnectionBlocks = null;
- protected SoftPerformer stealer_performer = null;
- protected ModelChannelMixer stealer_channelmixer = null;
- protected int stealer_voiceID = -1;
- protected int stealer_noteNumber = 0;
- protected int stealer_velocity = 0;
- protected boolean stealer_releaseTriggered = false;
- protected int voiceID = -1;
- protected boolean sustain = false;
- protected boolean sostenuto = false;
- protected boolean portamento = false;
- private SoftFilter filter_left;
- private SoftFilter filter_right;
- private SoftProcess eg = new SoftEnvelopeGenerator();
- private SoftProcess lfo = new SoftLowFrequencyOscillator();
- protected Map objects =
+ ModelChannelMixer channelmixer = null;
+ double tunedKey = 0;
+ SoftTuning tuning = null;
+ SoftChannel stealer_channel = null;
+ ModelConnectionBlock[] stealer_extendedConnectionBlocks = null;
+ SoftPerformer stealer_performer = null;
+ ModelChannelMixer stealer_channelmixer = null;
+ int stealer_voiceID = -1;
+ int stealer_noteNumber = 0;
+ int stealer_velocity = 0;
+ boolean stealer_releaseTriggered = false;
+ int voiceID = -1;
+ boolean sustain = false;
+ boolean sostenuto = false;
+ boolean portamento = false;
+ private final SoftFilter filter_left;
+ private final SoftFilter filter_right;
+ private final SoftProcess eg = new SoftEnvelopeGenerator();
+ private final SoftProcess lfo = new SoftLowFrequencyOscillator();
+ Map objects =
new HashMap();
- protected SoftSynthesizer synthesizer;
- protected SoftInstrument instrument;
- protected SoftPerformer performer;
- protected SoftChannel softchannel = null;
- protected boolean on = false;
+ SoftSynthesizer synthesizer;
+ SoftInstrument instrument;
+ SoftPerformer performer;
+ SoftChannel softchannel = null;
+ boolean on = false;
private boolean audiostarted = false;
private boolean started = false;
private boolean stopping = false;
@@ -87,7 +87,7 @@
private float last_out_mixer_right = 0;
private float last_out_mixer_effect1 = 0;
private float last_out_mixer_effect2 = 0;
- protected ModelConnectionBlock[] extendedConnectionBlocks = null;
+ ModelConnectionBlock[] extendedConnectionBlocks = null;
private ModelConnectionBlock[] connections;
// Last value added to destination
private double[] connections_last = new double[50];
@@ -100,10 +100,10 @@
private boolean soundoff = false;
private float lastMuteValue = 0;
private float lastSoloMuteValue = 0;
- protected double[] co_noteon_keynumber = new double[1];
- protected double[] co_noteon_velocity = new double[1];
- protected double[] co_noteon_on = new double[1];
- private SoftControl co_noteon = new SoftControl() {
+ double[] co_noteon_keynumber = new double[1];
+ double[] co_noteon_velocity = new double[1];
+ double[] co_noteon_on = new double[1];
+ private final SoftControl co_noteon = new SoftControl() {
double[] keynumber = co_noteon_keynumber;
double[] velocity = co_noteon_velocity;
double[] on = co_noteon_on;
@@ -119,13 +119,13 @@
return null;
}
};
- private double[] co_mixer_active = new double[1];
- private double[] co_mixer_gain = new double[1];
- private double[] co_mixer_pan = new double[1];
- private double[] co_mixer_balance = new double[1];
- private double[] co_mixer_reverb = new double[1];
- private double[] co_mixer_chorus = new double[1];
- private SoftControl co_mixer = new SoftControl() {
+ private final double[] co_mixer_active = new double[1];
+ private final double[] co_mixer_gain = new double[1];
+ private final double[] co_mixer_pan = new double[1];
+ private final double[] co_mixer_balance = new double[1];
+ private final double[] co_mixer_reverb = new double[1];
+ private final double[] co_mixer_chorus = new double[1];
+ private final SoftControl co_mixer = new SoftControl() {
double[] active = co_mixer_active;
double[] gain = co_mixer_gain;
double[] pan = co_mixer_pan;
@@ -150,8 +150,8 @@
return null;
}
};
- private double[] co_osc_pitch = new double[1];
- private SoftControl co_osc = new SoftControl() {
+ private final double[] co_osc_pitch = new double[1];
+ private final SoftControl co_osc = new SoftControl() {
double[] pitch = co_osc_pitch;
public double[] get(int instance, String name) {
if (name == null)
@@ -161,10 +161,10 @@
return null;
}
};
- private double[] co_filter_freq = new double[1];
- private double[] co_filter_type = new double[1];
- private double[] co_filter_q = new double[1];
- private SoftControl co_filter = new SoftControl() {
+ private final double[] co_filter_freq = new double[1];
+ private final double[] co_filter_type = new double[1];
+ private final double[] co_filter_q = new double[1];
+ private final SoftControl co_filter = new SoftControl() {
double[] freq = co_filter_freq;
double[] ftype = co_filter_type;
double[] q = co_filter_q;
@@ -180,8 +180,8 @@
return null;
}
};
- protected SoftResamplerStreamer resampler;
- private int nrofchannels;
+ SoftResamplerStreamer resampler;
+ private final int nrofchannels;
public SoftVoice(SoftSynthesizer synth) {
synthesizer = synth;
@@ -278,7 +278,7 @@
// co_mixer_gain[0] = 0;
}
- protected void updateTuning(SoftTuning newtuning) {
+ void updateTuning(SoftTuning newtuning) {
tuning = newtuning;
tunedKey = tuning.getTuning(note) / 100.0;
if (!portamento) {
@@ -293,12 +293,12 @@
}
}
- protected void setNote(int noteNumber) {
+ void setNote(int noteNumber) {
note = noteNumber;
tunedKey = tuning.getTuning(noteNumber) / 100.0;
}
- protected void noteOn(int noteNumber, int velocity, int delay) {
+ void noteOn(int noteNumber, int velocity, int delay) {
sustain = false;
sostenuto = false;
@@ -435,7 +435,7 @@
}
- protected void setPolyPressure(int pressure) {
+ void setPolyPressure(int pressure) {
if(performer == null)
return;
int[] c = performer.midi_connections[2];
@@ -445,7 +445,7 @@
processConnection(c[i]);
}
- protected void setChannelPressure(int pressure) {
+ void setChannelPressure(int pressure) {
if(performer == null)
return;
int[] c = performer.midi_connections[1];
@@ -455,7 +455,7 @@
processConnection(c[i]);
}
- protected void controlChange(int controller, int value) {
+ void controlChange(int controller, int value) {
if(performer == null)
return;
int[] c = performer.midi_ctrl_connections[controller];
@@ -465,7 +465,7 @@
processConnection(c[i]);
}
- protected void nrpnChange(int controller, int value) {
+ void nrpnChange(int controller, int value) {
if(performer == null)
return;
int[] c = performer.midi_nrpn_connections.get(controller);
@@ -475,7 +475,7 @@
processConnection(c[i]);
}
- protected void rpnChange(int controller, int value) {
+ void rpnChange(int controller, int value) {
if(performer == null)
return;
int[] c = performer.midi_rpn_connections.get(controller);
@@ -485,7 +485,7 @@
processConnection(c[i]);
}
- protected void setPitchBend(int bend) {
+ void setPitchBend(int bend) {
if(performer == null)
return;
int[] c = performer.midi_connections[0];
@@ -495,19 +495,19 @@
processConnection(c[i]);
}
- protected void setMute(boolean mute) {
+ void setMute(boolean mute) {
co_mixer_gain[0] -= lastMuteValue;
lastMuteValue = mute ? -960 : 0;
co_mixer_gain[0] += lastMuteValue;
}
- protected void setSoloMute(boolean mute) {
+ void setSoloMute(boolean mute) {
co_mixer_gain[0] -= lastSoloMuteValue;
lastSoloMuteValue = mute ? -960 : 0;
co_mixer_gain[0] += lastSoloMuteValue;
}
- protected void shutdown() {
+ void shutdown() {
if (co_noteon_on[0] < -0.5)
return;
on = false;
@@ -523,12 +523,12 @@
processConnection(c[i]);
}
- protected void soundOff() {
+ void soundOff() {
on = false;
soundoff = true;
}
- protected void noteOff(int velocity) {
+ void noteOff(int velocity) {
if (!on)
return;
on = false;
@@ -553,7 +553,7 @@
processConnection(c[i]);
}
- protected void redamp() {
+ void redamp() {
if (co_noteon_on[0] > 0.5)
return;
if (co_noteon_on[0] < -0.5)
@@ -571,7 +571,7 @@
processConnection(c[i]);
}
- protected void processControlLogic() {
+ void processControlLogic() {
if (stopping) {
active = false;
stopping = false;
@@ -760,9 +760,9 @@
}
- protected void mixAudioStream(SoftAudioBuffer in, SoftAudioBuffer out,
- SoftAudioBuffer dout,
- float amp_from, float amp_to) {
+ void mixAudioStream(SoftAudioBuffer in, SoftAudioBuffer out,
+ SoftAudioBuffer dout, float amp_from,
+ float amp_to) {
int bufferlen = in.getSize();
if (amp_from < 0.000000001 && amp_to < 0.000000001)
return;
@@ -815,7 +815,7 @@
}
- protected void processAudioLogic(SoftAudioBuffer[] buffer) {
+ void processAudioLogic(SoftAudioBuffer[] buffer) {
if (!audiostarted)
return;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/StandardMidiFileReader.java
--- a/jdk/src/share/classes/com/sun/media/sound/StandardMidiFileReader.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/StandardMidiFileReader.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,22 +26,13 @@
package com.sun.media.sound;
import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.SequenceInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.IOException;
import java.io.EOFException;
-import java.io.OutputStream;
-import java.io.RandomAccessFile;
import java.io.BufferedInputStream;
import java.net.URL;
-import java.net.MalformedURLException;
import javax.sound.midi.MidiFileFormat;
import javax.sound.midi.InvalidMidiDataException;
@@ -49,7 +40,6 @@
import javax.sound.midi.MidiEvent;
import javax.sound.midi.MidiMessage;
import javax.sound.midi.Sequence;
-import javax.sound.midi.ShortMessage;
import javax.sound.midi.SysexMessage;
import javax.sound.midi.Track;
import javax.sound.midi.spi.MidiFileReader;
@@ -64,23 +54,12 @@
* @author Florian Bomers
*/
-public class StandardMidiFileReader extends MidiFileReader {
+public final class StandardMidiFileReader extends MidiFileReader {
private static final int MThd_MAGIC = 0x4d546864; // 'MThd'
- private static final int MIDI_TYPE_0 = 0;
- private static final int MIDI_TYPE_1 = 1;
-
private static final int bisBufferSize = 1024; // buffer size in buffered input streams
- /**
- * MIDI parser types
- */
- private static final int types[] = {
- MIDI_TYPE_0,
- MIDI_TYPE_1
- };
-
public MidiFileFormat getMidiFileFormat(InputStream stream) throws InvalidMidiDataException, IOException {
return getMidiFileFormatFromStream(stream, MidiFileFormat.UNKNOWN_LENGTH, null);
}
@@ -253,7 +232,7 @@
/**
* State variables during parsing of a MIDI file
*/
-class SMFParser {
+final class SMFParser {
private static final int MTrk_MAGIC = 0x4d54726b; // 'MTrk'
// set to true to not allow corrupt MIDI files tombe loaded
@@ -268,7 +247,7 @@
private byte[] trackData = null;
private int pos = 0;
- public SMFParser() {
+ SMFParser() {
}
private int readUnsigned() throws IOException {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java
--- a/jdk/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
package com.sun.media.sound;
-import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
@@ -34,18 +33,13 @@
import java.io.SequenceInputStream;
import java.io.File;
import java.io.FileOutputStream;
-import java.io.BufferedOutputStream;
import java.io.InputStream;
import java.io.IOException;
-import java.lang.IllegalArgumentException;
import java.io.OutputStream;
-import java.util.Vector;
-import javax.sound.midi.MidiFileFormat;
import javax.sound.midi.InvalidMidiDataException;
import javax.sound.midi.MidiEvent;
import javax.sound.midi.MetaMessage;
-import javax.sound.midi.MidiMessage;
import javax.sound.midi.Sequence;
import javax.sound.midi.ShortMessage;
import javax.sound.midi.SysexMessage;
@@ -59,7 +53,7 @@
* @author Kara Kytle
* @author Jan Borgersen
*/
-public class StandardMidiFileWriter extends MidiFileWriter {
+public final class StandardMidiFileWriter extends MidiFileWriter {
private static final int MThd_MAGIC = 0x4d546864; // 'MThd'
private static final int MTrk_MAGIC = 0x4d54726b; // 'MTrk'
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SunCodec.java
--- a/jdk/src/share/classes/com/sun/media/sound/SunCodec.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SunCodec.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
package com.sun.media.sound;
-import java.io.InputStream;
-
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
@@ -48,14 +46,14 @@
*/
abstract class SunCodec extends FormatConversionProvider {
- AudioFormat.Encoding[] inputEncodings;
- AudioFormat.Encoding[] outputEncodings;
+ private final AudioFormat.Encoding[] inputEncodings;
+ private final AudioFormat.Encoding[] outputEncodings;
/**
* Constructs a new codec object.
*/
- protected SunCodec(AudioFormat.Encoding[] inputEncodings, AudioFormat.Encoding[] outputEncodings) {
-
+ SunCodec(final AudioFormat.Encoding[] inputEncodings,
+ final AudioFormat.Encoding[] outputEncodings) {
this.inputEncodings = inputEncodings;
this.outputEncodings = outputEncodings;
}
@@ -63,16 +61,14 @@
/**
*/
- public AudioFormat.Encoding[] getSourceEncodings() {
-
+ public final AudioFormat.Encoding[] getSourceEncodings() {
AudioFormat.Encoding[] encodings = new AudioFormat.Encoding[inputEncodings.length];
System.arraycopy(inputEncodings, 0, encodings, 0, inputEncodings.length);
return encodings;
}
/**
*/
- public AudioFormat.Encoding[] getTargetEncodings() {
-
+ public final AudioFormat.Encoding[] getTargetEncodings() {
AudioFormat.Encoding[] encodings = new AudioFormat.Encoding[outputEncodings.length];
System.arraycopy(outputEncodings, 0, encodings, 0, outputEncodings.length);
return encodings;
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SunFileReader.java
--- a/jdk/src/share/classes/com/sun/media/sound/SunFileReader.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SunFileReader.java Wed Jun 19 11:04:39 2013 +0100
@@ -27,7 +27,6 @@
import java.io.File;
import java.io.InputStream;
-import java.io.OutputStream;
import java.io.IOException;
import java.io.DataInputStream;
import java.net.URL;
@@ -52,7 +51,7 @@
/**
* Constructs a new SunFileReader object.
*/
- public SunFileReader() {
+ SunFileReader() {
}
@@ -167,7 +166,7 @@
* @return 32 bits swapped value.
* @exception IOException
*/
- protected int rllong(DataInputStream dis) throws IOException {
+ final int rllong(DataInputStream dis) throws IOException {
int b1, b2, b3, b4 ;
int i = 0;
@@ -190,7 +189,7 @@
* @param int
* @return 32 bits swapped value
*/
- protected int big2little(int i) {
+ final int big2little(int i) {
int b1, b2, b3, b4 ;
@@ -211,7 +210,7 @@
* @return the swapped value.
* @exception IOException
*/
- protected short rlshort(DataInputStream dis) throws IOException {
+ final short rlshort(DataInputStream dis) throws IOException {
short s=0;
short high, low;
@@ -232,7 +231,7 @@
* @param int
* @return 16 bits swapped value
*/
- protected short big2littleShort(short i) {
+ final short big2littleShort(short i) {
short high, low;
@@ -244,16 +243,14 @@
return i;
}
-
- /** Calculates the frame size for PCM frames.
- * Note that this method is appropriate for non-packed samples.
- * For instance, 12 bit, 2 channels will return 4 bytes, not 3.
- * @param sampleSizeInBits the size of a single sample in bits
- * @param channels the number of channels
- * @return the size of a PCM frame in bytes.
- */
- protected static int calculatePCMFrameSize(int sampleSizeInBits,
- int channels) {
- return ((sampleSizeInBits + 7) / 8) * channels;
- }
+ /** Calculates the frame size for PCM frames.
+ * Note that this method is appropriate for non-packed samples.
+ * For instance, 12 bit, 2 channels will return 4 bytes, not 3.
+ * @param sampleSizeInBits the size of a single sample in bits
+ * @param channels the number of channels
+ * @return the size of a PCM frame in bytes.
+ */
+ static final int calculatePCMFrameSize(int sampleSizeInBits, int channels) {
+ return ((sampleSizeInBits + 7) / 8) * channels;
+ }
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/SunFileWriter.java
--- a/jdk/src/share/classes/com/sun/media/sound/SunFileWriter.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/SunFileWriter.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -69,8 +69,7 @@
// new, 10.27.99
- public AudioFileFormat.Type[] getAudioFileTypes(){
-
+ public final AudioFileFormat.Type[] getAudioFileTypes(){
AudioFileFormat.Type[] localArray = new AudioFileFormat.Type[types.length];
System.arraycopy(types, 0, localArray, 0, types.length);
return localArray;
@@ -95,7 +94,7 @@
* @return 32 bits swapped value.
* @exception IOException
*/
- protected int rllong(DataInputStream dis) throws IOException {
+ final int rllong(DataInputStream dis) throws IOException {
int b1, b2, b3, b4 ;
int i = 0;
@@ -118,7 +117,7 @@
* @param int
* @return 32 bits swapped value
*/
- protected int big2little(int i) {
+ final int big2little(int i) {
int b1, b2, b3, b4 ;
@@ -139,7 +138,7 @@
* @return the swapped value.
* @exception IOException
*/
- protected short rlshort(DataInputStream dis) throws IOException {
+ final short rlshort(DataInputStream dis) throws IOException {
short s=0;
short high, low;
@@ -160,7 +159,7 @@
* @param int
* @return 16 bits swapped value
*/
- protected short big2littleShort(short i) {
+ final short big2littleShort(short i) {
short high, low;
@@ -177,10 +176,10 @@
* The class is usefull for use with SequenceInputStream to prevent
* closing of the source input streams.
*/
- protected class NoCloseInputStream extends InputStream {
+ final class NoCloseInputStream extends InputStream {
private final InputStream in;
- public NoCloseInputStream(InputStream in) {
+ NoCloseInputStream(InputStream in) {
this.in = in;
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/Toolkit.java
--- a/jdk/src/share/classes/com/sun/media/sound/Toolkit.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/Toolkit.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,8 +35,13 @@
* @author Kara Kytle
* @author Florian Bomers
*/
-public class Toolkit {
+public final class Toolkit {
+ /**
+ * Suppresses default constructor, ensuring non-instantiability.
+ */
+ private Toolkit() {
+ }
/**
* Converts bytes from signed to unsigned.
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/UlawCodec.java
--- a/jdk/src/share/classes/com/sun/media/sound/UlawCodec.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/UlawCodec.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
package com.sun.media.sound;
-import java.io.InputStream;
import java.io.IOException;
import java.util.Vector;
@@ -40,12 +39,12 @@
*
* @author Kara Kytle
*/
-public class UlawCodec extends SunCodec {
+public final class UlawCodec extends SunCodec {
/* Tables used for U-law decoding */
- final static byte ULAW_TABH[] = new byte[256];
- final static byte ULAW_TABL[] = new byte[256];
+ private final static byte[] ULAW_TABH = new byte[256];
+ private final static byte[] ULAW_TABL = new byte[256];
private static final AudioFormat.Encoding[] ulawEncodings = {AudioFormat.Encoding.ULAW,
AudioFormat.Encoding.PCM_SIGNED};
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
--- a/jdk/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
*
* @author Karl Helgason
*/
-public class WaveExtensibleFileReader extends AudioFileReader {
+public final class WaveExtensibleFileReader extends AudioFileReader {
static private class GUID {
long i1;
@@ -74,7 +74,7 @@
private GUID() {
}
- public GUID(long i1, int s1, int s2, int x1, int x2, int x3, int x4,
+ GUID(long i1, int s1, int s2, int x1, int x2, int x3, int x4,
int x5, int x6, int x7, int x8) {
this.i1 = i1;
this.s1 = s1;
@@ -140,13 +140,13 @@
}
- private static String[] channelnames = { "FL", "FR", "FC", "LF",
+ private static final String[] channelnames = { "FL", "FR", "FC", "LF",
"BL",
"BR", // 5.1
"FLC", "FLR", "BC", "SL", "SR", "TC", "TFL", "TFC", "TFR", "TBL",
"TBC", "TBR" };
- private static String[] allchannelnames = { "w1", "w2", "w3", "w4", "w5",
+ private static final String[] allchannelnames = { "w1", "w2", "w3", "w4", "w5",
"w6", "w7", "w8", "w9", "w10", "w11", "w12", "w13", "w14", "w15",
"w16", "w17", "w18", "w19", "w20", "w21", "w22", "w23", "w24",
"w25", "w26", "w27", "w28", "w29", "w30", "w31", "w32", "w33",
@@ -155,10 +155,10 @@
"w52", "w53", "w54", "w55", "w56", "w57", "w58", "w59", "w60",
"w61", "w62", "w63", "w64" };
- private static GUID SUBTYPE_PCM = new GUID(0x00000001, 0x0000, 0x0010,
+ private static final GUID SUBTYPE_PCM = new GUID(0x00000001, 0x0000, 0x0010,
0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
- private static GUID SUBTYPE_IEEE_FLOAT = new GUID(0x00000003, 0x0000,
+ private static final GUID SUBTYPE_IEEE_FLOAT = new GUID(0x00000003, 0x0000,
0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
private String decodeChannelMask(long channelmask) {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/WaveFileFormat.java
--- a/jdk/src/share/classes/com/sun/media/sound/WaveFileFormat.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/WaveFileFormat.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,24 +25,8 @@
package com.sun.media.sound;
-import java.util.Vector;
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.lang.IllegalArgumentException;
-
-import java.io.BufferedOutputStream;
-import java.io.DataOutputStream;
-import java.io.FileOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.SequenceInputStream;
-
import javax.sound.sampled.AudioFileFormat;
-import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.AudioSystem;
/**
@@ -51,12 +35,12 @@
* @author Jan Borgersen
*/
-class WaveFileFormat extends AudioFileFormat {
+final class WaveFileFormat extends AudioFileFormat {
/**
* Wave format type.
*/
- private int waveType;
+ private final int waveType;
//$$fb 2001-07-13: added management of header size in this class
//$$fb 2002-04-16: Fix for 4636355: RIFF audio headers could be _more_ spec compliant
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/WaveFileReader.java
--- a/jdk/src/share/classes/com/sun/media/sound/WaveFileReader.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/WaveFileReader.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,28 +25,17 @@
package com.sun.media.sound;
-import java.util.Vector;
+import java.io.DataInputStream;
+import java.io.EOFException;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.EOFException;
import java.net.URL;
-import java.net.MalformedURLException;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.DataInputStream;
-import java.io.FileInputStream;
-import java.io.DataOutputStream;
-import java.io.FileOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.SequenceInputStream;
import javax.sound.sampled.AudioFileFormat;
+import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.UnsupportedAudioFileException;
@@ -59,20 +48,11 @@
* @author Jan Borgersen
* @author Florian Bomers
*/
-public class WaveFileReader extends SunFileReader {
+public final class WaveFileReader extends SunFileReader {
private static final int MAX_READ_LENGTH = 12;
/**
- * WAVE reader type
- */
-
- public static final AudioFileFormat.Type types[] = {
- AudioFileFormat.Type.WAVE
- };
-
-
- /**
* Constructs a new WaveFileReader object.
*/
public WaveFileReader() {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/WaveFileWriter.java
--- a/jdk/src/share/classes/com/sun/media/sound/WaveFileWriter.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/WaveFileWriter.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@
*
* @author Jan Borgersen
*/
-public class WaveFileWriter extends SunFileWriter {
+public final class WaveFileWriter extends SunFileWriter {
// magic numbers
static final int RIFF_MAGIC = 1380533830;
@@ -74,18 +74,10 @@
static final int WAVE_FORMAT_SX7383 = 0x1C07;
/**
- * WAVE type
- */
- private static final AudioFileFormat.Type waveTypes[] = {
- AudioFileFormat.Type.WAVE
- };
-
-
- /**
* Constructs a new WaveFileWriter object.
*/
public WaveFileWriter() {
- super(waveTypes);
+ super(new AudioFileFormat.Type[]{AudioFileFormat.Type.WAVE});
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java
--- a/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
*
* @author Karl Helgason
*/
-public class WaveFloatFileReader extends AudioFileReader {
+public final class WaveFloatFileReader extends AudioFileReader {
public AudioFileFormat getAudioFileFormat(InputStream stream)
throws UnsupportedAudioFileException, IOException {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java
--- a/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java Wed Jun 19 11:04:39 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
*
* @author Karl Helgason
*/
-public class WaveFloatFileWriter extends AudioFileWriter {
+public final class WaveFloatFileWriter extends AudioFileWriter {
public Type[] getAudioFileTypes() {
return new Type[] { Type.WAVE };
@@ -86,9 +86,9 @@
}
private static class NoCloseOutputStream extends OutputStream {
- OutputStream out;
+ final OutputStream out;
- public NoCloseOutputStream(OutputStream out) {
+ NoCloseOutputStream(OutputStream out) {
this.out = out;
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java Wed Jun 19 11:04:39 2013 +0100
@@ -2,38 +2,43 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package com.sun.org.apache.xml.internal.security;
import java.io.InputStream;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import com.sun.org.apache.xml.internal.security.algorithms.JCEMapper;
import com.sun.org.apache.xml.internal.security.algorithms.SignatureAlgorithm;
import com.sun.org.apache.xml.internal.security.c14n.Canonicalizer;
-import com.sun.org.apache.xml.internal.security.keys.KeyInfo;
import com.sun.org.apache.xml.internal.security.keys.keyresolver.KeyResolver;
import com.sun.org.apache.xml.internal.security.transforms.Transform;
+import com.sun.org.apache.xml.internal.security.utils.ElementProxy;
import com.sun.org.apache.xml.internal.security.utils.I18n;
-//import com.sun.org.apache.xml.internal.security.utils.PRNG;
import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
import com.sun.org.apache.xml.internal.security.utils.resolver.ResourceResolver;
import org.w3c.dom.Attr;
@@ -47,367 +52,317 @@
* the mapping of Canonicalization and Transform algorithms. Initialization is
* done by calling {@link Init#init} which should be done in any static block
* of the files of this library. We ensure that this call is only executed once.
- *
- * @author $Author: mullan $
*/
-public final class Init {
+public class Init {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
+ /** The namespace for CONF file **/
+ public static final String CONF_NS = "http://www.xmlsecurity.org/NS/#configuration";
+
+ /** {@link org.apache.commons.logging} logging facility */
+ private static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(Init.class.getName());
- /** Field _initialized */
- private static boolean _alreadyInitialized = false;
+ /** Field alreadyInitialized */
+ private static boolean alreadyInitialized = false;
- /** The namespace for CONF file **/
- public static final String CONF_NS="http://www.xmlsecurity.org/NS/#configuration";
+ /**
+ * Method isInitialized
+ * @return true if the library is already initialized.
+ */
+ public static synchronized final boolean isInitialized() {
+ return Init.alreadyInitialized;
+ }
+
+ /**
+ * Method init
+ *
+ */
+ public static synchronized void init() {
+ if (alreadyInitialized) {
+ return;
+ }
- /**
- * Method isInitialized
- * @return true if the librairy is already initialized.
- *
- */
- public static final boolean isInitialized() {
- return Init._alreadyInitialized;
- }
+ InputStream is =
+ AccessController.doPrivileged(
+ new PrivilegedAction() {
+ public InputStream run() {
+ String cfile =
+ System.getProperty("com.sun.org.apache.xml.internal.security.resource.config");
+ if (cfile == null) {
+ return null;
+ }
+ return getClass().getResourceAsStream(cfile);
+ }
+ });
+ if (is == null) {
+ dynamicInit();
+ } else {
+ fileInit(is);
+ }
- /**
- * Method init
- *
- */
- public synchronized static void init() {
+ alreadyInitialized = true;
+ }
+
+ /**
+ * Dynamically initialise the library by registering the default algorithms/implementations
+ */
+ private static void dynamicInit() {
+ //
+ // Load the Resource Bundle - the default is the English resource bundle.
+ // To load another resource bundle, call I18n.init(...) before calling this
+ // method.
+ //
+ I18n.init("en", "US");
- if (_alreadyInitialized) {
- return;
- }
- long XX_configure_i18n_end=0;
- long XX_configure_reg_c14n_start=0;
- long XX_configure_reg_c14n_end=0;
- long XX_configure_reg_jcemapper_end=0;
- long XX_configure_reg_keyInfo_start=0;
- long XX_configure_reg_keyResolver_end=0;
- long XX_configure_reg_prefixes_start=0;
- long XX_configure_reg_resourceresolver_start=0;
- long XX_configure_reg_sigalgos_end=0;
- long XX_configure_reg_transforms_end=0;
- long XX_configure_reg_keyInfo_end=0;
- long XX_configure_reg_keyResolver_start=0;
- _alreadyInitialized = true;
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Registering default algorithms");
+ }
+ try {
+ //
+ // Bind the default prefixes
+ //
+ ElementProxy.registerDefaultPrefixes();
+
+ //
+ // Set the default Transforms
+ //
+ Transform.registerDefaultAlgorithms();
+
+ //
+ // Set the default signature algorithms
+ //
+ SignatureAlgorithm.registerDefaultAlgorithms();
+
+ //
+ // Set the default JCE algorithms
+ //
+ JCEMapper.registerDefaultAlgorithms();
- try {
- long XX_init_start = System.currentTimeMillis();
- long XX_prng_start = System.currentTimeMillis();
+ //
+ // Set the default c14n algorithms
+ //
+ Canonicalizer.registerDefaultAlgorithms();
- //PRNG.init(new java.security.SecureRandom());
+ //
+ // Register the default resolvers
+ //
+ ResourceResolver.registerDefaultResolvers();
- long XX_prng_end = System.currentTimeMillis();
+ //
+ // Register the default key resolvers
+ //
+ KeyResolver.registerDefaultResolvers();
+ } catch (Exception ex) {
+ log.log(java.util.logging.Level.SEVERE, ex.getMessage(), ex);
+ ex.printStackTrace();
+ }
+ }
+ /**
+ * Initialise the library from a configuration file
+ */
+ private static void fileInit(InputStream is) {
+ try {
/* read library configuration file */
- long XX_parsing_start = System.currentTimeMillis();
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
dbf.setNamespaceAware(true);
dbf.setValidating(false);
DocumentBuilder db = dbf.newDocumentBuilder();
- // We don't allow users to override the Apache XML Security
- // configuration in the JRE. Users should use the standard security
- // provider mechanism instead if implementing their own
- // transform or canonicalization algorithms.
- // InputStream is = Class.forName("com.sun.org.apache.xml.internal.security.Init").getResourceAsStream("resource/config.xml");
- InputStream is = AccessController.doPrivileged(
- new PrivilegedAction() {
- public InputStream run() {
-// String cfile = System.getProperty
-// ("com.sun.org.apache.xml.internal.security.resource.config");
- return getClass().getResourceAsStream
-// (cfile != null ? cfile : "resource/config.xml");
- ("resource/config.xml");
- }
- });
-
Document doc = db.parse(is);
- long XX_parsing_end = System.currentTimeMillis();
- long XX_configure_i18n_start = 0;
-
- {
- XX_configure_reg_keyInfo_start = System.currentTimeMillis();
- try {
- KeyInfo.init();
- } catch (Exception e) {
- e.printStackTrace();
-
- throw e;
- }
- XX_configure_reg_keyInfo_end = System.currentTimeMillis();
- }
-
- long XX_configure_reg_transforms_start=0;
- long XX_configure_reg_jcemapper_start=0;
- long XX_configure_reg_sigalgos_start=0;
- long XX_configure_reg_resourceresolver_end=0;
- long XX_configure_reg_prefixes_end=0;
- Node config=doc.getFirstChild();
- for (;config!=null;config=config.getNextSibling()) {
+ Node config = doc.getFirstChild();
+ for (; config != null; config = config.getNextSibling()) {
if ("Configuration".equals(config.getLocalName())) {
- break;
+ break;
}
}
- for (Node el=config.getFirstChild();el!=null;el=el.getNextSibling()) {
- if (el.getNodeType() != Node.ELEMENT_NODE) {
- continue;
+ if (config == null) {
+ log.log(java.util.logging.Level.SEVERE, "Error in reading configuration file - Configuration element not found");
+ return;
+ }
+ for (Node el = config.getFirstChild(); el != null; el = el.getNextSibling()) {
+ if (Node.ELEMENT_NODE != el.getNodeType()) {
+ continue;
+ }
+ String tag = el.getLocalName();
+ if (tag.equals("ResourceBundles")) {
+ Element resource = (Element)el;
+ /* configure internationalization */
+ Attr langAttr = resource.getAttributeNode("defaultLanguageCode");
+ Attr countryAttr = resource.getAttributeNode("defaultCountryCode");
+ String languageCode =
+ (langAttr == null) ? null : langAttr.getNodeValue();
+ String countryCode =
+ (countryAttr == null) ? null : countryAttr.getNodeValue();
+ I18n.init(languageCode, countryCode);
}
- String tag=el.getLocalName();
-//
-// Commented out: not supported in the JDK. We use the default locale.
-//
-// if (tag.equals("ResourceBundles")){
-// XX_configure_i18n_start = System.currentTimeMillis();
-// Element resource=(Element)el;
-// /* configure internationalization */
-// Attr langAttr = resource.getAttributeNode("defaultLanguageCode");
-// Attr countryAttr = resource.getAttributeNode("defaultCountryCode");
-// String languageCode = (langAttr == null)
-// ? null
-// : langAttr.getNodeValue();
-// String countryCode = (countryAttr == null)
-// ? null
-// : countryAttr.getNodeValue();
-//
-// I18n.init(languageCode, countryCode);
-// XX_configure_i18n_end = System.currentTimeMillis();
-// }
+
+ if (tag.equals("CanonicalizationMethods")) {
+ Element[] list =
+ XMLUtils.selectNodes(el.getFirstChild(), CONF_NS, "CanonicalizationMethod");
+
+ for (int i = 0; i < list.length; i++) {
+ String uri = list[i].getAttributeNS(null, "URI");
+ String javaClass =
+ list[i].getAttributeNS(null, "JAVACLASS");
+ try {
+ Canonicalizer.register(uri, javaClass);
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Canonicalizer.register(" + uri + ", " + javaClass + ")");
+ }
+ } catch (ClassNotFoundException e) {
+ Object exArgs[] = { uri, javaClass };
+ log.log(java.util.logging.Level.SEVERE, I18n.translate("algorithm.classDoesNotExist", exArgs));
+ }
+ }
+ }
+
+ if (tag.equals("TransformAlgorithms")) {
+ Element[] tranElem =
+ XMLUtils.selectNodes(el.getFirstChild(), CONF_NS, "TransformAlgorithm");
- if (tag.equals("CanonicalizationMethods")){
- XX_configure_reg_c14n_start = System.currentTimeMillis();
- Canonicalizer.init();
- Element[] list=XMLUtils.selectNodes(el.getFirstChild(),CONF_NS,"CanonicalizationMethod");
+ for (int i = 0; i < tranElem.length; i++) {
+ String uri = tranElem[i].getAttributeNS(null, "URI");
+ String javaClass =
+ tranElem[i].getAttributeNS(null, "JAVACLASS");
+ try {
+ Transform.register(uri, javaClass);
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Transform.register(" + uri + ", " + javaClass + ")");
+ }
+ } catch (ClassNotFoundException e) {
+ Object exArgs[] = { uri, javaClass };
- for (int i = 0; i < list.length; i++) {
- String URI = list[i].getAttributeNS(null,
- "URI");
- String JAVACLASS =
- list[i].getAttributeNS(null,
- "JAVACLASS");
- try {
- Class.forName(JAVACLASS);
-/* Method methods[] = c.getMethods();
+ log.log(java.util.logging.Level.SEVERE, I18n.translate("algorithm.classDoesNotExist", exArgs));
+ } catch (NoClassDefFoundError ex) {
+ log.log(java.util.logging.Level.WARNING, "Not able to found dependencies for algorithm, I'll keep working.");
+ }
+ }
+ }
- for (int j = 0; j < methods.length; j++) {
- Method currMeth = methods[j];
-
- if (currMeth.getDeclaringClass().getName()
- .equals(JAVACLASS)) {
- log.log(java.util.logging.Level.FINE, currMeth.getDe claringClass().toString());
+ if ("JCEAlgorithmMappings".equals(tag)) {
+ Node algorithmsNode = ((Element)el).getElementsByTagName("Algorithms").item(0);
+ if (algorithmsNode != null) {
+ Element[] algorithms =
+ XMLUtils.selectNodes(algorithmsNode.getFirstChild(), CONF_NS, "Algorithm");
+ for (int i = 0; i < algorithms.length; i++) {
+ Element element = algorithms[i];
+ String id = element.getAttribute("URI");
+ JCEMapper.register(id, new JCEMapper.Algorithm(element));
}
- }*/
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "Canonicalizer.register(" + URI + ", "
- + JAVACLASS + ")");
- Canonicalizer.register(URI, JAVACLASS);
- } catch (ClassNotFoundException e) {
- Object exArgs[] = { URI, JAVACLASS };
+ }
+ }
+
+ if (tag.equals("SignatureAlgorithms")) {
+ Element[] sigElems =
+ XMLUtils.selectNodes(el.getFirstChild(), CONF_NS, "SignatureAlgorithm");
+
+ for (int i = 0; i < sigElems.length; i++) {
+ String uri = sigElems[i].getAttributeNS(null, "URI");
+ String javaClass =
+ sigElems[i].getAttributeNS(null, "JAVACLASS");
+
+ /** $todo$ handle registering */
- log.log(java.util.logging.Level.SEVERE, I18n.translate("algorithm.classDoesNotExist",
- exArgs));
- }
- }
- XX_configure_reg_c14n_end = System.currentTimeMillis();
- }
+ try {
+ SignatureAlgorithm.register(uri, javaClass);
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "SignatureAlgorithm.register(" + uri + ", "
+ + javaClass + ")");
+ }
+ } catch (ClassNotFoundException e) {
+ Object exArgs[] = { uri, javaClass };
- if (tag.equals("TransformAlgorithms")){
- XX_configure_reg_transforms_start = System.currentTimeMillis();
- Transform.init();
+ log.log(java.util.logging.Level.SEVERE, I18n.translate("algorithm.classDoesNotExist", exArgs));
+ }
+ }
+ }
- Element[] tranElem = XMLUtils.selectNodes(el.getFirstChild(),CONF_NS,"TransformAlgorithm");
+ if (tag.equals("ResourceResolvers")) {
+ Element[]resolverElem =
+ XMLUtils.selectNodes(el.getFirstChild(), CONF_NS, "Resolver");
+
+ for (int i = 0; i < resolverElem.length; i++) {
+ String javaClass =
+ resolverElem[i].getAttributeNS(null, "JAVACLASS");
+ String description =
+ resolverElem[i].getAttributeNS(null, "DESCRIPTION");
- for (int i = 0; i < tranElem.length; i++) {
- String URI = tranElem[i].getAttributeNS(null,
- "URI");
- String JAVACLASS =
- tranElem[i].getAttributeNS(null,
- "JAVACLASS");
- try {
- Class.forName(JAVACLASS);
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "Transform.register(" + URI + ", " + JAVACLASS + ")");
- Transform.register(URI, JAVACLASS);
- } catch (ClassNotFoundException e) {
- Object exArgs[] = { URI, JAVACLASS };
+ if ((description != null) && (description.length() > 0)) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + javaClass + ": "
+ + description);
+ }
+ } else {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + javaClass
+ + ": For unknown purposes");
+ }
+ }
+ try {
+ ResourceResolver.register(javaClass);
+ } catch (Throwable e) {
+ log.log(java.util.logging.Level.WARNING,
+ "Cannot register:" + javaClass
+ + " perhaps some needed jars are not installed",
+ e
+ );
+ }
+ }
+ }
- log.log(java.util.logging.Level.SEVERE, I18n.translate("algorithm.classDoesNotExist",
- exArgs));
+ if (tag.equals("KeyResolver")){
+ Element[] resolverElem =
+ XMLUtils.selectNodes(el.getFirstChild(), CONF_NS, "Resolver");
+ List classNames = new ArrayList(resolverElem.length);
+ for (int i = 0; i < resolverElem.length; i++) {
+ String javaClass =
+ resolverElem[i].getAttributeNS(null, "JAVACLASS");
+ String description =
+ resolverElem[i].getAttributeNS(null, "DESCRIPTION");
- } catch (NoClassDefFoundError ex) {
- log.log(java.util.logging.Level.WARNING, "Not able to found dependecies for algorithm, I'm keep working.");
- }
- }
- XX_configure_reg_transforms_end = System.currentTimeMillis();
- }
-
-
- if ("JCEAlgorithmMappings".equals(tag)){
- XX_configure_reg_jcemapper_start = System.currentTimeMillis();
- JCEMapper.init((Element)el);
- XX_configure_reg_jcemapper_end = System.currentTimeMillis();
- }
-
+ if ((description != null) && (description.length() > 0)) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + javaClass + ": "
+ + description);
+ }
+ } else {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + javaClass
+ + ": For unknown purposes");
+ }
+ }
+ classNames.add(javaClass);
+ }
+ KeyResolver.registerClassNames(classNames);
+ }
- if (tag.equals("SignatureAlgorithms")){
- XX_configure_reg_sigalgos_start = System.currentTimeMillis();
- SignatureAlgorithm.providerInit();
-
- Element[] sigElems = XMLUtils.selectNodes(el.getFirstChild(), CONF_NS,
- "SignatureAlgorithm");
-
- for (int i = 0; i < sigElems.length; i++) {
- String URI = sigElems[i].getAttributeNS(null,
- "URI");
- String JAVACLASS =
- sigElems[i].getAttributeNS(null,
- "JAVACLASS");
-
- /** $todo$ handle registering */
-
- try {
- Class.forName(JAVACLASS);
- // Method methods[] = c.getMethods();
-
-// for (int j = 0; j < methods.length; j++) {
-// Method currMeth = methods[j];
-//
-// if (currMeth.getDeclaringClass().getName()
-// .equals(JAVACLASS)) {
-// log.log(java.util.logging.Level.FINE, currMeth.getDe claringClass().toString());
-// }
-// }
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "SignatureAlgorithm.register(" + URI + ", " + JAVACLASS + ")");
- SignatureAlgorithm.register(URI, JAVACLASS);
- } catch (ClassNotFoundException e) {
- Object exArgs[] = { URI, JAVACLASS };
-
- log.log(java.util.logging.Level.SEVERE, I18n.translate("algorithm.classDoesNotExist",
- exArgs));
+ if (tag.equals("PrefixMappings")){
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Now I try to bind prefixes:");
+ }
- }
- }
- XX_configure_reg_sigalgos_end = System.currentTimeMillis();
- }
-
-
-
- if (tag.equals("ResourceResolvers")){
- XX_configure_reg_resourceresolver_start = System.currentTimeMillis();
- ResourceResolver.init();
-
- Element[]resolverElem = XMLUtils.selectNodes(el.getFirstChild(),CONF_NS,
- "Resolver");
-
- for (int i = 0; i < resolverElem.length; i++) {
- String JAVACLASS =
- resolverElem[i].getAttributeNS(null,
- "JAVACLASS");
- String Description =
- resolverElem[i].getAttributeNS(null,
- "DESCRIPTION");
-
- if ((Description != null) && (Description.length() > 0)) {
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": " + Description);
- } else {
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": For unknown purposes");
- }
- try {
- ResourceResolver.register(JAVACLASS);
- } catch (Throwable e) {
- log.log(java.util.logging.Level.WARNING, "Cannot register:"+JAVACLASS+" perhaps some needed jars are not installed",e);
- }
- XX_configure_reg_resourceresolver_end =
- System.currentTimeMillis();
- }
+ Element[] nl =
+ XMLUtils.selectNodes(el.getFirstChild(), CONF_NS, "PrefixMapping");
- }
-
-
-
-
-
-
- if (tag.equals("KeyResolver")){
- XX_configure_reg_keyResolver_start =System.currentTimeMillis();
- KeyResolver.init();
-
- Element[] resolverElem = XMLUtils.selectNodes(el.getFirstChild(), CONF_NS,"Resolver");
-
- for (int i = 0; i < resolverElem.length; i++) {
- String JAVACLASS =
- resolverElem[i].getAttributeNS(null,
- "JAVACLASS");
- String Description =
- resolverElem[i].getAttributeNS(null,
- "DESCRIPTION");
-
- if ((Description != null) && (Description.length() > 0)) {
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": " + Description);
- } else {
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": For unknown purposes");
- }
-
- KeyResolver.register(JAVACLASS);
- }
- XX_configure_reg_keyResolver_end = System.currentTimeMillis();
+ for (int i = 0; i < nl.length; i++) {
+ String namespace = nl[i].getAttributeNS(null, "namespace");
+ String prefix = nl[i].getAttributeNS(null, "prefix");
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Now I try to bind " + prefix + " to " + namespace);
+ }
+ ElementProxy.setDefaultPrefix(namespace, prefix);
+ }
+ }
}
-
-
- if (tag.equals("PrefixMappings")){
- XX_configure_reg_prefixes_start = System.currentTimeMillis();
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "Now I try to bind prefixes:");
-
- Element[] nl = XMLUtils.selectNodes(el.getFirstChild(), CONF_NS,"PrefixMapping");
-
- for (int i = 0; i < nl.length; i++) {
- String namespace = nl[i].getAttributeNS(null,
- "namespace");
- String prefix = nl[i].getAttributeNS(null,
- "prefix");
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "Now I try to bind " + prefix + " to " + namespace);
- com.sun.org.apache.xml.internal.security.utils.ElementProxy
- .setDefaultPrefix(namespace, prefix);
- }
- XX_configure_reg_prefixes_end = System.currentTimeMillis();
- }
- }
-
- long XX_init_end = System.currentTimeMillis();
-
- //J-
- if (log.isLoggable(java.util.logging.Level.FINE)) {
- log.log(java.util.logging.Level.FINE, "XX_init " + ((int)(XX_init_end - XX_init_start)) + " ms");
- log.log(java.util.logging.Level.FINE, " XX_prng " + ((int)(XX_prng_end - XX_prng_start)) + " ms");
- log.log(java.util.logging.Level.FINE, " XX_parsing " + ((int)(XX_parsing_end - XX_parsing_start)) + " ms");
- log.log(java.util.logging.Level.FINE, " XX_configure_i18n " + ((int)(XX_configure_i18n_end- XX_configure_i18n_start)) + " ms");
- log.log(java.util.logging.Level.FINE, " XX_configure_reg_c14n " + ((int)(XX_configure_reg_c14n_end- XX_configure_reg_c14n_start)) + " ms");
- log.log(java.util.logging.Level.FINE, " XX_configure_reg_jcemapper " + ((int)(XX_configure_reg_jcemapper_end- XX_configure_reg_jcemapper_start)) + " ms");
- log.log(java.util.logging.Level.FINE, " XX_configure_reg_keyInfo " + ((int)(XX_configure_reg_keyInfo_end- XX_configure_reg_keyInfo_start)) + " ms");
- log.log(java.util.logging.Level.FINE, " XX_configure_reg_keyResolver " + ((int)(XX_configure_reg_keyResolver_end- XX_configure_reg_keyResolver_start)) + " ms");
- log.log(java.util.logging.Level.FINE, " XX_configure_reg_prefixes " + ((int)(XX_configure_reg_prefixes_end- XX_configure_reg_prefixes_start)) + " ms");
- log.log(java.util.logging.Level.FINE, " XX_configure_reg_resourceresolver " + ((int)(XX_configure_reg_resourceresolver_end- XX_configure_reg_resourceresolver_start)) + " ms");
- log.log(java.util.logging.Level.FINE, " XX_configure_reg_sigalgos " + ((int)(XX_configure_reg_sigalgos_end- XX_configure_reg_sigalgos_start)) + " ms");
- log.log(java.util.logging.Level.FINE, " XX_configure_reg_transforms " + ((int)(XX_configure_reg_transforms_end- XX_configure_reg_transforms_start)) + " ms");
- }
- } catch (Exception e) {
+ } catch (Exception e) {
log.log(java.util.logging.Level.SEVERE, "Bad: ", e);
e.printStackTrace();
- }
-
- }
-
+ }
+ }
}
+
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java Wed Jun 19 11:04:39 2013 +0100
@@ -0,0 +1,280 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.sun.org.apache.xml.internal.security.algorithms;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+/**
+ * This class is extremely useful for loading resources and classes in a fault
+ * tolerant manner that works across different applications servers. Do not
+ * touch this unless you're a grizzled classloading guru veteran who is going to
+ * verify any change on 6 different application servers.
+ */
+// NOTE! This is a duplicate of utils.ClassLoaderUtils with public
+// modifiers changed to package-private. Make sure to integrate any future
+// changes to utils.ClassLoaderUtils to this file.
+final class ClassLoaderUtils {
+
+ /** {@link org.apache.commons.logging} logging facility */
+ private static final java.util.logging.Logger log =
+ java.util.logging.Logger.getLogger(ClassLoaderUtils.class.getName());
+
+ private ClassLoaderUtils() {
+ }
+
+ /**
+ * Load a given resource. This method will try to load the resource
+ * using the following methods (in order):
+ *
+ * - From Thread.currentThread().getContextClassLoader()
+ *
- From ClassLoaderUtil.class.getClassLoader()
+ *
- callingClass.getClassLoader()
+ *
+ *
+ * @param resourceName The name of the resource to load
+ * @param callingClass The Class object of the calling object
+ */
+ static URL getResource(String resourceName, Class callingClass) {
+ URL url = Thread.currentThread().getContextClassLoader().getResource(resourceName);
+ if (url == null && resourceName.startsWith("/")) {
+ //certain classloaders need it without the leading /
+ url =
+ Thread.currentThread().getContextClassLoader().getResource(
+ resourceName.substring(1)
+ );
+ }
+
+ ClassLoader cluClassloader = ClassLoaderUtils.class.getClassLoader();
+ if (cluClassloader == null) {
+ cluClassloader = ClassLoader.getSystemClassLoader();
+ }
+ if (url == null) {
+ url = cluClassloader.getResource(resourceName);
+ }
+ if (url == null && resourceName.startsWith("/")) {
+ //certain classloaders need it without the leading /
+ url = cluClassloader.getResource(resourceName.substring(1));
+ }
+
+ if (url == null) {
+ ClassLoader cl = callingClass.getClassLoader();
+
+ if (cl != null) {
+ url = cl.getResource(resourceName);
+ }
+ }
+
+ if (url == null) {
+ url = callingClass.getResource(resourceName);
+ }
+
+ if ((url == null) && (resourceName != null) && (resourceName.charAt(0) != '/')) {
+ return getResource('/' + resourceName, callingClass);
+ }
+
+ return url;
+ }
+
+ /**
+ * Load a given resources. This method will try to load the resources
+ * using the following methods (in order):
+ *
+ * - From Thread.currentThread().getContextClassLoader()
+ *
- From ClassLoaderUtil.class.getClassLoader()
+ *
- callingClass.getClassLoader()
+ *
+ *
+ * @param resourceName The name of the resource to load
+ * @param callingClass The Class object of the calling object
+ */
+ static List getResources(String resourceName, Class callingClass) {
+ List ret = new ArrayList();
+ Enumeration urls = new Enumeration() {
+ public boolean hasMoreElements() {
+ return false;
+ }
+ public URL nextElement() {
+ return null;
+ }
+
+ };
+ try {
+ urls = Thread.currentThread().getContextClassLoader().getResources(resourceName);
+ } catch (IOException e) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, e.getMessage(), e);
+ }
+ //ignore
+ }
+ if (!urls.hasMoreElements() && resourceName.startsWith("/")) {
+ //certain classloaders need it without the leading /
+ try {
+ urls =
+ Thread.currentThread().getContextClassLoader().getResources(
+ resourceName.substring(1)
+ );
+ } catch (IOException e) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, e.getMessage(), e);
+ }
+ // ignore
+ }
+ }
+
+ ClassLoader cluClassloader = ClassLoaderUtils.class.getClassLoader();
+ if (cluClassloader == null) {
+ cluClassloader = ClassLoader.getSystemClassLoader();
+ }
+ if (!urls.hasMoreElements()) {
+ try {
+ urls = cluClassloader.getResources(resourceName);
+ } catch (IOException e) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, e.getMessage(), e);
+ }
+ // ignore
+ }
+ }
+ if (!urls.hasMoreElements() && resourceName.startsWith("/")) {
+ //certain classloaders need it without the leading /
+ try {
+ urls = cluClassloader.getResources(resourceName.substring(1));
+ } catch (IOException e) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, e.getMessage(), e);
+ }
+ // ignore
+ }
+ }
+
+ if (!urls.hasMoreElements()) {
+ ClassLoader cl = callingClass.getClassLoader();
+
+ if (cl != null) {
+ try {
+ urls = cl.getResources(resourceName);
+ } catch (IOException e) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, e.getMessage(), e);
+ }
+ // ignore
+ }
+ }
+ }
+
+ if (!urls.hasMoreElements()) {
+ URL url = callingClass.getResource(resourceName);
+ if (url != null) {
+ ret.add(url);
+ }
+ }
+ while (urls.hasMoreElements()) {
+ ret.add(urls.nextElement());
+ }
+
+
+ if (ret.isEmpty() && (resourceName != null) && (resourceName.charAt(0) != '/')) {
+ return getResources('/' + resourceName, callingClass);
+ }
+ return ret;
+ }
+
+
+ /**
+ * This is a convenience method to load a resource as a stream. The
+ * algorithm used to find the resource is given in getResource()
+ *
+ * @param resourceName The name of the resource to load
+ * @param callingClass The Class object of the calling object
+ */
+ static InputStream getResourceAsStream(String resourceName, Class callingClass) {
+ URL url = getResource(resourceName, callingClass);
+
+ try {
+ return (url != null) ? url.openStream() : null;
+ } catch (IOException e) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, e.getMessage(), e);
+ }
+ return null;
+ }
+ }
+
+ /**
+ * Load a class with a given name. It will try to load the class in the
+ * following order:
+ *
+ * - From Thread.currentThread().getContextClassLoader()
+ *
- Using the basic Class.forName()
+ *
- From ClassLoaderUtil.class.getClassLoader()
+ *
- From the callingClass.getClassLoader()
+ *
+ *
+ * @param className The name of the class to load
+ * @param callingClass The Class object of the calling object
+ * @throws ClassNotFoundException If the class cannot be found anywhere.
+ */
+ static Class loadClass(String className, Class callingClass)
+ throws ClassNotFoundException {
+ try {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+
+ if (cl != null) {
+ return cl.loadClass(className);
+ }
+ } catch (ClassNotFoundException e) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, e.getMessage(), e);
+ }
+ //ignore
+ }
+ return loadClass2(className, callingClass);
+ }
+
+ private static Class loadClass2(String className, Class callingClass)
+ throws ClassNotFoundException {
+ try {
+ return Class.forName(className);
+ } catch (ClassNotFoundException ex) {
+ try {
+ if (ClassLoaderUtils.class.getClassLoader() != null) {
+ return ClassLoaderUtils.class.getClassLoader().loadClass(className);
+ }
+ } catch (ClassNotFoundException exc) {
+ if (callingClass != null && callingClass.getClassLoader() != null) {
+ return callingClass.getClassLoader().loadClass(className);
+ }
+ }
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, ex.getMessage(), ex);
+ }
+ throw ex;
+ }
+ }
+}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java Wed Jun 19 11:04:39 2013 +0100
@@ -2,167 +2,316 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package com.sun.org.apache.xml.internal.security.algorithms;
-
-
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
-
-import com.sun.org.apache.xml.internal.security.Init;
-import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
+import com.sun.org.apache.xml.internal.security.encryption.XMLCipher;
+import com.sun.org.apache.xml.internal.security.signature.XMLSignature;
import org.w3c.dom.Element;
-
/**
* This class maps algorithm identifier URIs to JAVA JCE class names.
- *
- * @author $Author: mullan $
*/
public class JCEMapper {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
+ /** {@link org.apache.commons.logging} logging facility */
+ private static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(JCEMapper.class.getName());
-
-
- private static Map uriToJCEName;
-
- private static Map algorithmsMap;
+ private static Map algorithmsMap =
+ new ConcurrentHashMap();
- private static String providerName = null;
- /**
- * Method init
- *
- * @param mappingElement
- * @throws Exception
- */
- public static void init(Element mappingElement) throws Exception {
-
- loadAlgorithms((Element)mappingElement.getElementsByTagName("Algorithms").item(0));
- }
+ private static String providerName = null;
- static void loadAlgorithms( Element algorithmsEl) {
- Element[] algorithms = XMLUtils.selectNodes(algorithmsEl.getFirstChild(),Init.CONF_NS,"Algorithm");
- uriToJCEName = new HashMap( algorithms.length * 2);
- algorithmsMap = new HashMap( algorithms.length * 2);
- for (int i = 0 ;i < algorithms.length ;i ++) {
- Element el = algorithms[i];
- String id = el.getAttribute("URI");
- String jceName = el.getAttribute("JCEName");
- uriToJCEName.put(id, jceName);
- algorithmsMap.put(id, new Algorithm(el));
- }
-
- }
-
- static Algorithm getAlgorithmMapping(String algoURI) {
- return algorithmsMap.get(algoURI);
- }
-
- /**
- * Method translateURItoJCEID
- *
- * @param AlgorithmURI
- * @return the JCE standard name corresponding to the given URI
- *
- */
- public static String translateURItoJCEID(String AlgorithmURI) {
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI);
-
- String jceName = uriToJCEName.get(AlgorithmURI);
- return jceName;
- }
+ /**
+ * Method register
+ *
+ * @param id
+ * @param algorithm
+ */
+ public static void register(String id, Algorithm algorithm) {
+ algorithmsMap.put(id, algorithm);
+ }
- /**
- * Method getAlgorithmClassFromURI
- * NOTE(Raul Benito) It seems a buggy function the loop doesn't do
- * anything??
- * @param AlgorithmURI
- * @return the class name that implements this algorithm
- *
- */
- public static String getAlgorithmClassFromURI(String AlgorithmURI) {
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI);
-
- return (algorithmsMap.get(AlgorithmURI)).algorithmClass;
- }
-
- /**
- * Returns the keylength in bit for a particular algorithm.
- *
- * @param AlgorithmURI
- * @return The length of the key used in the alogrithm
- */
- public static int getKeyLengthFromURI(String AlgorithmURI) {
- return Integer.parseInt((algorithmsMap.get(AlgorithmURI)).keyLength);
- }
+ /**
+ * This method registers the default algorithms.
+ */
+ public static void registerDefaultAlgorithms() {
+ algorithmsMap.put(
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_NOT_RECOMMENDED_MD5,
+ new Algorithm("", "MD5", "MessageDigest")
+ );
+ algorithmsMap.put(
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_RIPEMD160,
+ new Algorithm("", "RIPEMD160", "MessageDigest")
+ );
+ algorithmsMap.put(
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1,
+ new Algorithm("", "SHA-1", "MessageDigest")
+ );
+ algorithmsMap.put(
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA256,
+ new Algorithm("", "SHA-256", "MessageDigest")
+ );
+ algorithmsMap.put(
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA384,
+ new Algorithm("", "SHA-384", "MessageDigest")
+ );
+ algorithmsMap.put(
+ MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA512,
+ new Algorithm("", "SHA-512", "MessageDigest")
+ );
+ algorithmsMap.put(
+ XMLSignature.ALGO_ID_SIGNATURE_DSA,
+ new Algorithm("", "SHA1withDSA", "Signature")
+ );
+ algorithmsMap.put(
+ XMLSignature.ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5,
+ new Algorithm("", "MD5withRSA", "Signature")
+ );
+ algorithmsMap.put(
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_RIPEMD160,
+ new Algorithm("", "RIPEMD160withRSA", "Signature")
+ );
+ algorithmsMap.put(
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1,
+ new Algorithm("", "SHA1withRSA", "Signature")
+ );
+ algorithmsMap.put(
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256,
+ new Algorithm("", "SHA256withRSA", "Signature")
+ );
+ algorithmsMap.put(
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA384,
+ new Algorithm("", "SHA384withRSA", "Signature")
+ );
+ algorithmsMap.put(
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA512,
+ new Algorithm("", "SHA512withRSA", "Signature")
+ );
+ algorithmsMap.put(
+ XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA1,
+ new Algorithm("", "SHA1withECDSA", "Signature")
+ );
+ algorithmsMap.put(
+ XMLSignature.ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5,
+ new Algorithm("", "HmacMD5", "Mac")
+ );
+ algorithmsMap.put(
+ XMLSignature.ALGO_ID_MAC_HMAC_RIPEMD160,
+ new Algorithm("", "HMACRIPEMD160", "Mac")
+ );
+ algorithmsMap.put(
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
+ new Algorithm("", "HmacSHA1", "Mac")
+ );
+ algorithmsMap.put(
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA256,
+ new Algorithm("", "HmacSHA256", "Mac")
+ );
+ algorithmsMap.put(
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA384,
+ new Algorithm("", "HmacSHA384", "Mac")
+ );
+ algorithmsMap.put(
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA512,
+ new Algorithm("", "HmacSHA512", "Mac")
+ );
+ algorithmsMap.put(
+ XMLCipher.TRIPLEDES,
+ new Algorithm("DESede", "DESede/CBC/ISO10126Padding", "BlockEncryption", 192)
+ );
+ algorithmsMap.put(
+ XMLCipher.AES_128,
+ new Algorithm("AES", "AES/CBC/ISO10126Padding", "BlockEncryption", 128)
+ );
+ algorithmsMap.put(
+ XMLCipher.AES_192,
+ new Algorithm("AES", "AES/CBC/ISO10126Padding", "BlockEncryption", 192)
+ );
+ algorithmsMap.put(
+ XMLCipher.AES_256,
+ new Algorithm("AES", "AES/CBC/ISO10126Padding", "BlockEncryption", 256)
+ );
+ algorithmsMap.put(
+ XMLCipher.RSA_v1dot5,
+ new Algorithm("RSA", "RSA/ECB/PKCS1Padding", "KeyTransport")
+ );
+ algorithmsMap.put(
+ XMLCipher.RSA_OAEP,
+ new Algorithm("RSA", "RSA/ECB/OAEPPadding", "KeyTransport")
+ );
+ algorithmsMap.put(
+ XMLCipher.DIFFIE_HELLMAN,
+ new Algorithm("", "", "KeyAgreement")
+ );
+ algorithmsMap.put(
+ XMLCipher.TRIPLEDES_KeyWrap,
+ new Algorithm("DESede", "DESedeWrap", "SymmetricKeyWrap", 192)
+ );
+ algorithmsMap.put(
+ XMLCipher.AES_128_KeyWrap,
+ new Algorithm("AES", "AESWrap", "SymmetricKeyWrap", 128)
+ );
+ algorithmsMap.put(
+ XMLCipher.AES_192_KeyWrap,
+ new Algorithm("AES", "AESWrap", "SymmetricKeyWrap", 192)
+ );
+ algorithmsMap.put(
+ XMLCipher.AES_256_KeyWrap,
+ new Algorithm("AES", "AESWrap", "SymmetricKeyWrap", 256)
+ );
+ }
- /**
- * Method getJCEKeyAlgorithmFromURI
- *
- * @param AlgorithmURI
- * @return The KeyAlgorithm for the given URI.
- *
- */
- public static String getJCEKeyAlgorithmFromURI(String AlgorithmURI) {
+ /**
+ * Method translateURItoJCEID
+ *
+ * @param algorithmURI
+ * @return the JCE standard name corresponding to the given URI
+ */
+ public static String translateURItoJCEID(String algorithmURI) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Request for URI " + algorithmURI);
+ }
- return (algorithmsMap.get(AlgorithmURI)).requiredKey;
+ Algorithm algorithm = algorithmsMap.get(algorithmURI);
+ if (algorithm != null) {
+ return algorithm.jceName;
+ }
+ return null;
+ }
- }
+ /**
+ * Method getAlgorithmClassFromURI
+ * @param algorithmURI
+ * @return the class name that implements this algorithm
+ */
+ public static String getAlgorithmClassFromURI(String algorithmURI) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Request for URI " + algorithmURI);
+ }
+
+ Algorithm algorithm = algorithmsMap.get(algorithmURI);
+ if (algorithm != null) {
+ return algorithm.algorithmClass;
+ }
+ return null;
+ }
- /**
- * Gets the default Provider for obtaining the security algorithms
- * @return the default providerId.
- */
- public static String getProviderId() {
- return providerName;
- }
+ /**
+ * Returns the keylength in bits for a particular algorithm.
+ *
+ * @param algorithmURI
+ * @return The length of the key used in the algorithm
+ */
+ public static int getKeyLengthFromURI(String algorithmURI) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Request for URI " + algorithmURI);
+ }
+ Algorithm algorithm = algorithmsMap.get(algorithmURI);
+ if (algorithm != null) {
+ return algorithm.keyLength;
+ }
+ return 0;
+ }
- /**
- * Sets the default Provider for obtaining the security algorithms
- * @param provider the default providerId.
- */
- public static void setProviderId(String provider) {
- providerName=provider;
- }
+ /**
+ * Method getJCEKeyAlgorithmFromURI
+ *
+ * @param algorithmURI
+ * @return The KeyAlgorithm for the given URI.
+ */
+ public static String getJCEKeyAlgorithmFromURI(String algorithmURI) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Request for URI " + algorithmURI);
+ }
+ Algorithm algorithm = algorithmsMap.get(algorithmURI);
+ if (algorithm != null) {
+ return algorithm.requiredKey;
+ }
+ return null;
+ }
- /**
- * Represents the Algorithm xml element
- */
- public static class Algorithm {
- String algorithmClass;
- String keyLength;
- String requiredKey;
+ /**
+ * Gets the default Provider for obtaining the security algorithms
+ * @return the default providerId.
+ */
+ public static String getProviderId() {
+ return providerName;
+ }
+
+ /**
+ * Sets the default Provider for obtaining the security algorithms
+ * @param provider the default providerId.
+ */
+ public static void setProviderId(String provider) {
+ providerName = provider;
+ }
+
+ /**
+ * Represents the Algorithm xml element
+ */
+ public static class Algorithm {
+
+ final String requiredKey;
+ final String jceName;
+ final String algorithmClass;
+ final int keyLength;
+
/**
* Gets data from element
* @param el
*/
public Algorithm(Element el) {
- algorithmClass=el.getAttribute("AlgorithmClass");
- keyLength=el.getAttribute("KeyLength");
- requiredKey=el.getAttribute("RequiredKey");
+ requiredKey = el.getAttribute("RequiredKey");
+ jceName = el.getAttribute("JCEName");
+ algorithmClass = el.getAttribute("AlgorithmClass");
+ if (el.hasAttribute("KeyLength")) {
+ keyLength = Integer.parseInt(el.getAttribute("KeyLength"));
+ } else {
+ keyLength = 0;
+ }
+ }
+
+ public Algorithm(String requiredKey, String jceName) {
+ this(requiredKey, jceName, null, 0);
}
- }
+
+ public Algorithm(String requiredKey, String jceName, String algorithmClass) {
+ this(requiredKey, jceName, algorithmClass, 0);
+ }
+
+ public Algorithm(String requiredKey, String jceName, int keyLength) {
+ this(requiredKey, jceName, null, keyLength);
+ }
+
+ public Algorithm(String requiredKey, String jceName, String algorithmClass, int keyLength) {
+ this.requiredKey = requiredKey;
+ this.jceName = jceName;
+ this.algorithmClass = algorithmClass;
+ this.keyLength = keyLength;
+ }
+ }
+
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java Wed Jun 19 11:04:39 2013 +0100
@@ -2,460 +2,445 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package com.sun.org.apache.xml.internal.security.algorithms;
-
import java.security.Key;
import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import com.sun.org.apache.xml.internal.security.algorithms.implementations.IntegrityHmac;
+import com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureBaseRSA;
+import com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureDSA;
+import com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureECDSA;
import com.sun.org.apache.xml.internal.security.exceptions.AlgorithmAlreadyRegisteredException;
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
+import com.sun.org.apache.xml.internal.security.signature.XMLSignature;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureException;
import com.sun.org.apache.xml.internal.security.utils.Constants;
+import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
/**
- * Allows selection of digital signature's algorithm, private keys, other security parameters, and algorithm's ID.
+ * Allows selection of digital signature's algorithm, private keys, other
+ * security parameters, and algorithm's ID.
*
* @author Christian Geuer-Pollmann
*/
public class SignatureAlgorithm extends Algorithm {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
+ /** {@link org.apache.commons.logging} logging facility */
+ private static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(SignatureAlgorithm.class.getName());
- /** Field _alreadyInitialized */
- static boolean _alreadyInitialized = false;
+ /** All available algorithm classes are registered here */
+ private static Map> algorithmHash =
+ new ConcurrentHashMap>();
- /** All available algorithm classes are registered here */
- static Map> _algorithmHash = null;
+ /** Field signatureAlgorithm */
+ private final SignatureAlgorithmSpi signatureAlgorithm;
+
+ private final String algorithmURI;
- static ThreadLocal> instancesSigning=new ThreadLocal>() {
- protected Map initialValue() {
- return new HashMap();
- };
- };
+ /**
+ * Constructor SignatureAlgorithm
+ *
+ * @param doc
+ * @param algorithmURI
+ * @throws XMLSecurityException
+ */
+ public SignatureAlgorithm(Document doc, String algorithmURI) throws XMLSecurityException {
+ super(doc, algorithmURI);
+ this.algorithmURI = algorithmURI;
- static ThreadLocal> instancesVerify=new ThreadLocal>() {
- protected Map initialValue() {
- return new HashMap();
- };
- };
+ signatureAlgorithm = getSignatureAlgorithmSpi(algorithmURI);
+ signatureAlgorithm.engineGetContextFromElement(this._constructionElement);
+ }
- static ThreadLocal> keysSigning=new ThreadLocal>() {
- protected Map initialValue() {
- return new HashMap();
- };
- };
- static ThreadLocal> keysVerify=new ThreadLocal>() {
- protected Map initialValue() {
- return new HashMap();
- };
- };
-// boolean isForSigning=false;
+ /**
+ * Constructor SignatureAlgorithm
+ *
+ * @param doc
+ * @param algorithmURI
+ * @param hmacOutputLength
+ * @throws XMLSecurityException
+ */
+ public SignatureAlgorithm(
+ Document doc, String algorithmURI, int hmacOutputLength
+ ) throws XMLSecurityException {
+ super(doc, algorithmURI);
+ this.algorithmURI = algorithmURI;
- /** Field _signatureAlgorithm */
- protected SignatureAlgorithmSpi _signatureAlgorithm = null;
+ signatureAlgorithm = getSignatureAlgorithmSpi(algorithmURI);
+ signatureAlgorithm.engineGetContextFromElement(this._constructionElement);
- private String algorithmURI;
+ signatureAlgorithm.engineSetHMACOutputLength(hmacOutputLength);
+ ((IntegrityHmac)signatureAlgorithm).engineAddContextToElement(_constructionElement);
+ }
- /**
- * Constructor SignatureAlgorithm
- *
- * @param doc
- * @param algorithmURI
- * @throws XMLSecurityException
- */
- public SignatureAlgorithm(Document doc, String algorithmURI)
- throws XMLSecurityException {
- super(doc, algorithmURI);
- this.algorithmURI = algorithmURI;
- }
+ /**
+ * Constructor SignatureAlgorithm
+ *
+ * @param element
+ * @param baseURI
+ * @throws XMLSecurityException
+ */
+ public SignatureAlgorithm(Element element, String baseURI) throws XMLSecurityException {
+ this(element, baseURI, false);
+ }
+ /**
+ * Constructor SignatureAlgorithm
+ *
+ * @param element
+ * @param baseURI
+ * @param secureValidation
+ * @throws XMLSecurityException
+ */
+ public SignatureAlgorithm(
+ Element element, String baseURI, boolean secureValidation
+ ) throws XMLSecurityException {
+ super(element, baseURI);
+ algorithmURI = this.getURI();
- private void initializeAlgorithm(boolean isForSigning) throws XMLSignatureException {
- if (_signatureAlgorithm!=null) {
- return;
- }
- _signatureAlgorithm=isForSigning ? getInstanceForSigning(algorithmURI) : getInstanceForVerify(algorithmURI);
- this._signatureAlgorithm
- .engineGetContextFromElement(this._constructionElement);
- }
- private static SignatureAlgorithmSpi getInstanceForSigning(String algorithmURI) throws XMLSignatureException {
- SignatureAlgorithmSpi result= instancesSigning.get().get(algorithmURI);
- if (result!=null) {
- result.reset();
- return result;
- }
- result=buildSigner(algorithmURI, result);
- instancesSigning.get().put(algorithmURI,result);
- return result;
- }
- private static SignatureAlgorithmSpi getInstanceForVerify(String algorithmURI) throws XMLSignatureException {
- SignatureAlgorithmSpi result= instancesVerify.get().get(algorithmURI);
- if (result!=null) {
- result.reset();
- return result;
- }
- result=buildSigner(algorithmURI, result);
- instancesVerify.get().put(algorithmURI,result);
- return result;
- }
+ Attr attr = element.getAttributeNodeNS(null, "Id");
+ if (attr != null) {
+ element.setIdAttributeNode(attr, true);
+ }
+
+ if (secureValidation && (XMLSignature.ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5.equals(algorithmURI)
+ || XMLSignature.ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5.equals(algorithmURI))) {
+ Object exArgs[] = { algorithmURI };
+
+ throw new XMLSecurityException("signature.signatureAlgorithm", exArgs);
+ }
- private static SignatureAlgorithmSpi buildSigner(String algorithmURI, SignatureAlgorithmSpi result) throws XMLSignatureException {
+ signatureAlgorithm = getSignatureAlgorithmSpi(algorithmURI);
+ signatureAlgorithm.engineGetContextFromElement(this._constructionElement);
+ }
+
+ /**
+ * Get a SignatureAlgorithmSpi object corresponding to the algorithmURI argument
+ */
+ private static SignatureAlgorithmSpi getSignatureAlgorithmSpi(String algorithmURI)
+ throws XMLSignatureException {
try {
- Class implementingClass =
- SignatureAlgorithm.getImplementingClass(algorithmURI);
- if (log.isLoggable(java.util.logging.Level.FINE))
+ Class implementingClass =
+ algorithmHash.get(algorithmURI);
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
log.log(java.util.logging.Level.FINE, "Create URI \"" + algorithmURI + "\" class \""
+ implementingClass + "\"");
- result= implementingClass.newInstance();
- return result;
- } catch (IllegalAccessException ex) {
- Object exArgs[] = { algorithmURI, ex.getMessage() };
-
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs,
- ex);
- } catch (InstantiationException ex) {
- Object exArgs[] = { algorithmURI, ex.getMessage() };
-
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs,
- ex);
- } catch (NullPointerException ex) {
- Object exArgs[] = { algorithmURI, ex.getMessage() };
-
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs,
- ex);
- }
-}
+ }
+ return implementingClass.newInstance();
+ } catch (IllegalAccessException ex) {
+ Object exArgs[] = { algorithmURI, ex.getMessage() };
+ throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs, ex);
+ } catch (InstantiationException ex) {
+ Object exArgs[] = { algorithmURI, ex.getMessage() };
+ throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs, ex);
+ } catch (NullPointerException ex) {
+ Object exArgs[] = { algorithmURI, ex.getMessage() };
+ throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs, ex);
+ }
+ }
- /**
- * Constructor SignatureAlgorithm
- *
- * @param doc
- * @param algorithmURI
- * @param HMACOutputLength
- * @throws XMLSecurityException
- */
- public SignatureAlgorithm(
- Document doc, String algorithmURI, int HMACOutputLength)
- throws XMLSecurityException {
- this(doc, algorithmURI);
- this.algorithmURI=algorithmURI;
- initializeAlgorithm(true);
- this._signatureAlgorithm.engineSetHMACOutputLength(HMACOutputLength);
- ((IntegrityHmac)this._signatureAlgorithm)
- .engineAddContextToElement(this._constructionElement);
- }
+ /**
+ * Proxy method for {@link java.security.Signature#sign()}
+ * which is executed on the internal {@link java.security.Signature} object.
+ *
+ * @return the result of the {@link java.security.Signature#sign()} method
+ * @throws XMLSignatureException
+ */
+ public byte[] sign() throws XMLSignatureException {
+ return signatureAlgorithm.engineSign();
+ }
- /**
- * Constructor SignatureAlgorithm
- *
- * @param element
- * @param BaseURI
- * @throws XMLSecurityException
- */
- public SignatureAlgorithm(Element element, String BaseURI)
- throws XMLSecurityException {
+ /**
+ * Proxy method for {@link java.security.Signature#getAlgorithm}
+ * which is executed on the internal {@link java.security.Signature} object.
+ *
+ * @return the result of the {@link java.security.Signature#getAlgorithm} method
+ */
+ public String getJCEAlgorithmString() {
+ return signatureAlgorithm.engineGetJCEAlgorithmString();
+ }
- super(element, BaseURI);
- algorithmURI = this.getURI();
- }
+ /**
+ * Method getJCEProviderName
+ *
+ * @return The Provider of this Signature Algorithm
+ */
+ public String getJCEProviderName() {
+ return signatureAlgorithm.engineGetJCEProviderName();
+ }
- /**
- * Proxy method for {@link java.security.Signature#sign()}
- * which is executed on the internal {@link java.security.Signature} object.
- *
- * @return the result of the {@link java.security.Signature#sign()} method
- * @throws XMLSignatureException
- */
- public byte[] sign() throws XMLSignatureException {
- return this._signatureAlgorithm.engineSign();
- }
+ /**
+ * Proxy method for {@link java.security.Signature#update(byte[])}
+ * which is executed on the internal {@link java.security.Signature} object.
+ *
+ * @param input
+ * @throws XMLSignatureException
+ */
+ public void update(byte[] input) throws XMLSignatureException {
+ signatureAlgorithm.engineUpdate(input);
+ }
- /**
- * Proxy method for {@link java.security.Signature#getAlgorithm}
- * which is executed on the internal {@link java.security.Signature} object.
- *
- * @return the result of the {@link java.security.Signature#getAlgorithm} method
- */
- public String getJCEAlgorithmString() {
- try {
- return getInstanceForVerify(algorithmURI).engineGetJCEAlgorithmString();
- } catch (XMLSignatureException e) {
- //Ignore.
- return null;
- }
- }
+ /**
+ * Proxy method for {@link java.security.Signature#update(byte)}
+ * which is executed on the internal {@link java.security.Signature} object.
+ *
+ * @param input
+ * @throws XMLSignatureException
+ */
+ public void update(byte input) throws XMLSignatureException {
+ signatureAlgorithm.engineUpdate(input);
+ }
- /**
- * Method getJCEProviderName
- *
- * @return The Provider of this Signature Alogrithm
- */
- public String getJCEProviderName() {
- try {
- return getInstanceForVerify(algorithmURI).engineGetJCEProviderName();
- } catch (XMLSignatureException e) {
- return null;
- }
- }
+ /**
+ * Proxy method for {@link java.security.Signature#update(byte[], int, int)}
+ * which is executed on the internal {@link java.security.Signature} object.
+ *
+ * @param buf
+ * @param offset
+ * @param len
+ * @throws XMLSignatureException
+ */
+ public void update(byte buf[], int offset, int len) throws XMLSignatureException {
+ signatureAlgorithm.engineUpdate(buf, offset, len);
+ }
- /**
- * Proxy method for {@link java.security.Signature#update(byte[])}
- * which is executed on the internal {@link java.security.Signature} object.
- *
- * @param input
- * @throws XMLSignatureException
- */
- public void update(byte[] input) throws XMLSignatureException {
- this._signatureAlgorithm.engineUpdate(input);
- }
+ /**
+ * Proxy method for {@link java.security.Signature#initSign(java.security.PrivateKey)}
+ * which is executed on the internal {@link java.security.Signature} object.
+ *
+ * @param signingKey
+ * @throws XMLSignatureException
+ */
+ public void initSign(Key signingKey) throws XMLSignatureException {
+ signatureAlgorithm.engineInitSign(signingKey);
+ }
- /**
- * Proxy method for {@link java.security.Signature#update(byte)}
- * which is executed on the internal {@link java.security.Signature} object.
- *
- * @param input
- * @throws XMLSignatureException
- */
- public void update(byte input) throws XMLSignatureException {
- this._signatureAlgorithm.engineUpdate(input);
- }
+ /**
+ * Proxy method for {@link java.security.Signature#initSign(java.security.PrivateKey,
+ * java.security.SecureRandom)}
+ * which is executed on the internal {@link java.security.Signature} object.
+ *
+ * @param signingKey
+ * @param secureRandom
+ * @throws XMLSignatureException
+ */
+ public void initSign(Key signingKey, SecureRandom secureRandom) throws XMLSignatureException {
+ signatureAlgorithm.engineInitSign(signingKey, secureRandom);
+ }
- /**
- * Proxy method for {@link java.security.Signature#update(byte[], int, int)}
- * which is executed on the internal {@link java.security.Signature} object.
- *
- * @param buf
- * @param offset
- * @param len
- * @throws XMLSignatureException
- */
- public void update(byte buf[], int offset, int len)
- throws XMLSignatureException {
- this._signatureAlgorithm.engineUpdate(buf, offset, len);
- }
+ /**
+ * Proxy method for {@link java.security.Signature#initSign(java.security.PrivateKey)}
+ * which is executed on the internal {@link java.security.Signature} object.
+ *
+ * @param signingKey
+ * @param algorithmParameterSpec
+ * @throws XMLSignatureException
+ */
+ public void initSign(
+ Key signingKey, AlgorithmParameterSpec algorithmParameterSpec
+ ) throws XMLSignatureException {
+ signatureAlgorithm.engineInitSign(signingKey, algorithmParameterSpec);
+ }
- /**
- * Proxy method for {@link java.security.Signature#initSign(java.security.PrivateKey)}
- * which is executed on the internal {@link java.security.Signature} object.
- *
- * @param signingKey
- * @throws XMLSignatureException
- */
- public void initSign(Key signingKey) throws XMLSignatureException {
- initializeAlgorithm(true);
- Map map=keysSigning.get();
- if (map.get(this.algorithmURI)==signingKey) {
- return;
- }
- map.put(this.algorithmURI,signingKey);
- this._signatureAlgorithm.engineInitSign(signingKey);
- }
+ /**
+ * Proxy method for {@link java.security.Signature#setParameter(
+ * java.security.spec.AlgorithmParameterSpec)}
+ * which is executed on the internal {@link java.security.Signature} object.
+ *
+ * @param params
+ * @throws XMLSignatureException
+ */
+ public void setParameter(AlgorithmParameterSpec params) throws XMLSignatureException {
+ signatureAlgorithm.engineSetParameter(params);
+ }
- /**
- * Proxy method for {@link java.security.Signature#initSign(java.security.PrivateKey, java.security.SecureRandom)}
- * which is executed on the internal {@link java.security.Signature} object.
- *
- * @param signingKey
- * @param secureRandom
- * @throws XMLSignatureException
- */
- public void initSign(Key signingKey, SecureRandom secureRandom)
- throws XMLSignatureException {
- initializeAlgorithm(true);
- this._signatureAlgorithm.engineInitSign(signingKey, secureRandom);
- }
+ /**
+ * Proxy method for {@link java.security.Signature#initVerify(java.security.PublicKey)}
+ * which is executed on the internal {@link java.security.Signature} object.
+ *
+ * @param verificationKey
+ * @throws XMLSignatureException
+ */
+ public void initVerify(Key verificationKey) throws XMLSignatureException {
+ signatureAlgorithm.engineInitVerify(verificationKey);
+ }
- /**
- * Proxy method for {@link java.security.Signature#initSign(java.security.PrivateKey)}
- * which is executed on the internal {@link java.security.Signature} object.
- *
- * @param signingKey
- * @param algorithmParameterSpec
- * @throws XMLSignatureException
- */
- public void initSign(
- Key signingKey, AlgorithmParameterSpec algorithmParameterSpec)
- throws XMLSignatureException {
- initializeAlgorithm(true);
- this._signatureAlgorithm.engineInitSign(signingKey,
- algorithmParameterSpec);
- }
+ /**
+ * Proxy method for {@link java.security.Signature#verify(byte[])}
+ * which is executed on the internal {@link java.security.Signature} object.
+ *
+ * @param signature
+ * @return true if if the signature is valid.
+ *
+ * @throws XMLSignatureException
+ */
+ public boolean verify(byte[] signature) throws XMLSignatureException {
+ return signatureAlgorithm.engineVerify(signature);
+ }
- /**
- * Proxy method for {@link java.security.Signature#setParameter(java.security.spec.AlgorithmParameterSpec)}
- * which is executed on the internal {@link java.security.Signature} object.
- *
- * @param params
- * @throws XMLSignatureException
- */
- public void setParameter(AlgorithmParameterSpec params)
- throws XMLSignatureException {
- this._signatureAlgorithm.engineSetParameter(params);
- }
+ /**
+ * Returns the URI representation of Transformation algorithm
+ *
+ * @return the URI representation of Transformation algorithm
+ */
+ public final String getURI() {
+ return _constructionElement.getAttributeNS(null, Constants._ATT_ALGORITHM);
+ }
- /**
- * Proxy method for {@link java.security.Signature#initVerify(java.security.PublicKey)}
- * which is executed on the internal {@link java.security.Signature} object.
- *
- * @param verificationKey
- * @throws XMLSignatureException
- */
- public void initVerify(Key verificationKey) throws XMLSignatureException {
- initializeAlgorithm(false);
- Map map=keysVerify.get();
- if (map.get(this.algorithmURI)==verificationKey) {
- return;
- }
- map.put(this.algorithmURI,verificationKey);
- this._signatureAlgorithm.engineInitVerify(verificationKey);
- }
+ /**
+ * Registers implementing class of the Transform algorithm with algorithmURI
+ *
+ * @param algorithmURI algorithmURI URI representation of Transform algorithm.
+ * @param implementingClass implementingClass the implementing class of
+ * {@link SignatureAlgorithmSpi}
+ * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI is already registered
+ * @throws XMLSignatureException
+ */
+ @SuppressWarnings("unchecked")
+ public static void register(String algorithmURI, String implementingClass)
+ throws AlgorithmAlreadyRegisteredException, ClassNotFoundException,
+ XMLSignatureException {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Try to register " + algorithmURI + " " + implementingClass);
+ }
- /**
- * Proxy method for {@link java.security.Signature#verify(byte[])}
- * which is executed on the internal {@link java.security.Signature} object.
- *
- * @param signature
- * @return true if if the signature is valid.
- *
- * @throws XMLSignatureException
- */
- public boolean verify(byte[] signature) throws XMLSignatureException {
- return this._signatureAlgorithm.engineVerify(signature);
- }
+ // are we already registered?
+ Class registeredClass = algorithmHash.get(algorithmURI);
+ if (registeredClass != null) {
+ Object exArgs[] = { algorithmURI, registeredClass };
+ throw new AlgorithmAlreadyRegisteredException(
+ "algorithm.alreadyRegistered", exArgs
+ );
+ }
+ try {
+ Class clazz =
+ (Class)
+ ClassLoaderUtils.loadClass(implementingClass, SignatureAlgorithm.class);
+ algorithmHash.put(algorithmURI, clazz);
+ } catch (NullPointerException ex) {
+ Object exArgs[] = { algorithmURI, ex.getMessage() };
+ throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs, ex);
+ }
+ }
- /**
- * Returns the URI representation of Transformation algorithm
- *
- * @return the URI representation of Transformation algorithm
- */
- public final String getURI() {
- return this._constructionElement.getAttributeNS(null,
- Constants._ATT_ALGORITHM);
- }
-
- /**
- * Initalizes for this {@link com.sun.org.apache.xml.internal.security.transforms.Transform}
- *
- */
- public static void providerInit() {
-
- if (SignatureAlgorithm.log == null) {
- SignatureAlgorithm.log =
- java.util.logging.Logger
- .getLogger(SignatureAlgorithm.class.getName());
- }
-
- log.log(java.util.logging.Level.FINE, "Init() called");
+ /**
+ * Registers implementing class of the Transform algorithm with algorithmURI
+ *
+ * @param algorithmURI algorithmURI URI representation of Transform algorithm.
+ * @param implementingClass implementingClass the implementing class of
+ * {@link SignatureAlgorithmSpi}
+ * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI is already registered
+ * @throws XMLSignatureException
+ */
+ public static void register(String algorithmURI, Class implementingClass)
+ throws AlgorithmAlreadyRegisteredException, ClassNotFoundException,
+ XMLSignatureException {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Try to register " + algorithmURI + " " + implementingClass);
+ }
- if (!SignatureAlgorithm._alreadyInitialized) {
- SignatureAlgorithm._algorithmHash = new HashMap>(10);
- SignatureAlgorithm._alreadyInitialized = true;
- }
- }
-
- /**
- * Registers implementing class of the Transform algorithm with algorithmURI
- *
- * @param algorithmURI algorithmURI URI representation of Transform algorithm.
- * @param implementingClass implementingClass the implementing class of {@link SignatureAlgorithmSpi}
- * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI is already registered
- * @throws XMLSignatureException
- */
- @SuppressWarnings("unchecked")
- public static void register(String algorithmURI, String implementingClass)
- throws AlgorithmAlreadyRegisteredException,XMLSignatureException {
-
- {
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "Try to register " + algorithmURI + " " + implementingClass);
-
- // are we already registered?
- Class registeredClassClass =
- SignatureAlgorithm.getImplementingClass(algorithmURI);
- if (registeredClassClass!=null) {
- String registeredClass = registeredClassClass.getName();
-
- if ((registeredClass != null) && (registeredClass.length() != 0)) {
- Object exArgs[] = { algorithmURI, registeredClass };
-
- throw new AlgorithmAlreadyRegisteredException(
- "algorithm.alreadyRegistered", exArgs);
- }
- }
- try {
- SignatureAlgorithm._algorithmHash.put(algorithmURI, (Class )Class.forName(implementingClass));
- } catch (ClassNotFoundException ex) {
- Object exArgs[] = { algorithmURI, ex.getMessage() };
+ // are we already registered?
+ Class registeredClass = algorithmHash.get(algorithmURI);
+ if (registeredClass != null) {
+ Object exArgs[] = { algorithmURI, registeredClass };
+ throw new AlgorithmAlreadyRegisteredException(
+ "algorithm.alreadyRegistered", exArgs
+ );
+ }
+ algorithmHash.put(algorithmURI, implementingClass);
+ }
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs,
- ex);
- } catch (NullPointerException ex) {
- Object exArgs[] = { algorithmURI, ex.getMessage() };
-
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs,
- ex);
- }
-
- }
- }
-
- /**
- * Method getImplementingClass
- *
- * @param URI
- * @return the class that implements the URI
- */
- private static Class getImplementingClass(String URI) {
+ /**
+ * This method registers the default algorithms.
+ */
+ public static void registerDefaultAlgorithms() {
+ algorithmHash.put(
+ XMLSignature.ALGO_ID_SIGNATURE_DSA, SignatureDSA.class
+ );
+ algorithmHash.put(
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1, SignatureBaseRSA.SignatureRSASHA1.class
+ );
+ algorithmHash.put(
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA1, IntegrityHmac.IntegrityHmacSHA1.class
+ );
+ algorithmHash.put(
+ XMLSignature.ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5,
+ SignatureBaseRSA.SignatureRSAMD5.class
+ );
+ algorithmHash.put(
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_RIPEMD160,
+ SignatureBaseRSA.SignatureRSARIPEMD160.class
+ );
+ algorithmHash.put(
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256, SignatureBaseRSA.SignatureRSASHA256.class
+ );
+ algorithmHash.put(
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA384, SignatureBaseRSA.SignatureRSASHA384.class
+ );
+ algorithmHash.put(
+ XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA512, SignatureBaseRSA.SignatureRSASHA512.class
+ );
+ algorithmHash.put(
+ XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA1, SignatureECDSA.SignatureECDSASHA1.class
+ );
+ algorithmHash.put(
+ XMLSignature.ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5, IntegrityHmac.IntegrityHmacMD5.class
+ );
+ algorithmHash.put(
+ XMLSignature.ALGO_ID_MAC_HMAC_RIPEMD160, IntegrityHmac.IntegrityHmacRIPEMD160.class
+ );
+ algorithmHash.put(
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA256, IntegrityHmac.IntegrityHmacSHA256.class
+ );
+ algorithmHash.put(
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA384, IntegrityHmac.IntegrityHmacSHA384.class
+ );
+ algorithmHash.put(
+ XMLSignature.ALGO_ID_MAC_HMAC_SHA512, IntegrityHmac.IntegrityHmacSHA512.class
+ );
+ }
- if (SignatureAlgorithm._algorithmHash == null) {
- return null;
- }
-
- return SignatureAlgorithm._algorithmHash.get(URI);
- }
+ /**
+ * Method getBaseNamespace
+ *
+ * @return URI of this element
+ */
+ public String getBaseNamespace() {
+ return Constants.SignatureSpecNS;
+ }
- /**
- * Method getBaseNamespace
- *
- * @return URI of this element
- */
- public String getBaseNamespace() {
- return Constants.SignatureSpecNS;
- }
-
- /**
- * Method getBaseLocalName
- *
- * @return Local name
- */
- public String getBaseLocalName() {
- return Constants._TAG_SIGNATUREMETHOD;
- }
+ /**
+ * Method getBaseLocalName
+ *
+ * @return Local name
+ */
+ public String getBaseLocalName() {
+ return Constants._TAG_SIGNATUREMETHOD;
+ }
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java Wed Jun 19 11:04:39 2013 +0100
@@ -2,34 +2,43 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-/*
- * Copyright 1999-2008 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package com.sun.org.apache.xml.internal.security.c14n;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import java.io.OutputStream;
-import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
+import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer11_OmitComments;
+import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer11_WithComments;
+import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315ExclOmitComments;
+import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315ExclWithComments;
+import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315OmitComments;
+import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315WithComments;
import com.sun.org.apache.xml.internal.security.exceptions.AlgorithmAlreadyRegisteredException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -46,7 +55,7 @@
public static final String ENCODING = "UTF8";
/**
- * XPath Expresion for selecting every node and continuous comments joined
+ * XPath Expression for selecting every node and continuous comments joined
* in only one node
*/
public static final String XPATH_C14N_WITH_COMMENTS_SINGLE_NODE =
@@ -83,22 +92,10 @@
public static final String ALGO_ID_C14N11_WITH_COMMENTS =
ALGO_ID_C14N11_OMIT_COMMENTS + "#WithComments";
- static boolean _alreadyInitialized = false;
- static Map> _canonicalizerHash = null;
-
- protected CanonicalizerSpi canonicalizerSpi = null;
+ private static Map> canonicalizerHash =
+ new ConcurrentHashMap>();
- /**
- * Method init
- *
- */
- public static void init() {
-
- if (!Canonicalizer._alreadyInitialized) {
- Canonicalizer._canonicalizerHash = new HashMap>(10);
- Canonicalizer._alreadyInitialized = true;
- }
- }
+ private final CanonicalizerSpi canonicalizerSpi;
/**
* Constructor Canonicalizer
@@ -106,21 +103,18 @@
* @param algorithmURI
* @throws InvalidCanonicalizerException
*/
- private Canonicalizer(String algorithmURI)
- throws InvalidCanonicalizerException {
-
+ private Canonicalizer(String algorithmURI) throws InvalidCanonicalizerException {
try {
Class implementingClass =
- getImplementingClass(algorithmURI);
+ canonicalizerHash.get(algorithmURI);
- this.canonicalizerSpi =
- implementingClass.newInstance();
- this.canonicalizerSpi.reset=true;
+ canonicalizerSpi = implementingClass.newInstance();
+ canonicalizerSpi.reset = true;
} catch (Exception e) {
Object exArgs[] = { algorithmURI };
-
throw new InvalidCanonicalizerException(
- "signature.Canonicalizer.UnknownCanonicalizer", exArgs);
+ "signature.Canonicalizer.UnknownCanonicalizer", exArgs, e
+ );
}
}
@@ -128,15 +122,12 @@
* Method getInstance
*
* @param algorithmURI
- * @return a Conicicalizer instance ready for the job
+ * @return a Canonicalizer instance ready for the job
* @throws InvalidCanonicalizerException
*/
public static final Canonicalizer getInstance(String algorithmURI)
- throws InvalidCanonicalizerException {
-
- Canonicalizer c14nizer = new Canonicalizer(algorithmURI);
-
- return c14nizer;
+ throws InvalidCanonicalizerException {
+ return new Canonicalizer(algorithmURI);
}
/**
@@ -148,23 +139,69 @@
*/
@SuppressWarnings("unchecked")
public static void register(String algorithmURI, String implementingClass)
- throws AlgorithmAlreadyRegisteredException {
+ throws AlgorithmAlreadyRegisteredException, ClassNotFoundException {
+ // check whether URI is already registered
+ Class registeredClass =
+ canonicalizerHash.get(algorithmURI);
+
+ if (registeredClass != null) {
+ Object exArgs[] = { algorithmURI, registeredClass };
+ throw new AlgorithmAlreadyRegisteredException("algorithm.alreadyRegistered", exArgs);
+ }
+ canonicalizerHash.put(
+ algorithmURI, (Class)Class.forName(implementingClass)
+ );
+ }
+
+ /**
+ * Method register
+ *
+ * @param algorithmURI
+ * @param implementingClass
+ * @throws AlgorithmAlreadyRegisteredException
+ */
+ public static void register(String algorithmURI, Class implementingClass)
+ throws AlgorithmAlreadyRegisteredException, ClassNotFoundException {
// check whether URI is already registered
- Class registeredClass = getImplementingClass(algorithmURI);
+ Class registeredClass = canonicalizerHash.get(algorithmURI);
if (registeredClass != null) {
Object exArgs[] = { algorithmURI, registeredClass };
-
- throw new AlgorithmAlreadyRegisteredException(
- "algorithm.alreadyRegistered", exArgs);
+ throw new AlgorithmAlreadyRegisteredException("algorithm.alreadyRegistered", exArgs);
}
- try {
- _canonicalizerHash.put(algorithmURI, (Class) Class.forName(implementingClass));
- } catch (ClassNotFoundException e) {
- throw new RuntimeException("c14n class not found");
- }
+ canonicalizerHash.put(algorithmURI, implementingClass);
+ }
+
+ /**
+ * This method registers the default algorithms.
+ */
+ public static void registerDefaultAlgorithms() {
+ canonicalizerHash.put(
+ Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS,
+ Canonicalizer20010315OmitComments.class
+ );
+ canonicalizerHash.put(
+ Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS,
+ Canonicalizer20010315WithComments.class
+ );
+ canonicalizerHash.put(
+ Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS,
+ Canonicalizer20010315ExclOmitComments.class
+ );
+ canonicalizerHash.put(
+ Canonicalizer.ALGO_ID_C14N_EXCL_WITH_COMMENTS,
+ Canonicalizer20010315ExclWithComments.class
+ );
+ canonicalizerHash.put(
+ Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS,
+ Canonicalizer11_OmitComments.class
+ );
+ canonicalizerHash.put(
+ Canonicalizer.ALGO_ID_C14N11_WITH_COMMENTS,
+ Canonicalizer11_WithComments.class
+ );
}
/**
@@ -173,7 +210,7 @@
* @return the URI defined for this c14n instance.
*/
public final String getURI() {
- return this.canonicalizerSpi.engineGetURI();
+ return canonicalizerSpi.engineGetURI();
}
/**
@@ -182,7 +219,7 @@
* @return true if the c14n respect the comments.
*/
public boolean getIncludeComments() {
- return this.canonicalizerSpi.engineGetIncludeComments();
+ return canonicalizerSpi.engineGetIncludeComments();
}
/**
@@ -191,33 +228,32 @@
* wrapped with a >a<...>/a<.
*
* @param inputBytes
- * @return the result of the conicalization.
+ * @return the result of the canonicalization.
* @throws CanonicalizationException
* @throws java.io.IOException
* @throws javax.xml.parsers.ParserConfigurationException
* @throws org.xml.sax.SAXException
*/
public byte[] canonicalize(byte[] inputBytes)
- throws javax.xml.parsers.ParserConfigurationException,
- java.io.IOException, org.xml.sax.SAXException,
- CanonicalizationException {
-
- ByteArrayInputStream bais = new ByteArrayInputStream(inputBytes);
+ throws javax.xml.parsers.ParserConfigurationException,
+ java.io.IOException, org.xml.sax.SAXException, CanonicalizationException {
+ InputStream bais = new ByteArrayInputStream(inputBytes);
InputSource in = new InputSource(bais);
DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+ dfactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
dfactory.setNamespaceAware(true);
- // needs to validate for ID attribute nomalization
+ // needs to validate for ID attribute normalization
dfactory.setValidating(true);
DocumentBuilder db = dfactory.newDocumentBuilder();
/*
* for some of the test vectors from the specification,
- * there has to be a validatin parser for ID attributes, default
+ * there has to be a validating parser for ID attributes, default
* attribute values, NMTOKENS, etc.
- * Unfortunaltely, the test vectors do use different DTDs or
+ * Unfortunately, the test vectors do use different DTDs or
* even no DTD. So Xerces 1.3.1 fires many warnings about using
* ErrorHandlers.
*
@@ -233,28 +269,23 @@
* declaration are used to help create the canonical form, even
* though the document type declaration is not retained in the
* canonical form.
- *
*/
- db.setErrorHandler(new com.sun.org.apache.xml.internal.security.utils
- .IgnoreAllErrorHandler());
+ db.setErrorHandler(new com.sun.org.apache.xml.internal.security.utils.IgnoreAllErrorHandler());
Document document = db.parse(in);
- byte result[] = this.canonicalizeSubtree(document);
-
- return result;
+ return this.canonicalizeSubtree(document);
}
/**
* Canonicalizes the subtree rooted by node.
*
- * @param node The node to canicalize
+ * @param node The node to canonicalize
* @return the result of the c14n.
*
* @throws CanonicalizationException
*/
- public byte[] canonicalizeSubtree(Node node)
- throws CanonicalizationException {
- return this.canonicalizerSpi.engineCanonicalizeSubTree(node);
+ public byte[] canonicalizeSubtree(Node node) throws CanonicalizationException {
+ return canonicalizerSpi.engineCanonicalizeSubTree(node);
}
/**
@@ -266,9 +297,8 @@
* @throws CanonicalizationException
*/
public byte[] canonicalizeSubtree(Node node, String inclusiveNamespaces)
- throws CanonicalizationException {
- return this.canonicalizerSpi.engineCanonicalizeSubTree(node,
- inclusiveNamespaces);
+ throws CanonicalizationException {
+ return canonicalizerSpi.engineCanonicalizeSubTree(node, inclusiveNamespaces);
}
/**
@@ -280,8 +310,8 @@
* @throws CanonicalizationException
*/
public byte[] canonicalizeXPathNodeSet(NodeList xpathNodeSet)
- throws CanonicalizationException {
- return this.canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet);
+ throws CanonicalizationException {
+ return canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet);
}
/**
@@ -294,10 +324,10 @@
* @throws CanonicalizationException
*/
public byte[] canonicalizeXPathNodeSet(
- NodeList xpathNodeSet, String inclusiveNamespaces)
- throws CanonicalizationException {
- return this.canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet,
- inclusiveNamespaces);
+ NodeList xpathNodeSet, String inclusiveNamespaces
+ ) throws CanonicalizationException {
+ return
+ canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet, inclusiveNamespaces);
}
/**
@@ -308,8 +338,8 @@
* @throws CanonicalizationException
*/
public byte[] canonicalizeXPathNodeSet(Set xpathNodeSet)
- throws CanonicalizationException {
- return this.canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet);
+ throws CanonicalizationException {
+ return canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet);
}
/**
@@ -320,10 +350,11 @@
* @return the result of the c14n.
* @throws CanonicalizationException
*/
- public byte[] canonicalizeXPathNodeSet(Set xpathNodeSet,
- String inclusiveNamespaces) throws CanonicalizationException {
- return this.canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet,
- inclusiveNamespaces);
+ public byte[] canonicalizeXPathNodeSet(
+ Set xpathNodeSet, String inclusiveNamespaces
+ ) throws CanonicalizationException {
+ return
+ canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet, inclusiveNamespaces);
}
/**
@@ -332,7 +363,7 @@
* @param os
*/
public void setWriter(OutputStream os) {
- this.canonicalizerSpi.setWriter(os);
+ canonicalizerSpi.setWriter(os);
}
/**
@@ -341,23 +372,14 @@
* @return the name of the implementing {@link CanonicalizerSpi} class
*/
public String getImplementingCanonicalizerClass() {
- return this.canonicalizerSpi.getClass().getName();
- }
-
- /**
- * Method getImplementingClass
- *
- * @param URI
- * @return the name of the class that implements the given URI
- */
- private static Class getImplementingClass(String URI) {
- return _canonicalizerHash.get(URI);
+ return canonicalizerSpi.getClass().getName();
}
/**
* Set the canonicalizer behaviour to not reset.
*/
public void notReset() {
- this.canonicalizerSpi.reset = false;
+ canonicalizerSpi.reset = false;
}
+
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java Wed Jun 19 11:04:39 2013 +0100
@@ -26,6 +26,7 @@
import java.io.OutputStream;
import java.util.Set;
+import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.xpath.XPath;
@@ -67,6 +68,7 @@
java.io.ByteArrayInputStream bais = new ByteArrayInputStream(inputBytes);
InputSource in = new InputSource(bais);
DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+ dfactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
// needs to validate for ID attribute nomalization
dfactory.setNamespaceAware(true);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java Wed Jun 19 11:04:39 2013 +0100
@@ -41,6 +41,7 @@
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.IvParameterSpec;
+import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -1981,22 +1982,23 @@
try {
DocumentBuilderFactory dbf =
DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- dbf.setAttribute("http://xml.org/sax/features/namespaces", Boolean.TRUE);
- DocumentBuilder db = dbf.newDocumentBuilder();
- Document d = db.parse(
- new InputSource(new StringReader(fragment)));
-
- Element fragElt = (Element) _contextDocument.importNode(
+ dbf.setNamespaceAware(true);
+ dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+ dbf.setAttribute("http://xml.org/sax/features/namespaces", Boolean.TRUE);
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ Document d = db.parse(
+ new InputSource(new StringReader(fragment)));
+
+ Element fragElt = (Element) _contextDocument.importNode(
d.getDocumentElement(), true);
- result = _contextDocument.createDocumentFragment();
- Node child = fragElt.getFirstChild();
- while (child != null) {
- fragElt.removeChild(child);
- result.appendChild(child);
- child = fragElt.getFirstChild();
- }
- // String outp = serialize(d);
+ result = _contextDocument.createDocumentFragment();
+ Node child = fragElt.getFirstChild();
+ while (child != null) {
+ fragElt.removeChild(child);
+ result.appendChild(child);
+ child = fragElt.getFirstChild();
+ }
+ // String outp = serialize(d);
} catch (SAXException se) {
throw new XMLEncryptionException("empty", se);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java Wed Jun 19 11:04:39 2013 +0100
@@ -54,6 +54,7 @@
import com.sun.org.apache.xml.internal.security.utils.IdResolver;
import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
+import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -128,8 +129,11 @@
*/
public KeyInfo(Element element, String BaseURI) throws XMLSecurityException {
super(element, BaseURI);
- // _storageResolvers.add(null);
+ Attr attr = element.getAttributeNodeNS(null, "Id");
+ if (attr != null) {
+ element.setIdAttributeNode(attr, true);
+ }
}
/**
@@ -139,9 +143,8 @@
*/
public void setId(String Id) {
- if ((Id != null)) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
- IdResolver.registerElementById(this._constructionElement, Id);
+ if (Id != null) {
+ setLocalIdAttribute(Constants._ATT_ID, Id);
}
}
@@ -719,42 +722,36 @@
return null;
}
- /**
- * Searches the library wide keyresolvers for public keys
- *
- * @return The publick contained in this Node.
- * @throws KeyResolverException
- */
- PublicKey getPublicKeyFromStaticResolvers() throws KeyResolverException {
- int length=KeyResolver.length();
- int storageLength=this._storageResolvers.size();
- Iterator it= KeyResolver.iterator();
- for (int i = 0; i < length; i++) {
- KeyResolverSpi keyResolver = it.next();
- Node currentChild=this._constructionElement.getFirstChild();
- String uri= this.getBaseURI();
- while (currentChild!=null) {
- if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
- for (int k = 0; k < storageLength; k++) {
- StorageResolver storage =
- this._storageResolvers.get(k);
+ /**
+ * Searches the library wide keyresolvers for public keys
+ *
+ * @return The public key contained in this Node.
+ * @throws KeyResolverException
+ */
+ PublicKey getPublicKeyFromStaticResolvers() throws KeyResolverException {
+ Iterator it = KeyResolver.iterator();
+ while (it.hasNext()) {
+ KeyResolverSpi keyResolver = it.next();
+ Node currentChild = this._constructionElement.getFirstChild();
+ String uri = this.getBaseURI();
+ while (currentChild != null) {
+ if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
+ for (StorageResolver storage : _storageResolvers) {
+ PublicKey pk =
+ keyResolver.engineLookupAndResolvePublicKey(
+ (Element) currentChild, uri, storage
+ );
- PublicKey pk =
- keyResolver.engineLookupAndResolvePublicKey((Element) currentChild,
- uri,
- storage);
-
- if (pk != null) {
- KeyResolver.hit(it);
- return pk;
- }
- }
+ if (pk != null) {
+ return pk;
+ }
+ }
+ }
+ currentChild = currentChild.getNextSibling();
}
- currentChild=currentChild.getNextSibling();
- }
- }
- return null;
- }
+ }
+ return null;
+ }
/**
* Searches the per-KeyInfo keyresolvers for public keys
@@ -829,81 +826,83 @@
return null;
}
- /**
- * This method uses each System-wide {@link KeyResolver} to search the
- * child elements. Each combination of {@link KeyResolver} and child element
- * is checked against all {@link StorageResolver}s.
- *
- * @return The certificate contined in this KeyInfo
- * @throws KeyResolverException
- */
- X509Certificate getX509CertificateFromStaticResolvers()
- throws KeyResolverException {
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "Start getX509CertificateFromStaticResolvers() with "
- + KeyResolver.length() + " resolvers");
- String uri=this.getBaseURI();
- int length= KeyResolver.length();
- int storageLength=this._storageResolvers.size();
- Iterator it = KeyResolver.iterator();
- for (int i = 0; i it = KeyResolver.iterator();
+ while (it.hasNext()) {
+ KeyResolverSpi keyResolver = it.next();
+ X509Certificate cert = applyCurrentResolver(uri, keyResolver);
+ if (cert != null) {
+ return cert;
+ }
+ }
+ return null;
+ }
- X509Certificate cert = keyResolver
- .engineLookupResolveX509Certificate((Element) currentChild, uri,
- storage);
+ private X509Certificate applyCurrentResolver(
+ String uri, KeyResolverSpi keyResolver
+ ) throws KeyResolverException {
+ Node currentChild = this._constructionElement.getFirstChild();
+ while (currentChild != null) {
+ if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
+ for (StorageResolver storage : _storageResolvers) {
+ X509Certificate cert =
+ keyResolver.engineLookupResolveX509Certificate(
+ (Element) currentChild, uri, storage
+ );
- if (cert != null) {
- return cert;
- }
- }
+ if (cert != null) {
+ return cert;
+ }
+ }
}
- currentChild=currentChild.getNextSibling();
- }
- return null;
- }
+ currentChild = currentChild.getNextSibling();
+ }
+ return null;
+ }
- /**
- * Method getX509CertificateFromInternalResolvers
- *
- * @return The certificate contined in this KeyInfo
- * @throws KeyResolverException
- */
- X509Certificate getX509CertificateFromInternalResolvers()
- throws KeyResolverException {
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "Start getX509CertificateFromInternalResolvers() with "
- + this.lengthInternalKeyResolver() + " resolvers");
- String uri=this.getBaseURI();
- int storageLength=this._storageResolvers.size();
- for (int i = 0; i < this.lengthInternalKeyResolver(); i++) {
- KeyResolverSpi keyResolver = this.itemInternalKeyResolver(i);
- if (log.isLoggable(java.util.logging.Level.FINE))
+ /**
+ * Method getX509CertificateFromInternalResolvers
+ *
+ * @return The certificate contined in this KeyInfo
+ * @throws KeyResolverException
+ */
+ X509Certificate getX509CertificateFromInternalResolvers()
+ throws KeyResolverException {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE,
+ "Start getX509CertificateFromInternalResolvers() with "
+ + this.lengthInternalKeyResolver() + " resolvers"
+ );
+ }
+ String uri = this.getBaseURI();
+ for (KeyResolverSpi keyResolver : _internalKeyResolvers) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
log.log(java.util.logging.Level.FINE, "Try " + keyResolver.getClass().getName());
- X509Certificate cert= applyCurrentResolver(uri, storageLength, keyResolver);
- if (cert!=null) {
- return cert;
- }
- }
+ }
+ X509Certificate cert = applyCurrentResolver(uri, keyResolver);
+ if (cert != null) {
+ return cert;
+ }
+ }
- return null;
- }
+ return null;
+ }
/**
* This method returns a secret (symmetric) key. This is for XML Encryption.
@@ -1012,7 +1011,7 @@
/**
* Stores the individual (per-KeyInfo) {@link KeyResolver}s
*/
- List _internalKeyResolvers = null;
+ List _internalKeyResolvers = new ArrayList();
/**
* This method is used to add a custom {@link KeyResolverSpi} to a KeyInfo
@@ -1048,7 +1047,7 @@
}
/** Field _storageResolvers */
- List _storageResolvers = nullList;
+ private List _storageResolvers = nullList;
/**
* Method addStorageResolver
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java Wed Jun 19 11:04:39 2013 +0100
@@ -2,357 +2,402 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package com.sun.org.apache.xml.internal.security.keys.keyresolver;
-
-
import java.security.PublicKey;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import javax.crypto.SecretKey;
+import com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.DSAKeyValueResolver;
+import com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.RSAKeyValueResolver;
+import com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.RetrievalMethodResolver;
+import com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509CertificateResolver;
+import com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509IssuerSerialResolver;
+import com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509SKIResolver;
+import com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509SubjectNameResolver;
import com.sun.org.apache.xml.internal.security.keys.storage.StorageResolver;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-
/**
* KeyResolver is factory class for subclass of KeyResolverSpi that
* represent child element of KeyInfo.
- *
- * @author $Author: mullan $
- * @version %I%, %G%
*/
public class KeyResolver {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
+ /** {@link org.apache.commons.logging} logging facility */
+ private static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(KeyResolver.class.getName());
- /** Field _alreadyInitialized */
- static boolean _alreadyInitialized = false;
+ /** Field resolverVector */
+ private static List resolverVector = new CopyOnWriteArrayList();
- /** Field _resolverVector */
- static List _resolverVector = null;
+ /** Field resolverSpi */
+ private final KeyResolverSpi resolverSpi;
- /** Field _resolverSpi */
- protected KeyResolverSpi _resolverSpi = null;
+ /**
+ * Constructor.
+ *
+ * @param keyResolverSpi a KeyResolverSpi instance
+ */
+ private KeyResolver(KeyResolverSpi keyResolverSpi) {
+ resolverSpi = keyResolverSpi;
+ }
- /** Field _storage */
- protected StorageResolver _storage = null;
+ /**
+ * Method length
+ *
+ * @return the length of resolvers registered
+ */
+ public static int length() {
+ return resolverVector.size();
+ }
- /**
- * Constructor ResourceResolver
- *
- * @param className
- * @throws ClassNotFoundException
- * @throws IllegalAccessException
- * @throws InstantiationException
- */
- private KeyResolver(String className)
- throws ClassNotFoundException, IllegalAccessException,
- InstantiationException {
- this._resolverSpi =
- (KeyResolverSpi) Class.forName(className).newInstance();
- this._resolverSpi.setGlobalResolver(true);
- }
+ /**
+ * Method getX509Certificate
+ *
+ * @param element
+ * @param baseURI
+ * @param storage
+ * @return The certificate represented by the element.
+ *
+ * @throws KeyResolverException
+ */
+ public static final X509Certificate getX509Certificate(
+ Element element, String baseURI, StorageResolver storage
+ ) throws KeyResolverException {
+ for (KeyResolver resolver : resolverVector) {
+ if (resolver == null) {
+ Object exArgs[] = {
+ (((element != null)
+ && (element.getNodeType() == Node.ELEMENT_NODE))
+ ? element.getTagName() : "null")
+ };
+
+ throw new KeyResolverException("utils.resolver.noClass", exArgs);
+ }
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "check resolvability by class " + resolver.getClass());
+ }
+
+ X509Certificate cert = resolver.resolveX509Certificate(element, baseURI, storage);
+ if (cert != null) {
+ return cert;
+ }
+ }
+
+ Object exArgs[] = {
+ (((element != null) && (element.getNodeType() == Node.ELEMENT_NODE))
+ ? element.getTagName() : "null")
+ };
- /**
- * Method length
- *
- * @return the length of resolvers registed
- */
- public static int length() {
- return KeyResolver._resolverVector.size();
- }
+ throw new KeyResolverException("utils.resolver.noClass", exArgs);
+ }
+
+ /**
+ * Method getPublicKey
+ *
+ * @param element
+ * @param baseURI
+ * @param storage
+ * @return the public key contained in the element
+ *
+ * @throws KeyResolverException
+ */
+ public static final PublicKey getPublicKey(
+ Element element, String baseURI, StorageResolver storage
+ ) throws KeyResolverException {
+ for (KeyResolver resolver : resolverVector) {
+ if (resolver == null) {
+ Object exArgs[] = {
+ (((element != null)
+ && (element.getNodeType() == Node.ELEMENT_NODE))
+ ? element.getTagName() : "null")
+ };
+
+ throw new KeyResolverException("utils.resolver.noClass", exArgs);
+ }
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "check resolvability by class " + resolver.getClass());
+ }
- public static void hit(Iterator hintI) {
- ResolverIterator hint = (ResolverIterator) hintI;
- int i = hint.i;
- if (i!=1 && hint.res ==_resolverVector) {
- List resolverVector=getResolverVectorClone();
- KeyResolver ob=resolverVector.remove(i-1);
- resolverVector.add(0,ob);
- _resolverVector=resolverVector;
- } else {
- //System.out.println("KeyResolver hitting");
- }
- }
+ PublicKey cert = resolver.resolvePublicKey(element, baseURI, storage);
+ if (cert != null) {
+ return cert;
+ }
+ }
+
+ Object exArgs[] = {
+ (((element != null) && (element.getNodeType() == Node.ELEMENT_NODE))
+ ? element.getTagName() : "null")
+ };
+
+ throw new KeyResolverException("utils.resolver.noClass", exArgs);
+ }
- /**
- * Method getInstance
- *
- * @param element
- * @param BaseURI
- * @param storage
- * @return The certificate represented by the element.
- *
- * @throws KeyResolverException
- */
- public static final X509Certificate getX509Certificate(
- Element element, String BaseURI, StorageResolver storage)
- throws KeyResolverException {
+ /**
+ * This method is used for registering {@link KeyResolverSpi}s which are
+ * available to all {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo} objects. This means that
+ * personalized {@link KeyResolverSpi}s should only be registered directly
+ * to the {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo} using
+ * {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo#registerInternalKeyResolver}.
+ * Please note that this method will create a new copy of the underlying array, as the
+ * underlying collection is a CopyOnWriteArrayList.
+ *
+ * @param className
+ * @param globalResolver Whether the KeyResolverSpi is a global resolver or not
+ * @throws InstantiationException
+ * @throws IllegalAccessException
+ * @throws ClassNotFoundException
+ */
+ public static void register(String className, boolean globalResolver)
+ throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+ KeyResolverSpi keyResolverSpi =
+ (KeyResolverSpi) Class.forName(className).newInstance();
+ keyResolverSpi.setGlobalResolver(globalResolver);
+ register(keyResolverSpi, false);
+ }
- // use the old vector to not be hit by updates
- List resolverVector = KeyResolver._resolverVector;
- for (KeyResolver resolver : resolverVector) {
- if (resolver==null) {
- Object exArgs[] = {
- (((element != null)
- && (element.getNodeType() == Node.ELEMENT_NODE))
- ? element.getTagName()
- : "null") };
+ /**
+ * This method is used for registering {@link KeyResolverSpi}s which are
+ * available to all {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo} objects. This means that
+ * personalized {@link KeyResolverSpi}s should only be registered directly
+ * to the {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo} using
+ * {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo#registerInternalKeyResolver}.
+ * Please note that this method will create a new copy of the underlying array, as the
+ * underlying collection is a CopyOnWriteArrayList.
+ *
+ * @param className
+ * @param globalResolver Whether the KeyResolverSpi is a global resolver or not
+ */
+ public static void registerAtStart(String className, boolean globalResolver) {
+ KeyResolverSpi keyResolverSpi = null;
+ Exception ex = null;
+ try {
+ keyResolverSpi = (KeyResolverSpi) Class.forName(className).newInstance();
+ } catch (ClassNotFoundException e) {
+ ex = e;
+ } catch (IllegalAccessException e) {
+ ex = e;
+ } catch (InstantiationException e) {
+ ex = e;
+ }
- throw new KeyResolverException("utils.resolver.noClass", exArgs);
- }
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "check resolvability by class " + resolver.getClass());
+ if (ex != null) {
+ throw (IllegalArgumentException) new
+ IllegalArgumentException("Invalid KeyResolver class name").initCause(ex);
+ }
+ keyResolverSpi.setGlobalResolver(globalResolver);
+ register(keyResolverSpi, true);
+ }
- X509Certificate cert=resolver.resolveX509Certificate(element, BaseURI, storage);
- if (cert!=null) {
- return cert;
- }
- }
-
- Object exArgs[] = {
- (((element != null) && (element.getNodeType() == Node.ELEMENT_NODE))
- ? element.getTagName()
- : "null") };
+ /**
+ * This method is used for registering {@link KeyResolverSpi}s which are
+ * available to all {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo} objects. This means that
+ * personalized {@link KeyResolverSpi}s should only be registered directly
+ * to the {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo} using
+ * {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo#registerInternalKeyResolver}.
+ * Please note that this method will create a new copy of the underlying array, as the
+ * underlying collection is a CopyOnWriteArrayList.
+ *
+ * @param keyResolverSpi a KeyResolverSpi instance to register
+ * @param start whether to register the KeyResolverSpi at the start of the list or not
+ */
+ public static void register(
+ KeyResolverSpi keyResolverSpi,
+ boolean start
+ ) {
+ KeyResolver resolver = new KeyResolver(keyResolverSpi);
+ if (start) {
+ resolverVector.add(0, resolver);
+ } else {
+ resolverVector.add(resolver);
+ }
+ }
- throw new KeyResolverException("utils.resolver.noClass", exArgs);
- }
- /**
- * Method getInstance
- *
- * @param element
- * @param BaseURI
- * @param storage
- * @return the public key contained in the element
- *
- * @throws KeyResolverException
- */
- public static final PublicKey getPublicKey(
- Element element, String BaseURI, StorageResolver storage)
- throws KeyResolverException {
+ /**
+ * This method is used for registering {@link KeyResolverSpi}s which are
+ * available to all {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo} objects. This means that
+ * personalized {@link KeyResolverSpi}s should only be registered directly
+ * to the {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo} using
+ * {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo#registerInternalKeyResolver}.
+ * The KeyResolverSpi instances are not registered as a global resolver.
+ *
+ *
+ * @param classNames
+ * @throws InstantiationException
+ * @throws IllegalAccessException
+ * @throws ClassNotFoundException
+ */
+ public static void registerClassNames(List classNames)
+ throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+ List keyResolverList = new ArrayList(classNames.size());
+ for (String className : classNames) {
+ KeyResolverSpi keyResolverSpi =
+ (KeyResolverSpi) Class.forName(className).newInstance();
+ keyResolverSpi.setGlobalResolver(false);
+ keyResolverList.add(new KeyResolver(keyResolverSpi));
+ }
+ resolverVector.addAll(keyResolverList);
+ }
- List resolverVector = KeyResolver._resolverVector;
- for (KeyResolver resolver : resolverVector) {
+ /**
+ * This method registers the default resolvers.
+ */
+ public static void registerDefaultResolvers() {
- if (resolver==null) {
- Object exArgs[] = {
- (((element != null)
- && (element.getNodeType() == Node.ELEMENT_NODE))
- ? element.getTagName()
- : "null") };
+ List keyResolverList = new ArrayList();
+ keyResolverList.add(new KeyResolver(new RSAKeyValueResolver()));
+ keyResolverList.add(new KeyResolver(new DSAKeyValueResolver()));
+ keyResolverList.add(new KeyResolver(new X509CertificateResolver()));
+ keyResolverList.add(new KeyResolver(new X509SKIResolver()));
+ keyResolverList.add(new KeyResolver(new RetrievalMethodResolver()));
+ keyResolverList.add(new KeyResolver(new X509SubjectNameResolver()));
+ keyResolverList.add(new KeyResolver(new X509IssuerSerialResolver()));
+
+ resolverVector.addAll(keyResolverList);
+ }
- throw new KeyResolverException("utils.resolver.noClass", exArgs);
- }
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "check resolvability by class " + resolver.getClass());
+ /**
+ * Method resolvePublicKey
+ *
+ * @param element
+ * @param baseURI
+ * @param storage
+ * @return resolved public key from the registered from the elements
+ *
+ * @throws KeyResolverException
+ */
+ public PublicKey resolvePublicKey(
+ Element element, String baseURI, StorageResolver storage
+ ) throws KeyResolverException {
+ return resolverSpi.engineLookupAndResolvePublicKey(element, baseURI, storage);
+ }
+
+ /**
+ * Method resolveX509Certificate
+ *
+ * @param element
+ * @param baseURI
+ * @param storage
+ * @return resolved X509certificate key from the registered from the elements
+ *
+ * @throws KeyResolverException
+ */
+ public X509Certificate resolveX509Certificate(
+ Element element, String baseURI, StorageResolver storage
+ ) throws KeyResolverException {
+ return resolverSpi.engineLookupResolveX509Certificate(element, baseURI, storage);
+ }
- PublicKey cert=resolver.resolvePublicKey(element, BaseURI, storage);
- if (cert!=null) {
- if (resolverVector.indexOf(resolver)!=0 && resolverVector==_resolverVector) {
- //update resolver.
- resolverVector=getResolverVectorClone();
- resolverVector.remove(resolver);
- resolverVector.add(0,resolver);
- _resolverVector=resolverVector;
- }
- return cert;
- }
- }
+ /**
+ * @param element
+ * @param baseURI
+ * @param storage
+ * @return resolved SecretKey key from the registered from the elements
+ * @throws KeyResolverException
+ */
+ public SecretKey resolveSecretKey(
+ Element element, String baseURI, StorageResolver storage
+ ) throws KeyResolverException {
+ return resolverSpi.engineLookupAndResolveSecretKey(element, baseURI, storage);
+ }
- Object exArgs[] = {
- (((element != null) && (element.getNodeType() == Node.ELEMENT_NODE))
- ? element.getTagName()
- : "null") };
+ /**
+ * Method setProperty
+ *
+ * @param key
+ * @param value
+ */
+ public void setProperty(String key, String value) {
+ resolverSpi.engineSetProperty(key, value);
+ }
- throw new KeyResolverException("utils.resolver.noClass", exArgs);
- }
+ /**
+ * Method getProperty
+ *
+ * @param key
+ * @return the property set for this resolver
+ */
+ public String getProperty(String key) {
+ return resolverSpi.engineGetProperty(key);
+ }
- @SuppressWarnings("unchecked")
- private static List getResolverVectorClone() {
- return (List)((ArrayList)_resolverVector).clone();
- }
-
- /**
- * The init() function is called by com.sun.org.apache.xml.internal.security.Init.init()
- */
- public static void init() {
-
- if (!KeyResolver._alreadyInitialized) {
- KeyResolver._resolverVector = new ArrayList(10);
- _alreadyInitialized = true;
- }
- }
-
- /**
- * This method is used for registering {@link KeyResolverSpi}s which are
- * available to all {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo} objects. This means that
- * personalized {@link KeyResolverSpi}s should only be registered directly
- * to the {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo} using
- * {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo#registerInternalKeyResolver}.
- *
- * @param className
- * @throws InstantiationException
- * @throws IllegalAccessException
- * @throws ClassNotFoundException
- */
- public static void register(String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
- KeyResolver._resolverVector.add(new KeyResolver(className));
- }
-
- /**
- * This method is used for registering {@link KeyResolverSpi}s which are
- * available to all {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo} objects. This means that
- * personalized {@link KeyResolverSpi}s should only be registered directly
- * to the {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo} using {@link com.sun.org.apache.xml.internal.security.keys.KeyInfo#registerInternalKeyResolver}.
- *
- * @param className
- */
- public static void registerAtStart(String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
- register(className);
- }
-
- /**
- * Method resolve
- *
- * @param element
- * @param BaseURI
- * @param storage
- * @return resolved public key from the registered from the elements
- *
- * @throws KeyResolverException
- */
- public PublicKey resolvePublicKey(
- Element element, String BaseURI, StorageResolver storage)
- throws KeyResolverException {
- return this._resolverSpi.engineLookupAndResolvePublicKey(element, BaseURI, storage);
- }
-
- /**
- * Method resolveX509Certificate
- *
- * @param element
- * @param BaseURI
- * @param storage
- * @return resolved X509certificate key from the registered from the elements
- *
- * @throws KeyResolverException
- */
- public X509Certificate resolveX509Certificate(
- Element element, String BaseURI, StorageResolver storage)
- throws KeyResolverException {
- return this._resolverSpi.engineLookupResolveX509Certificate(element, BaseURI,
- storage);
- }
-
- /**
- * @param element
- * @param BaseURI
- * @param storage
- * @return resolved SecretKey key from the registered from the elements
- * @throws KeyResolverException
- */
- public SecretKey resolveSecretKey(
- Element element, String BaseURI, StorageResolver storage)
- throws KeyResolverException {
- return this._resolverSpi.engineLookupAndResolveSecretKey(element, BaseURI,
- storage);
- }
-
- /**
- * Method setProperty
- *
- * @param key
- * @param value
- */
- public void setProperty(String key, String value) {
- this._resolverSpi.engineSetProperty(key, value);
- }
-
- /**
- * Method getProperty
- *
- * @param key
- * @return the property setted for this resolver
- */
- public String getProperty(String key) {
- return this._resolverSpi.engineGetProperty(key);
- }
+ /**
+ * Method understandsProperty
+ *
+ * @param propertyToTest
+ * @return true if the resolver understands property propertyToTest
+ */
+ public boolean understandsProperty(String propertyToTest) {
+ return resolverSpi.understandsProperty(propertyToTest);
+ }
- /**
- * Method understandsProperty
- *
- * @param propertyToTest
- * @return true if the resolver understands property propertyToTest
- */
- public boolean understandsProperty(String propertyToTest) {
- return this._resolverSpi.understandsProperty(propertyToTest);
- }
+ /**
+ * Method resolverClassName
+ *
+ * @return the name of the resolver.
+ */
+ public String resolverClassName() {
+ return resolverSpi.getClass().getName();
+ }
+ /**
+ * Iterate over the KeyResolverSpi instances
+ */
+ static class ResolverIterator implements Iterator {
+ List res;
+ Iterator it;
- /**
- * Method resolverClassName
- *
- * @return the name of the resolver.
- */
- public String resolverClassName() {
- return this._resolverSpi.getClass().getName();
- }
+ public ResolverIterator(List list) {
+ res = list;
+ it = res.iterator();
+ }
- static class ResolverIterator implements Iterator {
- List res;
- Iterator it;
- int i;
- public ResolverIterator(List list) {
- res = list;
- it = res.iterator();
+ public boolean hasNext() {
+ return it.hasNext();
}
- public boolean hasNext() {
- // TODO Auto-generated method stub
- return it.hasNext();
- }
+
+ public KeyResolverSpi next() {
+ KeyResolver resolver = it.next();
+ if (resolver == null) {
+ throw new RuntimeException("utils.resolver.noClass");
+ }
- public KeyResolverSpi next() {
- i++;
- KeyResolver resolver = it.next();
- if (resolver==null) {
- throw new RuntimeException("utils.resolver.noClass");
- }
-
- return resolver._resolverSpi;
- }
+ return resolver.resolverSpi;
+ }
- public void remove() {
- // TODO Auto-generated method stub
-
- }
+ public void remove() {
+ throw new UnsupportedOperationException("Can't remove resolvers using the iterator");
+ }
+ };
- };
- public static Iterator iterator() {
- return new ResolverIterator(_resolverVector);
- }
+ public static Iterator iterator() {
+ return new ResolverIterator(resolverVector);
+ }
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java Wed Jun 19 11:04:39 2013 +0100
@@ -34,6 +34,7 @@
import java.util.ListIterator;
import java.util.Set;
+import javax.xml.XMLConstants;
import javax.xml.parsers.ParserConfigurationException;
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
@@ -251,6 +252,7 @@
try {
javax.xml.parsers.DocumentBuilderFactory dbf =javax.xml.parsers.DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
+ dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
org.w3c.dom.Document doc =
db.parse(new java.io.ByteArrayInputStream(bytes));
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties Wed Jun 19 11:04:39 2013 +0100
@@ -1,123 +1,126 @@
-algorithm.alreadyRegistered = URI {0} already assigned to class {1}
-algorithm.classDoesNotExist = Cannot register URI {0} to class {1} because this class does not exist in CLASSPATH
-algorithm.ClassDoesNotExist = Class {0} does not exist
-algorithm.extendsWrongClass = Cannot register URI {0} to class {1} because it does not extend {2}
-algorithms.CannotUseAlgorithmParameterSpecOnDSA = Sorry, but you cannot use a AlgorithmParameterSpec object for creating DSA signatures.
-algorithms.CannotUseAlgorithmParameterSpecOnRSA = Sorry, but you cannot use a AlgorithmParameterSpec object for creating RSA signatures.
-algorithms.CannotUseSecureRandomOnMAC = Sorry, but you cannot use a SecureRandom object for creating MACs.
-algorithms.HMACOutputLengthOnlyForHMAC = A HMACOutputLength can only be specified for HMAC integrity algorithms
-algorithms.NoSuchAlgorithm = The requested algorithm {0} does not exist. Original Message was: {1}
-algorithms.NoSuchMap = The algorithm URI "{0}" could not be mapped to a JCE algorithm
-algorithms.NoSuchProvider = The specified Provider {0} does not exist. Original Message was: {1}
-algorithms.operationOnlyVerification = A public key can only used for verification of a signature.
-algorithms.WrongKeyForThisOperation = Sorry, you supplied the wrong key type for this operation! You supplied a {0} but a {1} is needed.
-attributeValueIllegal = The attribute {0} has value {1} but must be {2}
-c14n.Canonicalizer.Exception = Exception during Canonicalization: Original Message was {0}
-c14n.Canonicalizer.IllegalNode = Illegal node type {0}, node name was {1}
-c14n.Canonicalizer.NoSuchCanonicalizer = No canonicalizer found with URI {0}
-c14n.Canonicalizer.ParserConfigurationException = ParserConfigurationException during Canonicalization: Original Message was {0}
-c14n.Canonicalizer.RelativeNamespace = Element {0} has a relative namespace: {1}="{2}"
-c14n.Canonicalizer.SAXException = SAXException during Canonicalization: Original Message was {0}
-c14n.Canonicalizer.TraversalNotSupported = This DOM document does not support Traversal {0}
-c14n.Canonicalizer.UnsupportedEncoding = Unsupported encoding {0}
-c14n.Canonicalizer.UnsupportedOperation = This canonicalizer does not support this operation
-c14n.XMLUtils.circumventBug2650forgotten = The tree has not been prepared for canonicalization using XMLUtils#circumventBug2650(Document)
-certificate.noSki.lowVersion = Certificate cannot contain a SubjectKeyIdentifier because it is only X509v{0}
-certificate.noSki.notOctetString = Certificates SubjectKeyIdentifier is not a OctetString
-certificate.noSki.null = Certificate does not contain a SubjectKeyIdentifier
-defaultNamespaceCannotBeSetHere = Default namespace cannot be set here
-ElementProxy.nullElement = Cannot create an ElementProxy from a null argument
-empty = {0}
-encryption.algorithmCannotBeUsedForEncryptedData = encryption.algorithmCannotBeUsedForEncryptedData {0}
-encryption.algorithmCannotEatInitParams = encryption.algorithmCannotEatInitParams
-encryption.algorithmCannotEncryptDecrypt = encryption.algorithmCannotEncryptDecrypt
-encryption.algorithmCannotWrapUnWrap = encryption.algorithmCannotWrapUnWrap
-encryption.ExplicitKeySizeMismatch = The xenc:KeySize element requests a key size of {0} bit but the algorithm implements {1} bit
-encryption.nonceLongerThanDecryptedPlaintext = The given nonce is longer than the available plaintext. I Cannot strip away this.
-encryption.RSAOAEP.dataHashWrong = data hash wrong
-encryption.RSAOAEP.dataStartWrong = data wrong start {0}
-encryption.RSAOAEP.dataTooShort = data too short
-encryption.RSAPKCS15.blockTruncated = block truncated
-encryption.RSAPKCS15.noDataInBlock = no data in block
-encryption.RSAPKCS15.unknownBlockType = unknown block type
-encryption.nokey = No Key Encryption Key loaded and cannot determine using key resolvers
-endorsed.jdk1.4.0 = Since it seems that nobody reads our installation notes, we must do it in the exception messages. Hope you read them. You did NOT use the endorsed mechanism from JDK 1.4 properly; look at how to solve this problem.
-errorMessages.InvalidDigestValueException = INVALID signature -- check reference resolution.
-errorMessages.InvalidSignatureValueException = INVALID signature -- core validation failed.
-errorMessages.IOException = Other file I/O and similar exceptions.
-errorMessages.MissingKeyFailureException = Cannot verify because of missing public key. Provide it via addResource and try again.
-errorMessages.MissingResourceFailureException = Cannot verify because of unresolved references. Provide it via addResource and try again.
-errorMessages.NoSuchAlgorithmException = Unknown Algorithm {0}
-errorMessages.NotYetImplementedException = Functionality not yet there.
-errorMessages.XMLSignatureException = Verification failed for some other reason.
-decoding.divisible.four = It should be divisible by four
-decoding.general = Error while decoding
-FileKeyStorageImpl.addToDefaultFromRemoteNotImplemented = Method addToDefaultFromRemote() not yet implemented.
-FileKeyStorageImpl.NoCert.Context = Not found such a X509Certificate including context {0}
-FileKeyStorageImpl.NoCert.IssNameSerNo = Not found such a X509Certificate with IssuerName {0} and serial number {1}
-FileKeyStorageImpl.NoCert.SubjName = Not found such a X509Certificate including SubjectName {0}
-generic.dontHaveConstructionElement = I do not have a construction Element
-generic.EmptyMessage = {0}
-generic.NotYetImplemented = {0} Not YET implemented ;-((
-java.security.InvalidKeyException = Invalid key
-java.security.NoSuchProviderException = Unknown or unsupported provider
-java.security.UnknownKeyType = Unknown or unsupported key type {0}
-KeyInfo.needKeyResolver = More than one keyResovler have to be registered
-KeyInfo.nokey = Cannot get key from {0}
-KeyInfo.noKey = Cannot get the public key
-KeyInfo.wrongNumberOfObject = Need {0} keyObjects
-KeyInfo.wrongUse = This object was made for getting {0}
-keyResolver.alreadyRegistered = {1} class has already been registered for {0}
-KeyResolver.needStorageResolver = Need a StorageResolver to retrieve a Certificate from a {0}
-KeyResoverSpiImpl.cannotGetCert = Cannot get the Certificate that include or in {1} in implement class {0}
-KeyResoverSpiImpl.elementGeneration = Cannot make {1} element in implement class {0}
-KeyResoverSpiImpl.getPoublicKey = Cannot get the public key from implement class {0}
-KeyResoverSpiImpl.InvalidElement = Cannot set (2) Element in implement class {0}
-KeyResoverSpiImpl.keyStore = KeyStorage error in implement class {0}
-KeyResoverSpiImpl.need.Element = {1} type of Element is needed in implement class {0}
-KeyResoverSpiImpl.wrongCRLElement = Cannot make CRL from {1} in implement class {0}
-KeyResoverSpiImpl.wrongKeyObject = Need {1} type of KeyObject for generation Element in implement class{0}
-KeyResoverSpiImpl.wrongNumberOfObject = Need {1} keyObject in implement class {0}
-KeyStore.alreadyRegistered = {0} Class has already been registered for {1}
-KeyStore.register = {1} type class register error in class {0}
-KeyStore.registerStore.register = Registeration error for type {0}
-KeyValue.IllegalArgument = Cannot create a {0} from {1}
-namespacePrefixAlreadyUsedByOtherURI = Namespace prefix {0} already used by other URI {1}
-notYetInitialized = The module {0} is not yet initialized
-prefix.AlreadyAssigned = You want to assign {0} as prefix for namespace {1} but it is already assigned for {2}
-signature.Canonicalizer.UnknownCanonicalizer = Unknown canonicalizer. No handler installed for URI {0}
-signature.DSA.invalidFormat = Invalid ASN.1 encoding of the DSA signature
-signature.Generation.signBeforeGetValue = You have to XMLSignature.sign(java.security.PrivateKey) first
-signature.signaturePropertyHasNoTarget = The Target attribute of the SignatureProperty must be set
-signature.Transform.ErrorDuringTransform = A {1} was thrown during the {0} transform
-signature.Transform.NotYetImplemented = Transform {0} not yet implemented
-signature.Transform.NullPointerTransform = Null pointer as URI. Programming bug?
-signature.Transform.UnknownTransform = Unknown transformation. No handler installed for URI {0}
-signature.Transform.node = Current Node: {0}
-signature.Transform.nodeAndType = Current Node: {0}, type: {1}
-signature.Util.BignumNonPositive = bigInteger.signum() must be positive
-signature.Util.NonTextNode = Not a text node
-signature.Util.TooManyChilds = Too many childs of Type {0} in {1}
-signature.Verification.certificateError = Certificate error
-signature.Verification.IndexOutOfBounds = Index {0} illegal. We only have {1} References
-signature.Verification.internalError = Internal error
-signature.Verification.InvalidDigestOrReference = Invalid digest of reference {0}
-signature.Verification.keyStore = KeyStore error
-signature.Verification.MissingID = Cannot resolve element with ID {0}
-signature.Verification.MissingResources = Cannot resolve external resource {0}
-signature.Verification.NoSignatureElement = Input document contains no {0} Element in namespace {1}
-signature.Verification.Reference.NoInput = The Reference for URI {0} has no XMLSignatureInput
-signature.Verification.SignatureError = Signature error
-signature.XMLSignatureInput.MissingConstuctor = Cannot construct a XMLSignatureInput from class {0}
-signature.XMLSignatureInput.SerializeDOM = Input initialized with DOM Element. Use Canonicalization to serialize it
-signature.XMLSignatureInput.nodesetReference = Unable to convert to nodeset the reference
-transform.Init.IllegalContextArgument = Invalid context argument of class {0}. Must be String, org.w3c.dom.NodeList or java.io.InputStream.
-transform.init.NotInitialized =
-transform.init.wrongURI = Initialized with wrong URI. How could this happen? We implement {0} but {1} was used during initialization
-utils.Base64.IllegalBitlength = Illegal byte length; Data to be decoded must be a multiple of 4
-Base64Decoding = Error while decoding
-utils.resolver.noClass = Could not find a resolver for URI {0} and Base {1}
-xml.WrongContent = Cannot find {0} in {1}
-xml.WrongElement = Cannot create a {0} from a {1} element
-xpath.funcHere.documentsDiffer = The XPath is not in the same document as the context node
-xpath.funcHere.noXPathContext = Try to evaluate an XPath which uses the here() function but XPath is not inside an ds:XPath Element. XPath was : {0}
+algorithm.alreadyRegistered = URI {0} already assigned to class {1}
+algorithm.classDoesNotExist = Cannot register URI {0} to class {1} because this class does not exist in CLASSPATH
+algorithm.ClassDoesNotExist = Class {0} does not exist
+algorithm.extendsWrongClass = Cannot register URI {0} to class {1} because it does not extend {2}
+algorithms.CannotUseAlgorithmParameterSpecOnDSA = Sorry, but you cannot use a AlgorithmParameterSpec object for creating DSA signatures.
+algorithms.CannotUseAlgorithmParameterSpecOnRSA = Sorry, but you cannot use a AlgorithmParameterSpec object for creating RSA signatures.
+algorithms.CannotUseSecureRandomOnMAC = Sorry, but you cannot use a SecureRandom object for creating MACs.
+algorithms.HMACOutputLengthOnlyForHMAC = A HMACOutputLength can only be specified for HMAC integrity algorithms
+algorithms.NoSuchAlgorithm = The requested algorithm {0} does not exist. Original Message was: {1}
+algorithms.NoSuchMap = The algorithm URI "{0}" could not be mapped to a JCE algorithm
+algorithms.NoSuchProvider = The specified Provider {0} does not exist. Original Message was: {1}
+algorithms.operationOnlyVerification = A public key can only used for verification of a signature.
+algorithms.WrongKeyForThisOperation = Sorry, you supplied the wrong key type for this operation! You supplied a {0} but a {1} is needed.
+attributeValueIllegal = The attribute {0} has value {1} but must be {2}
+c14n.Canonicalizer.Exception = Exception during Canonicalization: Original Message was {0}
+c14n.Canonicalizer.IllegalNode = Illegal node type {0}, node name was {1}
+c14n.Canonicalizer.NoSuchCanonicalizer = No canonicalizer found with URI {0}
+c14n.Canonicalizer.ParserConfigurationException = ParserConfigurationException during Canonicalization: Original Message was {0}
+c14n.Canonicalizer.RelativeNamespace = Element {0} has a relative namespace: {1}="{2}"
+c14n.Canonicalizer.SAXException = SAXException during Canonicalization: Original Message was {0}
+c14n.Canonicalizer.TraversalNotSupported = This DOM document does not support Traversal {0}
+c14n.Canonicalizer.UnsupportedEncoding = Unsupported encoding {0}
+c14n.Canonicalizer.UnsupportedOperation = This canonicalizer does not support this operation
+c14n.XMLUtils.circumventBug2650forgotten = The tree has not been prepared for canonicalization using XMLUtils#circumventBug2650(Document)
+certificate.noSki.lowVersion = Certificate cannot contain a SubjectKeyIdentifier because it is only X509v{0}
+certificate.noSki.notOctetString = Certificates SubjectKeyIdentifier is not a OctetString
+certificate.noSki.null = Certificate does not contain a SubjectKeyIdentifier
+defaultNamespaceCannotBeSetHere = Default namespace cannot be set here
+ElementProxy.nullElement = Cannot create an ElementProxy from a null argument
+empty = {0}
+encryption.algorithmCannotBeUsedForEncryptedData = encryption.algorithmCannotBeUsedForEncryptedData {0}
+encryption.algorithmCannotEatInitParams = encryption.algorithmCannotEatInitParams
+encryption.algorithmCannotEncryptDecrypt = encryption.algorithmCannotEncryptDecrypt
+encryption.algorithmCannotWrapUnWrap = encryption.algorithmCannotWrapUnWrap
+encryption.ExplicitKeySizeMismatch = The xenc:KeySize element requests a key size of {0} bit but the algorithm implements {1} bit
+encryption.nonceLongerThanDecryptedPlaintext = The given nonce is longer than the available plaintext. I Cannot strip away this.
+encryption.RSAOAEP.dataHashWrong = data hash wrong
+encryption.RSAOAEP.dataStartWrong = data wrong start {0}
+encryption.RSAOAEP.dataTooShort = data too short
+encryption.RSAPKCS15.blockTruncated = block truncated
+encryption.RSAPKCS15.noDataInBlock = no data in block
+encryption.RSAPKCS15.unknownBlockType = unknown block type
+encryption.nokey = No Key Encryption Key loaded and cannot determine using key resolvers
+endorsed.jdk1.4.0 = Since it seems that nobody reads our installation notes, we must do it in the exception messages. Hope you read them. You did NOT use the endorsed mechanism from JDK 1.4 properly; look at how to solve this problem.
+errorMessages.InvalidDigestValueException = INVALID signature -- check reference resolution.
+errorMessages.InvalidSignatureValueException = INVALID signature -- core validation failed.
+errorMessages.IOException = Other file I/O and similar exceptions.
+errorMessages.MissingKeyFailureException = Cannot verify because of missing public key. Provide it via addResource and try again.
+errorMessages.MissingResourceFailureException = Cannot verify because of unresolved references. Provide it via addResource and try again.
+errorMessages.NoSuchAlgorithmException = Unknown Algorithm {0}
+errorMessages.NotYetImplementedException = Functionality not yet there.
+errorMessages.XMLSignatureException = Verification failed for some other reason.
+decoding.divisible.four = It should be divisible by four
+decoding.general = Error while decoding
+FileKeyStorageImpl.addToDefaultFromRemoteNotImplemented = Method addToDefaultFromRemote() not yet implemented.
+FileKeyStorageImpl.NoCert.Context = Not found such a X509Certificate including context {0}
+FileKeyStorageImpl.NoCert.IssNameSerNo = Not found such a X509Certificate with IssuerName {0} and serial number {1}
+FileKeyStorageImpl.NoCert.SubjName = Not found such a X509Certificate including SubjectName {0}
+generic.dontHaveConstructionElement = I do not have a construction Element
+generic.EmptyMessage = {0}
+generic.NotYetImplemented = {0} Not YET implemented ;-((
+java.security.InvalidKeyException = Invalid key
+java.security.NoSuchProviderException = Unknown or unsupported provider
+java.security.UnknownKeyType = Unknown or unsupported key type {0}
+KeyInfo.needKeyResolver = More than one keyResovler have to be registered
+KeyInfo.nokey = Cannot get key from {0}
+KeyInfo.noKey = Cannot get the public key
+KeyInfo.wrongNumberOfObject = Need {0} keyObjects
+KeyInfo.wrongUse = This object was made for getting {0}
+keyResolver.alreadyRegistered = {1} class has already been registered for {0}
+KeyResolver.needStorageResolver = Need a StorageResolver to retrieve a Certificate from a {0}
+KeyResoverSpiImpl.cannotGetCert = Cannot get the Certificate that include or in {1} in implement class {0}
+KeyResoverSpiImpl.elementGeneration = Cannot make {1} element in implement class {0}
+KeyResoverSpiImpl.getPoublicKey = Cannot get the public key from implement class {0}
+KeyResoverSpiImpl.InvalidElement = Cannot set (2) Element in implement class {0}
+KeyResoverSpiImpl.keyStore = KeyStorage error in implement class {0}
+KeyResoverSpiImpl.need.Element = {1} type of Element is needed in implement class {0}
+KeyResoverSpiImpl.wrongCRLElement = Cannot make CRL from {1} in implement class {0}
+KeyResoverSpiImpl.wrongKeyObject = Need {1} type of KeyObject for generation Element in implement class{0}
+KeyResoverSpiImpl.wrongNumberOfObject = Need {1} keyObject in implement class {0}
+KeyStore.alreadyRegistered = {0} Class has already been registered for {1}
+KeyStore.register = {1} type class register error in class {0}
+KeyStore.registerStore.register = Registeration error for type {0}
+KeyValue.IllegalArgument = Cannot create a {0} from {1}
+namespacePrefixAlreadyUsedByOtherURI = Namespace prefix {0} already used by other URI {1}
+notYetInitialized = The module {0} is not yet initialized
+prefix.AlreadyAssigned = You want to assign {0} as prefix for namespace {1} but it is already assigned for {2}
+signature.Canonicalizer.UnknownCanonicalizer = Unknown canonicalizer. No handler installed for URI {0}
+signature.DSA.invalidFormat = Invalid ASN.1 encoding of the DSA signature
+signature.Generation.signBeforeGetValue = You have to XMLSignature.sign(java.security.PrivateKey) first
+signature.Reference.ForbiddenResolver = It is forbidden to access resolver {0} when secure validation is enabled
+signature.signatureAlgorithm = It is forbidden to use algorithm {0} when secure validation is enabled
+signature.signaturePropertyHasNoTarget = The Target attribute of the SignatureProperty must be set
+signature.Transform.ErrorDuringTransform = A {1} was thrown during the {0} transform
+signature.Transform.NotYetImplemented = Transform {0} not yet implemented
+signature.Transform.NullPointerTransform = Null pointer as URI. Programming bug?
+signature.Transform.UnknownTransform = Unknown transformation. No handler installed for URI {0}
+signature.Transform.node = Current Node: {0}
+signature.Transform.nodeAndType = Current Node: {0}, type: {1}
+signature.Util.BignumNonPositive = bigInteger.signum() must be positive
+signature.Util.NonTextNode = Not a text node
+signature.Util.TooManyChilds = Too many childs of Type {0} in {1}
+signature.Verification.certificateError = Certificate error
+signature.Verification.IndexOutOfBounds = Index {0} illegal. We only have {1} References
+signature.Verification.internalError = Internal error
+signature.Verification.InvalidDigestOrReference = Invalid digest of reference {0}
+signature.Verification.keyStore = KeyStore error
+signature.Verification.MissingID = Cannot resolve element with ID {0}
+signature.Verification.MissingResources = Cannot resolve external resource {0}
+signature.Verification.MultipleIDs = Multiple Elements with the same ID {0} were detected
+signature.Verification.NoSignatureElement = Input document contains no {0} Element in namespace {1}
+signature.Verification.Reference.NoInput = The Reference for URI {0} has no XMLSignatureInput
+signature.Verification.SignatureError = Signature error
+signature.XMLSignatureInput.MissingConstuctor = Cannot construct a XMLSignatureInput from class {0}
+signature.XMLSignatureInput.SerializeDOM = Input initialized with DOM Element. Use Canonicalization to serialize it
+signature.XMLSignatureInput.nodesetReference = Unable to convert to nodeset the reference
+transform.Init.IllegalContextArgument = Invalid context argument of class {0}. Must be String, org.w3c.dom.NodeList or java.io.InputStream.
+transform.init.NotInitialized =
+transform.init.wrongURI = Initialized with wrong URI. How could this happen? We implement {0} but {1} was used during initialization
+utils.Base64.IllegalBitlength = Illegal byte length; Data to be decoded must be a multiple of 4
+Base64Decoding = Error while decoding
+utils.resolver.noClass = Could not find a resolver for URI {0} and Base {1}
+xml.WrongContent = Cannot find {0} in {1}
+xml.WrongElement = Cannot create a {0} from a {1} element
+xpath.funcHere.documentsDiffer = The XPath is not in the same document as the context node
+xpath.funcHere.noXPathContext = Try to evaluate an XPath which uses the here() function but XPath is not inside an ds:XPath Element. XPath was : {0}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java Wed Jun 19 11:04:39 2013 +0100
@@ -43,6 +43,7 @@
import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
import com.sun.org.apache.xml.internal.security.utils.resolver.ResourceResolver;
import com.sun.org.apache.xml.internal.security.utils.resolver.ResourceResolverSpi;
+import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -101,6 +102,11 @@
super(element, BaseURI);
+ Attr attr = element.getAttributeNodeNS(null, "Id");
+ if (attr != null) {
+ element.setIdAttributeNode(attr, true);
+ }
+
// check out Reference children
this._referencesEl = XMLUtils.selectDsNodes(this._constructionElement.getFirstChild(),
Constants._TAG_REFERENCE);
@@ -121,6 +127,11 @@
this._references = new ArrayList(le);
for (int i = 0; i < le; i++) {
+ Element refElem = this._referencesEl[i];
+ Attr refAttr = refElem.getAttributeNodeNS(null, "Id");
+ if (refAttr != null) {
+ refElem.setIdAttributeNode(refAttr, true);
+ }
this._references.add(null);
}
}
@@ -221,8 +232,7 @@
public void setId(String Id) {
if (Id != null) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
- IdResolver.registerElementById(this._constructionElement, Id);
+ setLocalIdAttribute(Constants._ATT_ID, Id);
}
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java Wed Jun 19 11:04:39 2013 +0100
@@ -68,9 +68,8 @@
*/
public void setId(String Id) {
- if ((Id != null)) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
- IdResolver.registerElementById(this._constructionElement, Id);
+ if (Id != null) {
+ setLocalIdAttribute(Constants._ATT_ID, Id);
}
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java Wed Jun 19 11:04:39 2013 +0100
@@ -284,8 +284,7 @@
public void setId(String Id) {
if ( Id != null ) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
- IdResolver.registerElementById(this._constructionElement, Id);
+ setLocalIdAttribute(Constants._ATT_ID, Id);
}
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java Wed Jun 19 11:04:39 2013 +0100
@@ -25,6 +25,7 @@
import com.sun.org.apache.xml.internal.security.utils.IdResolver;
import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
+import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -61,6 +62,21 @@
public SignatureProperties(Element element, String BaseURI)
throws XMLSecurityException {
super(element, BaseURI);
+
+ Attr attr = element.getAttributeNodeNS(null, "Id");
+ if (attr != null) {
+ element.setIdAttributeNode(attr, true);
+ }
+
+ int length = getLength();
+ for (int i = 0; i < length; i++) {
+ Element propertyElem =
+ XMLUtils.selectDsNode(getElement(), Constants._TAG_SIGNATUREPROPERTY, i);
+ Attr propertyAttr = propertyElem.getAttributeNodeNS(null, "Id");
+ if (propertyAttr != null) {
+ propertyElem.setIdAttributeNode(propertyAttr, true);
+ }
+ }
}
/**
@@ -109,9 +125,8 @@
*/
public void setId(String Id) {
- if ((Id != null)) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
- IdResolver.registerElementById(this._constructionElement, Id);
+ if (Id != null) {
+ setLocalIdAttribute(Constants._ATT_ID, Id);
}
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java Wed Jun 19 11:04:39 2013 +0100
@@ -80,9 +80,8 @@
*/
public void setId(String Id) {
- if ((Id != null)) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
- IdResolver.registerElementById(this._constructionElement, Id);
+ if (Id != null) {
+ setLocalIdAttribute(Constants._ATT_ID, Id);
}
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java Wed Jun 19 11:04:39 2013 +0100
@@ -25,6 +25,7 @@
import java.io.OutputStream;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
+import javax.xml.XMLConstants;
import javax.xml.parsers.ParserConfigurationException;
import com.sun.org.apache.xml.internal.security.algorithms.SignatureAlgorithm;
@@ -186,8 +187,10 @@
javax.xml.parsers.DocumentBuilderFactory dbf =
javax.xml.parsers.DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
+ dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
+ Boolean.TRUE);
javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
- org.w3c.dom.Document newdoc =
+ Document newdoc =
db.parse(new ByteArrayInputStream(this._c14nizedBytes));
Node imported =
this._doc.importNode(newdoc.getDocumentElement(), true);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java Wed Jun 19 11:04:39 2013 +0100
@@ -49,9 +49,11 @@
import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
import com.sun.org.apache.xml.internal.security.utils.resolver.ResourceResolver;
import com.sun.org.apache.xml.internal.security.utils.resolver.ResourceResolverSpi;
+import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
@@ -201,14 +203,13 @@
super(doc);
- String xmlnsDsPrefix =
- getDefaultPrefixBindings(Constants.SignatureSpecNS);
+ String xmlnsDsPrefix = getDefaultPrefix(Constants.SignatureSpecNS);
if (xmlnsDsPrefix == null) {
this._constructionElement.setAttributeNS
(Constants.NamespaceSpecNS, "xmlns", Constants.SignatureSpecNS);
} else {
this._constructionElement.setAttributeNS
- (Constants.NamespaceSpecNS, xmlnsDsPrefix, Constants.SignatureSpecNS);
+ (Constants.NamespaceSpecNS, "xmlns:" + xmlnsDsPrefix, Constants.SignatureSpecNS);
}
XMLUtils.addReturnToElement(this._constructionElement);
@@ -242,14 +243,13 @@
super(doc);
- String xmlnsDsPrefix =
- getDefaultPrefixBindings(Constants.SignatureSpecNS);
+ String xmlnsDsPrefix = getDefaultPrefix(Constants.SignatureSpecNS);
if (xmlnsDsPrefix == null) {
this._constructionElement.setAttributeNS
(Constants.NamespaceSpecNS, "xmlns", Constants.SignatureSpecNS);
} else {
this._constructionElement.setAttributeNS
- (Constants.NamespaceSpecNS, xmlnsDsPrefix, Constants.SignatureSpecNS);
+ (Constants.NamespaceSpecNS, "xmlns:" + xmlnsDsPrefix, Constants.SignatureSpecNS);
}
XMLUtils.addReturnToElement(this._constructionElement);
@@ -308,6 +308,10 @@
throw new XMLSignatureException("xml.WrongContent", exArgs);
}
+ Attr signatureValueAttr = signatureValueElement.getAttributeNodeNS(null, "Id");
+ if (signatureValueAttr != null) {
+ signatureValueElement.setIdAttributeNode(signatureValueAttr, true);
+ }
//
Element keyInfoElem = XMLUtils.getNextElement(signatureValueElement.getNextSibling());//XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
@@ -318,6 +322,34 @@
keyInfoElem.getLocalName().equals(Constants._TAG_KEYINFO)) ) {
this._keyInfo = new KeyInfo(keyInfoElem, BaseURI);
}
+
+ //
+ Element objectElem =
+ XMLUtils.getNextElement(signatureValueElement.getNextSibling());
+ while (objectElem != null) {
+ Attr objectAttr = objectElem.getAttributeNodeNS(null, "Id");
+ if (objectAttr != null) {
+ objectElem.setIdAttributeNode(objectAttr, true);
+ }
+
+ NodeList nodes = objectElem.getChildNodes();
+ int length = nodes.getLength();
+ // Register Ids of the Object child elements
+ for (int i = 0; i < length; i++) {
+ Node child = nodes.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ Element childElem = (Element)child;
+ String tag = childElem.getLocalName();
+ if (tag.equals("Manifest")) {
+ new Manifest(childElem, BaseURI);
+ } else if (tag.equals("SignatureProperties")) {
+ new SignatureProperties(childElem, BaseURI);
+ }
+ }
+ }
+
+ objectElem = XMLUtils.getNextElement(objectElem.getNextSibling());
+ }
}
/**
@@ -327,9 +359,8 @@
*/
public void setId(String Id) {
- if ( (Id != null)) {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
- IdResolver.registerElementById(this._constructionElement, Id);
+ if (Id != null) {
+ setLocalIdAttribute(Constants._ATT_ID, Id);
}
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java Wed Jun 19 11:04:39 2013 +0100
@@ -27,10 +27,11 @@
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
+import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -244,13 +245,13 @@
if (circumvent) {
XMLUtils.circumventBug2650(XMLUtils.getOwnerDocument(_subNode));
}
- this._inputNodeSet = new HashSet();
+ this._inputNodeSet = new LinkedHashSet();
XMLUtils.getSet(_subNode,this._inputNodeSet, excludeNode, this.excludeComments);
return this._inputNodeSet;
} else if (this.isOctetStream()) {
convertToNodes();
- HashSet result=new HashSet();
+ LinkedHashSet result = new LinkedHashSet();
XMLUtils.getSet(_subNode, result,null,false);
//this._inputNodeSet=result;
return result;
@@ -603,6 +604,8 @@
DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
dfactory.setValidating(false);
dfactory.setNamespaceAware(true);
+ dfactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
+ Boolean.TRUE);
DocumentBuilder db = dfactory.newDocumentBuilder();
// select all nodes, also the comments.
try {
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java Wed Jun 19 11:04:39 2013 +0100
@@ -0,0 +1,280 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.sun.org.apache.xml.internal.security.transforms;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+/**
+ * This class is extremely useful for loading resources and classes in a fault
+ * tolerant manner that works across different applications servers. Do not
+ * touch this unless you're a grizzled classloading guru veteran who is going to
+ * verify any change on 6 different application servers.
+ */
+// NOTE! This is a duplicate of utils.ClassLoaderUtils with public
+// modifiers changed to package-private. Make sure to integrate any future
+// changes to utils.ClassLoaderUtils to this file.
+final class ClassLoaderUtils {
+
+ /** {@link org.apache.commons.logging} logging facility */
+ private static final java.util.logging.Logger log =
+ java.util.logging.Logger.getLogger(ClassLoaderUtils.class.getName());
+
+ private ClassLoaderUtils() {
+ }
+
+ /**
+ * Load a given resource. This method will try to load the resource
+ * using the following methods (in order):
+ *
+ * - From Thread.currentThread().getContextClassLoader()
+ *
- From ClassLoaderUtil.class.getClassLoader()
+ *
- callingClass.getClassLoader()
+ *
+ *
+ * @param resourceName The name of the resource to load
+ * @param callingClass The Class object of the calling object
+ */
+ static URL getResource(String resourceName, Class callingClass) {
+ URL url = Thread.currentThread().getContextClassLoader().getResource(resourceName);
+ if (url == null && resourceName.startsWith("/")) {
+ //certain classloaders need it without the leading /
+ url =
+ Thread.currentThread().getContextClassLoader().getResource(
+ resourceName.substring(1)
+ );
+ }
+
+ ClassLoader cluClassloader = ClassLoaderUtils.class.getClassLoader();
+ if (cluClassloader == null) {
+ cluClassloader = ClassLoader.getSystemClassLoader();
+ }
+ if (url == null) {
+ url = cluClassloader.getResource(resourceName);
+ }
+ if (url == null && resourceName.startsWith("/")) {
+ //certain classloaders need it without the leading /
+ url = cluClassloader.getResource(resourceName.substring(1));
+ }
+
+ if (url == null) {
+ ClassLoader cl = callingClass.getClassLoader();
+
+ if (cl != null) {
+ url = cl.getResource(resourceName);
+ }
+ }
+
+ if (url == null) {
+ url = callingClass.getResource(resourceName);
+ }
+
+ if ((url == null) && (resourceName != null) && (resourceName.charAt(0) != '/')) {
+ return getResource('/' + resourceName, callingClass);
+ }
+
+ return url;
+ }
+
+ /**
+ * Load a given resources. This method will try to load the resources
+ * using the following methods (in order):
+ *
+ * - From Thread.currentThread().getContextClassLoader()
+ *
- From ClassLoaderUtil.class.getClassLoader()
+ *
- callingClass.getClassLoader()
+ *
+ *
+ * @param resourceName The name of the resource to load
+ * @param callingClass The Class object of the calling object
+ */
+ static List getResources(String resourceName, Class callingClass) {
+ List ret = new ArrayList();
+ Enumeration urls = new Enumeration() {
+ public boolean hasMoreElements() {
+ return false;
+ }
+ public URL nextElement() {
+ return null;
+ }
+
+ };
+ try {
+ urls = Thread.currentThread().getContextClassLoader().getResources(resourceName);
+ } catch (IOException e) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, e.getMessage(), e);
+ }
+ //ignore
+ }
+ if (!urls.hasMoreElements() && resourceName.startsWith("/")) {
+ //certain classloaders need it without the leading /
+ try {
+ urls =
+ Thread.currentThread().getContextClassLoader().getResources(
+ resourceName.substring(1)
+ );
+ } catch (IOException e) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, e.getMessage(), e);
+ }
+ // ignore
+ }
+ }
+
+ ClassLoader cluClassloader = ClassLoaderUtils.class.getClassLoader();
+ if (cluClassloader == null) {
+ cluClassloader = ClassLoader.getSystemClassLoader();
+ }
+ if (!urls.hasMoreElements()) {
+ try {
+ urls = cluClassloader.getResources(resourceName);
+ } catch (IOException e) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, e.getMessage(), e);
+ }
+ // ignore
+ }
+ }
+ if (!urls.hasMoreElements() && resourceName.startsWith("/")) {
+ //certain classloaders need it without the leading /
+ try {
+ urls = cluClassloader.getResources(resourceName.substring(1));
+ } catch (IOException e) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, e.getMessage(), e);
+ }
+ // ignore
+ }
+ }
+
+ if (!urls.hasMoreElements()) {
+ ClassLoader cl = callingClass.getClassLoader();
+
+ if (cl != null) {
+ try {
+ urls = cl.getResources(resourceName);
+ } catch (IOException e) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, e.getMessage(), e);
+ }
+ // ignore
+ }
+ }
+ }
+
+ if (!urls.hasMoreElements()) {
+ URL url = callingClass.getResource(resourceName);
+ if (url != null) {
+ ret.add(url);
+ }
+ }
+ while (urls.hasMoreElements()) {
+ ret.add(urls.nextElement());
+ }
+
+
+ if (ret.isEmpty() && (resourceName != null) && (resourceName.charAt(0) != '/')) {
+ return getResources('/' + resourceName, callingClass);
+ }
+ return ret;
+ }
+
+
+ /**
+ * This is a convenience method to load a resource as a stream. The
+ * algorithm used to find the resource is given in getResource()
+ *
+ * @param resourceName The name of the resource to load
+ * @param callingClass The Class object of the calling object
+ */
+ static InputStream getResourceAsStream(String resourceName, Class callingClass) {
+ URL url = getResource(resourceName, callingClass);
+
+ try {
+ return (url != null) ? url.openStream() : null;
+ } catch (IOException e) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, e.getMessage(), e);
+ }
+ return null;
+ }
+ }
+
+ /**
+ * Load a class with a given name. It will try to load the class in the
+ * following order:
+ *
+ * - From Thread.currentThread().getContextClassLoader()
+ *
- Using the basic Class.forName()
+ *
- From ClassLoaderUtil.class.getClassLoader()
+ *
- From the callingClass.getClassLoader()
+ *
+ *
+ * @param className The name of the class to load
+ * @param callingClass The Class object of the calling object
+ * @throws ClassNotFoundException If the class cannot be found anywhere.
+ */
+ static Class loadClass(String className, Class callingClass)
+ throws ClassNotFoundException {
+ try {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+
+ if (cl != null) {
+ return cl.loadClass(className);
+ }
+ } catch (ClassNotFoundException e) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, e.getMessage(), e);
+ }
+ //ignore
+ }
+ return loadClass2(className, callingClass);
+ }
+
+ private static Class loadClass2(String className, Class callingClass)
+ throws ClassNotFoundException {
+ try {
+ return Class.forName(className);
+ } catch (ClassNotFoundException ex) {
+ try {
+ if (ClassLoaderUtils.class.getClassLoader() != null) {
+ return ClassLoaderUtils.class.getClassLoader().loadClass(className);
+ }
+ } catch (ClassNotFoundException exc) {
+ if (callingClass != null && callingClass.getClassLoader() != null) {
+ return callingClass.getClassLoader().loadClass(className);
+ }
+ }
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, ex.getMessage(), ex);
+ }
+ throw ex;
+ }
+ }
+}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java Wed Jun 19 11:04:39 2013 +0100
@@ -2,29 +2,29 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package com.sun.org.apache.xml.internal.security.transforms;
import java.io.IOException;
import java.io.OutputStream;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
@@ -33,6 +33,17 @@
import com.sun.org.apache.xml.internal.security.exceptions.AlgorithmAlreadyRegisteredException;
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.transforms.implementations.TransformBase64Decode;
+import com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14N;
+import com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14N11;
+import com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14N11_WithComments;
+import com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14NExclusive;
+import com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14NExclusiveWithComments;
+import com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14NWithComments;
+import com.sun.org.apache.xml.internal.security.transforms.implementations.TransformEnvelopedSignature;
+import com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXPath;
+import com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXPath2Filter;
+import com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXSLT;
import com.sun.org.apache.xml.internal.security.utils.Constants;
import com.sun.org.apache.xml.internal.security.utils.HelperNodeList;
import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
@@ -54,112 +65,31 @@
* @author Christian Geuer-Pollmann
* @see Transforms
* @see TransformSpi
- *
*/
public final class Transform extends SignatureElementProxy {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
+ /** {@link org.apache.commons.logging} logging facility */
+ private static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(Transform.class.getName());
- /** Field _alreadyInitialized */
- private static boolean alreadyInitialized = false;
-
/** All available Transform classes are registered here */
- private static Map> transformClassHash = null;
-
- private static Map transformSpiHash = new HashMap();
-
- private TransformSpi transformSpi = null;
-
- /**
- * Constructs {@link Transform}
- *
- * @param doc the {@link Document} in which Transform will be
- * placed
- * @param algorithmURI URI representation of
- * Transform algorithm which will be specified as parameter of
- * {@link #getInstance(Document, String)}, when generated.
- * @param contextNodes the child node list of Transform element
- * @throws InvalidTransformException
- */
- public Transform(Document doc, String algorithmURI, NodeList contextNodes)
- throws InvalidTransformException {
-
- super(doc);
-
- this._constructionElement.setAttributeNS
- (null, Constants._ATT_ALGORITHM, algorithmURI);
-
- transformSpi = getTransformSpi(algorithmURI);
- if (transformSpi == null) {
- Object exArgs[] = { algorithmURI };
- throw new InvalidTransformException(
- "signature.Transform.UnknownTransform", exArgs);
- }
-
- if (log.isLoggable(java.util.logging.Level.FINE)) {
- log.log(java.util.logging.Level.FINE, "Create URI \"" + algorithmURI + "\" class \""
- + transformSpi.getClass() + "\"");
- log.log(java.util.logging.Level.FINE, "The NodeList is " + contextNodes);
- }
+ private static Map> transformSpiHash =
+ new ConcurrentHashMap>();
- // give it to the current document
- if (contextNodes != null) {
- for (int i = 0; i < contextNodes.getLength(); i++) {
- this._constructionElement.appendChild
- (contextNodes.item(i).cloneNode(true));
- }
- }
- }
-
- /**
- * This constructor can only be called from the {@link Transforms} object,
- * so it's protected.
- *
- * @param element ds:Transform element
- * @param BaseURI the URI of the resource where the XML instance was stored
- * @throws InvalidTransformException
- * @throws TransformationException
- * @throws XMLSecurityException
- */
- public Transform(Element element, String BaseURI)
- throws InvalidTransformException, TransformationException,
- XMLSecurityException {
-
- super(element, BaseURI);
-
- // retrieve Algorithm Attribute from ds:Transform
- String algorithmURI = element.getAttributeNS(null, Constants._ATT_ALGORITHM);
-
- if (algorithmURI == null || algorithmURI.length() == 0) {
- Object exArgs[] = { Constants._ATT_ALGORITHM,
- Constants._TAG_TRANSFORM };
- throw new TransformationException("xml.WrongContent", exArgs);
- }
-
- transformSpi = getTransformSpi(algorithmURI);
- if (transformSpi == null) {
- Object exArgs[] = { algorithmURI };
- throw new InvalidTransformException(
- "signature.Transform.UnknownTransform", exArgs);
- }
- }
+ private final TransformSpi transformSpi;
/**
* Generates a Transform object that implements the specified
* Transform algorithm URI.
*
+ * @param doc the proxy {@link Document}
* @param algorithmURI Transform algorithm URI representation,
* such as specified in
* Transform algorithm
- * @param doc the proxy {@link Document}
- * @return {@link Transform} object
* @throws InvalidTransformException
*/
- public static Transform getInstance(
- Document doc, String algorithmURI) throws InvalidTransformException {
- return getInstance(doc, algorithmURI, (NodeList) null);
+ public Transform(Document doc, String algorithmURI) throws InvalidTransformException {
+ this(doc, algorithmURI, (NodeList)null);
}
/**
@@ -171,82 +101,160 @@
* Transform algorithm
* @param contextChild the child element of Transform element
* @param doc the proxy {@link Document}
- * @return {@link Transform} object
* @throws InvalidTransformException
*/
- public static Transform getInstance(
- Document doc, String algorithmURI, Element contextChild)
+ public Transform(Document doc, String algorithmURI, Element contextChild)
throws InvalidTransformException {
+ super(doc);
+ HelperNodeList contextNodes = null;
- HelperNodeList contextNodes = new HelperNodeList();
+ if (contextChild != null) {
+ contextNodes = new HelperNodeList();
+
+ XMLUtils.addReturnToElement(doc, contextNodes);
+ contextNodes.appendChild(contextChild);
+ XMLUtils.addReturnToElement(doc, contextNodes);
+ }
- XMLUtils.addReturnToElement(doc, contextNodes);
- contextNodes.appendChild(contextChild);
- XMLUtils.addReturnToElement(doc, contextNodes);
+ transformSpi = initializeTransform(algorithmURI, contextNodes);
+ }
- return getInstance(doc, algorithmURI, contextNodes);
+ /**
+ * Constructs {@link Transform}
+ *
+ * @param doc the {@link Document} in which Transform will be
+ * placed
+ * @param algorithmURI URI representation of Transform algorithm
+ * @param contextNodes the child node list of Transform element
+ * @throws InvalidTransformException
+ */
+ public Transform(Document doc, String algorithmURI, NodeList contextNodes)
+ throws InvalidTransformException {
+ super(doc);
+ transformSpi = initializeTransform(algorithmURI, contextNodes);
}
/**
- * Generates a Transform object that implements the specified
- * Transform algorithm URI.
- *
- * @param algorithmURI Transform algorithm URI form, such as
- * specified in
- * Transform algorithm
- * @param contextNodes the child node list of Transform element
- * @param doc the proxy {@link Document}
- * @return {@link Transform} object
+ * @param element ds:Transform element
+ * @param BaseURI the URI of the resource where the XML instance was stored
* @throws InvalidTransformException
+ * @throws TransformationException
+ * @throws XMLSecurityException
*/
- public static Transform getInstance(
- Document doc, String algorithmURI, NodeList contextNodes)
- throws InvalidTransformException {
- return new Transform(doc, algorithmURI, contextNodes);
- }
+ public Transform(Element element, String BaseURI)
+ throws InvalidTransformException, TransformationException, XMLSecurityException {
+ super(element, BaseURI);
+
+ // retrieve Algorithm Attribute from ds:Transform
+ String algorithmURI = element.getAttributeNS(null, Constants._ATT_ALGORITHM);
+
+ if (algorithmURI == null || algorithmURI.length() == 0) {
+ Object exArgs[] = { Constants._ATT_ALGORITHM, Constants._TAG_TRANSFORM };
+ throw new TransformationException("xml.WrongContent", exArgs);
+ }
- /**
- * Initalizes for this {@link Transform}.
- */
- public static void init() {
- if (!alreadyInitialized) {
- transformClassHash = new HashMap>(10);
- // make sure builtin algorithms are all registered first
- com.sun.org.apache.xml.internal.security.Init.init();
- alreadyInitialized = true;
+ Class transformSpiClass = transformSpiHash.get(algorithmURI);
+ if (transformSpiClass == null) {
+ Object exArgs[] = { algorithmURI };
+ throw new InvalidTransformException("signature.Transform.UnknownTransform", exArgs);
+ }
+ try {
+ transformSpi = transformSpiClass.newInstance();
+ } catch (InstantiationException ex) {
+ Object exArgs[] = { algorithmURI };
+ throw new InvalidTransformException(
+ "signature.Transform.UnknownTransform", exArgs, ex
+ );
+ } catch (IllegalAccessException ex) {
+ Object exArgs[] = { algorithmURI };
+ throw new InvalidTransformException(
+ "signature.Transform.UnknownTransform", exArgs, ex
+ );
}
}
/**
* Registers implementing class of the Transform algorithm with algorithmURI
*
- * @param algorithmURI algorithmURI URI representation of
- * Transform algorithm will be specified as parameter of
- * {@link #getInstance(Document, String)}, when generate.
+ * @param algorithmURI algorithmURI URI representation of Transform algorithm
+ * @param implementingClass implementingClass the implementing
+ * class of {@link TransformSpi}
+ * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI
+ * is already registered
+ */
+ @SuppressWarnings("unchecked")
+ public static void register(String algorithmURI, String implementingClass)
+ throws AlgorithmAlreadyRegisteredException, ClassNotFoundException,
+ InvalidTransformException {
+ // are we already registered?
+ Class transformSpi = transformSpiHash.get(algorithmURI);
+ if (transformSpi != null) {
+ Object exArgs[] = { algorithmURI, transformSpi };
+ throw new AlgorithmAlreadyRegisteredException("algorithm.alreadyRegistered", exArgs);
+ }
+ Class transformSpiClass =
+ (Class)
+ ClassLoaderUtils.loadClass(implementingClass, Transform.class);
+ transformSpiHash.put(algorithmURI, transformSpiClass);
+ }
+
+ /**
+ * Registers implementing class of the Transform algorithm with algorithmURI
+ *
+ * @param algorithmURI algorithmURI URI representation of Transform algorithm
* @param implementingClass implementingClass the implementing
* class of {@link TransformSpi}
* @throws AlgorithmAlreadyRegisteredException if specified algorithmURI
* is already registered
*/
- public static void register(String algorithmURI, String implementingClass)
+ public static void register(String algorithmURI, Class implementingClass)
throws AlgorithmAlreadyRegisteredException {
-
// are we already registered?
- Class registeredClass = getImplementingClass(algorithmURI);
- if ((registeredClass != null) ) {
- Object exArgs[] = { algorithmURI, registeredClass };
- throw new AlgorithmAlreadyRegisteredException(
- "algorithm.alreadyRegistered", exArgs);
+ Class transformSpi = transformSpiHash.get(algorithmURI);
+ if (transformSpi != null) {
+ Object exArgs[] = { algorithmURI, transformSpi };
+ throw new AlgorithmAlreadyRegisteredException("algorithm.alreadyRegistered", exArgs);
}
-
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ transformSpiHash.put(algorithmURI, implementingClass);
+ }
- try {
- transformClassHash.put
- (algorithmURI, Class.forName(implementingClass, true, cl));
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
+ /**
+ * This method registers the default algorithms.
+ */
+ public static void registerDefaultAlgorithms() {
+ transformSpiHash.put(
+ Transforms.TRANSFORM_BASE64_DECODE, TransformBase64Decode.class
+ );
+ transformSpiHash.put(
+ Transforms.TRANSFORM_C14N_OMIT_COMMENTS, TransformC14N.class
+ );
+ transformSpiHash.put(
+ Transforms.TRANSFORM_C14N_WITH_COMMENTS, TransformC14NWithComments.class
+ );
+ transformSpiHash.put(
+ Transforms.TRANSFORM_C14N11_OMIT_COMMENTS, TransformC14N11.class
+ );
+ transformSpiHash.put(
+ Transforms.TRANSFORM_C14N11_WITH_COMMENTS, TransformC14N11_WithComments.class
+ );
+ transformSpiHash.put(
+ Transforms.TRANSFORM_C14N_EXCL_OMIT_COMMENTS, TransformC14NExclusive.class
+ );
+ transformSpiHash.put(
+ Transforms.TRANSFORM_C14N_EXCL_WITH_COMMENTS, TransformC14NExclusiveWithComments.class
+ );
+ transformSpiHash.put(
+ Transforms.TRANSFORM_XPATH, TransformXPath.class
+ );
+ transformSpiHash.put(
+ Transforms.TRANSFORM_ENVELOPED_SIGNATURE, TransformEnvelopedSignature.class
+ );
+ transformSpiHash.put(
+ Transforms.TRANSFORM_XSLT, TransformXSLT.class
+ );
+ transformSpiHash.put(
+ Transforms.TRANSFORM_XPATH2FILTER, TransformXPath2Filter.class
+ );
}
/**
@@ -255,8 +263,7 @@
* @return the URI representation of Transformation algorithm
*/
public String getURI() {
- return this._constructionElement.getAttributeNS
- (null, Constants._ATT_ALGORITHM);
+ return this._constructionElement.getAttributeNS(null, Constants._ATT_ALGORITHM);
}
/**
@@ -272,30 +279,15 @@
* @throws TransformationException
*/
public XMLSignatureInput performTransform(XMLSignatureInput input)
- throws IOException, CanonicalizationException,
- InvalidCanonicalizerException, TransformationException {
-
- XMLSignatureInput result = null;
-
- try {
- result = transformSpi.enginePerformTransform(input, this);
- } catch (ParserConfigurationException ex) {
- Object exArgs[] = { this.getURI(), "ParserConfigurationException" };
- throw new CanonicalizationException(
- "signature.Transform.ErrorDuringTransform", exArgs, ex);
- } catch (SAXException ex) {
- Object exArgs[] = { this.getURI(), "SAXException" };
- throw new CanonicalizationException(
- "signature.Transform.ErrorDuringTransform", exArgs, ex);
- }
-
- return result;
+ throws IOException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformationException {
+ return performTransform(input, null);
}
/**
* Transforms the input, and generates {@link XMLSignatureInput} as output.
*
- * @param input input {@link XMLSignatureInput} which can supplied Octet
+ * @param input input {@link XMLSignatureInput} which can supplied Octect
* Stream and NodeSet as Input of Transformation
* @param os where to output the result of the last transformation
* @return the {@link XMLSignatureInput} class as the result of
@@ -305,10 +297,10 @@
* @throws InvalidCanonicalizerException
* @throws TransformationException
*/
- public XMLSignatureInput performTransform(XMLSignatureInput input,
- OutputStream os) throws IOException, CanonicalizationException,
+ public XMLSignatureInput performTransform(
+ XMLSignatureInput input, OutputStream os
+ ) throws IOException, CanonicalizationException,
InvalidCanonicalizerException, TransformationException {
-
XMLSignatureInput result = null;
try {
@@ -326,44 +318,52 @@
return result;
}
- /**
- * Method getImplementingClass
- *
- * @param URI
- * @return The name of the class implementing the URI.
- */
- @SuppressWarnings("unchecked")
- private static Class getImplementingClass(String URI) {
- return (Class)transformClassHash.get(URI);
- }
-
- private static TransformSpi getTransformSpi(String URI)
- throws InvalidTransformException {
- try {
- TransformSpi value = transformSpiHash.get(URI);
- if (value != null) {
- return value;
- }
- Class cl = getImplementingClass(URI);
- if (cl != null) {
- TransformSpi tr = cl.newInstance();
- transformSpiHash.put(URI, tr);
- return tr;
- }
- } catch (InstantiationException ex) {
- Object exArgs[] = { URI };
- throw new InvalidTransformException(
- "signature.Transform.UnknownTransform", exArgs, ex);
- } catch (IllegalAccessException ex) {
- Object exArgs[] = { URI };
- throw new InvalidTransformException(
- "signature.Transform.UnknownTransform", exArgs, ex);
- }
- return null;
- }
-
/** @inheritDoc */
public String getBaseLocalName() {
return Constants._TAG_TRANSFORM;
}
+
+ /**
+ * Initialize the transform object.
+ */
+ private TransformSpi initializeTransform(String algorithmURI, NodeList contextNodes)
+ throws InvalidTransformException {
+
+ this._constructionElement.setAttributeNS(null, Constants._ATT_ALGORITHM, algorithmURI);
+
+ Class transformSpiClass = transformSpiHash.get(algorithmURI);
+ if (transformSpiClass == null) {
+ Object exArgs[] = { algorithmURI };
+ throw new InvalidTransformException("signature.Transform.UnknownTransform", exArgs);
+ }
+ TransformSpi newTransformSpi = null;
+ try {
+ newTransformSpi = transformSpiClass.newInstance();
+ } catch (InstantiationException ex) {
+ Object exArgs[] = { algorithmURI };
+ throw new InvalidTransformException(
+ "signature.Transform.UnknownTransform", exArgs, ex
+ );
+ } catch (IllegalAccessException ex) {
+ Object exArgs[] = { algorithmURI };
+ throw new InvalidTransformException(
+ "signature.Transform.UnknownTransform", exArgs, ex
+ );
+ }
+
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Create URI \"" + algorithmURI + "\" class \""
+ + newTransformSpi.getClass() + "\"");
+ log.log(java.util.logging.Level.FINE, "The NodeList is " + contextNodes);
+ }
+
+ // give it to the current document
+ if (contextNodes != null) {
+ for (int i = 0; i < contextNodes.getLength(); i++) {
+ this._constructionElement.appendChild(contextNodes.item(i).cloneNode(true));
+ }
+ }
+ return newTransformSpi;
+ }
+
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java Wed Jun 19 11:04:39 2013 +0100
@@ -158,8 +158,7 @@
if (log.isLoggable(java.util.logging.Level.FINE))
log.log(java.util.logging.Level.FINE, "Transforms.addTransform(" + transformURI + ")");
- Transform transform =
- Transform.getInstance(this._doc, transformURI);
+ Transform transform = new Transform(this._doc, transformURI);
this.addTransform(transform);
} catch (InvalidTransformException ex) {
@@ -184,8 +183,7 @@
if (log.isLoggable(java.util.logging.Level.FINE))
log.log(java.util.logging.Level.FINE, "Transforms.addTransform(" + transformURI + ")");
- Transform transform =
- Transform.getInstance(this._doc, transformURI, contextElement);
+ Transform transform = new Transform(this._doc, transformURI, contextElement);
this.addTransform(transform);
} catch (InvalidTransformException ex) {
@@ -207,8 +205,7 @@
throws TransformationException {
try {
- Transform transform =
- Transform.getInstance(this._doc, transformURI, contextNodes);
+ Transform transform = new Transform(this._doc, transformURI, contextNodes);
this.addTransform(transform);
} catch (InvalidTransformException ex) {
throw new TransformationException("empty", ex);
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java Wed Jun 19 11:04:39 2013 +0100
@@ -26,6 +26,7 @@
import java.io.IOException;
import java.io.OutputStream;
+import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -145,11 +146,13 @@
}
try {
- //Exceptional case there is current not text case testing this(Before it was a
- //a common case).
+ // Exceptional case there is current not text case testing this
+ // (before it was a a common case).
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
+ Boolean.TRUE);
Document doc =
- DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(
- input.getOctetStream());
+ dbf.newDocumentBuilder().parse(input.getOctetStream());
Element rootNode = doc.getDocumentElement();
StringBuffer sb = new StringBuffer();
@@ -157,13 +160,13 @@
byte[] decodedBytes = Base64.decode(sb.toString());
return new XMLSignatureInput(decodedBytes);
- } catch (ParserConfigurationException e) {
- throw new TransformationException("c14n.Canonicalizer.Exception",e);
- } catch (SAXException e) {
- throw new TransformationException("SAX exception", e);
- }
+ } catch (ParserConfigurationException e) {
+ throw new TransformationException("c14n.Canonicalizer.Exception",e);
+ } catch (SAXException e) {
+ throw new TransformationException("SAX exception", e);
+ }
} catch (Base64DecodingException e) {
- throw new TransformationException("Base64Decoding", e);
+ throw new TransformationException("Base64Decoding", e);
}
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java Wed Jun 19 11:04:39 2013 +0100
@@ -26,6 +26,7 @@
import java.io.OutputStream;
import java.lang.reflect.Method;
+import javax.xml.XMLConstants;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
@@ -109,7 +110,8 @@
TransformerFactory tFactory = TransformerFactory.newInstance();
// Process XSLT stylesheets in a secure manner
- tFactory.setFeature("http://javax.xml.XMLConstants/feature/secure-processing", Boolean.TRUE);
+ tFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
+ Boolean.TRUE);
/*
* This transform requires an octet stream as input. If the actual
* input is an XPath node-set, then the signature application should
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java Wed Jun 19 11:04:39 2013 +0100
@@ -2,28 +2,28 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-/*
- * Copyright 1999-2008 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package com.sun.org.apache.xml.internal.security.utils;
-
-
import java.math.BigInteger;
-import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.Map;
import com.sun.org.apache.xml.internal.security.exceptions.Base64DecodingException;
@@ -35,466 +35,432 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
-
/**
* This is the base class to all Objects which have a direct 1:1 mapping to an
* Element in a particular namespace.
- *
- * @author $Author: mullan $
*/
public abstract class ElementProxy {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
+ protected static final java.util.logging.Logger log =
java.util.logging.Logger.getLogger(ElementProxy.class.getName());
- /**
- * Returns the namespace of the Elements of the sub-class.
- *
- * @return the namespace of the Elements of the sub-class.
- */
- public abstract String getBaseNamespace();
+ /** Field constructionElement */
+ protected Element _constructionElement = null;
+
+ /** Field baseURI */
+ protected String _baseURI = null;
+
+ /** Field doc */
+ protected Document _doc = null;
+
+ /** Field prefixMappings */
+ private static Map prefixMappings = new ConcurrentHashMap();
- /**
- * Returns the localname of the Elements of the sub-class.
- *
- * @return the localname of the Elements of the sub-class.
- */
- public abstract String getBaseLocalName();
+ /**
+ * Constructor ElementProxy
+ *
+ */
+ public ElementProxy() {
+ }
+
+ /**
+ * Constructor ElementProxy
+ *
+ * @param doc
+ */
+ public ElementProxy(Document doc) {
+ if (doc == null) {
+ throw new RuntimeException("Document is null");
+ }
+
+ this._doc = doc;
+ this._constructionElement =
+ createElementForFamilyLocal(this._doc, this.getBaseNamespace(), this.getBaseLocalName());
+ }
- /** Field _constructionElement */
- protected Element _constructionElement = null;
+ /**
+ * Constructor ElementProxy
+ *
+ * @param element
+ * @param BaseURI
+ * @throws XMLSecurityException
+ */
+ public ElementProxy(Element element, String BaseURI) throws XMLSecurityException {
+ if (element == null) {
+ throw new XMLSecurityException("ElementProxy.nullElement");
+ }
- /** Field _baseURI */
- protected String _baseURI = null;
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "setElement(\"" + element.getTagName() + "\", \"" + BaseURI + "\")");
+ }
- /** Field _doc */
- protected Document _doc = null;
+ this._doc = element.getOwnerDocument();
+ this._constructionElement = element;
+ this._baseURI = BaseURI;
+
+ this.guaranteeThatElementInCorrectSpace();
+ }
- /**
- * Constructor ElementProxy
- *
- */
- public ElementProxy() {
- }
+ /**
+ * Returns the namespace of the Elements of the sub-class.
+ *
+ * @return the namespace of the Elements of the sub-class.
+ */
+ public abstract String getBaseNamespace();
+
+ /**
+ * Returns the localname of the Elements of the sub-class.
+ *
+ * @return the localname of the Elements of the sub-class.
+ */
+ public abstract String getBaseLocalName();
+
- /**
- * Constructor ElementProxy
- *
- * @param doc
- */
- public ElementProxy(Document doc) {
- if (doc == null) {
- throw new RuntimeException("Document is null");
- }
+ protected Element createElementForFamilyLocal(
+ Document doc, String namespace, String localName
+ ) {
+ Element result = null;
+ if (namespace == null) {
+ result = doc.createElementNS(null, localName);
+ } else {
+ String baseName = this.getBaseNamespace();
+ String prefix = ElementProxy.getDefaultPrefix(baseName);
+ if ((prefix == null) || (prefix.length() == 0)) {
+ result = doc.createElementNS(namespace, localName);
+ result.setAttributeNS(Constants.NamespaceSpecNS, "xmlns", namespace);
+ } else {
+ result = doc.createElementNS(namespace, prefix + ":" + localName);
+ result.setAttributeNS(Constants.NamespaceSpecNS, "xmlns:" + prefix, namespace);
+ }
+ }
+ return result;
+ }
+
- this._doc = doc;
- this._constructionElement = createElementForFamilyLocal(this._doc,
- this.getBaseNamespace(), this.getBaseLocalName());
- }
- protected Element createElementForFamilyLocal(Document doc, String namespace,
- String localName) {
- Element result = null;
- if (namespace == null) {
- result = doc.createElementNS(null, localName);
- } else {
- String baseName=this.getBaseNamespace();
- String prefix=ElementProxy.getDefaultPrefix(baseName);
- if ((prefix == null) || (prefix.length() == 0)) {
- result = doc.createElementNS(namespace, localName);
+ /**
+ * This method creates an Element in a given namespace with a given localname.
+ * It uses the {@link ElementProxy#getDefaultPrefix} method to decide whether
+ * a particular prefix is bound to that namespace.
+ *
+ * This method was refactored out of the constructor.
+ *
+ * @param doc
+ * @param namespace
+ * @param localName
+ * @return The element created.
+ */
+ public static Element createElementForFamily(Document doc, String namespace, String localName) {
+ Element result = null;
+ String prefix = ElementProxy.getDefaultPrefix(namespace);
- result.setAttributeNS(Constants.NamespaceSpecNS, "xmlns",
- namespace);
- } else {
- String tagName=null;
- String defaultPrefixNaming=ElementProxy.getDefaultPrefixBindings(baseName);
- StringBuffer sb=new StringBuffer(prefix);
- sb.append(':');
- sb.append(localName);
- tagName=sb.toString();
- result = doc.createElementNS(namespace, tagName );
+ if (namespace == null) {
+ result = doc.createElementNS(null, localName);
+ } else {
+ if ((prefix == null) || (prefix.length() == 0)) {
+ result = doc.createElementNS(namespace, localName);
+ result.setAttributeNS(Constants.NamespaceSpecNS, "xmlns", namespace);
+ } else {
+ result = doc.createElementNS(namespace, prefix + ":" + localName);
+ result.setAttributeNS(Constants.NamespaceSpecNS, "xmlns:" + prefix, namespace);
+ }
+ }
+
+ return result;
+ }
- result.setAttributeNS(Constants.NamespaceSpecNS, defaultPrefixNaming,
- namespace);
- }
- }
- return result;
-}
+ /**
+ * Method setElement
+ *
+ * @param element
+ * @param BaseURI
+ * @throws XMLSecurityException
+ */
+ public void setElement(Element element, String BaseURI) throws XMLSecurityException {
+ if (element == null) {
+ throw new XMLSecurityException("ElementProxy.nullElement");
+ }
+
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "setElement(" + element.getTagName() + ", \"" + BaseURI + "\"");
+ }
+
+ this._doc = element.getOwnerDocument();
+ this._constructionElement = element;
+ this._baseURI = BaseURI;
+ }
- /**
- * This method creates an Element in a given namespace with a given localname.
- * It uses the {@link ElementProxy#getDefaultPrefix} method to decide whether
- * a particular prefix is bound to that namespace.
- *
- * This method was refactored out of the constructor.
- *
- * @param doc
- * @param namespace
- * @param localName
- * @return The element created.
- */
- public static Element createElementForFamily(Document doc, String namespace,
- String localName) {
- //Element nscontext = XMLUtils.createDSctx(doc, "x", namespace);
- Element result = null;
- String prefix = ElementProxy.getDefaultPrefix(namespace);
+ /**
+ * Returns the Element which was constructed by the Object.
+ *
+ * @return the Element which was constructed by the Object.
+ */
+ public final Element getElement() {
+ return this._constructionElement;
+ }
- if (namespace == null) {
- result = doc.createElementNS(null, localName);
- } else {
- if ((prefix == null) || (prefix.length() == 0)) {
- result = doc.createElementNS(namespace, localName);
+ /**
+ * Returns the Element plus a leading and a trailing CarriageReturn Text node.
+ *
+ * @return the Element which was constructed by the Object.
+ */
+ public final NodeList getElementPlusReturns() {
- result.setAttributeNS(Constants.NamespaceSpecNS, "xmlns",
- namespace);
- } else {
- result = doc.createElementNS(namespace, prefix + ":" + localName);
+ HelperNodeList nl = new HelperNodeList();
- result.setAttributeNS(Constants.NamespaceSpecNS, ElementProxy.getDefaultPrefixBindings(namespace),
- namespace);
- }
- }
+ nl.appendChild(this._doc.createTextNode("\n"));
+ nl.appendChild(this.getElement());
+ nl.appendChild(this._doc.createTextNode("\n"));
- return result;
- }
+ return nl;
+ }
- /**
- * Method setElement
- *
- * @param element
- * @param BaseURI
- * @throws XMLSecurityException
- */
- public void setElement(Element element, String BaseURI)
- throws XMLSecurityException {
+ /**
+ * Method getDocument
+ *
+ * @return the Document where this element is contained.
+ */
+ public Document getDocument() {
+ return this._doc;
+ }
- if (element == null) {
- throw new XMLSecurityException("ElementProxy.nullElement");
- }
-
- if (log.isLoggable(java.util.logging.Level.FINE)) {
- log.log(java.util.logging.Level.FINE, "setElement(" + element.getTagName() + ", \"" + BaseURI + "\"");
- }
-
- this._doc = element.getOwnerDocument();
- this._constructionElement = element;
- this._baseURI = BaseURI;
- }
+ /**
+ * Method getBaseURI
+ *
+ * @return the base uri of the namespace of this element
+ */
+ public String getBaseURI() {
+ return this._baseURI;
+ }
- /**
- * Constructor ElementProxy
- *
- * @param element
- * @param BaseURI
- * @throws XMLSecurityException
- */
- public ElementProxy(Element element, String BaseURI)
- throws XMLSecurityException {
- if (element == null) {
- throw new XMLSecurityException("ElementProxy.nullElement");
- }
+ /**
+ * Method guaranteeThatElementInCorrectSpace
+ *
+ * @throws XMLSecurityException
+ */
+ void guaranteeThatElementInCorrectSpace() throws XMLSecurityException {
+
+ String expectedLocalName = this.getBaseLocalName();
+ String expectedNamespaceUri = this.getBaseNamespace();
- if (log.isLoggable(java.util.logging.Level.FINE)) {
- log.log(java.util.logging.Level.FINE, "setElement(\"" + element.getTagName() + "\", \"" + BaseURI
- + "\")");
- }
+ String actualLocalName = this._constructionElement.getLocalName();
+ String actualNamespaceUri = this._constructionElement.getNamespaceURI();
- this._doc = element.getOwnerDocument();
- this._constructionElement = element;
- this._baseURI = BaseURI;
-
- this.guaranteeThatElementInCorrectSpace();
- }
+ if(!expectedNamespaceUri.equals(actualNamespaceUri)
+ && !expectedLocalName.equals(actualLocalName)) {
+ Object exArgs[] = { actualNamespaceUri + ":" + actualLocalName,
+ expectedNamespaceUri + ":" + expectedLocalName};
+ throw new XMLSecurityException("xml.WrongElement", exArgs);
+ }
+ }
- /**
- * Returns the Element which was constructed by the Object.
- *
- * @return the Element which was constructed by the Object.
- */
- public final Element getElement() {
- return this._constructionElement;
- }
+ /**
+ * Method addBigIntegerElement
+ *
+ * @param bi
+ * @param localname
+ */
+ public void addBigIntegerElement(BigInteger bi, String localname) {
+ if (bi != null) {
+ Element e = XMLUtils.createElementInSignatureSpace(this._doc, localname);
- /**
- * Returns the Element plus a leading and a trailing CarriageReturn Text node.
- *
- * @return the Element which was constructed by the Object.
- */
- public final NodeList getElementPlusReturns() {
-
- HelperNodeList nl = new HelperNodeList();
-
- nl.appendChild(this._doc.createTextNode("\n"));
- nl.appendChild(this.getElement());
- nl.appendChild(this._doc.createTextNode("\n"));
+ Base64.fillElementWithBigInteger(e, bi);
+ this._constructionElement.appendChild(e);
+ XMLUtils.addReturnToElement(this._constructionElement);
+ }
+ }
- return nl;
- }
+ /**
+ * Method addBase64Element
+ *
+ * @param bytes
+ * @param localname
+ */
+ public void addBase64Element(byte[] bytes, String localname) {
+ if (bytes != null) {
+ Element e = Base64.encodeToElement(this._doc, localname, bytes);
- /**
- * Method getDocument
- *
- * @return the Document where this element is contained.
- */
- public Document getDocument() {
- return this._doc;
- }
-
- /**
- * Method getBaseURI
- *
- * @return the base uri of the namespace of this element
- */
- public String getBaseURI() {
- return this._baseURI;
- }
-
- static ElementChecker checker = new ElementCheckerImpl.InternedNsChecker();
+ this._constructionElement.appendChild(e);
+ if (!XMLUtils.ignoreLineBreaks()) {
+ this._constructionElement.appendChild(this._doc.createTextNode("\n"));
+ }
+ }
+ }
- /**
- * Method guaranteeThatElementInCorrectSpace
- *
- * @throws XMLSecurityException
- */
- void guaranteeThatElementInCorrectSpace()
- throws XMLSecurityException {
-
- checker.guaranteeThatElementInCorrectSpace(this,this._constructionElement);
-
- }
+ /**
+ * Method addTextElement
+ *
+ * @param text
+ * @param localname
+ */
+ public void addTextElement(String text, String localname) {
+ Element e = XMLUtils.createElementInSignatureSpace(this._doc, localname);
+ Text t = this._doc.createTextNode(text);
- /**
- * Method setVal
- *
- * @param bi
- * @param localname
- */
- public void addBigIntegerElement(BigInteger bi, String localname) {
-
- if (bi != null) {
- Element e = XMLUtils.createElementInSignatureSpace(this._doc,
- localname);
+ e.appendChild(t);
+ this._constructionElement.appendChild(e);
+ XMLUtils.addReturnToElement(this._constructionElement);
+ }
- Base64.fillElementWithBigInteger(e, bi);
- this._constructionElement.appendChild(e);
- XMLUtils.addReturnToElement(this._constructionElement);
- }
- }
-
- /**
- * Method addBase64Element
- *
- * @param bytes
- * @param localname
- */
- public void addBase64Element(byte[] bytes, String localname) {
-
- if (bytes != null) {
+ /**
+ * Method addBase64Text
+ *
+ * @param bytes
+ */
+ public void addBase64Text(byte[] bytes) {
+ if (bytes != null) {
+ Text t = XMLUtils.ignoreLineBreaks()
+ ? this._doc.createTextNode(Base64.encode(bytes))
+ : this._doc.createTextNode("\n" + Base64.encode(bytes) + "\n");
+ this._constructionElement.appendChild(t);
+ }
+ }
- Element e = Base64.encodeToElement(this._doc, localname, bytes);
-
- this._constructionElement.appendChild(e);
- if (!XMLUtils.ignoreLineBreaks()) {
- this._constructionElement.appendChild(this._doc.createTextNode("\n"));
- }
- }
- }
-
- /**
- * Method addTextElement
- *
- * @param text
- * @param localname
- */
- public void addTextElement(String text, String localname) {
+ /**
+ * Method addText
+ *
+ * @param text
+ */
+ public void addText(String text) {
+ if (text != null) {
+ Text t = this._doc.createTextNode(text);
- Element e = XMLUtils.createElementInSignatureSpace(this._doc, localname);
- Text t = this._doc.createTextNode(text);
-
- e.appendChild(t);
- this._constructionElement.appendChild(e);
- XMLUtils.addReturnToElement(this._constructionElement);
- }
-
- /**
- * Method addBase64Text
- *
- * @param bytes
- */
- public void addBase64Text(byte[] bytes) {
+ this._constructionElement.appendChild(t);
+ }
+ }
- if (bytes != null) {
- Text t = XMLUtils.ignoreLineBreaks()
- ? this._doc.createTextNode(Base64.encode(bytes))
- : this._doc.createTextNode("\n" + Base64.encode(bytes) + "\n");
- this._constructionElement.appendChild(t);
- }
- }
-
- /**
- * Method addText
- *
- * @param text
- */
- public void addText(String text) {
-
- if (text != null) {
- Text t = this._doc.createTextNode(text);
-
- this._constructionElement.appendChild(t);
- }
- }
+ /**
+ * Method getVal
+ *
+ * @param localname
+ * @param namespace
+ * @return The biginteger contained in the given element
+ * @throws Base64DecodingException
+ */
+ public BigInteger getBigIntegerFromChildElement(
+ String localname, String namespace
+ ) throws Base64DecodingException {
+ return Base64.decodeBigIntegerFromText(
+ XMLUtils.selectNodeText(
+ this._constructionElement.getFirstChild(), namespace, localname, 0
+ )
+ );
+ }
- /**
- * Method getVal
- *
- * @param localname
- * @param namespace
- * @return The biginter contained in the given element
- * @throws Base64DecodingException
- */
- public BigInteger getBigIntegerFromChildElement(
- String localname, String namespace) throws Base64DecodingException {
+ /**
+ * Method getBytesFromChildElement
+ * @deprecated
+ * @param localname
+ * @param namespace
+ * @return the bytes
+ * @throws XMLSecurityException
+ */
+ @Deprecated
+ public byte[] getBytesFromChildElement(String localname, String namespace)
+ throws XMLSecurityException {
+ Element e =
+ XMLUtils.selectNode(
+ this._constructionElement.getFirstChild(), namespace, localname, 0
+ );
- return Base64.decodeBigIntegerFromText(
- XMLUtils.selectNodeText(this._constructionElement.getFirstChild(),
- namespace,localname,0));
-
- }
+ return Base64.decode(e);
+ }
- /**
- * Method getBytesFromChildElement
- * @deprecated
- * @param localname
- * @param namespace
- * @return the bytes
- * @throws XMLSecurityException
- */
- @Deprecated
- public byte[] getBytesFromChildElement(String localname, String namespace)
- throws XMLSecurityException {
-
- Element e =
- XMLUtils.selectNode(
- this._constructionElement.getFirstChild(),
- namespace,
- localname,
- 0);
+ /**
+ * Method getTextFromChildElement
+ *
+ * @param localname
+ * @param namespace
+ * @return the Text of the textNode
+ */
+ public String getTextFromChildElement(String localname, String namespace) {
+ return XMLUtils.selectNode(
+ this._constructionElement.getFirstChild(),
+ namespace,
+ localname,
+ 0).getTextContent();
+ }
- return Base64.decode(e);
- }
-
- /**
- * Method getTextFromChildElement
- *
- * @param localname
- * @param namespace
- * @return the Text of the textNode
- */
- public String getTextFromChildElement(String localname, String namespace) {
-
- return XMLUtils.selectNode(
- this._constructionElement.getFirstChild(),
- namespace,
- localname,
- 0).getFirstChild().getNodeValue();
-
- }
+ /**
+ * Method getBytesFromTextChild
+ *
+ * @return The base64 bytes from the text children of this element
+ * @throws XMLSecurityException
+ */
+ public byte[] getBytesFromTextChild() throws XMLSecurityException {
+ return Base64.decode(XMLUtils.getFullTextChildrenFromElement(this._constructionElement));
+ }
- /**
- * Method getBytesFromTextChild
- *
- * @return The base64 bytes from the text children of this element
- * @throws XMLSecurityException
- */
- public byte[] getBytesFromTextChild() throws XMLSecurityException {
- return Base64.decode
- (XMLUtils.getFullTextChildrenFromElement(this._constructionElement));
- }
-
- /**
- * Method getTextFromTextChild
- *
- * @return the Text obtained by concatenating all the text nodes of this
- * element
- */
- public String getTextFromTextChild() {
- return XMLUtils.getFullTextChildrenFromElement(this._constructionElement);
- }
+ /**
+ * Method getTextFromTextChild
+ *
+ * @return the Text obtained by concatenating all the text nodes of this
+ * element
+ */
+ public String getTextFromTextChild() {
+ return XMLUtils.getFullTextChildrenFromElement(this._constructionElement);
+ }
- /**
- * Method length
- *
- * @param namespace
- * @param localname
- * @return the number of elements {namespace}:localname under this element
- */
- public int length(String namespace, String localname) {
- int number=0;
- Node sibling=this._constructionElement.getFirstChild();
- while (sibling!=null) {
- if (localname.equals(sibling.getLocalName())
- &&
- namespace==sibling.getNamespaceURI() ) {
- number++;
- }
- sibling=sibling.getNextSibling();
+ /**
+ * Method length
+ *
+ * @param namespace
+ * @param localname
+ * @return the number of elements {namespace}:localname under this element
+ */
+ public int length(String namespace, String localname) {
+ int number = 0;
+ Node sibling = this._constructionElement.getFirstChild();
+ while (sibling != null) {
+ if (localname.equals(sibling.getLocalName())
+ && namespace.equals(sibling.getNamespaceURI())) {
+ number++;
}
- return number;
- }
+ sibling = sibling.getNextSibling();
+ }
+ return number;
+ }
- /**
- * Adds an xmlns: definition to the Element. This can be called as follows:
- *
- *
- * // set namespace with ds prefix
- * xpathContainer.setXPathNamespaceContext("ds", "http://www.w3.org/2000/09/xmldsig#");
- * xpathContainer.setXPathNamespaceContext("xmlns:ds", "http://www.w3.org/2000/09/xmldsig#");
- *
- *
- * @param prefix
- * @param uri
- * @throws XMLSecurityException
- */
- public void setXPathNamespaceContext(String prefix, String uri)
- throws XMLSecurityException {
-
- String ns;
+ /**
+ * Adds an xmlns: definition to the Element. This can be called as follows:
+ *
+ *
+ * // set namespace with ds prefix
+ * xpathContainer.setXPathNamespaceContext("ds", "http://www.w3.org/2000/09/xmldsig#");
+ * xpathContainer.setXPathNamespaceContext("xmlns:ds", "http://www.w3.org/2000/09/xmldsig#");
+ *
+ *
+ * @param prefix
+ * @param uri
+ * @throws XMLSecurityException
+ */
+ public void setXPathNamespaceContext(String prefix, String uri)
+ throws XMLSecurityException {
+ String ns;
- if ((prefix == null) || (prefix.length() == 0)) {
- throw new XMLSecurityException("defaultNamespaceCannotBeSetHere");
- } else if (prefix.equals("xmlns")) {
- throw new XMLSecurityException("defaultNamespaceCannotBeSetHere");
- } else if (prefix.startsWith("xmlns:")) {
- ns = prefix;//"xmlns:" + prefix.substring("xmlns:".length());
- } else {
- ns = "xmlns:" + prefix;
- }
+ if ((prefix == null) || (prefix.length() == 0)) {
+ throw new XMLSecurityException("defaultNamespaceCannotBeSetHere");
+ } else if (prefix.equals("xmlns")) {
+ throw new XMLSecurityException("defaultNamespaceCannotBeSetHere");
+ } else if (prefix.startsWith("xmlns:")) {
+ ns = prefix;//"xmlns:" + prefix.substring("xmlns:".length());
+ } else {
+ ns = "xmlns:" + prefix;
+ }
-
-
- Attr a = this._constructionElement.getAttributeNodeNS(Constants.NamespaceSpecNS, ns);
+ Attr a = this._constructionElement.getAttributeNodeNS(Constants.NamespaceSpecNS, ns);
- if (a != null) {
- if (!a.getNodeValue().equals(uri)) {
- Object exArgs[] = { ns,
- this._constructionElement.getAttributeNS(null,
- ns) };
+ if (a != null) {
+ if (!a.getNodeValue().equals(uri)) {
+ Object exArgs[] = { ns, this._constructionElement.getAttributeNS(null, ns) };
- throw new XMLSecurityException("namespacePrefixAlreadyUsedByOtherURI",
- exArgs);
- }
- return;
- }
+ throw new XMLSecurityException("namespacePrefixAlreadyUsedByOtherURI", exArgs);
+ }
+ return;
+ }
- this._constructionElement.setAttributeNS(Constants.NamespaceSpecNS, ns,
- uri);
- }
-
- /** Field _prefixMappings */
- static Map _prefixMappings = new HashMap();
- static Map _prefixMappingsBindings = new HashMap();
+ this._constructionElement.setAttributeNS(Constants.NamespaceSpecNS, ns, uri);
+ }
/**
* Method setDefaultPrefix
@@ -505,26 +471,39 @@
*/
public static void setDefaultPrefix(String namespace, String prefix)
throws XMLSecurityException {
-
- if (ElementProxy._prefixMappings.containsValue(prefix)) {
-
- Object storedNamespace=ElementProxy._prefixMappings.get(namespace);
- if (!storedNamespace.equals(prefix)) {
- Object exArgs[] = { prefix, namespace, storedNamespace };
+ if (prefixMappings.containsValue(prefix)) {
+ String storedPrefix = prefixMappings.get(namespace);
+ if (!storedPrefix.equals(prefix)) {
+ Object exArgs[] = { prefix, namespace, storedPrefix };
throw new XMLSecurityException("prefix.AlreadyAssigned", exArgs);
}
}
+
if (Constants.SignatureSpecNS.equals(namespace)) {
- XMLUtils.dsPrefix=prefix;
+ XMLUtils.setDsPrefix(prefix);
+ }
+ if (EncryptionConstants.EncryptionSpecNS.equals(namespace)) {
+ XMLUtils.setXencPrefix(prefix);
}
- ElementProxy._prefixMappings.put(namespace, prefix.intern());
- if (prefix.length() == 0) {
- ElementProxy._prefixMappingsBindings.put(namespace, "xmlns");
- } else {
- ElementProxy._prefixMappingsBindings.put(namespace, ("xmlns:"+prefix).intern());
- }
- }
+ prefixMappings.put(namespace, prefix);
+ }
+
+ /**
+ * This method registers the default prefixes.
+ */
+ public static void registerDefaultPrefixes() throws XMLSecurityException {
+ setDefaultPrefix("http://www.w3.org/2000/09/xmldsig#", "ds");
+ setDefaultPrefix("http://www.w3.org/2001/04/xmlenc#", "xenc");
+ setDefaultPrefix("http://www.w3.org/2009/xmlenc11#", "xenc11");
+ setDefaultPrefix("http://www.xmlsecurity.org/experimental#", "experimental");
+ setDefaultPrefix("http://www.w3.org/2002/04/xmldsig-filter2", "dsig-xpath-old");
+ setDefaultPrefix("http://www.w3.org/2002/06/xmldsig-filter2", "dsig-xpath");
+ setDefaultPrefix("http://www.w3.org/2001/10/xml-exc-c14n#", "ec");
+ setDefaultPrefix(
+ "http://www.nue.et-inf.uni-siegen.de/~geuer-pollmann/#xpathFilter", "xx"
+ );
+ }
/**
* Method getDefaultPrefix
@@ -533,10 +512,19 @@
* @return the default prefix bind to this element.
*/
public static String getDefaultPrefix(String namespace) {
- return ElementProxy._prefixMappings.get(namespace);
+ return prefixMappings.get(namespace);
}
- public static String getDefaultPrefixBindings(String namespace) {
- return ElementProxy._prefixMappingsBindings.get(namespace);
+ protected void setLocalIdAttribute(String attrName, String value) {
+
+ if (value != null) {
+ Attr attr = getDocument().createAttributeNS(null, attrName);
+ attr.setValue(value);
+ getElement().setAttributeNodeNS(attr);
+ getElement().setIdAttributeNode(attr, true);
+ }
+ else {
+ getElement().removeAttributeNS(null, attrName);
+ }
}
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java Wed Jun 19 11:04:39 2013 +0100
@@ -2,21 +2,23 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package com.sun.org.apache.xml.internal.security.utils;
@@ -31,202 +33,136 @@
*/
public class I18n {
- /** Field NOT_INITIALIZED_MSG */
- public static final String NOT_INITIALIZED_MSG =
- "You must initialize the xml-security library correctly before you use it. "
- + "Call the static method \"com.sun.org.apache.xml.internal.security.Init.init();\" to do that "
- + "before you use any functionality from that library.";
+ /** Field NOT_INITIALIZED_MSG */
+ public static final String NOT_INITIALIZED_MSG =
+ "You must initialize the xml-security library correctly before you use it. "
+ + "Call the static method \"com.sun.org.apache.xml.internal.security.Init.init();\" to do that "
+ + "before you use any functionality from that library.";
- /** Field defaultLanguageCode */
- private static String defaultLanguageCode; // will be set in static{} block
-
- /** Field defaultCountryCode */
- private static String defaultCountryCode; // will be set in static{} block
-
- /** Field resourceBundle */
- private static ResourceBundle resourceBundle =
- ResourceBundle.getBundle
- (Constants.exceptionMessagesResourceBundleBase, Locale.US);
+ /** Field resourceBundle */
+ private static ResourceBundle resourceBundle;
- /** Field alreadyInitialized */
- private static boolean alreadyInitialized = false;
-
- /** Field _languageCode */
- private static String _languageCode = null;
-
- /** Field _countryCode */
- private static String _countryCode = null;
+ /** Field alreadyInitialized */
+ private static boolean alreadyInitialized = false;
- /**
- * Constructor I18n
- *
- */
- private I18n() {
-
- // we don't allow instantiation
- }
+ /**
+ * Constructor I18n
+ *
+ */
+ private I18n() {
+ // we don't allow instantiation
+ }
- /**
- * Method translate
- *
- * translates a message ID into an internationalized String, see alse
- * XMLSecurityException.getExceptionMEssage(). The strings are
- * stored in the ResourceBundle, which is identified in
- * exceptionMessagesResourceBundleBase
- *
- * @param message
- * @param args is an Object[] array of strings which are inserted into the String which is retrieved from the ResouceBundle
- * @return message translated
- */
- public static String translate(String message, Object[] args) {
- return getExceptionMessage(message, args);
- }
-
- /**
- * Method translate
- *
- * translates a message ID into an internationalized String, see alse
- * XMLSecurityException.getExceptionMEssage()
- *
- * @param message
- * @return message translated
- */
- public static String translate(String message) {
- return getExceptionMessage(message);
- }
+ /**
+ * Method translate
+ *
+ * translates a message ID into an internationalized String, see alse
+ * XMLSecurityException.getExceptionMEssage(). The strings are
+ * stored in the ResourceBundle, which is identified in
+ * exceptionMessagesResourceBundleBase
+ *
+ * @param message
+ * @param args is an Object[] array of strings which are inserted into
+ * the String which is retrieved from the ResouceBundle
+ * @return message translated
+ */
+ public static String translate(String message, Object[] args) {
+ return getExceptionMessage(message, args);
+ }
- /**
- * Method getExceptionMessage
- *
- * @param msgID
- * @return message translated
- *
- */
- public static String getExceptionMessage(String msgID) {
-
- try {
- String s = resourceBundle.getString(msgID);
-
- return s;
- } catch (Throwable t) {
- if (com.sun.org.apache.xml.internal.security.Init.isInitialized()) {
- return "No message with ID \"" + msgID
- + "\" found in resource bundle \""
- + Constants.exceptionMessagesResourceBundleBase + "\"";
- }
- return I18n.NOT_INITIALIZED_MSG;
- }
- }
-
- /**
- * Method getExceptionMessage
- *
- * @param msgID
- * @param originalException
- * @return message translated
- */
- public static String getExceptionMessage(String msgID,
- Exception originalException) {
+ /**
+ * Method translate
+ *
+ * translates a message ID into an internationalized String, see also
+ * XMLSecurityException.getExceptionMessage()
+ *
+ * @param message
+ * @return message translated
+ */
+ public static String translate(String message) {
+ return getExceptionMessage(message);
+ }
- try {
- Object exArgs[] = { originalException.getMessage() };
- String s = MessageFormat.format(resourceBundle.getString(msgID),
- exArgs);
-
- return s;
- } catch (Throwable t) {
- if (com.sun.org.apache.xml.internal.security.Init.isInitialized()) {
- return "No message with ID \"" + msgID
- + "\" found in resource bundle \""
- + Constants.exceptionMessagesResourceBundleBase
- + "\". Original Exception was a "
- + originalException.getClass().getName() + " and message "
- + originalException.getMessage();
- }
- return I18n.NOT_INITIALIZED_MSG;
- }
- }
-
- /**
- * Method getExceptionMessage
- *
- * @param msgID
- * @param exArgs
- * @return message translated
- */
- public static String getExceptionMessage(String msgID, Object exArgs[]) {
-
- try {
- String s = MessageFormat.format(resourceBundle.getString(msgID),
- exArgs);
-
- return s;
- } catch (Throwable t) {
- if (com.sun.org.apache.xml.internal.security.Init.isInitialized()) {
- return "No message with ID \"" + msgID
- + "\" found in resource bundle \""
- + Constants.exceptionMessagesResourceBundleBase + "\"";
- }
- return I18n.NOT_INITIALIZED_MSG;
- }
- }
+ /**
+ * Method getExceptionMessage
+ *
+ * @param msgID
+ * @return message translated
+ *
+ */
+ public static String getExceptionMessage(String msgID) {
+ try {
+ return resourceBundle.getString(msgID);
+ } catch (Throwable t) {
+ if (com.sun.org.apache.xml.internal.security.Init.isInitialized()) {
+ return "No message with ID \"" + msgID
+ + "\" found in resource bundle \""
+ + Constants.exceptionMessagesResourceBundleBase + "\"";
+ }
+ return I18n.NOT_INITIALIZED_MSG;
+ }
+ }
-//
-// Commented out because it modifies shared static
-// state which could be maliciously called by untrusted code
-//
-// /**
-// * Method init
-// *
-// * @param _defaultLanguageCode
-// * @param _defaultCountryCode
-// */
-// public static void init(String _defaultLanguageCode,
-// String _defaultCountryCode) {
-//
-// I18n.defaultLanguageCode = _defaultLanguageCode;
-//
-// if (I18n.defaultLanguageCode == null) {
-// I18n.defaultLanguageCode = Locale.getDefault().getLanguage();
-// }
-//
-// I18n.defaultCountryCode = _defaultCountryCode;
-//
-// if (I18n.defaultCountryCode == null) {
-// I18n.defaultCountryCode = Locale.getDefault().getCountry();
-// }
-//
-// initLocale(I18n.defaultLanguageCode, I18n.defaultCountryCode);
-// }
+ /**
+ * Method getExceptionMessage
+ *
+ * @param msgID
+ * @param originalException
+ * @return message translated
+ */
+ public static String getExceptionMessage(String msgID, Exception originalException) {
+ try {
+ Object exArgs[] = { originalException.getMessage() };
+ return MessageFormat.format(resourceBundle.getString(msgID), exArgs);
+ } catch (Throwable t) {
+ if (com.sun.org.apache.xml.internal.security.Init.isInitialized()) {
+ return "No message with ID \"" + msgID
+ + "\" found in resource bundle \""
+ + Constants.exceptionMessagesResourceBundleBase
+ + "\". Original Exception was a "
+ + originalException.getClass().getName() + " and message "
+ + originalException.getMessage();
+ }
+ return I18n.NOT_INITIALIZED_MSG;
+ }
+ }
-//
-// Commented out because it modifies shared static
-// state which could be maliciously called by untrusted code
-//
-// /**
-// * Method initLocale
-// *
-// * @param languageCode
-// * @param countryCode
-// */
-// public static void initLocale(String languageCode, String countryCode) {
-//
-// if (alreadyInitialized && languageCode.equals(_languageCode)
-// && countryCode.equals(_countryCode)) {
-// return;
-// }
-//
-// if ((languageCode != null) && (countryCode != null)
-// && (languageCode.length() > 0) && (countryCode.length() > 0)) {
-// _languageCode = languageCode;
-// _countryCode = countryCode;
-// } else {
-// _countryCode = I18n.defaultCountryCode;
-// _languageCode = I18n.defaultLanguageCode;
-// }
-//
-// I18n.resourceBundle =
-// ResourceBundle.getBundle(Constants.exceptionMessagesResourceBundleBase,
-// new Locale(_languageCode, _countryCode));
-// }
+ /**
+ * Method getExceptionMessage
+ *
+ * @param msgID
+ * @param exArgs
+ * @return message translated
+ */
+ public static String getExceptionMessage(String msgID, Object exArgs[]) {
+ try {
+ return MessageFormat.format(resourceBundle.getString(msgID), exArgs);
+ } catch (Throwable t) {
+ if (com.sun.org.apache.xml.internal.security.Init.isInitialized()) {
+ return "No message with ID \"" + msgID
+ + "\" found in resource bundle \""
+ + Constants.exceptionMessagesResourceBundleBase + "\"";
+ }
+ return I18n.NOT_INITIALIZED_MSG;
+ }
+ }
+
+ /**
+ * Method init
+ *
+ * @param languageCode
+ * @param countryCode
+ */
+ public synchronized static void init(String languageCode, String countryCode) {
+ if (alreadyInitialized) {
+ return;
+ }
+
+ I18n.resourceBundle =
+ ResourceBundle.getBundle(
+ Constants.exceptionMessagesResourceBundleBase,
+ new Locale(languageCode, countryCode)
+ );
+ alreadyInitialized = true;
+ }
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java Wed Jun 19 11:04:39 2013 +0100
@@ -21,14 +21,15 @@
package com.sun.org.apache.xml.internal.security.utils;
-
import java.io.IOException;
import java.io.OutputStream;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -60,6 +61,12 @@
}
});
+ private static volatile String dsPrefix = "ds";
+ private static volatile String xencPrefix = "xenc";
+
+ private static final java.util.logging.Logger log =
+ java.util.logging.Logger.getLogger(XMLUtils.class.getName());
+
/**
* Constructor XMLUtils
*
@@ -68,6 +75,23 @@
// we don't allow instantiation
}
+
+ /**
+ * Set the prefix for the digital signature namespace
+ * @param prefix the new prefix for the digital signature namespace
+ */
+ public static void setDsPrefix(String prefix) {
+ dsPrefix = prefix;
+ }
+
+ /**
+ * Set the prefix for the encryption namespace
+ * @param prefix the new prefix for the encryption namespace
+ */
+ public static void setXencPrefix(String prefix) {
+ xencPrefix = prefix;
+ }
+
public static Element getNextElement(Node el) {
while ((el!=null) && (el.getNodeType()!=Node.ELEMENT_NODE)) {
el=el.getNextSibling();
@@ -230,9 +254,8 @@
return sb.toString();
}
+ static Map namePrefixes=new HashMap();
- static String dsPrefix=null;
- static Map namePrefixes=new HashMap();
/**
* Creates an Element in the XML Signature specification namespace.
*
@@ -261,31 +284,38 @@
return doc.createElementNS(Constants.SignatureSpecNS, namePrefix);
}
- /**
- * Returns true if the element is in XML Signature namespace and the local
- * name equals the supplied one.
- *
- * @param element
- * @param localName
- * @return true if the element is in XML Signature namespace and the local name equals the supplied one
- */
- public static boolean elementIsInSignatureSpace(Element element,
- String localName) {
- return ElementProxy.checker.isNamespaceElement(element, localName, Constants.SignatureSpecNS);
- }
+ /**
+ * Returns true if the element is in XML Signature namespace and the local
+ * name equals the supplied one.
+ *
+ * @param element
+ * @param localName
+ * @return true if the element is in XML Signature namespace and the local name equals the supplied one
+ */
+ public static boolean elementIsInSignatureSpace(Element element, String localName) {
+ if (element == null) {
+ return false;
+ }
- /**
- * Returns true if the element is in XML Encryption namespace and the local
- * name equals the supplied one.
- *
- * @param element
- * @param localName
- * @return true if the element is in XML Encryption namespace and the local name equals the supplied one
- */
- public static boolean elementIsInEncryptionSpace(Element element,
- String localName) {
- return ElementProxy.checker.isNamespaceElement(element, localName, EncryptionConstants.EncryptionSpecNS);
- }
+ return Constants.SignatureSpecNS.equals(element.getNamespaceURI())
+ && element.getLocalName().equals(localName);
+ }
+
+ /**
+ * Returns true if the element is in XML Encryption namespace and the local
+ * name equals the supplied one.
+ *
+ * @param element
+ * @param localName
+ * @return true if the element is in XML Encryption namespace and the local name equals the supplied one
+ */
+ public static boolean elementIsInEncryptionSpace(Element element, String localName) {
+ if (element == null) {
+ return false;
+ }
+ return EncryptionConstants.EncryptionSpecNS.equals(element.getNamespaceURI())
+ && element.getLocalName().equals(localName);
+ }
/**
* This method returns the owner document of a particular node.
@@ -504,45 +534,45 @@
} while (true);
}
- /**
- * @param sibling
- * @param nodeName
- * @param number
- * @return nodes with the constrain
- */
- public static Element selectDsNode(Node sibling, String nodeName, int number) {
- while (sibling!=null) {
- if (ElementProxy.checker.isNamespaceElement(sibling, nodeName, Constants.SignatureSpecNS )) {
- if (number==0){
- return (Element)sibling;
- }
- number--;
+ /**
+ * @param sibling
+ * @param nodeName
+ * @param number
+ * @return nodes with the constrain
+ */
+ public static Element selectDsNode(Node sibling, String nodeName, int number) {
+ while (sibling != null) {
+ if (Constants.SignatureSpecNS.equals(sibling.getNamespaceURI())
+ && sibling.getLocalName().equals(nodeName)) {
+ if (number == 0){
+ return (Element)sibling;
}
- sibling=sibling.getNextSibling();
+ number--;
+ }
+ sibling = sibling.getNextSibling();
}
return null;
- }
-
- /**
- * @param sibling
- * @param nodeName
- * @param number
- * @return nodes with the constrain
- */
+ }
- public static Element selectXencNode(Node sibling, String nodeName, int number) {
- while (sibling!=null) {
- if (ElementProxy.checker.isNamespaceElement(sibling, nodeName, EncryptionConstants.EncryptionSpecNS )) {
- if (number==0){
- return (Element)sibling;
- }
- number--;
+ /**
+ * @param sibling
+ * @param nodeName
+ * @param number
+ * @return nodes with the constrain
+ */
+ public static Element selectXencNode(Node sibling, String nodeName, int number) {
+ while (sibling != null) {
+ if (EncryptionConstants.EncryptionSpecNS.equals(sibling.getNamespaceURI())
+ && sibling.getLocalName().equals(nodeName)) {
+ if (number == 0){
+ return (Element)sibling;
}
- sibling=sibling.getNextSibling();
+ number--;
+ }
+ sibling = sibling.getNextSibling();
}
return null;
- }
-
+ }
/**
* @param sibling
@@ -581,62 +611,53 @@
return (Text)n;
}
- /**
- * @param sibling
- * @param uri
- * @param nodeName
- * @param number
- * @return nodes with the constrain
- */
- public static Element selectNode(Node sibling, String uri,String nodeName, int number) {
- while (sibling!=null) {
- if (ElementProxy.checker.isNamespaceElement(sibling, nodeName, uri)) {
- if (number==0){
- return (Element)sibling;
- }
- number--;
+ /**
+ * @param sibling
+ * @param uri
+ * @param nodeName
+ * @param number
+ * @return nodes with the constrain
+ */
+ public static Element selectNode(Node sibling, String uri, String nodeName, int number) {
+ while (sibling != null) {
+ if (sibling.getNamespaceURI() != null && sibling.getNamespaceURI().equals(uri)
+ && sibling.getLocalName().equals(nodeName)) {
+ if (number == 0){
+ return (Element)sibling;
}
- sibling=sibling.getNextSibling();
+ number--;
+ }
+ sibling = sibling.getNextSibling();
}
return null;
- }
+ }
+
+ /**
+ * @param sibling
+ * @param nodeName
+ * @return nodes with the constrain
+ */
+ public static Element[] selectDsNodes(Node sibling, String nodeName) {
+ return selectNodes(sibling,Constants.SignatureSpecNS, nodeName);
+ }
- /**
- * @param sibling
- * @param nodeName
- * @return nodes with the constrain
- */
- public static Element[] selectDsNodes(Node sibling,String nodeName) {
- return selectNodes(sibling,Constants.SignatureSpecNS,nodeName);
- }
- /**
- * @param sibling
- * @param uri
- * @param nodeName
- * @return nodes with the constrain
- */
- public static Element[] selectNodes(Node sibling,String uri,String nodeName) {
- int size=20;
- Element[] a= new Element[size];
- int curr=0;
- //List list=new ArrayList();
- while (sibling!=null) {
- if (ElementProxy.checker.isNamespaceElement(sibling, nodeName, uri)) {
- a[curr++]=(Element)sibling;
- if (size<=curr) {
- int cursize= size<<2;
- Element []cp=new Element[cursize];
- System.arraycopy(a,0,cp,0,size);
- a=cp;
- size=cursize;
- }
- }
- sibling=sibling.getNextSibling();
+ /**
+ * @param sibling
+ * @param uri
+ * @param nodeName
+ * @return nodes with the constrain
+ */
+ public static Element[] selectNodes(Node sibling, String uri, String nodeName) {
+ List list = new ArrayList();
+ while (sibling != null) {
+ if (sibling.getNamespaceURI() != null && sibling.getNamespaceURI().equals(uri)
+ && sibling.getLocalName().equals(nodeName)) {
+ list.add((Element)sibling);
+ }
+ sibling = sibling.getNextSibling();
}
- Element []af=new Element[curr];
- System.arraycopy(a,0,af,0,curr);
- return af;
- }
+ return list.toArray(new Element[list.size()]);
+ }
/**
* @param signatureElement
@@ -694,4 +715,127 @@
public static boolean ignoreLineBreaks() {
return ignoreLineBreaks;
}
+
+ /**
+ * This method is a tree-search to help prevent against wrapping attacks.
+ * It checks that no two Elements have ID Attributes that match the "value"
+ * argument, if this is the case then "false" is returned. Note that a
+ * return value of "true" does not necessarily mean that a matching Element
+ * has been found, just that no wrapping attack has been detected.
+ */
+ public static boolean protectAgainstWrappingAttack(Node startNode,
+ String value)
+ {
+ Node startParent = startNode.getParentNode();
+ Node processedNode = null;
+ Element foundElement = null;
+
+ String id = value.trim();
+ if (id.charAt(0) == '#') {
+ id = id.substring(1);
+ }
+
+ while (startNode != null) {
+ if (startNode.getNodeType() == Node.ELEMENT_NODE) {
+ Element se = (Element) startNode;
+
+ NamedNodeMap attributes = se.getAttributes();
+ if (attributes != null) {
+ for (int i = 0; i < attributes.getLength(); i++) {
+ Attr attr = (Attr)attributes.item(i);
+ if (attr.isId() && id.equals(attr.getValue())) {
+ if (foundElement == null) {
+ // Continue searching to find duplicates
+ foundElement = attr.getOwnerElement();
+ } else {
+ log.log(java.util.logging.Level.FINE, "Multiple elements with the same 'Id' attribute value!");
+ return false;
+ }
+ }
+ }
+ }
+ }
+
+ processedNode = startNode;
+ startNode = startNode.getFirstChild();
+
+ // no child, this node is done.
+ if (startNode == null) {
+ // close node processing, get sibling
+ startNode = processedNode.getNextSibling();
+ }
+
+ // no more siblings, get parent, all children
+ // of parent are processed.
+ while (startNode == null) {
+ processedNode = processedNode.getParentNode();
+ if (processedNode == startParent) {
+ return true;
+ }
+ // close parent node processing (processed node now)
+ startNode = processedNode.getNextSibling();
+ }
+ }
+ return true;
+ }
+
+ /**
+ * This method is a tree-search to help prevent against wrapping attacks.
+ * It checks that no other Element than the given "knownElement" argument
+ * has an ID attribute that matches the "value" argument, which is the ID
+ * value of "knownElement". If this is the case then "false" is returned.
+ */
+ public static boolean protectAgainstWrappingAttack(Node startNode,
+ Element knownElement,
+ String value)
+ {
+ Node startParent = startNode.getParentNode();
+ Node processedNode = null;
+
+ String id = value.trim();
+ if (id.charAt(0) == '#') {
+ id = id.substring(1);
+ }
+
+ while (startNode != null) {
+ if (startNode.getNodeType() == Node.ELEMENT_NODE) {
+ Element se = (Element) startNode;
+
+ NamedNodeMap attributes = se.getAttributes();
+ if (attributes != null) {
+ for (int i = 0; i < attributes.getLength(); i++) {
+ Attr attr = (Attr)attributes.item(i);
+ if (attr.isId() && id.equals(attr.getValue())
+ && se != knownElement)
+ {
+ log.log(java.util.logging.Level.FINE, "Multiple elements with the same 'Id' attribute value!");
+ return false;
+ }
+ }
+ }
+ }
+
+ processedNode = startNode;
+ startNode = startNode.getFirstChild();
+
+ // no child, this node is done.
+ if (startNode == null) {
+ // close node processing, get sibling
+ startNode = processedNode.getNextSibling();
+ }
+
+ // no more siblings, get parent, all children
+ // of parent are processed.
+ while (startNode == null) {
+ processedNode = processedNode.getParentNode();
+ if (processedNode == startParent) {
+ return true;
+ }
+ // close parent node processing (processed node now)
+ startNode = processedNode.getNextSibling();
+ }
+ }
+ return true;
+ }
+
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java Wed Jun 19 11:04:39 2013 +0100
@@ -2,21 +2,23 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package com.sun.org.apache.xml.internal.security.utils.resolver;
@@ -25,311 +27,318 @@
import java.util.Map;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverDirectHTTP;
+import com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverFragment;
+import com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverLocalFilesystem;
+import com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverXPointer;
import org.w3c.dom.Attr;
/**
* During reference validation, we have to retrieve resources from somewhere.
* This is done by retrieving a Resolver. The resolver needs two arguments: The
- * URI in which the link to the new resource is defined and the BaseURI of the
- * file/entity in which the URI occurs (the BaseURI is the same as the SystemId.
- *
- *
- * - Verschiedene Implementierungen k??nnen sich als Resolver registrieren.
- *
- Standardm????ig werden erste Implementierungen auf dem XML config file registrirt.
- *
- Der Benutzer kann bei Bedarf Implementierungen voranstellen oder anf??gen.
- *
- Implementierungen k??nnen mittels Features customized werden ??
- * (z.B. um Proxy-Passworter ??bergeben zu k??nnen).
- *
- Jede Implementierung bekommt das URI Attribut und den Base URI
- * ??bergeben und muss antworten, ob sie aufl??sen kann.
- *
- Die erste Implementierung, die die Aufgabe erf??llt, f??hrt die Aufl??sung durch.
- *
- *
- * @author $Author: mullan $
+ * URI in which the link to the new resource is defined and the baseURI of the
+ * file/entity in which the URI occurs (the baseURI is the same as the SystemId).
*/
public class ResourceResolver {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
+ /** {@link org.apache.commons.logging} logging facility */
+ private static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(ResourceResolver.class.getName());
- /** Field _alreadyInitialized */
- static boolean _alreadyInitialized = false;
+ /** these are the system-wide resolvers */
+ private static List resolverList = new ArrayList();
- /** these are the system-wide resolvers */
- static List _resolverVector = null;
-
- static boolean allThreadSafeInList=true;
-
- /** Field transformSpi */
- protected ResourceResolverSpi _resolverSpi = null;
+ /** Field resolverSpi */
+ private final ResourceResolverSpi resolverSpi;
- /**
- * Constructor ResourceResolver
- *
- * @param className
- * @throws ClassNotFoundException
- * @throws IllegalAccessException
- * @throws InstantiationException
- */
- private ResourceResolver(String className)
- throws ClassNotFoundException, IllegalAccessException,
- InstantiationException {
- this._resolverSpi =
- (ResourceResolverSpi) Class.forName(className).newInstance();
- }
+ /**
+ * Constructor ResourceResolver
+ *
+ * @param resourceResolver
+ */
+ public ResourceResolver(ResourceResolverSpi resourceResolver) {
+ this.resolverSpi = resourceResolver;
+ }
+
+ /**
+ * Method getInstance
+ *
+ * @param uri
+ * @param baseURI
+ * @return the instance
+ *
+ * @throws ResourceResolverException
+ */
+ public static final ResourceResolver getInstance(Attr uri, String baseURI)
+ throws ResourceResolverException {
+ return getInstance(uri, baseURI, false);
+ }
- /**
- * Constructor ResourceResolver
- *
- * @param resourceResolver
- */
- public ResourceResolver(ResourceResolverSpi resourceResolver) {
- this._resolverSpi = resourceResolver;
- }
-
+ /**
+ * Method getInstance
+ *
+ * @param uri
+ * @param baseURI
+ * @param secureValidation
+ * @return the instance
+ *
+ * @throws ResourceResolverException
+ */
+ public static final ResourceResolver getInstance(
+ Attr uri, String baseURI, boolean secureValidation
+ ) throws ResourceResolverException {
+ synchronized (resolverList) {
+ for (ResourceResolver resolver : resolverList) {
+ ResourceResolver resolverTmp = resolver;
+ if (!resolver.resolverSpi.engineIsThreadSafe()) {
+ try {
+ resolverTmp =
+ new ResourceResolver(resolver.resolverSpi.getClass().newInstance());
+ } catch (InstantiationException e) {
+ throw new ResourceResolverException("", e, uri, baseURI);
+ } catch (IllegalAccessException e) {
+ throw new ResourceResolverException("", e, uri, baseURI);
+ }
+ }
- /**
- * Method getInstance
- *
- * @param uri
- * @param BaseURI
- * @return the instnace
- *
- * @throws ResourceResolverException
- */
- public static final ResourceResolver getInstance(Attr uri, String BaseURI)
- throws ResourceResolverException {
- int length=ResourceResolver._resolverVector.size();
- for (int i = 0; i < length; i++) {
- ResourceResolver resolver =
- ResourceResolver._resolverVector.get(i);
- ResourceResolver resolverTmp=null;
- try {
- resolverTmp = allThreadSafeInList || resolver._resolverSpi.engineIsThreadSafe() ? resolver :
- new ResourceResolver((ResourceResolverSpi)resolver._resolverSpi.getClass().newInstance());
- } catch (InstantiationException e) {
- throw new ResourceResolverException("",e,uri,BaseURI);
- } catch (IllegalAccessException e) {
- throw new ResourceResolverException("",e,uri,BaseURI);
- }
-
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "check resolvability by class " + resolver._resolverSpi.getClass().getName());
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE,
+ "check resolvability by class " + resolverTmp.getClass().getName()
+ );
+ }
- if ((resolver != null) && resolverTmp.canResolve(uri, BaseURI)) {
- if (i!=0) {
- //update resolver.
- //System.out.println("Swaping");
- List resolverVector=getResolverVectorClone();
- resolverVector.remove(i);
- resolverVector.add(0,resolver);
- _resolverVector=resolverVector;
- } else {
- //System.out.println("hitting");
- }
+ resolverTmp.resolverSpi.secureValidation = secureValidation;
+ if ((resolverTmp != null) && resolverTmp.canResolve(uri, baseURI)) {
+ // Check to see whether the Resolver is allowed
+ if (secureValidation
+ && (resolverTmp.resolverSpi instanceof ResolverLocalFilesystem
+ || resolverTmp.resolverSpi instanceof ResolverDirectHTTP)) {
+ Object exArgs[] = { resolverTmp.resolverSpi.getClass().getName() };
+ throw new ResourceResolverException(
+ "signature.Reference.ForbiddenResolver", exArgs, uri, baseURI
+ );
+ }
+ return resolverTmp;
+ }
+ }
+ }
- return resolverTmp;
- }
- }
+ Object exArgs[] = { ((uri != null) ? uri.getNodeValue() : "null"), baseURI };
- Object exArgs[] = { ((uri != null)
- ? uri.getNodeValue()
- : "null"), BaseURI };
-
- throw new ResourceResolverException("utils.resolver.noClass", exArgs,
- uri, BaseURI);
- }
+ throw new ResourceResolverException("utils.resolver.noClass", exArgs, uri, baseURI);
+ }
- /**
- * Method getResolverVectorClone
- *
- * @return clone of _resolverVector
- */
- @SuppressWarnings("unchecked")
- private static List getResolverVectorClone() {
- return (List)((ArrayList)_resolverVector).clone();
- }
+ /**
+ * Method getInstance
+ *
+ * @param uri
+ * @param baseURI
+ * @param individualResolvers
+ * @return the instance
+ *
+ * @throws ResourceResolverException
+ */
+ public static ResourceResolver getInstance(
+ Attr uri, String baseURI, List individualResolvers
+ ) throws ResourceResolverException {
+ return getInstance(uri, baseURI, individualResolvers, false);
+ }
- /**
- * Method getInstance
- *
- * @param uri
- * @param BaseURI
- * @param individualResolvers
- * @return the instance
- *
- * @throws ResourceResolverException
- */
- public static final ResourceResolver getInstance(
- Attr uri, String BaseURI, List individualResolvers)
- throws ResourceResolverException {
- if (log.isLoggable(java.util.logging.Level.FINE)) {
-
- log.log(java.util.logging.Level.FINE, "I was asked to create a ResourceResolver and got " + (individualResolvers==null? 0 : individualResolvers.size()) );
- log.log(java.util.logging.Level.FINE, " extra resolvers to my existing " + ResourceResolver._resolverVector.size() + " system-wide resolvers");
- }
-
- // first check the individual Resolvers
- int size=0;
- if ((individualResolvers != null) && ((size=individualResolvers.size()) > 0)) {
- for (int i = 0; i < size; i++) {
- ResourceResolver resolver =
- individualResolvers.get(i);
+ /**
+ * Method getInstance
+ *
+ * @param uri
+ * @param baseURI
+ * @param individualResolvers
+ * @param secureValidation
+ * @return the instance
+ *
+ * @throws ResourceResolverException
+ */
+ public static ResourceResolver getInstance(
+ Attr uri, String baseURI, List individualResolvers, boolean secureValidation
+ ) throws ResourceResolverException {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE,
+ "I was asked to create a ResourceResolver and got "
+ + (individualResolvers == null ? 0 : individualResolvers.size())
+ );
+ }
- if (resolver != null) {
- String currentClass = resolver._resolverSpi.getClass().getName();
- if (log.isLoggable(java.util.logging.Level.FINE))
- log.log(java.util.logging.Level.FINE, "check resolvability by class " + currentClass);
+ // first check the individual Resolvers
+ if (individualResolvers != null) {
+ for (int i = 0; i < individualResolvers.size(); i++) {
+ ResourceResolver resolver = individualResolvers.get(i);
- if (resolver.canResolve(uri, BaseURI)) {
- return resolver;
- }
- }
- }
- }
+ if (resolver != null) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ String currentClass = resolver.resolverSpi.getClass().getName();
+ log.log(java.util.logging.Level.FINE, "check resolvability by class " + currentClass);
+ }
- return getInstance(uri,BaseURI);
- }
+ resolver.resolverSpi.secureValidation = secureValidation;
+ if (resolver.canResolve(uri, baseURI)) {
+ return resolver;
+ }
+ }
+ }
+ }
- /**
- * The init() function is called by com.sun.org.apache.xml.internal.security.Init.init()
- */
- public static void init() {
-
- if (!ResourceResolver._alreadyInitialized) {
- ResourceResolver._resolverVector = new ArrayList(10);
- _alreadyInitialized = true;
- }
- }
+ return getInstance(uri, baseURI, secureValidation);
+ }
/**
* Registers a ResourceResolverSpi class. This method logs a warning if
* the class cannot be registered.
*
- * @param className the name of the ResourceResolverSpi class to be
- * registered
+ * @param className the name of the ResourceResolverSpi class to be registered
*/
+ @SuppressWarnings("unchecked")
public static void register(String className) {
- register(className, false);
+ try {
+ Class resourceResolverClass =
+ (Class) Class.forName(className);
+ register(resourceResolverClass, false);
+ } catch (ClassNotFoundException e) {
+ log.log(java.util.logging.Level.WARNING, "Error loading resolver " + className + " disabling it");
+ }
}
/**
* Registers a ResourceResolverSpi class at the beginning of the provider
* list. This method logs a warning if the class cannot be registered.
*
- * @param className the name of the ResourceResolverSpi class to be
- * registered
+ * @param className the name of the ResourceResolverSpi class to be registered
*/
+ @SuppressWarnings("unchecked")
public static void registerAtStart(String className) {
- register(className, true);
+ try {
+ Class resourceResolverClass =
+ (Class) Class.forName(className);
+ register(resourceResolverClass, true);
+ } catch (ClassNotFoundException e) {
+ log.log(java.util.logging.Level.WARNING, "Error loading resolver " + className + " disabling it");
+ }
}
- private static void register(String className, boolean start) {
+ /**
+ * Registers a ResourceResolverSpi class. This method logs a warning if the class
+ * cannot be registered.
+ * @param className
+ * @param start
+ */
+ public static void register(Class className, boolean start) {
try {
- ResourceResolver resolver = new ResourceResolver(className);
+ ResourceResolverSpi resourceResolverSpi = className.newInstance();
+ register(resourceResolverSpi, start);
+ } catch (IllegalAccessException e) {
+ log.log(java.util.logging.Level.WARNING, "Error loading resolver " + className + " disabling it");
+ } catch (InstantiationException e) {
+ log.log(java.util.logging.Level.WARNING, "Error loading resolver " + className + " disabling it");
+ }
+ }
+
+ /**
+ * Registers a ResourceResolverSpi instance. This method logs a warning if the class
+ * cannot be registered.
+ * @param resourceResolverSpi
+ * @param start
+ */
+ public static void register(ResourceResolverSpi resourceResolverSpi, boolean start) {
+ synchronized(resolverList) {
if (start) {
- ResourceResolver._resolverVector.add(0, resolver);
- log.log(java.util.logging.Level.FINE, "registered resolver");
+ resolverList.add(0, new ResourceResolver(resourceResolverSpi));
} else {
- ResourceResolver._resolverVector.add(resolver);
+ resolverList.add(new ResourceResolver(resourceResolverSpi));
}
- if (!resolver._resolverSpi.engineIsThreadSafe()) {
- allThreadSafeInList=false;
+ }
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Registered resolver: " + resourceResolverSpi.toString());
}
- } catch (Exception e) {
- log.log(java.util.logging.Level.WARNING, "Error loading resolver " + className +" disabling it");
- } catch (NoClassDefFoundError e) {
- log.log(java.util.logging.Level.WARNING, "Error loading resolver " + className +" disabling it");
+ }
+
+ /**
+ * This method registers the default resolvers.
+ */
+ public static void registerDefaultResolvers() {
+ synchronized(resolverList) {
+ resolverList.add(new ResourceResolver(new ResolverFragment()));
+ resolverList.add(new ResourceResolver(new ResolverLocalFilesystem()));
+ resolverList.add(new ResourceResolver(new ResolverXPointer()));
+ resolverList.add(new ResourceResolver(new ResolverDirectHTTP()));
}
}
- /**
- * Method resolve
- *
- * @param uri
- * @param BaseURI
- * @return the resource
- *
- * @throws ResourceResolverException
- */
- public static XMLSignatureInput resolveStatic(Attr uri, String BaseURI)
- throws ResourceResolverException {
-
- ResourceResolver myResolver = ResourceResolver.getInstance(uri, BaseURI);
-
- return myResolver.resolve(uri, BaseURI);
- }
+ /**
+ * Method resolve
+ *
+ * @param uri
+ * @param baseURI
+ * @return the resource
+ *
+ * @throws ResourceResolverException
+ */
+ public XMLSignatureInput resolve(Attr uri, String baseURI)
+ throws ResourceResolverException {
+ return resolverSpi.engineResolve(uri, baseURI);
+ }
- /**
- * Method resolve
- *
- * @param uri
- * @param BaseURI
- * @return the resource
- *
- * @throws ResourceResolverException
- */
- public XMLSignatureInput resolve(Attr uri, String BaseURI)
- throws ResourceResolverException {
- return this._resolverSpi.engineResolve(uri, BaseURI);
- }
+ /**
+ * Method setProperty
+ *
+ * @param key
+ * @param value
+ */
+ public void setProperty(String key, String value) {
+ resolverSpi.engineSetProperty(key, value);
+ }
- /**
- * Method setProperty
- *
- * @param key
- * @param value
- */
- public void setProperty(String key, String value) {
- this._resolverSpi.engineSetProperty(key, value);
- }
+ /**
+ * Method getProperty
+ *
+ * @param key
+ * @return the value of the property
+ */
+ public String getProperty(String key) {
+ return resolverSpi.engineGetProperty(key);
+ }
- /**
- * Method getProperty
- *
- * @param key
- * @return the value of the property
- */
- public String getProperty(String key) {
- return this._resolverSpi.engineGetProperty(key);
- }
+ /**
+ * Method addProperties
+ *
+ * @param properties
+ */
+ public void addProperties(Map properties) {
+ resolverSpi.engineAddProperies(properties);
+ }
- /**
- * Method addProperties
- *
- * @param properties
- */
- public void addProperties(Map properties) {
- this._resolverSpi.engineAddProperies(properties);
- }
+ /**
+ * Method getPropertyKeys
+ *
+ * @return all property keys.
+ */
+ public String[] getPropertyKeys() {
+ return resolverSpi.engineGetPropertyKeys();
+ }
- /**
- * Method getPropertyKeys
- *
- * @return all property keys.
- */
- public String[] getPropertyKeys() {
- return this._resolverSpi.engineGetPropertyKeys();
- }
+ /**
+ * Method understandsProperty
+ *
+ * @param propertyToTest
+ * @return true if the resolver understands the property
+ */
+ public boolean understandsProperty(String propertyToTest) {
+ return resolverSpi.understandsProperty(propertyToTest);
+ }
- /**
- * Method understandsProperty
- *
- * @param propertyToTest
- * @return true if the resolver understands the property
- */
- public boolean understandsProperty(String propertyToTest) {
- return this._resolverSpi.understandsProperty(propertyToTest);
- }
-
- /**
- * Method canResolve
- *
- * @param uri
- * @param BaseURI
- * @return true if it can resolve the uri
- */
- private boolean canResolve(Attr uri, String BaseURI) {
- return this._resolverSpi.engineCanResolve(uri, BaseURI);
- }
+ /**
+ * Method canResolve
+ *
+ * @param uri
+ * @param baseURI
+ * @return true if it can resolve the uri
+ */
+ private boolean canResolve(Attr uri, String baseURI) {
+ return resolverSpi.engineCanResolve(uri, baseURI);
+ }
}
diff -r 5e467681e781 -r 47cb0bfa2f0d jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java Wed Jun 19 11:04:39 2013 +0100
@@ -43,6 +43,8 @@
/** Field _properties */
protected java.util.Map