diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2005-02-19 10:50:23 +0000 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2005-02-19 10:50:23 +0000 |
commit | d0746dc2a7ddce772d6b28622a6e12401a5a21d4 (patch) | |
tree | fb0d33575f5a6b33e8a14fd12eaccaa3d3e243c0 /java/util/logging/LogManager.java | |
parent | d53b33bb113f07eee51a9577dc0d9546206a9a91 (diff) | |
download | classpath-d0746dc2a7ddce772d6b28622a6e12401a5a21d4.tar.gz |
2005-02-19 Andrew John Hughes <gnu_andrew@member.fsf.org>
Merge from HEAD --> generics-branch for 2005/02/14-2005/02/18.
2005-02-18 Bryce McKinlay <mckinlay@redhat.com>
* java/util/LinkedHashMap (addEntry): Call remove() with key argument,
not the HashEntry. Reported by Jean-Marie White.
2005-02-18 Mark Wielaard <mark@klomp.org>
* doc/www.gnu.org/events/escape_fosdem05.wml: New event.
* doc/www.gnu.org/newsitems.txt: Add Escape the Java Trap.
* doc/www.gnu.org/events/events.wml: Likewise.
2005-02-18 Sven de Marothy <sven@physto.se>
* java/util/TimeZone.java,
(getDefaultDisplayName): Fix previous fix.
2005-02-18 David Gilbert <david.gilbert@object-refinery.com>
* java/awt/font/TransformAttribute.java,
(TransformAttribute(AffineTransform)): throw
IllegalArgumentException for null transform.
(getTransform): return a copy of transform.
Added doc comments to all.
2005-02-18 Sven de Marothy <sven@physto.se>
* java/util/TimeZone.java,
(getDefaultDisplayName): Don't print zero offsets.
2005-02-18 Robert Schuster <thebohemian@gmx.net>
* java/nio/charset/Charset.java (forName): Throws
IllegalArgumentException when argument is null
and added documentation.
2005-02-17 Mark Wielaard <mark@klomp.org>
* java/util/SimpleTimeZone.java (checkRule): Throw
IllegalArgumentException when month out of range.
2005-02-17 Sven de Marothy <sven@physto.se>
* java/util/GregorianCalendar.java,
(add): Don't set fields directly anymore. Use set()
2005-02-17 Ito Kazumitsu <kaz@maczuka.gcd.org>
* gnu/java/nio/channels/FileChannelImpl.java (write(ByteBuffer)):
Move the position of the source buffer forward.
2005-02-16 Andrew Haley <aph@redhat.com>
* javax/security/auth/Subject.java (doAsPrivileged): If acc is
null, create a new AccessControlContext.
* java/security/SecureClassLoader.java (protectionDomainCache):
new field.
(defineClass): Create a new protection domain and add it to our
cache.
* java/rmi/server/UnicastRemoteObject.java (exportObject): Call
addStub() to keep track of the stub we've exported.
(unexportObject): Call deleteStub().
* java/rmi/server/RemoteObject.java (stubs): New field.
(addStub): New method.
(deleteStub): New method.
(toStub): Rewrite.
* java/security/Permissions.java (PermissionsHash.implies):
Iterate over the collection and invoke implies() on each
element.
2005-02-16 Julian Scheid <julian@sektor37.de>
* gnu/java/nio/charset/UTF_8.java (decodeLoop): Set inPos to
in.position().
(encodeLoop): Likewise.
2005-02-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/Locale.java
Added two new String[] arrays for caching.
(getLocale(String)): Documentation.
(getLocale(String, String)): Documentation.
(getLocale(String, String, String)): Documentation.
(getISOCountries()): Now calls getISOStrings() and caches result.
(getISOLanguages()): Now calls getISOStrings() and caches result.
(getISOStrings(String)): Pulls all two-letter keys from the specified
hashtable in our locale information.
2005-02-16 Sven de Marothy <sven@physto.se>
* java/util/logging/LogManager.java
Reformatted.
(readConfiguration): If a logger for a key is not found, create one.
2005-02-16 Michael Koch <konqueror@gmx.de>
* scripts/checkstyle-config.xml: Activate JavadocStyle and
IllegalInstantiation tests.
* scripts/checkstyle-suppressions.xml: Suppress some more errors.
2005-02-16 Michael Koch <konqueror@gmx.de>
* gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
gnu/java/awt/peer/gtk/GdkFontPeer.java,
gnu/java/awt/peer/gtk/GdkGlyphVector.java,
gnu/java/awt/peer/gtk/GdkGraphics.java,
gnu/java/awt/peer/gtk/GdkGraphics2D.java,
gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java,
gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java,
gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,
gnu/java/awt/peer/gtk/GdkRobotPeer.java,
gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java,
gnu/java/awt/peer/gtk/GdkTextLayout.java,
gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkChoicePeer.java,
gnu/java/awt/peer/gtk/GtkClipboard.java,
gnu/java/awt/peer/gtk/GtkComponentPeer.java,
gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,
gnu/java/awt/peer/gtk/GtkFontPeer.java,
gnu/java/awt/peer/gtk/GtkLabelPeer.java,
gnu/java/awt/peer/gtk/GtkMenuBarPeer.java,
gnu/java/awt/peer/gtk/GtkMenuItemPeer.java,
gnu/java/awt/peer/gtk/GtkMenuPeer.java,
gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,
gnu/java/awt/peer/gtk/GtkScrollbarPeer.java,
gnu/java/awt/peer/gtk/GtkToolkit.java,
gnu/java/awt/peer/gtk/GtkWindowPeer.java:
Made checkstyle clean.
* gnu/java/awt/peer/gtk/package.html:
New file.
2005-02-16 Michael Koch <konqueror@gmx.de>
* java/awt/geom/Ellipse2D.java,
java/beans/PropertyDescriptor.java,
java/net/NetworkInterface.java,
java/nio/ByteBufferImpl.java,
java/nio/DoubleBufferImpl.java,
java/nio/FloatBufferImpl.java,
java/nio/IntBufferImpl.java,
java/nio/LongBufferImpl.java,
java/nio/ShortBufferImpl.java,
java/nio/channels/Channel.java,
java/util/Calendar.java,
java/util/Comparator.java,
java/util/Date.java,
java/util/SimpleTimeZone.java,
java/util/logging/FileHandler.java,
java/util/prefs/InvalidPreferencesFormatException.java,
java/util/prefs/Preferences.java,
javax/security/auth/callback/ConfirmationCallback.java,
javax/security/sasl/Sasl.java,
javax/security/sasl/SaslServerFactory.java,
javax/swing/JComponent.java,
javax/swing/JList.java,
javax/swing/JProgressBar.java,
javax/swing/JTree.java,
javax/swing/text/JTextComponent.java:
Fixed javadocs to contain valid (X)HTML.
2005-02-16 Michael Koch <konqueror@gmx.de>
* javax/xml/XMLConstants.java,
javax/xml/datatype/DatatypeConfigurationException.java,
javax/xml/datatype/DatatypeConstants.java,
javax/xml/datatype/DatatypeFactory.java,
javax/xml/datatype/Duration.java,
javax/xml/datatype/XMLGregorianCalendar.java,
javax/xml/namespace/NamespaceContext.java,
javax/xml/namespace/QName.java,
javax/xml/parsers/DocumentBuilder.java,
javax/xml/parsers/DocumentBuilderFactory.java,
javax/xml/parsers/FactoryConfigurationError.java,
javax/xml/parsers/ParserConfigurationException.java,
javax/xml/parsers/SAXParser.java,
javax/xml/parsers/SAXParserFactory.java,
javax/xml/transform/ErrorListener.java,
javax/xml/transform/OutputKeys.java,
javax/xml/transform/Result.java,
javax/xml/transform/Source.java,
javax/xml/transform/SourceLocator.java,
javax/xml/transform/Templates.java,
javax/xml/transform/Transformer.java,
javax/xml/transform/TransformerConfigurationException.java,
javax/xml/transform/TransformerException.java,
javax/xml/transform/TransformerFactory.java,
javax/xml/transform/TransformerFactoryConfigurationError.java,
javax/xml/transform/URIResolver.java,
javax/xml/transform/dom/DOMLocator.java,
javax/xml/transform/dom/DOMResult.java,
javax/xml/transform/dom/DOMSource.java,
javax/xml/transform/sax/SAXResult.java,
javax/xml/transform/sax/SAXSource.java,
javax/xml/transform/sax/SAXTransformerFactory.java,
javax/xml/transform/sax/TemplatesHandler.java,
javax/xml/transform/sax/TransformerHandler.java,
javax/xml/transform/stream/StreamResult.java,
javax/xml/transform/stream/StreamSource.java,
javax/xml/validation/Schema.java,
javax/xml/validation/SchemaFactory.java,
javax/xml/validation/TypeInfoProvider.java,
javax/xml/validation/Validator.java,
javax/xml/validation/ValidatorHandler.java,
javax/xml/xpath/XPathConstants.java,
javax/xml/xpath/XPathException.java,
javax/xml/xpath/XPathExpression.java,
javax/xml/xpath/XPathExpressionException.java,
javax/xml/xpath/XPathFactory.java,
javax/xml/xpath/XPathFactoryConfigurationException.java,
javax/xml/xpath/XPathFunction.java,
javax/xml/xpath/XPathFunctionException.java,
javax/xml/xpath/XPathFunctionResolver.java:
Fixed usage of @author tag.
2005-02-16 Michael Koch <konqueror@gmx.de>
* javax/XMLConstants.java,
javax/datatype/DatatypeConfigurationException.java,
javax/datatype/DatatypeConstants.java,
javax/datatype/DatatypeFactory.java,
javax/datatype/Duration.java,
javax/datatype/XMLGregorianCalendar.java,
javax/namespace/NamespaceContext.java,
javax/namespace/QName.java,
javax/parsers/DocumentBuilder.java,
javax/parsers/DocumentBuilderFactory.java,
javax/parsers/FactoryConfigurationError.java,
javax/parsers/ParserConfigurationException.java,
javax/parsers/SAXParser.java,
javax/parsers/SAXParserFactory.java,
javax/transform/ErrorListener.java,
javax/transform/OutputKeys.java,
javax/transform/Result.java,
javax/transform/Source.java,
javax/transform/SourceLocator.java,
javax/transform/Templates.java,
javax/transform/Transformer.java,
javax/transform/TransformerConfigurationException.java,
javax/transform/TransformerException.java,
javax/transform/TransformerFactory.java,
javax/transform/TransformerFactoryConfigurationError.java,
javax/transform/URIResolver.java,
javax/transform/dom/DOMLocator.java,
javax/transform/dom/DOMResult.java,
javax/transform/dom/DOMSource.java,
javax/transform/sax/SAXResult.java,
javax/transform/sax/SAXSource.java,
javax/transform/sax/SAXTransformerFactory.java,
javax/transform/sax/TemplatesHandler.java,
javax/transform/sax/TransformerHandler.java,
javax/transform/stream/StreamResult.java,
javax/transform/stream/StreamSource.java,
javax/validation/Schema.java,
javax/validation/SchemaFactory.java,
javax/validation/TypeInfoProvider.java,
javax/validation/Validator.java,
javax/validation/ValidatorHandler.java,
javax/xpath/XPathConstants.java,
javax/xpath/XPathException.java,
javax/xpath/XPathExpression.java,
javax/xpath/XPathExpressionException.java,
javax/xpath/XPathFactory.java,
javax/xpath/XPathFactoryConfigurationException.java,
javax/xpath/XPathFunction.java,
javax/xpath/XPathFunctionException.java,
javax/xpath/XPathFunctionResolver.java:
Fixed usage of @author tag.
2005-02-16 Michael Koch <konqueror@gmx.de>
* javax/accessibility/Accessible.java,
javax/accessibility/AccessibleAction.java,
javax/accessibility/AccessibleBundle.java,
javax/accessibility/AccessibleComponent.java,
javax/accessibility/AccessibleContext.java,
javax/accessibility/AccessibleEditableText.java,
javax/accessibility/AccessibleExtendedComponent.java,
javax/accessibility/AccessibleExtendedTable.java,
javax/accessibility/AccessibleHyperlink.java,
javax/accessibility/AccessibleHypertext.java,
javax/accessibility/AccessibleIcon.java,
javax/accessibility/AccessibleKeyBinding.java,
javax/accessibility/AccessibleRelation.java,
javax/accessibility/AccessibleRelationSet.java,
javax/accessibility/AccessibleResourceBundle.java,
javax/accessibility/AccessibleRole.java,
javax/accessibility/AccessibleSelection.java,
javax/accessibility/AccessibleState.java,
javax/accessibility/AccessibleStateSet.java,
javax/accessibility/AccessibleTable.java,
javax/accessibility/AccessibleTableModelChange.java,
javax/accessibility/AccessibleText.java,
javax/accessibility/AccessibleValue.java,
javax/imageio/IIOException.java,
javax/imageio/spi/IIOServiceProvider.java,
javax/imageio/spi/ImageInputStreamSpi.java,
javax/imageio/spi/ImageOutputStreamSpi.java,
javax/imageio/spi/ImageReaderWriterSpi.java,
javax/imageio/spi/ImageTranscoderSpi.java,
javax/imageio/spi/RegisterableService.java,
javax/imageio/spi/ServiceRegistry.java,
javax/imageio/stream/IIOByteBuffer.java,
javax/imageio/stream/ImageInputStream.java,
javax/imageio/stream/ImageOutputStream.java,
javax/naming/Binding.java,
javax/naming/CannotProceedException.java,
javax/naming/CompositeName.java,
javax/naming/CompoundName.java,
javax/naming/LinkException.java,
javax/naming/LinkRef.java,
javax/naming/NameClassPair.java,
javax/naming/Reference.java,
javax/naming/ReferralException.java,
javax/naming/directory/Attribute.java,
javax/naming/directory/AttributeModificationException.java,
javax/naming/directory/Attributes.java,
javax/naming/directory/DirContext.java,
javax/naming/directory/ModificationItem.java,
javax/naming/directory/SearchControls.java,
javax/naming/directory/SearchResult.java,
javax/naming/event/EventContext.java,
javax/naming/event/EventDirContext.java,
javax/naming/event/NamespaceChangeListener.java,
javax/naming/event/NamingExceptionEvent.java,
javax/naming/event/NamingListener.java,
javax/naming/event/ObjectChangeListener.java,
javax/naming/ldap/Control.java,
javax/naming/ldap/ExtendedResponse.java,
javax/naming/ldap/HasControls.java,
javax/naming/ldap/LdapContext.java,
javax/naming/ldap/UnsolicitedNotification.java,
javax/naming/ldap/UnsolicitedNotificationEvent.java,
javax/naming/ldap/UnsolicitedNotificationListener.java,
javax/naming/spi/DirectoryManager.java,
javax/naming/spi/ResolveResult.java,
javax/naming/spi/Resolver.java,
javax/swing/DefaultBoundedRangeModel.java,
javax/swing/JRadioButton.java,
javax/swing/JTextArea.java,
javax/swing/JToggleButton.java,
javax/swing/SpinnerListModel.java,
javax/swing/event/EventListenerList.java,
javax/swing/text/Utilities.java,
javax/swing/undo/UndoManager.java,
javax/swing/undo/UndoableEditSupport.java,
javax/transaction/HeuristicCommitException.java,
javax/transaction/HeuristicMixedException.java,
javax/transaction/HeuristicRollbackException.java,
javax/transaction/InvalidTransactionException.java,
javax/transaction/NotSupportedException.java,
javax/transaction/RollbackException.java,
javax/transaction/Status.java,
javax/transaction/Synchronization.java,
javax/transaction/SystemException.java,
javax/transaction/Transaction.java,
javax/transaction/TransactionManager.java,
javax/transaction/TransactionRequiredException.java,
javax/transaction/TransactionRolledbackException.java,
javax/transaction/UserTransaction.java,
javax/transaction/xa/XAException.java,
javax/transaction/xa/XAResource.java,
javax/transaction/xa/Xid.java:
Fixed usage of @author tag all over.
2005-02-16 Michael Koch <konqueror@gmx.de>
* java/applet/Applet.java,
java/beans/AppletInitializer.java,
java/beans/ExceptionListener.java,
java/beans/PropertyChangeEvent.java,
java/beans/PropertyChangeListenerProxy.java,
java/beans/PropertyChangeSupport.java,
java/beans/PropertyDescriptor.java,
java/beans/VetoableChangeListenerProxy.java,
java/beans/VetoableChangeSupport.java,
java/io/BufferedInputStream.java,
java/io/BufferedReader.java,
java/io/ByteArrayInputStream.java,
java/io/ByteArrayOutputStream.java,
java/io/CharArrayReader.java,
java/io/CharArrayWriter.java,
java/io/CharConversionException.java,
java/io/DataInput.java,
java/io/DataInputStream.java,
java/io/DataOutput.java,
java/io/DataOutputStream.java,
java/io/EOFException.java,
java/io/FileInputStream.java,
java/io/FileNotFoundException.java,
java/io/FileOutputStream.java,
java/io/FilenameFilter.java,
java/io/FilterInputStream.java,
java/io/FilterOutputStream.java,
java/io/FilterReader.java,
java/io/FilterWriter.java,
java/io/IOException.java,
java/io/InputStream.java,
java/io/InputStreamReader.java,
java/io/InterruptedIOException.java,
java/io/LineNumberInputStream.java,
java/io/LineNumberReader.java,
java/io/ObjectStreamException.java,
java/io/OptionalDataException.java,
java/io/OutputStream.java,
java/io/OutputStreamWriter.java,
java/io/PrintStream.java,
java/io/PrintWriter.java,
java/io/PushbackInputStream.java,
java/io/PushbackReader.java,
java/io/RandomAccessFile.java,
java/io/Reader.java,
java/io/SequenceInputStream.java,
java/io/Serializable.java,
java/io/StreamCorruptedException.java,
java/io/StreamTokenizer.java,
java/io/StringBufferInputStream.java,
java/io/StringWriter.java,
java/io/SyncFailedException.java,
java/io/UTFDataFormatException.java,
java/io/UnsupportedEncodingException.java,
java/io/WriteAbortedException.java,
java/io/Writer.java,
java/lang/AbstractMethodError.java,
java/lang/ArithmeticException.java,
java/lang/ArrayIndexOutOfBoundsException.java,
java/lang/ArrayStoreException.java,
java/lang/AssertionError.java,
java/lang/Boolean.java,
java/lang/Byte.java,
java/lang/ClassCastException.java,
java/lang/ClassCircularityError.java,
java/lang/ClassLoader.java,
java/lang/ClassNotFoundException.java,
java/lang/CloneNotSupportedException.java,
java/lang/Cloneable.java,
java/lang/Comparable.java,
java/lang/Compiler.java,
java/lang/Double.java,
java/lang/Error.java,
java/lang/Exception.java,
java/lang/ExceptionInInitializerError.java,
java/lang/Float.java,
java/lang/IllegalAccessError.java,
java/lang/IllegalAccessException.java,
java/lang/IllegalArgumentException.java,
java/lang/IllegalMonitorStateException.java,
java/lang/IllegalStateException.java,
java/lang/IllegalThreadStateException.java,
java/lang/IncompatibleClassChangeError.java,
java/lang/IndexOutOfBoundsException.java,
java/lang/InheritableThreadLocal.java,
java/lang/InstantiationError.java,
java/lang/InstantiationException.java,
java/lang/Integer.java,
java/lang/InternalError.java,
java/lang/InterruptedException.java,
java/lang/LinkageError.java,
java/lang/Long.java,
java/lang/NegativeArraySizeException.java,
java/lang/NoClassDefFoundError.java,
java/lang/NoSuchFieldError.java,
java/lang/NoSuchFieldException.java,
java/lang/NoSuchMethodError.java,
java/lang/NoSuchMethodException.java,
java/lang/NullPointerException.java,
java/lang/Number.java,
java/lang/NumberFormatException.java,
java/lang/OutOfMemoryError.java,
java/lang/Process.java,
java/lang/Runnable.java,
java/lang/Runtime.java,
java/lang/RuntimeException.java,
java/lang/RuntimePermission.java,
java/lang/SecurityException.java,
java/lang/SecurityManager.java,
java/lang/Short.java,
java/lang/StackOverflowError.java,
java/lang/StackTraceElement.java,
java/lang/StringBuffer.java,
java/lang/StringIndexOutOfBoundsException.java,
java/lang/ThreadDeath.java,
java/lang/ThreadGroup.java,
java/lang/Throwable.java,
java/lang/UnsatisfiedLinkError.java,
java/lang/UnsupportedOperationException.java,
java/lang/VerifyError.java,
java/lang/VirtualMachineError.java,
java/lang/reflect/AccessibleObject.java,
java/lang/reflect/Array.java,
java/lang/reflect/InvocationTargetException.java,
java/lang/reflect/Member.java,
java/lang/reflect/Modifier.java,
java/lang/reflect/Proxy.java,
java/lang/reflect/ReflectPermission.java,
java/lang/reflect/UndeclaredThrowableException.java,
java/math/BigInteger.java,
java/nio/ByteBufferHelper.java,
java/nio/channels/IllegalBlockingModeException.java,
java/nio/charset/spi/CharsetProvider.java,
java/security/AccessControlException.java,
java/security/AllPermission.java,
java/security/BasicPermission.java,
java/security/DigestException.java,
java/security/DigestInputStream.java,
java/security/DigestOutputStream.java,
java/security/GeneralSecurityException.java,
java/security/Guard.java,
java/security/GuardedObject.java,
java/security/InvalidAlgorithmParameterException.java,
java/security/InvalidKeyException.java,
java/security/InvalidParameterException.java,
java/security/Key.java,
java/security/KeyException.java,
java/security/KeyManagementException.java,
java/security/KeyStoreException.java,
java/security/MessageDigestSpi.java,
java/security/NoSuchAlgorithmException.java,
java/security/NoSuchProviderException.java,
java/security/Permission.java,
java/security/PermissionCollection.java,
java/security/Permissions.java,
java/security/Principal.java,
java/security/PrivateKey.java,
java/security/PrivilegedActionException.java,
java/security/ProviderException.java,
java/security/PublicKey.java,
java/security/SecureRandom.java,
java/security/SecureRandomSpi.java,
java/security/SignatureException.java,
java/security/SignatureSpi.java,
java/security/SignedObject.java,
java/security/Signer.java,
java/security/UnrecoverableKeyException.java,
java/security/UnresolvedPermission.java,
java/security/acl/AclNotFoundException.java,
java/security/acl/LastOwnerException.java,
java/security/acl/NotOwnerException.java,
java/security/cert/CertPath.java,
java/security/cert/CertPathBuilderException.java,
java/security/cert/CertPathValidatorException.java,
java/security/cert/CertStoreException.java,
java/text/BreakIterator.java,
java/text/ChoiceFormat.java,
java/text/CollationElementIterator.java,
java/text/CollationKey.java,
java/text/Collator.java,
java/text/DateFormat.java,
java/text/DateFormatSymbols.java,
java/text/FieldPosition.java,
java/text/Format.java,
java/text/MessageFormat.java,
java/text/ParseException.java,
java/text/ParsePosition.java,
java/text/StringCharacterIterator.java,
java/util/AbstractCollection.java,
java/util/AbstractList.java,
java/util/AbstractMap.java,
java/util/AbstractSequentialList.java,
java/util/AbstractSet.java,
java/util/ArrayList.java,
java/util/Arrays.java,
java/util/BitSet.java,
java/util/Collection.java,
java/util/Collections.java,
java/util/Comparator.java,
java/util/ConcurrentModificationException.java,
java/util/EmptyStackException.java,
java/util/Enumeration.java,
java/util/EventListener.java,
java/util/EventListenerProxy.java,
java/util/EventObject.java,
java/util/HashMap.java,
java/util/HashSet.java,
java/util/Hashtable.java,
java/util/IdentityHashMap.java,
java/util/Iterator.java,
java/util/LinkedHashSet.java,
java/util/LinkedList.java,
java/util/List.java,
java/util/ListIterator.java,
java/util/ListResourceBundle.java,
java/util/Map.java,
java/util/MissingResourceException.java,
java/util/NoSuchElementException.java,
java/util/Observable.java,
java/util/Observer.java,
java/util/Properties.java,
java/util/PropertyPermissionCollection.java,
java/util/RandomAccess.java,
java/util/Set.java,
java/util/SortedMap.java,
java/util/SortedSet.java,
java/util/Stack.java,
java/util/StringTokenizer.java,
java/util/TooManyListenersException.java,
java/util/TreeMap.java,
java/util/TreeSet.java,
java/util/Vector.java,
java/util/logging/Level.java,
java/util/prefs/BackingStoreException.java:
Fixed @author tag all over.
2005-02-16 Michael Koch <konqueror@gmx.de>
* java/awt/AWTError.java,
java/awt/AWTEvent.java,
java/awt/AWTEventMulticaster.java,
java/awt/AWTException.java,
java/awt/AWTKeyStroke.java,
java/awt/AWTPermission.java,
java/awt/ActiveEvent.java,
java/awt/Adjustable.java,
java/awt/AlphaComposite.java,
java/awt/AttributeValue.java,
java/awt/BorderLayout.java,
java/awt/BufferCapabilities.java,
java/awt/Button.java,
java/awt/Canvas.java,
java/awt/CheckboxGroup.java,
java/awt/CheckboxMenuItem.java,
java/awt/Color.java,
java/awt/ColorPaintContext.java,
java/awt/Component.java,
java/awt/ComponentOrientation.java,
java/awt/Composite.java,
java/awt/CompositeContext.java,
java/awt/Container.java,
java/awt/ContainerOrderFocusTraversalPolicy.java,
java/awt/DefaultFocusTraversalPolicy.java,
java/awt/Dialog.java,
java/awt/Dimension.java,
java/awt/DisplayMode.java,
java/awt/FileDialog.java,
java/awt/FontFormatException.java,
java/awt/Graphics.java,
java/awt/Graphics2D.java,
java/awt/GraphicsConfigTemplate.java,
java/awt/GraphicsConfiguration.java,
java/awt/GraphicsDevice.java,
java/awt/GridBagLayout.java,
java/awt/GridBagLayoutInfo.java,
java/awt/GridLayout.java,
java/awt/HeadlessException.java,
java/awt/IllegalComponentStateException.java,
java/awt/Image.java,
java/awt/Insets.java,
java/awt/ItemSelectable.java,
java/awt/JobAttributes.java,
java/awt/KeyEventDispatcher.java,
java/awt/KeyEventPostProcessor.java,
java/awt/KeyboardFocusManager.java,
java/awt/Label.java,
java/awt/LayoutManager.java,
java/awt/MenuBar.java,
java/awt/MenuComponent.java,
java/awt/MenuContainer.java,
java/awt/PageAttributes.java,
java/awt/Paint.java,
java/awt/PaintContext.java,
java/awt/Panel.java,
java/awt/Point.java,
java/awt/Polygon.java,
java/awt/PrintGraphics.java,
java/awt/PrintJob.java,
java/awt/Rectangle.java,
java/awt/RenderingHints.java,
java/awt/Shape.java,
java/awt/Stroke.java,
java/awt/SystemColor.java,
java/awt/Toolkit.java,
java/awt/Transparency.java,
java/awt/Window.java,
java/awt/color/CMMException.java,
java/awt/color/ColorSpace.java,
java/awt/color/ICC_ColorSpace.java,
java/awt/color/ICC_Profile.java,
java/awt/color/ProfileDataException.java,
java/awt/datatransfer/FlavorTable.java,
java/awt/datatransfer/MimeTypeParseException.java,
java/awt/datatransfer/Transferable.java,
java/awt/datatransfer/UnsupportedFlavorException.java,
java/awt/dnd/Autoscroll.java,
java/awt/dnd/DnDConstants.java,
java/awt/dnd/DragGestureListener.java,
java/awt/dnd/DragSourceAdapter.java,
java/awt/dnd/DragSourceDropEvent.java,
java/awt/dnd/DragSourceListener.java,
java/awt/dnd/DragSourceMotionListener.java,
java/awt/dnd/DropTargetAdapter.java,
java/awt/dnd/DropTargetContext.java,
java/awt/dnd/DropTargetListener.java,
java/awt/dnd/InvalidDnDOperationException.java,
java/awt/dnd/MouseDragGestureRecognizer.java,
java/awt/dnd/peer/DropTargetContextPeer.java,
java/awt/event/AWTEventListener.java,
java/awt/event/AWTEventListenerProxy.java,
java/awt/event/ActionEvent.java,
java/awt/event/AdjustmentEvent.java,
java/awt/event/AdjustmentListener.java,
java/awt/event/ComponentAdapter.java,
java/awt/event/ComponentEvent.java,
java/awt/event/ComponentListener.java,
java/awt/event/ContainerAdapter.java,
java/awt/event/ContainerEvent.java,
java/awt/event/ContainerListener.java,
java/awt/event/FocusAdapter.java,
java/awt/event/FocusEvent.java,
java/awt/event/FocusListener.java,
java/awt/event/InputEvent.java,
java/awt/event/InputMethodEvent.java,
java/awt/event/InputMethodListener.java,
java/awt/event/InvocationEvent.java,
java/awt/event/ItemEvent.java,
java/awt/event/ItemListener.java,
java/awt/event/KeyAdapter.java,
java/awt/event/KeyEvent.java,
java/awt/event/KeyListener.java,
java/awt/event/MouseAdapter.java,
java/awt/event/MouseEvent.java,
java/awt/event/MouseListener.java,
java/awt/event/MouseMotionAdapter.java,
java/awt/event/MouseMotionListener.java,
java/awt/event/MouseWheelEvent.java,
java/awt/event/MouseWheelListener.java,
java/awt/event/PaintEvent.java,
java/awt/event/TextEvent.java,
java/awt/event/TextListener.java,
java/awt/event/WindowAdapter.java,
java/awt/event/WindowEvent.java,
java/awt/event/WindowFocusListener.java,
java/awt/event/WindowListener.java,
java/awt/event/WindowStateListener.java,
java/awt/font/TextHitInfo.java,
java/awt/geom/CubicCurve2D.java,
java/awt/geom/Dimension2D.java,
java/awt/geom/Ellipse2D.java,
java/awt/geom/IllegalPathStateException.java,
java/awt/geom/Line2D.java,
java/awt/geom/NoninvertibleTransformException.java,
java/awt/geom/PathIterator.java,
java/awt/geom/Point2D.java,
java/awt/geom/QuadCurve2D.java,
java/awt/geom/RectangularShape.java,
java/awt/geom/RoundRectangle2D.java,
java/awt/im/InputContext.java,
java/awt/im/InputMethodHighlight.java,
java/awt/im/InputMethodRequests.java,
java/awt/im/InputSubset.java,
java/awt/im/spi/InputMethod.java,
java/awt/im/spi/InputMethodDescriptor.java,
java/awt/image/BandCombineOp.java,
java/awt/image/BandedSampleModel.java,
java/awt/image/ByteLookupTable.java,
java/awt/image/ComponentSampleModel.java,
java/awt/image/DataBuffer.java,
java/awt/image/DataBufferByte.java,
java/awt/image/DataBufferDouble.java,
java/awt/image/DataBufferFloat.java,
java/awt/image/DataBufferInt.java,
java/awt/image/DataBufferShort.java,
java/awt/image/DataBufferUShort.java,
java/awt/image/ImagingOpException.java,
java/awt/image/Kernel.java,
java/awt/image/LookupTable.java,
java/awt/image/MultiPixelPackedSampleModel.java,
java/awt/image/PackedColorModel.java,
java/awt/image/PixelInterleavedSampleModel.java,
java/awt/image/RGBImageFilter.java,
java/awt/image/Raster.java,
java/awt/image/RasterFormatException.java,
java/awt/image/SampleModel.java,
java/awt/image/ShortLookupTable.java,
java/awt/image/SinglePixelPackedSampleModel.java,
java/awt/image/WritableRaster.java,
java/awt/print/PrinterAbortException.java,
java/awt/print/PrinterException.java,
java/awt/print/PrinterIOException.java:
Fixed @author tag all over.
2005-02-16 Michael Koch <konqueror@gmx.de>
* java/awt/EventQueue.java: Reworked import statements.
* java/lang/StringBuilder.java
(DEFAULT_CAPACITY): Reordered modifiers.
* java/text/SimpleDateFormat.java: Reworked import statements.
Fixed one littel formatting issue.
(formatData): Removed a useless comment.
* javax/imageio/ImageIO.java: Reworked import statements.
* javax/swing/text/StringContent.java: Likewise.
* javax/swing/JTextField.java: Likewise.
(notifyAction): Added javadoc.
2005-02-15 Mark Wielaard <mark@klomp.org>
* java/util/jar/Attributes.java (Name.CLASS_PATH): Document that
file path elements are separated by spaces.
2005-02-15 Mark Wielaard <mark@klomp.org>
* javax/net/ssl/SSLContext.java (getInstance): Add exception message
and/or cause before throwing.
2005-02-15 Mark Wielaard <mark@klomp.org>
* java/net/URLClassLoader.java (JarURLLoader.JarURLLoader): Just use
space for parsing CLASS_PATH attribute.
2005-02-15 Andrew Haley <aph@redhat.com>
* java/net/URLClassLoader.java
(URLLoader.getClassPath): New method.
(JarURLLoader.JarURLLoader): Read mainfest to parse "Class-Path"
attribute and add URLs for each entry.
(JarURLLoader.classPath): New field.
(JarURLLoader.getClassPath): New method.
(addURLImpl): Scan through the list of extraUrls in the new
loader, adding them to our urlinfos.
(definePackage, findURLResource, findResources): Use
urlinfos.size(), not urls.size().
2005-02-14 Tom Tromey <tromey@redhat.com>
* java/net/URLClassLoader.java (URLLoader(URLClassLoader, URL,
URL)): New constructor.
2005-02-14 Mark Wielaard <mark@klomp.org>
* java/net/URLClassLoader.java (findClass): Throw
ClassNotFoundExceptions including urls, plus parent using toString().
(thisString): New field.
(toString): New method.
* java/lang/ClassLoader (defaultGetSystemClassLoader): Only install
ExtensionClassLoader when there are actual extension URLs.
2005-02-14 Mark Wielaard <mark@klomp.org>
* native/jni/xmlj/.cvsignore: Add *.o, *.a, *.lo, *.la, .libs, .deps.
Diffstat (limited to 'java/util/logging/LogManager.java')
-rw-r--r-- | java/util/logging/LogManager.java | 450 |
1 files changed, 212 insertions, 238 deletions
diff --git a/java/util/logging/LogManager.java b/java/util/logging/LogManager.java index 85a9f4cb7..d771a7015 100644 --- a/java/util/logging/LogManager.java +++ b/java/util/logging/LogManager.java @@ -103,17 +103,14 @@ public class LogManager * The singleton LogManager instance. */ private static LogManager logManager; - /** * The registered named loggers; maps the name of a Logger to * a WeakReference to it. */ private Map loggers; - final Logger rootLogger; - /** * The properties for the logging framework which have been * read in last. @@ -132,20 +129,19 @@ public class LogManager * behave differently from the reference implementation in * this case. */ - private final PropertyChangeSupport pcs - = new PropertyChangeSupport(/* source bean */ LogManager.class); + private final PropertyChangeSupport pcs = new PropertyChangeSupport( /* source bean */ + LogManager.class); protected LogManager() { if (logManager != null) - throw new IllegalStateException( - "there can be only one LogManager; use LogManager.getLogManager()"); + throw new IllegalStateException("there can be only one LogManager; use LogManager.getLogManager()"); logManager = this; loggers = new java.util.HashMap(); rootLogger = new Logger("", null); addLogger(rootLogger); - + /* Make sure that Logger.global has the rootLogger as its parent. * * Logger.global is set during class initialization of Logger, @@ -166,7 +162,6 @@ public class LogManager Logger.getLogger("global").setUseParentHandlers(true); } - /** * Returns the globally shared LogManager instance. */ @@ -176,32 +171,30 @@ public class LogManager } static - { - makeLogManager(); - - /* The Javadoc description of the class explains - * what is going on here. - */ - Object configurator = createInstance( - System.getProperty("java.util.logging.config.class"), - /* must be instance of */ Object.class); - - try - { - if (configurator == null) - getLogManager().readConfiguration(); - } - catch (IOException ex) { - /* FIXME: Is it ok to ignore exceptions here? */ + makeLogManager(); + + /* The Javadoc description of the class explains + * what is going on here. + */ + Object configurator = createInstance(System.getProperty("java.util.logging.config.class"), + /* must be instance of */ Object.class); + + try + { + if (configurator == null) + getLogManager().readConfiguration(); + } + catch (IOException ex) + { + /* FIXME: Is it ok to ignore exceptions here? */ + } } - } - private static LogManager makeLogManager() { - String managerClassName; - LogManager manager; + String managerClassName; + LogManager manager; managerClassName = System.getProperty("java.util.logging.manager"); manager = (LogManager) createInstance(managerClassName, LogManager.class); @@ -210,12 +203,11 @@ public class LogManager if (managerClassName != null) System.err.println("WARNING: System property \"java.util.logging.manager\"" - + " should be the name of a subclass of java.util.logging.LogManager"); + + " should be the name of a subclass of java.util.logging.LogManager"); return new LogManager(); } - /** * Registers a listener which will be notified when the * logging properties are re-read. @@ -228,7 +220,6 @@ public class LogManager pcs.addPropertyChangeListener(listener); } - /** * Unregisters a listener. * @@ -242,7 +233,6 @@ public class LogManager pcs.removePropertyChangeListener(listener); } - /** * Adds a named logger. If a logger with the same name has * already been registered, the method returns <code>false</code> @@ -271,9 +261,8 @@ public class LogManager * that LogManager does its synchronization on the globally * shared instance of LogManager. */ - String name; - WeakReference ref; + WeakReference ref; /* This will throw a NullPointerException if logger is null, * as required by the API specification. @@ -282,18 +271,18 @@ public class LogManager ref = (WeakReference) loggers.get(name); if (ref != null) - { - if (ref.get() != null) - return false; + { + if (ref.get() != null) + return false; - /* There has been a logger under this name in the past, - * but it has been garbage collected. - */ - loggers.remove(ref); - } + /* There has been a logger under this name in the past, + * but it has been garbage collected. + */ + loggers.remove(ref); + } /* Adding a named logger requires a security permission. */ - if ((name != null) && !name.equals("")) + if ((name != null) && ! name.equals("")) checkAccess(); Logger parent = findAncestor(logger); @@ -308,27 +297,28 @@ public class LogManager * its parent to "foo.bar". */ if (parent != rootLogger) - { - for (Iterator iter = loggers.keySet().iterator(); iter.hasNext();) { - Logger possChild = (Logger) ((WeakReference) loggers.get(iter.next())).get(); - if ((possChild == null) || (possChild == logger) || (possChild.getParent() != parent)) - continue; + for (Iterator iter = loggers.keySet().iterator(); iter.hasNext();) + { + Logger possChild = (Logger) ((WeakReference) loggers.get(iter.next())) + .get(); + if ((possChild == null) || (possChild == logger) + || (possChild.getParent() != parent)) + continue; - if (!possChild.getName().startsWith(name)) - continue; + if (! possChild.getName().startsWith(name)) + continue; - if (possChild.getName().charAt(name.length()) != '.') - continue; + if (possChild.getName().charAt(name.length()) != '.') + continue; - possChild.setParent(logger); + possChild.setParent(logger); + } } - } return true; } - /** * Finds the closest ancestor for a logger among the currently * registered ones. For example, if the currently registered @@ -348,40 +338,39 @@ public class LogManager private synchronized Logger findAncestor(Logger child) { String childName = child.getName(); - int childNameLength = childName.length(); + int childNameLength = childName.length(); Logger best = rootLogger; - int bestNameLength = 0; + int bestNameLength = 0; - Logger cand; - String candName; - int candNameLength; + Logger cand; + String candName; + int candNameLength; if (child == rootLogger) return null; for (Iterator iter = loggers.keySet().iterator(); iter.hasNext();) - { - candName = (String) iter.next(); - candNameLength = candName.length(); - - if (candNameLength > bestNameLength - && childNameLength > candNameLength - && childName.startsWith(candName) - && childName.charAt(candNameLength) == '.') { - cand = (Logger) ((WeakReference) loggers.get(candName)).get(); - if ((cand == null) || (cand == child)) - continue; + candName = (String) iter.next(); + candNameLength = candName.length(); + + if (candNameLength > bestNameLength + && childNameLength > candNameLength + && childName.startsWith(candName) + && childName.charAt(candNameLength) == '.') + { + cand = (Logger) ((WeakReference) loggers.get(candName)).get(); + if ((cand == null) || (cand == child)) + continue; - bestNameLength = candName.length(); - best = cand; + bestNameLength = candName.length(); + best = cand; + } } - } return best; } - /** * Returns a Logger given its name. * @@ -395,7 +384,7 @@ public class LogManager */ public synchronized Logger getLogger(String name) { - WeakReference ref; + WeakReference ref; /* Throw a NullPointerException if name is null. */ name.getClass(); @@ -407,7 +396,6 @@ public class LogManager return null; } - /** * Returns an Enumeration of currently registered Logger names. * Since other threads can register loggers at any time, the @@ -421,7 +409,6 @@ public class LogManager return Collections.enumeration(loggers.keySet()); } - /** * Resets the logging configuration by removing all handlers for * registered named loggers and setting their level to <code>null</code>. @@ -431,8 +418,7 @@ public class LogManager * the caller is not granted the permission to control * the logging infrastructure. */ - public synchronized void reset() - throws SecurityException + public synchronized void reset() throws SecurityException { /* Throw a SecurityException if the caller does not have the * permission to control the logging infrastructure. @@ -443,26 +429,25 @@ public class LogManager Iterator iter = loggers.values().iterator(); while (iter.hasNext()) - { - WeakReference ref; - Logger logger; - - ref = (WeakReference) iter.next(); - if (ref != null) { - logger = (Logger) ref.get(); + WeakReference ref; + Logger logger; - if (logger == null) - iter.remove(); - else if (logger != rootLogger) - logger.setLevel(null); + ref = (WeakReference) iter.next(); + if (ref != null) + { + logger = (Logger) ref.get(); + + if (logger == null) + iter.remove(); + else if (logger != rootLogger) + logger.setLevel(null); + } } - } rootLogger.setLevel(Level.INFO); } - /** * Configures the logging framework by reading a configuration file. * The name and location of this file are specified by the system @@ -488,97 +473,99 @@ public class LogManager public synchronized void readConfiguration() throws IOException, SecurityException { - String path; - InputStream inputStream; + String path; + InputStream inputStream; path = System.getProperty("java.util.logging.config.file"); if ((path == null) || (path.length() == 0)) - { - String url = (System.getProperty("gnu.classpath.home.url") - + "/logging.properties"); - inputStream = new URL(url).openStream(); - } + { + String url = (System.getProperty("gnu.classpath.home.url") + + "/logging.properties"); + inputStream = new URL(url).openStream(); + } else - { inputStream = new java.io.FileInputStream(path); - } try - { - readConfiguration(inputStream); - } + { + readConfiguration(inputStream); + } finally - { - /* Close the stream in order to save - * resources such as file descriptors. - */ - inputStream.close(); - } + { + /* Close the stream in order to save + * resources such as file descriptors. + */ + inputStream.close(); + } } - public synchronized void readConfiguration(InputStream inputStream) throws IOException, SecurityException - { - Properties newProperties; - Enumeration keys; + { + Properties newProperties; + Enumeration keys; checkAccess(); newProperties = new Properties(); newProperties.load(inputStream); - this.properties = newProperties; + this.properties = newProperties; keys = newProperties.propertyNames(); while (keys.hasMoreElements()) - { - String key = ((String) keys.nextElement()).trim(); - String value = newProperties.getProperty(key); - - if (value == null) - continue; - - value = value.trim(); - - if("handlers".equals(key)) - { - StringTokenizer tokenizer = new StringTokenizer(value); - while(tokenizer.hasMoreTokens()) - { - String handlerName = tokenizer.nextToken(); - try - { - Class handlerClass = Class.forName(handlerName); - getLogger("").addHandler((Handler)handlerClass.newInstance()); - } - catch (ClassCastException ex) - { - System.err.println("[LogManager] class " + handlerName + " is not subclass of java.util.logging.Handler"); - } - catch (Exception ex) - { - //System.out.println("[LogManager.readConfiguration]"+ex); - } - } - } - - if (key.endsWith(".level")) { - String loggerName = key.substring(0, key.length() - 6); - Logger logger = getLogger(loggerName); - if (logger != null) - { - try + String key = ((String) keys.nextElement()).trim(); + String value = newProperties.getProperty(key); + + if (value == null) + continue; + + value = value.trim(); + + if ("handlers".equals(key)) { - logger.setLevel(Level.parse(value)); + StringTokenizer tokenizer = new StringTokenizer(value); + while (tokenizer.hasMoreTokens()) + { + String handlerName = tokenizer.nextToken(); + try + { + Class handlerClass = Class.forName(handlerName); + getLogger("").addHandler((Handler) handlerClass + .newInstance()); + } + catch (ClassCastException ex) + { + System.err.println("[LogManager] class " + handlerName + + " is not subclass of java.util.logging.Handler"); + } + catch (Exception ex) + { + //System.out.println("[LogManager.readConfiguration]"+ex); + } + } } - catch (Exception _) + + if (key.endsWith(".level")) { - //System.out.println("[LogManager.readConfiguration] "+_); + String loggerName = key.substring(0, key.length() - 6); + Logger logger = getLogger(loggerName); + + if (logger == null) + { + logger = Logger.getLogger(loggerName); + addLogger(logger); + } + try + { + logger.setLevel(Level.parse(value)); + } + catch (Exception _) + { + //System.out.println("[LogManager.readConfiguration] "+_); + } + continue; } - continue; - } } - } /* The API specification does not talk about the * property name that is distributed with the @@ -589,7 +576,6 @@ public class LogManager pcs.firePropertyChange(null, null, null); } - /** * Returns the value of a configuration property as a String. */ @@ -601,7 +587,6 @@ public class LogManager return null; } - /** * Returns the value of a configuration property as an integer. * This function is a helper used by the Classpath implementation @@ -617,16 +602,15 @@ public class LogManager static int getIntProperty(String name, int defaultValue) { try - { - return Integer.parseInt(getLogManager().getProperty(name)); - } + { + return Integer.parseInt(getLogManager().getProperty(name)); + } catch (Exception ex) - { - return defaultValue; - } + { + return defaultValue; + } } - /** * Returns the value of a configuration property as an integer, * provided it is inside the acceptable range. @@ -646,7 +630,7 @@ public class LogManager * or if it is greater than the maximum value. */ static int getIntPropertyClamped(String name, int defaultValue, - int minValue, int maxValue) + int minValue, int maxValue) { int val = getIntProperty(name, defaultValue); if ((val < minValue) || (val > maxValue)) @@ -654,7 +638,6 @@ public class LogManager return val; } - /** * Returns the value of a configuration property as a boolean. * This function is a helper used by the Classpath implementation @@ -670,17 +653,15 @@ public class LogManager static boolean getBooleanProperty(String name, boolean defaultValue) { try - { - return (new Boolean(getLogManager().getProperty(name))) - .booleanValue(); - } + { + return (new Boolean(getLogManager().getProperty(name))).booleanValue(); + } catch (Exception ex) - { - return defaultValue; - } + { + return defaultValue; + } } - /** * Returns the value of a configuration property as a Level. * This function is a helper used by the Classpath implementation @@ -697,16 +678,15 @@ public class LogManager static Level getLevelProperty(String propertyName, Level defaultValue) { try - { - return Level.parse(getLogManager().getProperty(propertyName)); - } + { + return Level.parse(getLogManager().getProperty(propertyName)); + } catch (Exception ex) - { - return defaultValue; - } + { + return defaultValue; + } } - /** * Returns the value of a configuration property as a Class. * This function is a helper used by the Classpath implementation @@ -724,64 +704,60 @@ public class LogManager Class usingClass = null; try - { - String propertyValue = logManager.getProperty(propertyName); - if (propertyValue != null) - usingClass = Class.forName(propertyValue); - if (usingClass != null) - return usingClass; - } + { + String propertyValue = logManager.getProperty(propertyName); + if (propertyValue != null) + usingClass = Class.forName(propertyValue); + if (usingClass != null) + return usingClass; + } catch (Exception _) - { - } + { + } return defaultValue; } - - static final Object getInstanceProperty(String propertyName, - Class ofClass, - Class defaultClass) + static final Object getInstanceProperty(String propertyName, Class ofClass, + Class defaultClass) { Class klass = getClassProperty(propertyName, defaultClass); if (klass == null) return null; try - { - Object obj = klass.newInstance(); - if (ofClass.isInstance(obj)) - return obj; - } + { + Object obj = klass.newInstance(); + if (ofClass.isInstance(obj)) + return obj; + } catch (Exception _) - { - } + { + } if (defaultClass == null) return null; try - { - return defaultClass.newInstance(); - } + { + return defaultClass.newInstance(); + } catch (java.lang.InstantiationException ex) - { - throw new RuntimeException(ex.getMessage()); - } + { + throw new RuntimeException(ex.getMessage()); + } catch (java.lang.IllegalAccessException ex) - { - throw new RuntimeException(ex.getMessage()); - } + { + throw new RuntimeException(ex.getMessage()); + } } - /** * An instance of <code>LoggingPermission("control")</code> * that is shared between calls to <code>checkAccess()</code>. */ - private static final LoggingPermission controlPermission - = new LoggingPermission("control", null); - + private static final LoggingPermission controlPermission = new LoggingPermission("control", + null); /** * Checks whether the current security context allows changing @@ -793,21 +769,19 @@ public class LogManager * the caller is not granted the permission to control * the logging infrastructure. */ - public void checkAccess() - throws SecurityException + public void checkAccess() throws SecurityException { SecurityManager sm = System.getSecurityManager(); if (sm != null) sm.checkPermission(controlPermission); } - - /** + /** * Creates a new instance of a class specified by name. * * @param className the name of the class of which a new instance * should be created. - * + * * @param ofClass the class to which the new instance should * be either an instance or an instance of a subclass. * FIXME: This description is just terrible. @@ -820,26 +794,26 @@ public class LogManager */ static final Object createInstance(String className, Class ofClass) { - Class klass; + Class klass; if ((className == null) || (className.length() == 0)) return null; try - { - klass = Class.forName(className); - if (!ofClass.isAssignableFrom(klass)) - return null; + { + klass = Class.forName(className); + if (! ofClass.isAssignableFrom(klass)) + return null; - return klass.newInstance(); - } + return klass.newInstance(); + } catch (Exception _) - { - return null; - } + { + return null; + } catch (java.lang.LinkageError _) - { - return null; - } + { + return null; + } } } |