aboutsummaryrefslogtreecommitdiff
path: root/libjava/classpath/javax/swing
diff options
context:
space:
mode:
authorAndrew John Hughes <ahughes@redhat.com>2011-01-11 19:46:05 +0000
committerAndrew John Hughes <gandalf@gcc.gnu.org>2011-01-11 19:46:05 +0000
commitdc6715320db92089b3c1b046157b56b5680738a5 (patch)
tree0da7dbb2f6c016ebe1a6d0bf012840bd76da9170 /libjava/classpath/javax/swing
parent9a270ad3c0ba0eb21d09657f8fb3a7786a69ec5d (diff)
downloadgcc-dc6715320db92089b3c1b046157b56b5680738a5.zip
gcc-dc6715320db92089b3c1b046157b56b5680738a5.tar.gz
gcc-dc6715320db92089b3c1b046157b56b5680738a5.tar.bz2
Normalise whitespace in GNU Classpath.
2010-06-03 Andrew John Hughes <ahughes@redhat.com> * examples/gnu/classpath/examples/CORBA/NamingService/Demo.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/Demo.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPass.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturn.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNode.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisException.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisExceptionHelper.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterImplBase.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterStub.java, * examples/gnu/classpath/examples/CORBA/swing/x5/CanvasWorld.java, * examples/gnu/classpath/examples/CORBA/swing/x5/ChatConstants.java, * examples/gnu/classpath/examples/CORBA/swing/x5/ClientFrame.java, * examples/gnu/classpath/examples/CORBA/swing/x5/Demo.java, * examples/gnu/classpath/examples/CORBA/swing/x5/GameManager.java, * examples/gnu/classpath/examples/CORBA/swing/x5/GameManagerImpl.java, * examples/gnu/classpath/examples/CORBA/swing/x5/IorReader.java, * examples/gnu/classpath/examples/CORBA/swing/x5/OrbStarter.java, * examples/gnu/classpath/examples/CORBA/swing/x5/Player.java, * examples/gnu/classpath/examples/CORBA/swing/x5/PlayerImpl.java, * examples/gnu/classpath/examples/CORBA/swing/x5/PlayingDesk.java, * examples/gnu/classpath/examples/CORBA/swing/x5/State.java, * examples/gnu/classpath/examples/CORBA/swing/x5/X5Server.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_GameManagerImpl_Tie.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_GameManager_Stub.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_PlayerImpl_Tie.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_Player_Stub.java, * examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java, * examples/gnu/classpath/examples/awt/Demo.java, * examples/gnu/classpath/examples/awt/HintingDemo.java, * examples/gnu/classpath/examples/datatransfer/Demo.java, * examples/gnu/classpath/examples/html/Demo.java, * examples/gnu/classpath/examples/java2d/J2dBenchmark.java, * examples/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java, * examples/gnu/classpath/examples/java2d/JNIOverhead.java, * examples/gnu/classpath/examples/jawt/DemoJAWT.java, * examples/gnu/classpath/examples/management/TestClassLoading.java, * examples/gnu/classpath/examples/management/TestCompilation.java, * examples/gnu/classpath/examples/management/TestGarbageCollector.java, * examples/gnu/classpath/examples/management/TestMemory.java, * examples/gnu/classpath/examples/management/TestMemoryManager.java, * examples/gnu/classpath/examples/management/TestMemoryPool.java, * examples/gnu/classpath/examples/management/TestThread.java, * examples/gnu/classpath/examples/midi/Demo.java, * examples/gnu/classpath/examples/print/Demo.java, * examples/gnu/classpath/examples/sound/AudioPlayerSample.java, * examples/gnu/classpath/examples/swing/BrowserEditorKit.java, * examples/gnu/classpath/examples/swing/ButtonDemo.java, * examples/gnu/classpath/examples/swing/ComboBoxDemo.java, * examples/gnu/classpath/examples/swing/Demo.java, * examples/gnu/classpath/examples/swing/DemoFactory.java, * examples/gnu/classpath/examples/swing/DocumentFilterDemo.java, * examples/gnu/classpath/examples/swing/FileChooserDemo.java, * examples/gnu/classpath/examples/swing/HtmlDemo.java, * examples/gnu/classpath/examples/swing/ListDemo.java, * examples/gnu/classpath/examples/swing/MetalThemeEditor.java, * examples/gnu/classpath/examples/swing/NavigationFilterDemo.java, * examples/gnu/classpath/examples/swing/ScrollBarDemo.java, * examples/gnu/classpath/examples/swing/SliderDemo.java, * examples/gnu/classpath/examples/swing/SpinnerDemo.java, * examples/gnu/classpath/examples/swing/TabbedPaneDemo.java, * examples/gnu/classpath/examples/swing/TableDemo.java, * examples/gnu/classpath/examples/swing/TextAreaDemo.java, * examples/gnu/classpath/examples/swing/TextFieldDemo.java, * examples/gnu/classpath/examples/swing/TreeDemo.java, * external/jsr166/java/util/ArrayDeque.java, * external/jsr166/java/util/concurrent/ArrayBlockingQueue.java, * external/jsr166/java/util/concurrent/ConcurrentHashMap.java, * external/jsr166/java/util/concurrent/ConcurrentSkipListMap.java, * external/jsr166/java/util/concurrent/ConcurrentSkipListSet.java, * external/jsr166/java/util/concurrent/CopyOnWriteArraySet.java, * external/jsr166/java/util/concurrent/CyclicBarrier.java, * external/jsr166/java/util/concurrent/DelayQueue.java, * external/jsr166/java/util/concurrent/Executors.java, * external/jsr166/java/util/concurrent/FutureTask.java, * external/jsr166/java/util/concurrent/LinkedBlockingDeque.java, * external/jsr166/java/util/concurrent/LinkedBlockingQueue.java, * external/jsr166/java/util/concurrent/PriorityBlockingQueue.java, * external/jsr166/java/util/concurrent/ScheduledExecutorService.java, * external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java, * external/jsr166/java/util/concurrent/Semaphore.java, * external/jsr166/java/util/concurrent/SynchronousQueue.java, * external/jsr166/java/util/concurrent/ThreadPoolExecutor.java, * external/jsr166/java/util/concurrent/atomic/AtomicInteger.java, * external/jsr166/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java, * external/jsr166/java/util/concurrent/atomic/AtomicLong.java, * external/jsr166/java/util/concurrent/atomic/AtomicLongFieldUpdater.java, * external/jsr166/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java, * external/jsr166/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java, * external/jsr166/java/util/concurrent/locks/AbstractQueuedSynchronizer.java, * external/jsr166/java/util/concurrent/locks/ReentrantReadWriteLock.java, * external/relaxngDatatype/org/relaxng/datatype/Datatype.java, * external/relaxngDatatype/org/relaxng/datatype/DatatypeBuilder.java, * external/relaxngDatatype/org/relaxng/datatype/DatatypeException.java, * external/relaxngDatatype/org/relaxng/datatype/DatatypeLibrary.java, * external/relaxngDatatype/org/relaxng/datatype/DatatypeLibraryFactory.java, * external/relaxngDatatype/org/relaxng/datatype/DatatypeStreamingValidator.java, * external/relaxngDatatype/org/relaxng/datatype/ValidationContext.java, * external/relaxngDatatype/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java, * external/relaxngDatatype/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java, * external/relaxngDatatype/org/relaxng/datatype/helpers/StreamingValidatorImpl.java, * external/sax/org/xml/sax/AttributeList.java, * external/sax/org/xml/sax/Attributes.java, * external/sax/org/xml/sax/ContentHandler.java, * external/sax/org/xml/sax/DTDHandler.java, * external/sax/org/xml/sax/DocumentHandler.java, * external/sax/org/xml/sax/EntityResolver.java, * external/sax/org/xml/sax/ErrorHandler.java, * external/sax/org/xml/sax/HandlerBase.java, * external/sax/org/xml/sax/InputSource.java, * external/sax/org/xml/sax/Locator.java, * external/sax/org/xml/sax/Parser.java, * external/sax/org/xml/sax/SAXException.java, * external/sax/org/xml/sax/SAXNotRecognizedException.java, * external/sax/org/xml/sax/SAXNotSupportedException.java, * external/sax/org/xml/sax/SAXParseException.java, * external/sax/org/xml/sax/XMLReader.java, * external/sax/org/xml/sax/ext/Attributes2.java, * external/sax/org/xml/sax/ext/Attributes2Impl.java, * external/sax/org/xml/sax/ext/DeclHandler.java, * external/sax/org/xml/sax/ext/DefaultHandler2.java, * external/sax/org/xml/sax/ext/EntityResolver2.java, * external/sax/org/xml/sax/ext/LexicalHandler.java, * external/sax/org/xml/sax/ext/Locator2.java, * external/sax/org/xml/sax/ext/Locator2Impl.java, * external/sax/org/xml/sax/helpers/AttributeListImpl.java, * external/sax/org/xml/sax/helpers/AttributesImpl.java, * external/sax/org/xml/sax/helpers/DefaultHandler.java, * external/sax/org/xml/sax/helpers/LocatorImpl.java, * external/sax/org/xml/sax/helpers/NamespaceSupport.java, * external/sax/org/xml/sax/helpers/NewInstance.java, * external/sax/org/xml/sax/helpers/ParserAdapter.java, * external/sax/org/xml/sax/helpers/ParserFactory.java, * external/sax/org/xml/sax/helpers/XMLFilterImpl.java, * external/sax/org/xml/sax/helpers/XMLReaderAdapter.java, * external/sax/org/xml/sax/helpers/XMLReaderFactory.java, * external/w3c_dom/org/w3c/dom/Attr.java, * external/w3c_dom/org/w3c/dom/CDATASection.java, * external/w3c_dom/org/w3c/dom/CharacterData.java, * external/w3c_dom/org/w3c/dom/Comment.java, * external/w3c_dom/org/w3c/dom/DOMConfiguration.java, * external/w3c_dom/org/w3c/dom/DOMError.java, * external/w3c_dom/org/w3c/dom/DOMErrorHandler.java, * external/w3c_dom/org/w3c/dom/DOMException.java, * external/w3c_dom/org/w3c/dom/DOMImplementation.java, * external/w3c_dom/org/w3c/dom/DOMImplementationList.java, * external/w3c_dom/org/w3c/dom/DOMImplementationSource.java, * external/w3c_dom/org/w3c/dom/DOMLocator.java, * external/w3c_dom/org/w3c/dom/DOMStringList.java, * external/w3c_dom/org/w3c/dom/Document.java, * external/w3c_dom/org/w3c/dom/DocumentFragment.java, * external/w3c_dom/org/w3c/dom/DocumentType.java, * external/w3c_dom/org/w3c/dom/Element.java, * external/w3c_dom/org/w3c/dom/Entity.java, * external/w3c_dom/org/w3c/dom/EntityReference.java, * external/w3c_dom/org/w3c/dom/NameList.java, * external/w3c_dom/org/w3c/dom/NamedNodeMap.java, * external/w3c_dom/org/w3c/dom/Node.java, * external/w3c_dom/org/w3c/dom/NodeList.java, * external/w3c_dom/org/w3c/dom/Notation.java, * external/w3c_dom/org/w3c/dom/ProcessingInstruction.java, * external/w3c_dom/org/w3c/dom/Text.java, * external/w3c_dom/org/w3c/dom/TypeInfo.java, * external/w3c_dom/org/w3c/dom/UserDataHandler.java, * external/w3c_dom/org/w3c/dom/bootstrap/DOMImplementationRegistry.java, * external/w3c_dom/org/w3c/dom/css/CSS2Properties.java, * external/w3c_dom/org/w3c/dom/css/CSSCharsetRule.java, * external/w3c_dom/org/w3c/dom/css/CSSFontFaceRule.java, * external/w3c_dom/org/w3c/dom/css/CSSImportRule.java, * external/w3c_dom/org/w3c/dom/css/CSSMediaRule.java, * external/w3c_dom/org/w3c/dom/css/CSSPageRule.java, * external/w3c_dom/org/w3c/dom/css/CSSPrimitiveValue.java, * external/w3c_dom/org/w3c/dom/css/CSSRule.java, * external/w3c_dom/org/w3c/dom/css/CSSRuleList.java, * external/w3c_dom/org/w3c/dom/css/CSSStyleDeclaration.java, * external/w3c_dom/org/w3c/dom/css/CSSStyleRule.java, * external/w3c_dom/org/w3c/dom/css/CSSStyleSheet.java, * external/w3c_dom/org/w3c/dom/css/CSSUnknownRule.java, * external/w3c_dom/org/w3c/dom/css/CSSValue.java, * external/w3c_dom/org/w3c/dom/css/CSSValueList.java, * external/w3c_dom/org/w3c/dom/css/Counter.java, * external/w3c_dom/org/w3c/dom/css/DOMImplementationCSS.java, * external/w3c_dom/org/w3c/dom/css/DocumentCSS.java, * external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java, * external/w3c_dom/org/w3c/dom/css/RGBColor.java, * external/w3c_dom/org/w3c/dom/css/Rect.java, * external/w3c_dom/org/w3c/dom/css/ViewCSS.java, * external/w3c_dom/org/w3c/dom/events/DocumentEvent.java, * external/w3c_dom/org/w3c/dom/events/Event.java, * external/w3c_dom/org/w3c/dom/events/EventException.java, * external/w3c_dom/org/w3c/dom/events/EventListener.java, * external/w3c_dom/org/w3c/dom/events/EventTarget.java, * external/w3c_dom/org/w3c/dom/events/MouseEvent.java, * external/w3c_dom/org/w3c/dom/events/MutationEvent.java, * external/w3c_dom/org/w3c/dom/events/UIEvent.java, * external/w3c_dom/org/w3c/dom/html2/HTMLAnchorElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLAppletElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLAreaElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLBRElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLBaseElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLBaseFontElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLBodyElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLButtonElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLCollection.java, * external/w3c_dom/org/w3c/dom/html2/HTMLDListElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLDirectoryElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLDivElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLDocument.java, * external/w3c_dom/org/w3c/dom/html2/HTMLElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLFieldSetElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLFontElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLFormElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLFrameElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLFrameSetElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLHRElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLHeadElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLHeadingElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLHtmlElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLIFrameElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLImageElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLInputElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLIsIndexElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLLIElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLLabelElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLLegendElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLLinkElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLMapElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLMenuElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLMetaElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLModElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLOListElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLObjectElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLOptGroupElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLOptionElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLOptionsCollection.java, * external/w3c_dom/org/w3c/dom/html2/HTMLParagraphElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLParamElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLPreElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLQuoteElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLScriptElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLSelectElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLStyleElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTableCaptionElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTableCellElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTableColElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTableElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTableRowElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTableSectionElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTextAreaElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTitleElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLUListElement.java, * external/w3c_dom/org/w3c/dom/ls/DOMImplementationLS.java, * external/w3c_dom/org/w3c/dom/ls/LSException.java, * external/w3c_dom/org/w3c/dom/ls/LSInput.java, * external/w3c_dom/org/w3c/dom/ls/LSLoadEvent.java, * external/w3c_dom/org/w3c/dom/ls/LSOutput.java, * external/w3c_dom/org/w3c/dom/ls/LSParser.java, * external/w3c_dom/org/w3c/dom/ls/LSParserFilter.java, * external/w3c_dom/org/w3c/dom/ls/LSProgressEvent.java, * external/w3c_dom/org/w3c/dom/ls/LSResourceResolver.java, * external/w3c_dom/org/w3c/dom/ls/LSSerializer.java, * external/w3c_dom/org/w3c/dom/ls/LSSerializerFilter.java, * external/w3c_dom/org/w3c/dom/ranges/DocumentRange.java, * external/w3c_dom/org/w3c/dom/ranges/Range.java, * external/w3c_dom/org/w3c/dom/ranges/RangeException.java, * external/w3c_dom/org/w3c/dom/stylesheets/DocumentStyle.java, * external/w3c_dom/org/w3c/dom/stylesheets/LinkStyle.java, * external/w3c_dom/org/w3c/dom/stylesheets/MediaList.java, * external/w3c_dom/org/w3c/dom/stylesheets/StyleSheet.java, * external/w3c_dom/org/w3c/dom/stylesheets/StyleSheetList.java, * external/w3c_dom/org/w3c/dom/traversal/DocumentTraversal.java, * external/w3c_dom/org/w3c/dom/traversal/NodeFilter.java, * external/w3c_dom/org/w3c/dom/traversal/NodeIterator.java, * external/w3c_dom/org/w3c/dom/traversal/TreeWalker.java, * external/w3c_dom/org/w3c/dom/views/AbstractView.java, * external/w3c_dom/org/w3c/dom/views/DocumentView.java, * external/w3c_dom/org/w3c/dom/xpath/XPathEvaluator.java, * external/w3c_dom/org/w3c/dom/xpath/XPathException.java, * external/w3c_dom/org/w3c/dom/xpath/XPathExpression.java, * external/w3c_dom/org/w3c/dom/xpath/XPathNSResolver.java, * external/w3c_dom/org/w3c/dom/xpath/XPathNamespace.java, * external/w3c_dom/org/w3c/dom/xpath/XPathResult.java, * gnu/CORBA/BigDecimalHelper.java, * gnu/CORBA/CDR/AbstractCdrInput.java, * gnu/CORBA/CDR/AbstractCdrOutput.java, * gnu/CORBA/CDR/AbstractDataInput.java, * gnu/CORBA/CDR/AbstractDataOutput.java, * gnu/CORBA/CDR/AligningInput.java, * gnu/CORBA/CDR/AligningOutput.java, * gnu/CORBA/CDR/ArrayValueHelper.java, * gnu/CORBA/CDR/BigEndianInputStream.java, * gnu/CORBA/CDR/BigEndianOutputStream.java, * gnu/CORBA/CDR/BufferedCdrOutput.java, * gnu/CORBA/CDR/BufferredCdrInput.java, * gnu/CORBA/CDR/HeadlessInput.java, * gnu/CORBA/CDR/IDLTypeHelper.java, * gnu/CORBA/CDR/LittleEndianOutputStream.java, * gnu/CORBA/CDR/UnknownExceptionCtxHandler.java, * gnu/CORBA/CDR/VMVio.java, * gnu/CORBA/CDR/Vio.java, * gnu/CORBA/CDR/gnuRuntime.java, * gnu/CORBA/CDR/gnuValueStream.java, * gnu/CORBA/CdrEncapsCodecImpl.java, * gnu/CORBA/CollocatedOrbs.java, * gnu/CORBA/Connected_objects.java, * gnu/CORBA/DefaultSocketFactory.java, * gnu/CORBA/DuplicateNameHolder.java, * gnu/CORBA/DynAn/AbstractAny.java, * gnu/CORBA/DynAn/DivideableAny.java, * gnu/CORBA/DynAn/NameValuePairHolder.java, * gnu/CORBA/DynAn/RecordAny.java, * gnu/CORBA/DynAn/ValueChangeListener.java, * gnu/CORBA/DynAn/gnuDynAny.java, * gnu/CORBA/DynAn/gnuDynAnyFactory.java, * gnu/CORBA/DynAn/gnuDynArray.java, * gnu/CORBA/DynAn/gnuDynEnum.java, * gnu/CORBA/DynAn/gnuDynFixed.java, * gnu/CORBA/DynAn/gnuDynSequence.java, * gnu/CORBA/DynAn/gnuDynUnion.java, * gnu/CORBA/DynAn/gnuDynValue.java, * gnu/CORBA/DynAn/gnuDynValueBox.java, * gnu/CORBA/DynAnySeqHolder.java, * gnu/CORBA/EmptyExceptionHolder.java, * gnu/CORBA/ForwardRequestHelper.java, * gnu/CORBA/GIOP/CharSets_OSF.java, * gnu/CORBA/GIOP/CloseMessage.java, * gnu/CORBA/GIOP/ErrorMessage.java, * gnu/CORBA/GIOP/MessageHeader.java, * gnu/CORBA/GIOP/ServiceContext.java, * gnu/CORBA/GIOP/v1_2/RequestHeader.java, * gnu/CORBA/GeneralHolder.java, * gnu/CORBA/IOR.java, * gnu/CORBA/Interceptor/ClientRequestInterceptors.java, * gnu/CORBA/Interceptor/ForwardRequestHolder.java, * gnu/CORBA/Interceptor/IORInterceptors.java, * gnu/CORBA/Interceptor/Registrator.java, * gnu/CORBA/Interceptor/ServerRequestInterceptors.java, * gnu/CORBA/Interceptor/gnuClientRequestInfo.java, * gnu/CORBA/Interceptor/gnuIcCurrent.java, * gnu/CORBA/Interceptor/gnuIorInfo.java, * gnu/CORBA/Interceptor/gnuServerRequestInfo.java, * gnu/CORBA/IorDelegate.java, * gnu/CORBA/IorObject.java, * gnu/CORBA/Minor.java, * gnu/CORBA/NameDynAnyPairHolder.java, * gnu/CORBA/NameDynAnyPairSeqHolder.java, * gnu/CORBA/NameValuePairHolder.java, * gnu/CORBA/NameValuePairSeqHolder.java, * gnu/CORBA/NamingService/NameParser.java, * gnu/CORBA/NamingService/NamingMap.java, * gnu/CORBA/NamingService/NamingServiceTransient.java, * gnu/CORBA/NamingService/TransientContext.java, * gnu/CORBA/ObjectCreator.java, * gnu/CORBA/OrbFocused.java, * gnu/CORBA/OrbFunctional.java, * gnu/CORBA/OrbRestricted.java, * gnu/CORBA/Poa/AOM.java, * gnu/CORBA/Poa/AccessiblePolicy.java, * gnu/CORBA/Poa/DynamicImpHandler.java, * gnu/CORBA/Poa/ForwardRequestHolder.java, * gnu/CORBA/Poa/ForwardedServant.java, * gnu/CORBA/Poa/InvalidPolicyHolder.java, * gnu/CORBA/Poa/LocalDelegate.java, * gnu/CORBA/Poa/LocalRequest.java, * gnu/CORBA/Poa/LocalServerRequest.java, * gnu/CORBA/Poa/ORB_1_4.java, * gnu/CORBA/Poa/ServantDelegateImpl.java, * gnu/CORBA/Poa/StandardPolicies.java, * gnu/CORBA/Poa/gnuAdapterActivator.java, * gnu/CORBA/Poa/gnuForwardRequest.java, * gnu/CORBA/Poa/gnuIdAssignmentPolicy.java, * gnu/CORBA/Poa/gnuIdUniquenessPolicy.java, * gnu/CORBA/Poa/gnuImplicitActivationPolicy.java, * gnu/CORBA/Poa/gnuLifespanPolicy.java, * gnu/CORBA/Poa/gnuPOA.java, * gnu/CORBA/Poa/gnuPOAManager.java, * gnu/CORBA/Poa/gnuPoaCurrent.java, * gnu/CORBA/Poa/gnuRequestProcessingPolicy.java, * gnu/CORBA/Poa/gnuServantObject.java, * gnu/CORBA/Poa/gnuServantRetentionPolicy.java, * gnu/CORBA/Poa/gnuThreadPolicy.java, * gnu/CORBA/ServiceRequestAdapter.java, * gnu/CORBA/SetOverrideTypeHolder.java, * gnu/CORBA/SimpleDelegate.java, * gnu/CORBA/SocketRepository.java, * gnu/CORBA/StreamHolder.java, * gnu/CORBA/TypeCodeHelper.java, * gnu/CORBA/TypeKindNamer.java, * gnu/CORBA/Version.java, * gnu/CORBA/_PolicyImplBase.java, * gnu/CORBA/gnuAny.java, * gnu/CORBA/gnuCodecFactory.java, * gnu/CORBA/gnuEnvironment.java, * gnu/CORBA/gnuRequest.java, * gnu/CORBA/gnuValueHolder.java, * gnu/CORBA/interfaces/SocketFactory.java, * gnu/CORBA/typecodes/AliasTypeCode.java, * gnu/CORBA/typecodes/ArrayTypeCode.java, * gnu/CORBA/typecodes/FixedTypeCode.java, * gnu/CORBA/typecodes/GeneralTypeCode.java, * gnu/CORBA/typecodes/PrimitiveTypeCode.java, * gnu/CORBA/typecodes/RecordTypeCode.java, * gnu/CORBA/typecodes/RecursiveTypeCode.java, * gnu/CORBA/typecodes/StringTypeCode.java, * gnu/classpath/Pair.java, * gnu/classpath/Pointer.java, * gnu/classpath/Pointer32.java, * gnu/classpath/Pointer64.java, * gnu/classpath/ServiceFactory.java, * gnu/classpath/ServiceProviderLoadingAction.java, * gnu/classpath/SystemProperties.java, * gnu/classpath/debug/Component.java, * gnu/classpath/debug/PreciseFilter.java, * gnu/classpath/debug/SystemLogger.java, * gnu/classpath/debug/TeeInputStream.java, * gnu/classpath/debug/TeeReader.java, * gnu/classpath/jdwp/Jdwp.java, * gnu/classpath/jdwp/JdwpConstants.java, * gnu/classpath/jdwp/event/BreakpointEvent.java, * gnu/classpath/jdwp/event/ClassPrepareEvent.java, * gnu/classpath/jdwp/event/ClassUnloadEvent.java, * gnu/classpath/jdwp/event/Event.java, * gnu/classpath/jdwp/event/EventManager.java, * gnu/classpath/jdwp/event/EventRequest.java, * gnu/classpath/jdwp/event/ExceptionEvent.java, * gnu/classpath/jdwp/event/MethodEntryEvent.java, * gnu/classpath/jdwp/event/MethodExitEvent.java, * gnu/classpath/jdwp/event/SingleStepEvent.java, * gnu/classpath/jdwp/event/ThreadEndEvent.java, * gnu/classpath/jdwp/event/VmDeathEvent.java, * gnu/classpath/jdwp/event/VmInitEvent.java, * gnu/classpath/jdwp/event/filters/ClassExcludeFilter.java, * gnu/classpath/jdwp/event/filters/ClassMatchFilter.java, * gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java, * gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java, * gnu/classpath/jdwp/event/filters/FieldOnlyFilter.java, * gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java, * gnu/classpath/jdwp/event/filters/StepFilter.java, * gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java, * gnu/classpath/jdwp/exception/InvalidClassException.java, * gnu/classpath/jdwp/exception/InvalidClassLoaderException.java, * gnu/classpath/jdwp/exception/InvalidEventTypeException.java, * gnu/classpath/jdwp/exception/InvalidFieldException.java, * gnu/classpath/jdwp/exception/InvalidFrameException.java, * gnu/classpath/jdwp/exception/InvalidLocationException.java, * gnu/classpath/jdwp/exception/InvalidMethodException.java, * gnu/classpath/jdwp/exception/InvalidObjectException.java, * gnu/classpath/jdwp/exception/InvalidSlotException.java, * gnu/classpath/jdwp/exception/InvalidStringException.java, * gnu/classpath/jdwp/exception/InvalidThreadException.java, * gnu/classpath/jdwp/exception/InvalidThreadGroupException.java, * gnu/classpath/jdwp/exception/NativeMethodException.java, * gnu/classpath/jdwp/exception/NotImplementedException.java, * gnu/classpath/jdwp/id/JdwpId.java, * gnu/classpath/jdwp/id/NullObjectId.java, * gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ArrayTypeCommandSet.java, * gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ClassTypeCommandSet.java, * gnu/classpath/jdwp/processor/CommandSet.java, * gnu/classpath/jdwp/processor/EventRequestCommandSet.java, * gnu/classpath/jdwp/processor/FieldCommandSet.java, * gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.java, * gnu/classpath/jdwp/processor/MethodCommandSet.java, * gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java, * gnu/classpath/jdwp/processor/PacketProcessor.java, * gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java, * gnu/classpath/jdwp/processor/StackFrameCommandSet.java, * gnu/classpath/jdwp/processor/StringReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.java, * gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java, * gnu/classpath/jdwp/transport/JdwpCommandPacket.java, * gnu/classpath/jdwp/transport/JdwpConnection.java, * gnu/classpath/jdwp/transport/JdwpPacket.java, * gnu/classpath/jdwp/transport/JdwpReplyPacket.java, * gnu/classpath/jdwp/transport/SocketTransport.java, * gnu/classpath/jdwp/transport/TransportFactory.java, * gnu/classpath/jdwp/util/JdwpString.java, * gnu/classpath/jdwp/util/LineTable.java, * gnu/classpath/jdwp/util/Location.java, * gnu/classpath/jdwp/util/MethodResult.java, * gnu/classpath/jdwp/util/MonitorInfo.java, * gnu/classpath/jdwp/util/Signature.java, * gnu/classpath/jdwp/util/VariableTable.java, * gnu/classpath/jdwp/value/ArrayValue.java, * gnu/classpath/jdwp/value/BooleanValue.java, * gnu/classpath/jdwp/value/ByteValue.java, * gnu/classpath/jdwp/value/CharValue.java, * gnu/classpath/jdwp/value/DoubleValue.java, * gnu/classpath/jdwp/value/FloatValue.java, * gnu/classpath/jdwp/value/IntValue.java, * gnu/classpath/jdwp/value/LongValue.java, * gnu/classpath/jdwp/value/ObjectValue.java, * gnu/classpath/jdwp/value/ShortValue.java, * gnu/classpath/jdwp/value/StringValue.java, * gnu/classpath/jdwp/value/Value.java, * gnu/classpath/jdwp/value/ValueFactory.java, * gnu/classpath/jdwp/value/VoidValue.java, * gnu/classpath/toolkit/DefaultDaemonThreadFactory.java, * gnu/java/awt/AWTUtilities.java, * gnu/java/awt/BitMaskExtent.java, * gnu/java/awt/BitwiseXORComposite.java, * gnu/java/awt/Buffers.java, * gnu/java/awt/ClasspathGraphicsEnvironment.java, * gnu/java/awt/ClasspathToolkit.java, * gnu/java/awt/ComponentDataBlitOp.java, * gnu/java/awt/EmbeddedWindow.java, * gnu/java/awt/GradientPaintContext.java, * gnu/java/awt/color/CieXyzConverter.java, * gnu/java/awt/color/ClutProfileConverter.java, * gnu/java/awt/color/ColorLookUpTable.java, * gnu/java/awt/color/GrayProfileConverter.java, * gnu/java/awt/color/GrayScaleConverter.java, * gnu/java/awt/color/LinearRGBConverter.java, * gnu/java/awt/color/ProfileHeader.java, * gnu/java/awt/color/RgbProfileConverter.java, * gnu/java/awt/color/SrgbConverter.java, * gnu/java/awt/color/ToneReproductionCurve.java, * gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.java, * gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java, * gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java, * gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.java, * gnu/java/awt/font/FontDelegate.java, * gnu/java/awt/font/FontFactory.java, * gnu/java/awt/font/GNUGlyphVector.java, * gnu/java/awt/font/OpenTypeFontPeer.java, * gnu/java/awt/font/autofit/GlyphHints.java, * gnu/java/awt/font/autofit/Latin.java, * gnu/java/awt/font/autofit/Utils.java, * gnu/java/awt/font/opentype/CharGlyphMap.java, * gnu/java/awt/font/opentype/GlyphNamer.java, * gnu/java/awt/font/opentype/MacResourceFork.java, * gnu/java/awt/font/opentype/NameDecoder.java, * gnu/java/awt/font/opentype/OpenTypeFont.java, * gnu/java/awt/font/opentype/OpenTypeFontFactory.java, * gnu/java/awt/font/opentype/truetype/GlyphLoader.java, * gnu/java/awt/font/opentype/truetype/GlyphLocator.java, * gnu/java/awt/font/opentype/truetype/GlyphMeasurer.java, * gnu/java/awt/font/opentype/truetype/Point.java, * gnu/java/awt/font/opentype/truetype/TrueTypeScaler.java, * gnu/java/awt/font/opentype/truetype/VirtualMachine.java, * gnu/java/awt/font/opentype/truetype/Zone.java, * gnu/java/awt/font/opentype/truetype/ZonePathIterator.java, * gnu/java/awt/image/AsyncImage.java, * gnu/java/awt/image/ImageConverter.java, * gnu/java/awt/image/ImageDecoder.java, * gnu/java/awt/image/XBMDecoder.java, * gnu/java/awt/java2d/AbstractGraphics2D.java, * gnu/java/awt/java2d/AlphaCompositeContext.java, * gnu/java/awt/java2d/CubicSegment.java, * gnu/java/awt/java2d/LineSegment.java, * gnu/java/awt/java2d/PixelCoverage.java, * gnu/java/awt/java2d/QuadSegment.java, * gnu/java/awt/java2d/RasterGraphics.java, * gnu/java/awt/java2d/ScanlineConverter.java, * gnu/java/awt/java2d/ScanlineCoverage.java, * gnu/java/awt/java2d/Segment.java, * gnu/java/awt/java2d/TexturePaintContext.java, * gnu/java/awt/peer/ClasspathDesktopPeer.java, * gnu/java/awt/peer/ClasspathFontPeer.java, * gnu/java/awt/peer/GLightweightPeer.java, * gnu/java/awt/peer/GnomeDesktopPeer.java, * gnu/java/awt/peer/KDEDesktopPeer.java, * gnu/java/awt/peer/gtk/AsyncImage.java, * gnu/java/awt/peer/gtk/BufferedImageGraphics.java, * gnu/java/awt/peer/gtk/CairoGraphics2D.java, * gnu/java/awt/peer/gtk/CairoSurface.java, * gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java, * gnu/java/awt/peer/gtk/ComponentGraphics.java, * gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java, * gnu/java/awt/peer/gtk/FreetypeGlyphVector.java, * gnu/java/awt/peer/gtk/GdkFontPeer.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/GtkButtonPeer.java, * gnu/java/awt/peer/gtk/GtkCheckboxPeer.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/GtkContainerPeer.java, * gnu/java/awt/peer/gtk/GtkCursor.java, * gnu/java/awt/peer/gtk/GtkDialogPeer.java, * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java, * gnu/java/awt/peer/gtk/GtkFramePeer.java, * gnu/java/awt/peer/gtk/GtkGenericPeer.java, * gnu/java/awt/peer/gtk/GtkImage.java, * gnu/java/awt/peer/gtk/GtkImageConsumer.java, * gnu/java/awt/peer/gtk/GtkLabelPeer.java, * gnu/java/awt/peer/gtk/GtkListPeer.java, * gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java, * gnu/java/awt/peer/gtk/GtkMenuPeer.java, * gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java, * gnu/java/awt/peer/gtk/GtkPanelPeer.java, * gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java, * gnu/java/awt/peer/gtk/GtkScrollbarPeer.java, * gnu/java/awt/peer/gtk/GtkSelection.java, * gnu/java/awt/peer/gtk/GtkToolkit.java, * gnu/java/awt/peer/gtk/GtkVolatileImage.java, * gnu/java/awt/peer/gtk/GtkWindowPeer.java, * gnu/java/awt/peer/gtk/VolatileImageGraphics.java, * gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.java, * gnu/java/awt/peer/qt/MainQtThread.java, * gnu/java/awt/peer/qt/QMatrix.java, * gnu/java/awt/peer/qt/QPainterPath.java, * gnu/java/awt/peer/qt/QPen.java, * gnu/java/awt/peer/qt/QtAudioClip.java, * gnu/java/awt/peer/qt/QtButtonPeer.java, * gnu/java/awt/peer/qt/QtCheckboxPeer.java, * gnu/java/awt/peer/qt/QtChoicePeer.java, * gnu/java/awt/peer/qt/QtComponentGraphics.java, * gnu/java/awt/peer/qt/QtComponentPeer.java, * gnu/java/awt/peer/qt/QtContainerPeer.java, * gnu/java/awt/peer/qt/QtDialogPeer.java, * gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java, * gnu/java/awt/peer/qt/QtFileDialogPeer.java, * gnu/java/awt/peer/qt/QtFontMetrics.java, * gnu/java/awt/peer/qt/QtFontPeer.java, * gnu/java/awt/peer/qt/QtFramePeer.java, * gnu/java/awt/peer/qt/QtGraphics.java, * gnu/java/awt/peer/qt/QtGraphicsEnvironment.java, * gnu/java/awt/peer/qt/QtImage.java, * gnu/java/awt/peer/qt/QtImageConsumer.java, * gnu/java/awt/peer/qt/QtImageDirectGraphics.java, * gnu/java/awt/peer/qt/QtImageGraphics.java, * gnu/java/awt/peer/qt/QtLabelPeer.java, * gnu/java/awt/peer/qt/QtListPeer.java, * gnu/java/awt/peer/qt/QtMenuBarPeer.java, * gnu/java/awt/peer/qt/QtMenuComponentPeer.java, * gnu/java/awt/peer/qt/QtMenuItemPeer.java, * gnu/java/awt/peer/qt/QtMenuPeer.java, * gnu/java/awt/peer/qt/QtPanelPeer.java, * gnu/java/awt/peer/qt/QtPopupMenuPeer.java, * gnu/java/awt/peer/qt/QtRepaintThread.java, * gnu/java/awt/peer/qt/QtScreenDevice.java, * gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java, * gnu/java/awt/peer/qt/QtScrollPanePeer.java, * gnu/java/awt/peer/qt/QtScrollbarPeer.java, * gnu/java/awt/peer/qt/QtTextAreaPeer.java, * gnu/java/awt/peer/qt/QtTextFieldPeer.java, * gnu/java/awt/peer/qt/QtToolkit.java, * gnu/java/awt/peer/qt/QtVolatileImage.java, * gnu/java/awt/peer/qt/QtWindowPeer.java, * gnu/java/awt/peer/swing/SwingButtonPeer.java, * gnu/java/awt/peer/swing/SwingCheckboxPeer.java, * gnu/java/awt/peer/swing/SwingComponent.java, * gnu/java/awt/peer/swing/SwingComponentPeer.java, * gnu/java/awt/peer/swing/SwingContainerPeer.java, * gnu/java/awt/peer/swing/SwingLabelPeer.java, * gnu/java/awt/peer/swing/SwingListPeer.java, * gnu/java/awt/peer/swing/SwingMenuItemPeer.java, * gnu/java/awt/peer/swing/SwingMenuPeer.java, * gnu/java/awt/peer/swing/SwingTextAreaPeer.java, * gnu/java/awt/peer/swing/SwingTextFieldPeer.java, * gnu/java/awt/peer/x/GLGraphics.java, * gnu/java/awt/peer/x/KeyboardMapping.java, * gnu/java/awt/peer/x/XEventPump.java, * gnu/java/awt/peer/x/XFontPeer.java, * gnu/java/awt/peer/x/XFramePeer.java, * gnu/java/awt/peer/x/XGraphics2D.java, * gnu/java/awt/peer/x/XGraphicsConfiguration.java, * gnu/java/awt/peer/x/XGraphicsDevice.java, * gnu/java/awt/peer/x/XGraphicsEnvironment.java, * gnu/java/awt/peer/x/XImage.java, * gnu/java/awt/peer/x/XToolkit.java, * gnu/java/awt/peer/x/XWindowPeer.java, * gnu/java/awt/print/JavaPrinterGraphics.java, * gnu/java/awt/print/JavaPrinterJob.java, * gnu/java/awt/print/PostScriptGraphics2D.java, * gnu/java/awt/print/SpooledDocument.java, * gnu/java/beans/BeanInfoEmbryo.java, * gnu/java/beans/DefaultExceptionListener.java, * gnu/java/beans/ExplicitBeanInfo.java, * gnu/java/beans/IntrospectionIncubator.java, * gnu/java/beans/decoder/AbstractContext.java, * gnu/java/beans/decoder/AbstractCreatableObjectContext.java, * gnu/java/beans/decoder/AbstractElementHandler.java, * gnu/java/beans/decoder/AbstractObjectContext.java, * gnu/java/beans/decoder/ArrayContext.java, * gnu/java/beans/decoder/ArrayHandler.java, * gnu/java/beans/decoder/AssemblyException.java, * gnu/java/beans/decoder/BooleanHandler.java, * gnu/java/beans/decoder/ByteHandler.java, * gnu/java/beans/decoder/CharHandler.java, * gnu/java/beans/decoder/ClassHandler.java, * gnu/java/beans/decoder/ConstructorContext.java, * gnu/java/beans/decoder/Context.java, * gnu/java/beans/decoder/DecoderContext.java, * gnu/java/beans/decoder/DoubleHandler.java, * gnu/java/beans/decoder/DummyContext.java, * gnu/java/beans/decoder/DummyHandler.java, * gnu/java/beans/decoder/ElementHandler.java, * gnu/java/beans/decoder/FloatHandler.java, * gnu/java/beans/decoder/GrowableArrayContext.java, * gnu/java/beans/decoder/IndexContext.java, * gnu/java/beans/decoder/IntHandler.java, * gnu/java/beans/decoder/JavaHandler.java, * gnu/java/beans/decoder/LongHandler.java, * gnu/java/beans/decoder/MethodContext.java, * gnu/java/beans/decoder/MethodFinder.java, * gnu/java/beans/decoder/NullHandler.java, * gnu/java/beans/decoder/ObjectContext.java, * gnu/java/beans/decoder/ObjectHandler.java, * gnu/java/beans/decoder/PersistenceParser.java, * gnu/java/beans/decoder/PropertyContext.java, * gnu/java/beans/decoder/ShortHandler.java, * gnu/java/beans/decoder/SimpleHandler.java, * gnu/java/beans/decoder/StaticMethodContext.java, * gnu/java/beans/decoder/StringHandler.java, * gnu/java/beans/decoder/VoidHandler.java, * gnu/java/beans/editors/ColorEditor.java, * gnu/java/beans/editors/FontEditor.java, * gnu/java/beans/editors/NativeBooleanEditor.java, * gnu/java/beans/editors/NativeByteEditor.java, * gnu/java/beans/editors/NativeDoubleEditor.java, * gnu/java/beans/editors/NativeFloatEditor.java, * gnu/java/beans/editors/NativeIntEditor.java, * gnu/java/beans/editors/NativeLongEditor.java, * gnu/java/beans/editors/NativeShortEditor.java, * gnu/java/beans/editors/StringEditor.java, * gnu/java/beans/encoder/ArrayPersistenceDelegate.java, * gnu/java/beans/encoder/ClassPersistenceDelegate.java, * gnu/java/beans/encoder/CollectionPersistenceDelegate.java, * gnu/java/beans/encoder/Context.java, * gnu/java/beans/encoder/GenericScannerState.java, * gnu/java/beans/encoder/IgnoringScannerState.java, * gnu/java/beans/encoder/MapPersistenceDelegate.java, * gnu/java/beans/encoder/ObjectId.java, * gnu/java/beans/encoder/PrimitivePersistenceDelegate.java, * gnu/java/beans/encoder/ReportingScannerState.java, * gnu/java/beans/encoder/Root.java, * gnu/java/beans/encoder/ScanEngine.java, * gnu/java/beans/encoder/ScannerState.java, * gnu/java/beans/encoder/StAXWriter.java, * gnu/java/beans/encoder/Writer.java, * gnu/java/beans/encoder/elements/ArrayInstantiation.java, * gnu/java/beans/encoder/elements/Array_Get.java, * gnu/java/beans/encoder/elements/ClassResolution.java, * gnu/java/beans/encoder/elements/Element.java, * gnu/java/beans/encoder/elements/List_Get.java, * gnu/java/beans/encoder/elements/List_Set.java, * gnu/java/beans/encoder/elements/MethodInvocation.java, * gnu/java/beans/encoder/elements/NullObject.java, * gnu/java/beans/encoder/elements/ObjectInstantiation.java, * gnu/java/beans/encoder/elements/ObjectReference.java, * gnu/java/beans/encoder/elements/PrimitiveInstantiation.java, * gnu/java/beans/encoder/elements/StaticFieldAccess.java, * gnu/java/beans/encoder/elements/StaticMethodInvocation.java, * gnu/java/beans/encoder/elements/StringReference.java, * gnu/java/io/ASN1ParsingException.java, * gnu/java/io/Base64InputStream.java, * gnu/java/io/ClassLoaderObjectInputStream.java, * gnu/java/io/NullOutputStream.java, * gnu/java/io/ObjectIdentityMap2Int.java, * gnu/java/io/ObjectIdentityWrapper.java, * gnu/java/io/PlatformHelper.java, * gnu/java/lang/CPStringBuilder.java, * gnu/java/lang/CharData.java, * gnu/java/lang/InstrumentationImpl.java, * gnu/java/lang/MainThread.java, * gnu/java/lang/management/BeanImpl.java, * gnu/java/lang/management/ClassLoadingMXBeanImpl.java, * gnu/java/lang/management/CompilationMXBeanImpl.java, * gnu/java/lang/management/GarbageCollectorMXBeanImpl.java, * gnu/java/lang/management/MemoryMXBeanImpl.java, * gnu/java/lang/management/MemoryManagerMXBeanImpl.java, * gnu/java/lang/management/MemoryPoolMXBeanImpl.java, * gnu/java/lang/management/OperatingSystemMXBeanImpl.java, * gnu/java/lang/management/RuntimeMXBeanImpl.java, * gnu/java/lang/management/ThreadMXBeanImpl.java, * gnu/java/lang/reflect/TypeSignature.java, * gnu/java/locale/LocaleHelper.java, * gnu/java/math/Fixed.java, * gnu/java/math/GMP.java, * gnu/java/math/MPN.java, * gnu/java/net/CRLFInputStream.java, * gnu/java/net/CRLFOutputStream.java, * gnu/java/net/DefaultContentHandlerFactory.java, * gnu/java/net/DefaultProxySelector.java, * gnu/java/net/EmptyX509TrustManager.java, * gnu/java/net/GetLocalHostAction.java, * gnu/java/net/HeaderFieldHelper.java, * gnu/java/net/IndexListParser.java, * gnu/java/net/LineInputStream.java, * gnu/java/net/PlainDatagramSocketImpl.java, * gnu/java/net/PlainSocketImpl.java, * gnu/java/net/loader/FileResource.java, * gnu/java/net/loader/FileURLLoader.java, * gnu/java/net/loader/JarURLLoader.java, * gnu/java/net/loader/JarURLResource.java, * gnu/java/net/loader/RemoteResource.java, * gnu/java/net/loader/RemoteURLLoader.java, * gnu/java/net/loader/Resource.java, * gnu/java/net/loader/URLLoader.java, * gnu/java/net/protocol/file/Connection.java, * gnu/java/net/protocol/file/Handler.java, * gnu/java/net/protocol/ftp/ActiveModeDTP.java, * gnu/java/net/protocol/ftp/BlockInputStream.java, * gnu/java/net/protocol/ftp/BlockOutputStream.java, * gnu/java/net/protocol/ftp/CompressedInputStream.java, * gnu/java/net/protocol/ftp/CompressedOutputStream.java, * gnu/java/net/protocol/ftp/DTP.java, * gnu/java/net/protocol/ftp/DTPInputStream.java, * gnu/java/net/protocol/ftp/DTPOutputStream.java, * gnu/java/net/protocol/ftp/FTPConnection.java, * gnu/java/net/protocol/ftp/FTPException.java, * gnu/java/net/protocol/ftp/FTPResponse.java, * gnu/java/net/protocol/ftp/FTPURLConnection.java, * gnu/java/net/protocol/ftp/Handler.java, * gnu/java/net/protocol/ftp/PassiveModeDTP.java, * gnu/java/net/protocol/ftp/StreamInputStream.java, * gnu/java/net/protocol/ftp/StreamOutputStream.java, * gnu/java/net/protocol/http/Authenticator.java, * gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.java, * gnu/java/net/protocol/http/ChunkedInputStream.java, * gnu/java/net/protocol/http/Cookie.java, * gnu/java/net/protocol/http/CookieManager.java, * gnu/java/net/protocol/http/Credentials.java, * gnu/java/net/protocol/http/HTTPConnection.java, * gnu/java/net/protocol/http/HTTPDateFormat.java, * gnu/java/net/protocol/http/HTTPURLConnection.java, * gnu/java/net/protocol/http/Handler.java, * gnu/java/net/protocol/http/Headers.java, * gnu/java/net/protocol/http/Request.java, * gnu/java/net/protocol/http/RequestBodyWriter.java, * gnu/java/net/protocol/http/Response.java, * gnu/java/net/protocol/http/ResponseHeaderHandler.java, * gnu/java/net/protocol/http/SimpleCookieManager.java, * gnu/java/net/protocol/https/Handler.java, * gnu/java/net/protocol/jar/Connection.java, * gnu/java/net/protocol/jar/Handler.java, * gnu/java/nio/ChannelInputStream.java, * gnu/java/nio/ChannelOutputStream.java, * gnu/java/nio/ChannelReader.java, * gnu/java/nio/ChannelWriter.java, * gnu/java/nio/DatagramChannelImpl.java, * gnu/java/nio/DatagramChannelSelectionKey.java, * gnu/java/nio/EpollSelectionKeyImpl.java, * gnu/java/nio/EpollSelectorImpl.java, * gnu/java/nio/FileChannelImpl.java, * gnu/java/nio/FileLockImpl.java, * gnu/java/nio/InputStreamChannel.java, * gnu/java/nio/KqueueSelectionKeyImpl.java, * gnu/java/nio/KqueueSelectorImpl.java, * gnu/java/nio/NIODatagramSocket.java, * gnu/java/nio/NIOServerSocket.java, * gnu/java/nio/NIOSocket.java, * gnu/java/nio/NIOSocketImpl.java, * gnu/java/nio/OutputStreamChannel.java, * gnu/java/nio/PipeImpl.java, * gnu/java/nio/SelectionKeyImpl.java, * gnu/java/nio/SelectorImpl.java, * gnu/java/nio/SelectorProviderImpl.java, * gnu/java/nio/ServerSocketChannelImpl.java, * gnu/java/nio/ServerSocketChannelSelectionKey.java, * gnu/java/nio/SocketChannelImpl.java, * gnu/java/nio/SocketChannelSelectionKey.java, * gnu/java/nio/SocketChannelSelectionKeyImpl.java, * gnu/java/nio/VMChannelOwner.java, * gnu/java/nio/charset/ByteCharset.java, * gnu/java/nio/charset/ByteDecodeLoopHelper.java, * gnu/java/nio/charset/ByteEncodeLoopHelper.java, * gnu/java/nio/charset/Cp424.java, * gnu/java/nio/charset/Cp437.java, * gnu/java/nio/charset/Cp737.java, * gnu/java/nio/charset/Cp775.java, * gnu/java/nio/charset/Cp850.java, * gnu/java/nio/charset/Cp852.java, * gnu/java/nio/charset/Cp855.java, * gnu/java/nio/charset/Cp857.java, * gnu/java/nio/charset/Cp860.java, * gnu/java/nio/charset/Cp861.java, * gnu/java/nio/charset/Cp862.java, * gnu/java/nio/charset/Cp863.java, * gnu/java/nio/charset/Cp864.java, * gnu/java/nio/charset/Cp865.java, * gnu/java/nio/charset/Cp866.java, * gnu/java/nio/charset/Cp869.java, * gnu/java/nio/charset/Cp874.java, * gnu/java/nio/charset/EncodingHelper.java, * gnu/java/nio/charset/ISO_8859_1.java, * gnu/java/nio/charset/ISO_8859_13.java, * gnu/java/nio/charset/ISO_8859_15.java, * gnu/java/nio/charset/ISO_8859_2.java, * gnu/java/nio/charset/ISO_8859_3.java, * gnu/java/nio/charset/ISO_8859_4.java, * gnu/java/nio/charset/ISO_8859_5.java, * gnu/java/nio/charset/ISO_8859_6.java, * gnu/java/nio/charset/ISO_8859_7.java, * gnu/java/nio/charset/ISO_8859_8.java, * gnu/java/nio/charset/ISO_8859_9.java, * gnu/java/nio/charset/KOI_8.java, * gnu/java/nio/charset/MS874.java, * gnu/java/nio/charset/MacCentralEurope.java, * gnu/java/nio/charset/MacCroatian.java, * gnu/java/nio/charset/MacCyrillic.java, * gnu/java/nio/charset/MacDingbat.java, * gnu/java/nio/charset/MacGreek.java, * gnu/java/nio/charset/MacIceland.java, * gnu/java/nio/charset/MacRoman.java, * gnu/java/nio/charset/MacRomania.java, * gnu/java/nio/charset/MacSymbol.java, * gnu/java/nio/charset/MacThai.java, * gnu/java/nio/charset/MacTurkish.java, * gnu/java/nio/charset/Provider.java, * gnu/java/nio/charset/US_ASCII.java, * gnu/java/nio/charset/UTF_16.java, * gnu/java/nio/charset/UTF_16BE.java, * gnu/java/nio/charset/UTF_16Decoder.java, * gnu/java/nio/charset/UTF_16Encoder.java, * gnu/java/nio/charset/UTF_16LE.java, * gnu/java/nio/charset/UTF_8.java, * gnu/java/nio/charset/UnicodeLittle.java, * gnu/java/nio/charset/Windows1250.java, * gnu/java/nio/charset/Windows1251.java, * gnu/java/nio/charset/Windows1252.java, * gnu/java/nio/charset/Windows1253.java, * gnu/java/nio/charset/Windows1254.java, * gnu/java/nio/charset/Windows1255.java, * gnu/java/nio/charset/Windows1256.java, * gnu/java/nio/charset/Windows1257.java, * gnu/java/nio/charset/Windows1258.java, * gnu/java/nio/charset/iconv/IconvCharset.java, * gnu/java/nio/charset/iconv/IconvDecoder.java, * gnu/java/nio/charset/iconv/IconvEncoder.java, * gnu/java/nio/charset/iconv/IconvProvider.java, * gnu/java/rmi/RMIMarshalledObjectInputStream.java, * gnu/java/rmi/RMIMarshalledObjectOutputStream.java, * gnu/java/rmi/activation/ActivationSystemTransient.java, * gnu/java/rmi/activation/BidiTable.java, * gnu/java/rmi/activation/DefaultActivationGroup.java, * gnu/java/rmi/activation/DefaultActivationSystem.java, * gnu/java/rmi/dgc/DGCImpl.java, * gnu/java/rmi/dgc/DGCImpl_Skel.java, * gnu/java/rmi/dgc/DGCImpl_Stub.java, * gnu/java/rmi/dgc/LeaseRenewingTask.java, * gnu/java/rmi/registry/RegistryImpl.java, * gnu/java/rmi/registry/RegistryImpl_Skel.java, * gnu/java/rmi/registry/RegistryImpl_Stub.java, * gnu/java/rmi/server/ActivatableRef.java, * gnu/java/rmi/server/ActivatableServerRef.java, * gnu/java/rmi/server/CombinedClassLoader.java, * gnu/java/rmi/server/ConnectionRunnerPool.java, * gnu/java/rmi/server/ProtocolConstants.java, * gnu/java/rmi/server/RMIClassLoaderImpl.java, * gnu/java/rmi/server/RMIDefaultSocketFactory.java, * gnu/java/rmi/server/RMIHashes.java, * gnu/java/rmi/server/RMIIncomingThread.java, * gnu/java/rmi/server/RMIObjectInputStream.java, * gnu/java/rmi/server/RMIObjectOutputStream.java, * gnu/java/rmi/server/UnicastConnection.java, * gnu/java/rmi/server/UnicastConnectionManager.java, * gnu/java/rmi/server/UnicastRef.java, * gnu/java/rmi/server/UnicastRemoteCall.java, * gnu/java/rmi/server/UnicastRemoteStub.java, * gnu/java/rmi/server/UnicastServer.java, * gnu/java/rmi/server/UnicastServerRef.java, * gnu/java/security/Engine.java, * gnu/java/security/OID.java, * gnu/java/security/PolicyFile.java, * gnu/java/security/Properties.java, * gnu/java/security/Registry.java, * gnu/java/security/Requires.java, * gnu/java/security/action/GetPropertyAction.java, * gnu/java/security/action/SetAccessibleAction.java, * gnu/java/security/der/DERValue.java, * gnu/java/security/hash/BaseHash.java, * gnu/java/security/hash/HashFactory.java, * gnu/java/security/hash/Haval.java, * gnu/java/security/hash/IMessageDigest.java, * gnu/java/security/hash/MD2.java, * gnu/java/security/hash/MD4.java, * gnu/java/security/hash/MD5.java, * gnu/java/security/hash/RipeMD128.java, * gnu/java/security/hash/RipeMD160.java, * gnu/java/security/hash/Sha160.java, * gnu/java/security/hash/Sha256.java, * gnu/java/security/hash/Sha384.java, * gnu/java/security/hash/Sha512.java, * gnu/java/security/hash/Tiger.java, * gnu/java/security/hash/Whirlpool.java, * gnu/java/security/jce/hash/HavalSpi.java, * gnu/java/security/jce/hash/MD2Spi.java, * gnu/java/security/jce/hash/MD4Spi.java, * gnu/java/security/jce/hash/MD5Spi.java, * gnu/java/security/jce/hash/MessageDigestAdapter.java, * gnu/java/security/jce/hash/RipeMD128Spi.java, * gnu/java/security/jce/hash/RipeMD160Spi.java, * gnu/java/security/jce/hash/Sha160Spi.java, * gnu/java/security/jce/hash/Sha256Spi.java, * gnu/java/security/jce/hash/Sha384Spi.java, * gnu/java/security/jce/hash/Sha512Spi.java, * gnu/java/security/jce/hash/TigerSpi.java, * gnu/java/security/jce/hash/WhirlpoolSpi.java, * gnu/java/security/jce/prng/HavalRandomSpi.java, * gnu/java/security/jce/prng/MD2RandomSpi.java, * gnu/java/security/jce/prng/MD4RandomSpi.java, * gnu/java/security/jce/prng/MD5RandomSpi.java, * gnu/java/security/jce/prng/RipeMD128RandomSpi.java, * gnu/java/security/jce/prng/RipeMD160RandomSpi.java, * gnu/java/security/jce/prng/SecureRandomAdapter.java, * gnu/java/security/jce/prng/Sha160RandomSpi.java, * gnu/java/security/jce/prng/Sha256RandomSpi.java, * gnu/java/security/jce/prng/Sha384RandomSpi.java, * gnu/java/security/jce/prng/Sha512RandomSpi.java, * gnu/java/security/jce/prng/TigerRandomSpi.java, * gnu/java/security/jce/prng/WhirlpoolRandomSpi.java, * gnu/java/security/jce/sig/DSSKeyFactory.java, * gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java, * gnu/java/security/jce/sig/DSSParameters.java, * gnu/java/security/jce/sig/DSSRawSignatureSpi.java, * gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java, * gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java, * gnu/java/security/jce/sig/SignatureAdapter.java, * gnu/java/security/key/IKeyPairCodec.java, * gnu/java/security/key/IKeyPairGenerator.java, * gnu/java/security/key/KeyPairCodecFactory.java, * gnu/java/security/key/KeyPairGeneratorFactory.java, * gnu/java/security/key/dss/DSSKey.java, * gnu/java/security/key/dss/DSSKeyPairGenerator.java, * gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java, * gnu/java/security/key/dss/DSSKeyPairRawCodec.java, * gnu/java/security/key/dss/DSSKeyPairX509Codec.java, * gnu/java/security/key/dss/DSSPrivateKey.java, * gnu/java/security/key/dss/DSSPublicKey.java, * gnu/java/security/key/dss/FIPS186.java, * gnu/java/security/key/rsa/GnuRSAKey.java, * gnu/java/security/key/rsa/GnuRSAPrivateKey.java, * gnu/java/security/key/rsa/GnuRSAPublicKey.java, * gnu/java/security/key/rsa/RSAKeyPairGenerator.java, * gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java, * gnu/java/security/key/rsa/RSAKeyPairRawCodec.java, * gnu/java/security/key/rsa/RSAKeyPairX509Codec.java, * gnu/java/security/pkcs/PKCS7Data.java, * gnu/java/security/pkcs/PKCS7SignedData.java, * gnu/java/security/pkcs/SignerInfo.java, * gnu/java/security/prng/BasePRNG.java, * gnu/java/security/prng/EntropySource.java, * gnu/java/security/prng/IRandom.java, * gnu/java/security/prng/LimitReachedException.java, * gnu/java/security/prng/MDGenerator.java, * gnu/java/security/prng/PRNGFactory.java, * gnu/java/security/prng/RandomEventListener.java, * gnu/java/security/provider/DefaultPolicy.java, * gnu/java/security/provider/PKIXCertPathValidatorImpl.java, * gnu/java/security/sig/BaseSignature.java, * gnu/java/security/sig/ISignature.java, * gnu/java/security/sig/ISignatureCodec.java, * gnu/java/security/sig/SignatureCodecFactory.java, * gnu/java/security/sig/SignatureFactory.java, * gnu/java/security/sig/dss/DSSSignature.java, * gnu/java/security/sig/dss/DSSSignatureRawCodec.java, * gnu/java/security/sig/dss/DSSSignatureX509Codec.java, * gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java, * gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java, * gnu/java/security/sig/rsa/EMSA_PSS.java, * gnu/java/security/sig/rsa/RSA.java, * gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java, * gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.java, * gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.java, * gnu/java/security/sig/rsa/RSAPSSSignature.java, * gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java, * gnu/java/security/sig/rsa/RSASignatureFactory.java, * gnu/java/security/util/ByteArray.java, * gnu/java/security/util/ByteBufferOutputStream.java, * gnu/java/security/util/ExpirableObject.java, * gnu/java/security/util/FormatUtil.java, * gnu/java/security/util/IntegerUtil.java, * gnu/java/security/util/PRNG.java, * gnu/java/security/util/Prime.java, * gnu/java/security/util/Sequence.java, * gnu/java/security/util/SimpleList.java, * gnu/java/security/util/Util.java, * gnu/java/security/x509/X509CRLSelectorImpl.java, * gnu/java/security/x509/X509CertSelectorImpl.java, * gnu/java/security/x509/ext/CertificatePolicies.java, * gnu/java/security/x509/ext/GeneralName.java, * gnu/java/security/x509/ext/GeneralSubtree.java, * gnu/java/security/x509/ext/NameConstraints.java, * gnu/java/text/AttributedFormatBuffer.java, * gnu/java/text/BaseBreakIterator.java, * gnu/java/text/CharacterBreakIterator.java, * gnu/java/text/FormatBuffer.java, * gnu/java/text/FormatCharacterIterator.java, * gnu/java/text/LineBreakIterator.java, * gnu/java/text/SentenceBreakIterator.java, * gnu/java/text/StringFormatBuffer.java, * gnu/java/text/WordBreakIterator.java, * gnu/java/util/Base64.java, * gnu/java/util/DoubleEnumeration.java, * gnu/java/util/EmptyEnumeration.java, * gnu/java/util/WeakIdentityHashMap.java, * gnu/java/util/ZoneInfo.java, * gnu/java/util/jar/JarUtils.java, * gnu/java/util/prefs/FileBasedFactory.java, * gnu/java/util/prefs/FileBasedPreferences.java, * gnu/java/util/prefs/GConfBasedFactory.java, * gnu/java/util/prefs/GConfBasedPreferences.java, * gnu/java/util/prefs/MemoryBasedFactory.java, * gnu/java/util/prefs/MemoryBasedPreferences.java, * gnu/java/util/prefs/NodeReader.java, * gnu/java/util/prefs/NodeWriter.java, * gnu/java/util/prefs/gconf/GConfNativePeer.java, * gnu/java/util/regex/BacktrackStack.java, * gnu/java/util/regex/CharIndexed.java, * gnu/java/util/regex/CharIndexedInputStream.java, * gnu/java/util/regex/RE.java, * gnu/java/util/regex/REFilterInputStream.java, * gnu/java/util/regex/REMatch.java, * gnu/java/util/regex/REMatchEnumeration.java, * gnu/java/util/regex/RESyntax.java, * gnu/java/util/regex/REToken.java, * gnu/java/util/regex/RETokenAny.java, * gnu/java/util/regex/RETokenBackRef.java, * gnu/java/util/regex/RETokenChar.java, * gnu/java/util/regex/RETokenEnd.java, * gnu/java/util/regex/RETokenEndOfPreviousMatch.java, * gnu/java/util/regex/RETokenIndependent.java, * gnu/java/util/regex/RETokenLookAhead.java, * gnu/java/util/regex/RETokenLookBehind.java, * gnu/java/util/regex/RETokenNamedProperty.java, * gnu/java/util/regex/RETokenOneOf.java, * gnu/java/util/regex/RETokenPOSIX.java, * gnu/java/util/regex/RETokenRange.java, * gnu/java/util/regex/RETokenRepeated.java, * gnu/java/util/regex/RETokenStart.java, * gnu/java/util/regex/RETokenWordBoundary.java, * gnu/java/util/regex/UncheckedRE.java, * gnu/javax/activation/viewers/ImageViewer.java, * gnu/javax/activation/viewers/TextEditor.java, * gnu/javax/activation/viewers/TextViewer.java, * gnu/javax/crypto/assembly/Assembly.java, * gnu/javax/crypto/assembly/Cascade.java, * gnu/javax/crypto/assembly/CascadeStage.java, * gnu/javax/crypto/assembly/CascadeTransformer.java, * gnu/javax/crypto/assembly/DeflateTransformer.java, * gnu/javax/crypto/assembly/Direction.java, * gnu/javax/crypto/assembly/LoopbackTransformer.java, * gnu/javax/crypto/assembly/ModeStage.java, * gnu/javax/crypto/assembly/Operation.java, * gnu/javax/crypto/assembly/PaddingTransformer.java, * gnu/javax/crypto/assembly/Stage.java, * gnu/javax/crypto/assembly/Transformer.java, * gnu/javax/crypto/assembly/TransformerException.java, * gnu/javax/crypto/cipher/Anubis.java, * gnu/javax/crypto/cipher/BaseCipher.java, * gnu/javax/crypto/cipher/Blowfish.java, * gnu/javax/crypto/cipher/Cast5.java, * gnu/javax/crypto/cipher/CipherFactory.java, * gnu/javax/crypto/cipher/DES.java, * gnu/javax/crypto/cipher/IBlockCipher.java, * gnu/javax/crypto/cipher/IBlockCipherSpi.java, * gnu/javax/crypto/cipher/Khazad.java, * gnu/javax/crypto/cipher/NullCipher.java, * gnu/javax/crypto/cipher/Rijndael.java, * gnu/javax/crypto/cipher/Serpent.java, * gnu/javax/crypto/cipher/Square.java, * gnu/javax/crypto/cipher/TripleDES.java, * gnu/javax/crypto/cipher/Twofish.java, * gnu/javax/crypto/cipher/WeakKeyException.java, * gnu/javax/crypto/jce/DiffieHellmanImpl.java, * gnu/javax/crypto/jce/GnuCrypto.java, * gnu/javax/crypto/jce/GnuSasl.java, * gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java, * gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.java, * gnu/javax/crypto/jce/cipher/AESSpi.java, * gnu/javax/crypto/jce/cipher/ARCFourSpi.java, * gnu/javax/crypto/jce/cipher/AnubisSpi.java, * gnu/javax/crypto/jce/cipher/BlowfishSpi.java, * gnu/javax/crypto/jce/cipher/Cast5Spi.java, * gnu/javax/crypto/jce/cipher/CipherAdapter.java, * gnu/javax/crypto/jce/cipher/DESSpi.java, * gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java, * gnu/javax/crypto/jce/cipher/KhazadSpi.java, * gnu/javax/crypto/jce/cipher/NullCipherSpi.java, * gnu/javax/crypto/jce/cipher/PBES2.java, * gnu/javax/crypto/jce/cipher/RijndaelSpi.java, * gnu/javax/crypto/jce/cipher/SerpentSpi.java, * gnu/javax/crypto/jce/cipher/SquareSpi.java, * gnu/javax/crypto/jce/cipher/TripleDESSpi.java, * gnu/javax/crypto/jce/cipher/TwofishSpi.java, * gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java, * gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java, * gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java, * gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java, * gnu/javax/crypto/jce/keyring/GnuKeyring.java, * gnu/javax/crypto/jce/mac/HMacHavalSpi.java, * gnu/javax/crypto/jce/mac/HMacMD2Spi.java, * gnu/javax/crypto/jce/mac/HMacMD4Spi.java, * gnu/javax/crypto/jce/mac/HMacMD5Spi.java, * gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java, * gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java, * gnu/javax/crypto/jce/mac/HMacSHA160Spi.java, * gnu/javax/crypto/jce/mac/HMacSHA256Spi.java, * gnu/javax/crypto/jce/mac/HMacSHA384Spi.java, * gnu/javax/crypto/jce/mac/HMacSHA512Spi.java, * gnu/javax/crypto/jce/mac/HMacTigerSpi.java, * gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java, * gnu/javax/crypto/jce/mac/MacAdapter.java, * gnu/javax/crypto/jce/mac/TMMH16Spi.java, * gnu/javax/crypto/jce/mac/UHash32Spi.java, * gnu/javax/crypto/jce/mac/UMac32Spi.java, * gnu/javax/crypto/jce/params/BlockCipherParameters.java, * gnu/javax/crypto/jce/params/DEREncodingException.java, * gnu/javax/crypto/jce/params/DERReader.java, * gnu/javax/crypto/jce/params/DERWriter.java, * gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java, * gnu/javax/crypto/jce/prng/CSPRNGSpi.java, * gnu/javax/crypto/jce/prng/FortunaImpl.java, * gnu/javax/crypto/jce/prng/ICMRandomSpi.java, * gnu/javax/crypto/jce/prng/UMacRandomSpi.java, * gnu/javax/crypto/jce/sig/DHParameters.java, * gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java, * gnu/javax/crypto/jce/spec/TMMHParameterSpec.java, * gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java, * gnu/javax/crypto/key/BaseKeyAgreementParty.java, * gnu/javax/crypto/key/GnuPBEKey.java, * gnu/javax/crypto/key/GnuSecretKey.java, * gnu/javax/crypto/key/IKeyAgreementParty.java, * gnu/javax/crypto/key/IncomingMessage.java, * gnu/javax/crypto/key/KeyAgreementException.java, * gnu/javax/crypto/key/KeyAgreementFactory.java, * gnu/javax/crypto/key/OutgoingMessage.java, * gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.java, * gnu/javax/crypto/key/dh/DHKeyPairRawCodec.java, * gnu/javax/crypto/key/dh/DHKeyPairX509Codec.java, * gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.java, * gnu/javax/crypto/key/dh/DiffieHellmanReceiver.java, * gnu/javax/crypto/key/dh/DiffieHellmanSender.java, * gnu/javax/crypto/key/dh/ElGamalKeyAgreement.java, * gnu/javax/crypto/key/dh/ElGamalReceiver.java, * gnu/javax/crypto/key/dh/ElGamalSender.java, * gnu/javax/crypto/key/dh/GnuDHKey.java, * gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java, * gnu/javax/crypto/key/dh/GnuDHPrivateKey.java, * gnu/javax/crypto/key/dh/GnuDHPublicKey.java, * gnu/javax/crypto/key/dh/RFC2631.java, * gnu/javax/crypto/key/srp6/SRP6Host.java, * gnu/javax/crypto/key/srp6/SRP6KeyAgreement.java, * gnu/javax/crypto/key/srp6/SRP6SaslClient.java, * gnu/javax/crypto/key/srp6/SRP6SaslServer.java, * gnu/javax/crypto/key/srp6/SRP6TLSClient.java, * gnu/javax/crypto/key/srp6/SRP6TLSServer.java, * gnu/javax/crypto/key/srp6/SRP6User.java, * gnu/javax/crypto/key/srp6/SRPAlgorithm.java, * gnu/javax/crypto/key/srp6/SRPKey.java, * gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java, * gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.java, * gnu/javax/crypto/key/srp6/SRPPrivateKey.java, * gnu/javax/crypto/key/srp6/SRPPublicKey.java, * gnu/javax/crypto/keyring/AuthenticatedEntry.java, * gnu/javax/crypto/keyring/BaseKeyring.java, * gnu/javax/crypto/keyring/BinaryDataEntry.java, * gnu/javax/crypto/keyring/CertPathEntry.java, * gnu/javax/crypto/keyring/CertificateEntry.java, * gnu/javax/crypto/keyring/CompressedEntry.java, * gnu/javax/crypto/keyring/EncryptedEntry.java, * gnu/javax/crypto/keyring/Entry.java, * gnu/javax/crypto/keyring/EnvelopeEntry.java, * gnu/javax/crypto/keyring/GnuPrivateKeyring.java, * gnu/javax/crypto/keyring/GnuPublicKeyring.java, * gnu/javax/crypto/keyring/IKeyring.java, * gnu/javax/crypto/keyring/IPrivateKeyring.java, * gnu/javax/crypto/keyring/IPublicKeyring.java, * gnu/javax/crypto/keyring/MalformedKeyringException.java, * gnu/javax/crypto/keyring/MaskableEnvelopeEntry.java, * gnu/javax/crypto/keyring/MeteredInputStream.java, * gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java, * gnu/javax/crypto/keyring/PasswordEncryptedEntry.java, * gnu/javax/crypto/keyring/PasswordProtectedEntry.java, * gnu/javax/crypto/keyring/PrimitiveEntry.java, * gnu/javax/crypto/keyring/PrivateKeyEntry.java, * gnu/javax/crypto/keyring/Properties.java, * gnu/javax/crypto/keyring/PublicKeyEntry.java, * gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.java, * gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.java, * gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.java, * gnu/javax/crypto/kwa/TripleDESKeyWrap.java, * gnu/javax/crypto/mac/BaseMac.java, * gnu/javax/crypto/mac/HMac.java, * gnu/javax/crypto/mac/HMacFactory.java, * gnu/javax/crypto/mac/IMac.java, * gnu/javax/crypto/mac/MacFactory.java, * gnu/javax/crypto/mac/MacInputStream.java, * gnu/javax/crypto/mac/MacOutputStream.java, * gnu/javax/crypto/mac/OMAC.java, * gnu/javax/crypto/mac/TMMH16.java, * gnu/javax/crypto/mac/UHash32.java, * gnu/javax/crypto/mac/UMac32.java, * gnu/javax/crypto/mode/BaseMode.java, * gnu/javax/crypto/mode/CBC.java, * gnu/javax/crypto/mode/CFB.java, * gnu/javax/crypto/mode/CTR.java, * gnu/javax/crypto/mode/EAX.java, * gnu/javax/crypto/mode/ECB.java, * gnu/javax/crypto/mode/IAuthenticatedMode.java, * gnu/javax/crypto/mode/ICM.java, * gnu/javax/crypto/mode/IMode.java, * gnu/javax/crypto/mode/ModeFactory.java, * gnu/javax/crypto/mode/OFB.java, * gnu/javax/crypto/pad/BasePad.java, * gnu/javax/crypto/pad/IPad.java, * gnu/javax/crypto/pad/PKCS1_V1_5.java, * gnu/javax/crypto/pad/PKCS7.java, * gnu/javax/crypto/pad/PadFactory.java, * gnu/javax/crypto/pad/TBC.java, * gnu/javax/crypto/pad/WrongPaddingException.java, * gnu/javax/crypto/prng/ARCFour.java, * gnu/javax/crypto/prng/CSPRNG.java, * gnu/javax/crypto/prng/ICMGenerator.java, * gnu/javax/crypto/prng/IPBE.java, * gnu/javax/crypto/prng/PBKDF2.java, * gnu/javax/crypto/prng/PRNGFactory.java, * gnu/javax/crypto/prng/UMacGenerator.java, * gnu/javax/crypto/sasl/AuthInfo.java, * gnu/javax/crypto/sasl/AuthInfoProviderFactory.java, * gnu/javax/crypto/sasl/ClientFactory.java, * gnu/javax/crypto/sasl/ClientMechanism.java, * gnu/javax/crypto/sasl/ConfidentialityException.java, * gnu/javax/crypto/sasl/IAuthInfoProvider.java, * gnu/javax/crypto/sasl/IAuthInfoProviderFactory.java, * gnu/javax/crypto/sasl/IllegalMechanismStateException.java, * gnu/javax/crypto/sasl/InputBuffer.java, * gnu/javax/crypto/sasl/IntegrityException.java, * gnu/javax/crypto/sasl/NoSuchMechanismException.java, * gnu/javax/crypto/sasl/NoSuchUserException.java, * gnu/javax/crypto/sasl/OutputBuffer.java, * gnu/javax/crypto/sasl/SaslEncodingException.java, * gnu/javax/crypto/sasl/SaslInputStream.java, * gnu/javax/crypto/sasl/SaslOutputStream.java, * gnu/javax/crypto/sasl/SaslUtil.java, * gnu/javax/crypto/sasl/ServerFactory.java, * gnu/javax/crypto/sasl/ServerMechanism.java, * gnu/javax/crypto/sasl/UserAlreadyExistsException.java, * gnu/javax/crypto/sasl/anonymous/AnonymousClient.java, * gnu/javax/crypto/sasl/anonymous/AnonymousServer.java, * gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java, * gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.java, * gnu/javax/crypto/sasl/crammd5/CramMD5Client.java, * gnu/javax/crypto/sasl/crammd5/CramMD5Registry.java, * gnu/javax/crypto/sasl/crammd5/CramMD5Server.java, * gnu/javax/crypto/sasl/crammd5/CramMD5Util.java, * gnu/javax/crypto/sasl/crammd5/PasswordFile.java, * gnu/javax/crypto/sasl/plain/PasswordFile.java, * gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.java, * gnu/javax/crypto/sasl/plain/PlainClient.java, * gnu/javax/crypto/sasl/plain/PlainRegistry.java, * gnu/javax/crypto/sasl/plain/PlainServer.java, * gnu/javax/crypto/sasl/srp/CALG.java, * gnu/javax/crypto/sasl/srp/ClientStore.java, * gnu/javax/crypto/sasl/srp/IALG.java, * gnu/javax/crypto/sasl/srp/KDF.java, * gnu/javax/crypto/sasl/srp/PasswordFile.java, * gnu/javax/crypto/sasl/srp/SRP.java, * gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.java, * gnu/javax/crypto/sasl/srp/SRPClient.java, * gnu/javax/crypto/sasl/srp/SRPRegistry.java, * gnu/javax/crypto/sasl/srp/SRPServer.java, * gnu/javax/crypto/sasl/srp/SecurityContext.java, * gnu/javax/crypto/sasl/srp/ServerStore.java, * gnu/javax/crypto/sasl/srp/StoreEntry.java, * gnu/javax/imageio/IIOInputStream.java, * gnu/javax/imageio/bmp/BMPDecoder.java, * gnu/javax/imageio/bmp/BMPEncoder.java, * gnu/javax/imageio/bmp/BMPException.java, * gnu/javax/imageio/bmp/BMPFileHeader.java, * gnu/javax/imageio/bmp/BMPImageReader.java, * gnu/javax/imageio/bmp/BMPImageReaderSpi.java, * gnu/javax/imageio/bmp/BMPImageWriter.java, * gnu/javax/imageio/bmp/BMPImageWriterSpi.java, * gnu/javax/imageio/bmp/BMPInfoHeader.java, * gnu/javax/imageio/bmp/DecodeBF16.java, * gnu/javax/imageio/bmp/DecodeBF32.java, * gnu/javax/imageio/bmp/DecodeRGB1.java, * gnu/javax/imageio/bmp/DecodeRGB24.java, * gnu/javax/imageio/bmp/DecodeRGB4.java, * gnu/javax/imageio/bmp/DecodeRGB8.java, * gnu/javax/imageio/bmp/DecodeRLE4.java, * gnu/javax/imageio/bmp/DecodeRLE8.java, * gnu/javax/imageio/bmp/EncodeRGB1.java, * gnu/javax/imageio/bmp/EncodeRGB16.java, * gnu/javax/imageio/bmp/EncodeRGB24.java, * gnu/javax/imageio/bmp/EncodeRGB32.java, * gnu/javax/imageio/bmp/EncodeRGB4.java, * gnu/javax/imageio/bmp/EncodeRGB8.java, * gnu/javax/imageio/bmp/EncodeRLE4.java, * gnu/javax/imageio/bmp/EncodeRLE8.java, * gnu/javax/imageio/gif/GIFFile.java, * gnu/javax/imageio/gif/GIFImageReader.java, * gnu/javax/imageio/gif/GIFImageReaderSpi.java, * gnu/javax/imageio/jpeg/DCT.java, * gnu/javax/imageio/jpeg/JPEGComponent.java, * gnu/javax/imageio/jpeg/JPEGDecoder.java, * gnu/javax/imageio/jpeg/JPEGImageInputStream.java, * gnu/javax/imageio/jpeg/JPEGImageReader.java, * gnu/javax/imageio/jpeg/JPEGImageReaderSpi.java, * gnu/javax/imageio/jpeg/JPEGMarker.java, * gnu/javax/imageio/jpeg/ZigZag.java, * gnu/javax/imageio/png/PNGChunk.java, * gnu/javax/imageio/png/PNGData.java, * gnu/javax/imageio/png/PNGDecoder.java, * gnu/javax/imageio/png/PNGEncoder.java, * gnu/javax/imageio/png/PNGException.java, * gnu/javax/imageio/png/PNGFile.java, * gnu/javax/imageio/png/PNGFilter.java, * gnu/javax/imageio/png/PNGGamma.java, * gnu/javax/imageio/png/PNGHeader.java, * gnu/javax/imageio/png/PNGICCProfile.java, * gnu/javax/imageio/png/PNGImageReader.java, * gnu/javax/imageio/png/PNGPalette.java, * gnu/javax/imageio/png/PNGPhys.java, * gnu/javax/imageio/png/PNGTime.java, * gnu/javax/management/ListenerData.java, * gnu/javax/management/Server.java, * gnu/javax/management/Translator.java, * gnu/javax/naming/giop/ContextContinuation.java, * gnu/javax/naming/giop/CorbalocParser.java, * gnu/javax/naming/giop/GiopNamingEnumeration.java, * gnu/javax/naming/giop/GiopNamingServiceFactory.java, * gnu/javax/naming/giop/GiopNamingServiceURLContext.java, * gnu/javax/naming/giop/ListBindingsEnumeration.java, * gnu/javax/naming/giop/ListEnumeration.java, * gnu/javax/naming/ictxImpl/trans/GnuName.java, * gnu/javax/naming/jndi/url/corbaname/corbanameURLContextFactory.java, * gnu/javax/naming/jndi/url/rmi/ContextContinuation.java, * gnu/javax/naming/jndi/url/rmi/ListBindingsEnumeration.java, * gnu/javax/naming/jndi/url/rmi/ListEnumeration.java, * gnu/javax/naming/jndi/url/rmi/RmiContinuation.java, * gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.java, * gnu/javax/naming/jndi/url/rmi/rmiURLContext.java, * gnu/javax/naming/jndi/url/rmi/rmiURLContextFactory.java, * gnu/javax/net/ssl/AbstractSessionContext.java, * gnu/javax/net/ssl/PreSharedKeyManager.java, * gnu/javax/net/ssl/PreSharedKeyManagerParameters.java, * gnu/javax/net/ssl/SSLCipherSuite.java, * gnu/javax/net/ssl/SSLRecordHandler.java, * gnu/javax/net/ssl/Session.java, * gnu/javax/net/ssl/SessionStoreException.java, * gnu/javax/net/ssl/provider/AbstractHandshake.java, * gnu/javax/net/ssl/provider/Alert.java, * gnu/javax/net/ssl/provider/AlertException.java, * gnu/javax/net/ssl/provider/Builder.java, * gnu/javax/net/ssl/provider/Certificate.java, * gnu/javax/net/ssl/provider/CertificateBuilder.java, * gnu/javax/net/ssl/provider/CertificateRequest.java, * gnu/javax/net/ssl/provider/CertificateRequestBuilder.java, * gnu/javax/net/ssl/provider/CertificateStatusRequest.java, * gnu/javax/net/ssl/provider/CertificateStatusType.java, * gnu/javax/net/ssl/provider/CertificateURL.java, * gnu/javax/net/ssl/provider/CertificateVerify.java, * gnu/javax/net/ssl/provider/CipherSuite.java, * gnu/javax/net/ssl/provider/CipherSuiteList.java, * gnu/javax/net/ssl/provider/ClientCertificateTypeList.java, * gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.java, * gnu/javax/net/ssl/provider/ClientDiffieHellmanPublic.java, * gnu/javax/net/ssl/provider/ClientHandshake.java, * gnu/javax/net/ssl/provider/ClientHello.java, * gnu/javax/net/ssl/provider/ClientHelloBuilder.java, * gnu/javax/net/ssl/provider/ClientHelloV2.java, * gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.java, * gnu/javax/net/ssl/provider/ClientPSKParameters.java, * gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java, * gnu/javax/net/ssl/provider/CompressionMethod.java, * gnu/javax/net/ssl/provider/CompressionMethodList.java, * gnu/javax/net/ssl/provider/Constructed.java, * gnu/javax/net/ssl/provider/Debug.java, * gnu/javax/net/ssl/provider/DelegatedTask.java, * gnu/javax/net/ssl/provider/EmptyExchangeKeys.java, * gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java, * gnu/javax/net/ssl/provider/ExchangeKeys.java, * gnu/javax/net/ssl/provider/Extension.java, * gnu/javax/net/ssl/provider/ExtensionList.java, * gnu/javax/net/ssl/provider/Handshake.java, * gnu/javax/net/ssl/provider/InputSecurityParameters.java, * gnu/javax/net/ssl/provider/Jessie.java, * gnu/javax/net/ssl/provider/MaxFragmentLength.java, * gnu/javax/net/ssl/provider/OutputSecurityParameters.java, * gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.java, * gnu/javax/net/ssl/provider/Random.java, * gnu/javax/net/ssl/provider/SSLContextImpl.java, * gnu/javax/net/ssl/provider/SSLEngineImpl.java, * gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java, * gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.java, * gnu/javax/net/ssl/provider/SSLServerSocketImpl.java, * gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java, * gnu/javax/net/ssl/provider/SSLSocketImpl.java, * gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.java, * gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.java, * gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java, * gnu/javax/net/ssl/provider/ServerDHParams.java, * gnu/javax/net/ssl/provider/ServerHandshake.java, * gnu/javax/net/ssl/provider/ServerHello.java, * gnu/javax/net/ssl/provider/ServerHelloBuilder.java, * gnu/javax/net/ssl/provider/ServerHelloDone.java, * gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.java, * gnu/javax/net/ssl/provider/ServerNameList.java, * gnu/javax/net/ssl/provider/ServerPSKParameters.java, * gnu/javax/net/ssl/provider/ServerRSA_PSKParameters.java, * gnu/javax/net/ssl/provider/SessionImpl.java, * gnu/javax/net/ssl/provider/Signature.java, * gnu/javax/net/ssl/provider/SignatureAlgorithm.java, * gnu/javax/net/ssl/provider/SimpleSessionContext.java, * gnu/javax/net/ssl/provider/TruncatedHMAC.java, * gnu/javax/net/ssl/provider/TrustedAuthorities.java, * gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java, * gnu/javax/net/ssl/provider/Util.java, * gnu/javax/net/ssl/provider/X500PrincipalList.java, * gnu/javax/net/ssl/provider/X509KeyManagerFactory.java, * gnu/javax/net/ssl/provider/X509TrustManagerFactory.java, * gnu/javax/print/ipp/IppRequest.java, * gnu/javax/rmi/CORBA/CorbaInput.java, * gnu/javax/rmi/CORBA/CorbaOutput.java, * gnu/javax/rmi/CORBA/DefaultWriteObjectTester.java, * gnu/javax/rmi/CORBA/DelegateFactory.java, * gnu/javax/rmi/CORBA/GetDelegateInstanceException.java, * gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java, * gnu/javax/rmi/CORBA/RmiUtilities.java, * gnu/javax/rmi/CORBA/StubDelegateImpl.java, * gnu/javax/rmi/CORBA/TieTargetRecord.java, * gnu/javax/rmi/CORBA/UtilDelegateImpl.java, * gnu/javax/rmi/CORBA/ValueHandlerDelegateImpl.java, * gnu/javax/security/auth/callback/AWTCallbackHandler.java, * gnu/javax/security/auth/callback/AbstractCallbackHandler.java, * gnu/javax/security/auth/callback/CertificateCallback.java, * gnu/javax/security/auth/callback/ConsoleCallbackHandler.java, * gnu/javax/security/auth/callback/DefaultCallbackHandler.java, * gnu/javax/security/auth/callback/SwingCallbackHandler.java, * gnu/javax/security/auth/login/ConfigFileParser.java, * gnu/javax/security/auth/login/ConfigFileTokenizer.java, * gnu/javax/security/auth/login/GnuConfiguration.java, * gnu/javax/sound/AudioSecurityManager.java, * gnu/javax/sound/midi/alsa/AlsaInputPortDevice.java, * gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.java, * gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.java, * gnu/javax/sound/midi/alsa/AlsaOutputPortDevice.java, * gnu/javax/sound/midi/alsa/AlsaPortDevice.java, * gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java, * gnu/javax/sound/midi/dssi/DSSISynthesizer.java, * gnu/javax/sound/midi/file/ExtendedMidiFileFormat.java, * gnu/javax/sound/midi/file/MidiDataInputStream.java, * gnu/javax/sound/midi/file/MidiDataOutputStream.java, * gnu/javax/sound/midi/file/MidiFileReader.java, * gnu/javax/sound/midi/file/MidiFileWriter.java, * gnu/javax/sound/sampled/AU/AUReader.java, * gnu/javax/sound/sampled/WAV/WAVReader.java, * gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java, * gnu/javax/sound/sampled/gstreamer/GStreamerMixerProvider.java, * gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java, * gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.java, * gnu/javax/sound/sampled/gstreamer/io/GstInputStream.java, * gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.java, * gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.java, * gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.java, * gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.java, * gnu/javax/swing/plaf/gnu/GNULookAndFeel.java, * gnu/javax/swing/text/html/CharacterAttributeTranslator.java, * gnu/javax/swing/text/html/CombinedAttributes.java, * gnu/javax/swing/text/html/ImageViewIconFactory.java, * gnu/javax/swing/text/html/css/BorderStyle.java, * gnu/javax/swing/text/html/css/CSSParser.java, * gnu/javax/swing/text/html/css/CSSScanner.java, * gnu/javax/swing/text/html/css/Selector.java, * gnu/javax/swing/text/html/parser/GnuParserDelegator.java, * gnu/javax/swing/text/html/parser/HTML_401F.java, * gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java, * gnu/javax/swing/text/html/parser/htmlAttributeSet.java, * gnu/javax/swing/text/html/parser/htmlValidator.java, * gnu/javax/swing/text/html/parser/models/list.java, * gnu/javax/swing/text/html/parser/support/Parser.java, * gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.java, * gnu/javax/swing/text/html/parser/support/textPreProcessor.java, * gnu/javax/swing/tree/GnuPath.java, * gnu/test/Fail.java, * gnu/test/Pass.java, * gnu/test/Test.java, * gnu/test/Unsupported.java, * gnu/xml/aelfred2/JAXPFactory.java, * gnu/xml/aelfred2/SAXDriver.java, * gnu/xml/aelfred2/XmlParser.java, * gnu/xml/aelfred2/XmlReader.java, * gnu/xml/dom/Consumer.java, * gnu/xml/dom/DTDAttributeTypeInfo.java, * gnu/xml/dom/DTDElementTypeInfo.java, * gnu/xml/dom/DomAttr.java, * gnu/xml/dom/DomCDATASection.java, * gnu/xml/dom/DomCharacterData.java, * gnu/xml/dom/DomComment.java, * gnu/xml/dom/DomDOMException.java, * gnu/xml/dom/DomDoctype.java, * gnu/xml/dom/DomDocument.java, * gnu/xml/dom/DomDocumentBuilder.java, * gnu/xml/dom/DomDocumentBuilderFactory.java, * gnu/xml/dom/DomDocumentConfiguration.java, * gnu/xml/dom/DomDocumentFragment.java, * gnu/xml/dom/DomElement.java, * gnu/xml/dom/DomEntity.java, * gnu/xml/dom/DomEntityReference.java, * gnu/xml/dom/DomEvent.java, * gnu/xml/dom/DomExtern.java, * gnu/xml/dom/DomImpl.java, * gnu/xml/dom/DomIterator.java, * gnu/xml/dom/DomNSResolverContext.java, * gnu/xml/dom/DomNamedNodeMap.java, * gnu/xml/dom/DomNode.java, * gnu/xml/dom/DomNodeIterator.java, * gnu/xml/dom/DomNotation.java, * gnu/xml/dom/DomNsNode.java, * gnu/xml/dom/DomProcessingInstruction.java, * gnu/xml/dom/DomText.java, * gnu/xml/dom/DomXPathExpression.java, * gnu/xml/dom/DomXPathNSResolver.java, * gnu/xml/dom/DomXPathResult.java, * gnu/xml/dom/ImplementationList.java, * gnu/xml/dom/ImplementationSource.java, * gnu/xml/dom/JAXPFactory.java, * gnu/xml/dom/html2/DomHTMLAnchorElement.java, * gnu/xml/dom/html2/DomHTMLAppletElement.java, * gnu/xml/dom/html2/DomHTMLAreaElement.java, * gnu/xml/dom/html2/DomHTMLBRElement.java, * gnu/xml/dom/html2/DomHTMLBaseElement.java, * gnu/xml/dom/html2/DomHTMLBaseFontElement.java, * gnu/xml/dom/html2/DomHTMLBodyElement.java, * gnu/xml/dom/html2/DomHTMLButtonElement.java, * gnu/xml/dom/html2/DomHTMLCollection.java, * gnu/xml/dom/html2/DomHTMLDListElement.java, * gnu/xml/dom/html2/DomHTMLDirectoryElement.java, * gnu/xml/dom/html2/DomHTMLDivElement.java, * gnu/xml/dom/html2/DomHTMLDocument.java, * gnu/xml/dom/html2/DomHTMLElement.java, * gnu/xml/dom/html2/DomHTMLEmbedElement.java, * gnu/xml/dom/html2/DomHTMLFieldSetElement.java, * gnu/xml/dom/html2/DomHTMLFontElement.java, * gnu/xml/dom/html2/DomHTMLFormElement.java, * gnu/xml/dom/html2/DomHTMLFrameElement.java, * gnu/xml/dom/html2/DomHTMLFrameSetElement.java, * gnu/xml/dom/html2/DomHTMLHRElement.java, * gnu/xml/dom/html2/DomHTMLHeadElement.java, * gnu/xml/dom/html2/DomHTMLHeadingElement.java, * gnu/xml/dom/html2/DomHTMLHtmlElement.java, * gnu/xml/dom/html2/DomHTMLIFrameElement.java, * gnu/xml/dom/html2/DomHTMLImageElement.java, * gnu/xml/dom/html2/DomHTMLImpl.java, * gnu/xml/dom/html2/DomHTMLInputElement.java, * gnu/xml/dom/html2/DomHTMLIsIndexElement.java, * gnu/xml/dom/html2/DomHTMLLIElement.java, * gnu/xml/dom/html2/DomHTMLLabelElement.java, * gnu/xml/dom/html2/DomHTMLLegendElement.java, * gnu/xml/dom/html2/DomHTMLLinkElement.java, * gnu/xml/dom/html2/DomHTMLMapElement.java, * gnu/xml/dom/html2/DomHTMLMenuElement.java, * gnu/xml/dom/html2/DomHTMLMetaElement.java, * gnu/xml/dom/html2/DomHTMLModElement.java, * gnu/xml/dom/html2/DomHTMLOListElement.java, * gnu/xml/dom/html2/DomHTMLObjectElement.java, * gnu/xml/dom/html2/DomHTMLOptGroupElement.java, * gnu/xml/dom/html2/DomHTMLOptionElement.java, * gnu/xml/dom/html2/DomHTMLParagraphElement.java, * gnu/xml/dom/html2/DomHTMLParamElement.java, * gnu/xml/dom/html2/DomHTMLParser.java, * gnu/xml/dom/html2/DomHTMLPreElement.java, * gnu/xml/dom/html2/DomHTMLQuoteElement.java, * gnu/xml/dom/html2/DomHTMLScriptElement.java, * gnu/xml/dom/html2/DomHTMLSelectElement.java, * gnu/xml/dom/html2/DomHTMLStyleElement.java, * gnu/xml/dom/html2/DomHTMLTableCaptionElement.java, * gnu/xml/dom/html2/DomHTMLTableCellElement.java, * gnu/xml/dom/html2/DomHTMLTableColElement.java, * gnu/xml/dom/html2/DomHTMLTableElement.java, * gnu/xml/dom/html2/DomHTMLTableRowElement.java, * gnu/xml/dom/html2/DomHTMLTableSectionElement.java, * gnu/xml/dom/html2/DomHTMLTextAreaElement.java, * gnu/xml/dom/html2/DomHTMLTitleElement.java, * gnu/xml/dom/html2/DomHTMLUListElement.java, * gnu/xml/dom/ls/DomLSException.java, * gnu/xml/dom/ls/DomLSInput.java, * gnu/xml/dom/ls/DomLSOutput.java, * gnu/xml/dom/ls/DomLSParser.java, * gnu/xml/dom/ls/DomLSSerializer.java, * gnu/xml/dom/ls/FilteredSAXEventSink.java, * gnu/xml/dom/ls/ReaderInputStream.java, * gnu/xml/dom/ls/SAXEventSink.java, * gnu/xml/dom/ls/WriterOutputStream.java, * gnu/xml/libxmlj/dom/GnomeAttr.java, * gnu/xml/libxmlj/dom/GnomeCDATASection.java, * gnu/xml/libxmlj/dom/GnomeCharacterData.java, * gnu/xml/libxmlj/dom/GnomeComment.java, * gnu/xml/libxmlj/dom/GnomeDOMException.java, * gnu/xml/libxmlj/dom/GnomeDOMStringList.java, * gnu/xml/libxmlj/dom/GnomeDocument.java, * gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java, * gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.java, * gnu/xml/libxmlj/dom/GnomeDocumentFragment.java, * gnu/xml/libxmlj/dom/GnomeDocumentType.java, * gnu/xml/libxmlj/dom/GnomeElement.java, * gnu/xml/libxmlj/dom/GnomeEntity.java, * gnu/xml/libxmlj/dom/GnomeEntityReference.java, * gnu/xml/libxmlj/dom/GnomeNamedNodeMap.java, * gnu/xml/libxmlj/dom/GnomeNode.java, * gnu/xml/libxmlj/dom/GnomeNodeList.java, * gnu/xml/libxmlj/dom/GnomeNotation.java, * gnu/xml/libxmlj/dom/GnomeProcessingInstruction.java, * gnu/xml/libxmlj/dom/GnomeText.java, * gnu/xml/libxmlj/dom/GnomeTypeInfo.java, * gnu/xml/libxmlj/dom/GnomeXPathExpression.java, * gnu/xml/libxmlj/dom/GnomeXPathNSResolver.java, * gnu/xml/libxmlj/dom/GnomeXPathNodeList.java, * gnu/xml/libxmlj/dom/GnomeXPathResult.java, * gnu/xml/libxmlj/sax/GnomeLocator.java, * gnu/xml/libxmlj/sax/GnomeSAXParser.java, * gnu/xml/libxmlj/sax/GnomeSAXParserFactory.java, * gnu/xml/libxmlj/sax/GnomeXMLReader.java, * gnu/xml/libxmlj/sax/Namespaces.java, * gnu/xml/libxmlj/sax/StringArrayAttributes.java, * gnu/xml/libxmlj/sax/XMLName.java, * gnu/xml/libxmlj/transform/ErrorListenerErrorHandler.java, * gnu/xml/libxmlj/transform/GnomeTransformer.java, * gnu/xml/libxmlj/transform/GnomeTransformerFactory.java, * gnu/xml/libxmlj/transform/URIResolverEntityResolver.java, * gnu/xml/libxmlj/util/EmptyNodeList.java, * gnu/xml/libxmlj/util/NamedInputStream.java, * gnu/xml/libxmlj/util/StandaloneDocumentType.java, * gnu/xml/libxmlj/util/StandaloneLocator.java, * gnu/xml/libxmlj/util/XMLJ.java, * gnu/xml/pipeline/CallFilter.java, * gnu/xml/pipeline/DomConsumer.java, * gnu/xml/pipeline/EventConsumer.java, * gnu/xml/pipeline/EventFilter.java, * gnu/xml/pipeline/LinkFilter.java, * gnu/xml/pipeline/NSFilter.java, * gnu/xml/pipeline/PipelineFactory.java, * gnu/xml/pipeline/TeeConsumer.java, * gnu/xml/pipeline/TextConsumer.java, * gnu/xml/pipeline/ValidationConsumer.java, * gnu/xml/pipeline/WellFormednessFilter.java, * gnu/xml/pipeline/XIncludeFilter.java, * gnu/xml/pipeline/XsltFilter.java, * gnu/xml/stream/AttributeImpl.java, * gnu/xml/stream/BufferedReader.java, * gnu/xml/stream/CRLFReader.java, * gnu/xml/stream/CharactersImpl.java, * gnu/xml/stream/CommentImpl.java, * gnu/xml/stream/DTDImpl.java, * gnu/xml/stream/EndDocumentImpl.java, * gnu/xml/stream/EndElementImpl.java, * gnu/xml/stream/EntityDeclarationImpl.java, * gnu/xml/stream/EntityReferenceImpl.java, * gnu/xml/stream/FilteredEventReader.java, * gnu/xml/stream/FilteredStreamReader.java, * gnu/xml/stream/NamespaceImpl.java, * gnu/xml/stream/NotationDeclarationImpl.java, * gnu/xml/stream/ProcessingInstructionImpl.java, * gnu/xml/stream/SAXParser.java, * gnu/xml/stream/SAXParserFactory.java, * gnu/xml/stream/StartDocumentImpl.java, * gnu/xml/stream/StartElementImpl.java, * gnu/xml/stream/UnicodeReader.java, * gnu/xml/stream/XIncludeFilter.java, * gnu/xml/stream/XMLEventAllocatorImpl.java, * gnu/xml/stream/XMLEventFactoryImpl.java, * gnu/xml/stream/XMLEventImpl.java, * gnu/xml/stream/XMLEventReaderImpl.java, * gnu/xml/stream/XMLEventWriterImpl.java, * gnu/xml/stream/XMLInputFactoryImpl.java, * gnu/xml/stream/XMLOutputFactoryImpl.java, * gnu/xml/stream/XMLParser.java, * gnu/xml/stream/XMLStreamWriterImpl.java, * gnu/xml/transform/AbstractNumberNode.java, * gnu/xml/transform/ApplyImportsNode.java, * gnu/xml/transform/ApplyTemplatesNode.java, * gnu/xml/transform/AttributeNode.java, * gnu/xml/transform/AttributeSet.java, * gnu/xml/transform/Bindings.java, * gnu/xml/transform/CallTemplateNode.java, * gnu/xml/transform/ChooseNode.java, * gnu/xml/transform/CommentNode.java, * gnu/xml/transform/CopyNode.java, * gnu/xml/transform/CopyOfNode.java, * gnu/xml/transform/CurrentFunction.java, * gnu/xml/transform/DOMSourceLocator.java, * gnu/xml/transform/DocumentFunction.java, * gnu/xml/transform/ElementAvailableFunction.java, * gnu/xml/transform/ElementNode.java, * gnu/xml/transform/ErrorListenerErrorHandler.java, * gnu/xml/transform/ForEachNode.java, * gnu/xml/transform/FormatNumberFunction.java, * gnu/xml/transform/FunctionAvailableFunction.java, * gnu/xml/transform/GenerateIdFunction.java, * gnu/xml/transform/IfNode.java, * gnu/xml/transform/Key.java, * gnu/xml/transform/KeyFunction.java, * gnu/xml/transform/LiteralNode.java, * gnu/xml/transform/MessageNode.java, * gnu/xml/transform/NamespaceProxy.java, * gnu/xml/transform/NodeNumberNode.java, * gnu/xml/transform/NumberNode.java, * gnu/xml/transform/OtherwiseNode.java, * gnu/xml/transform/ParameterNode.java, * gnu/xml/transform/ProcessingInstructionNode.java, * gnu/xml/transform/SAXSerializer.java, * gnu/xml/transform/SAXTemplatesHandler.java, * gnu/xml/transform/SAXTransformerHandler.java, * gnu/xml/transform/SortKey.java, * gnu/xml/transform/StreamSerializer.java, * gnu/xml/transform/StrippingInstruction.java, * gnu/xml/transform/Stylesheet.java, * gnu/xml/transform/SystemPropertyFunction.java, * gnu/xml/transform/Template.java, * gnu/xml/transform/TemplateNode.java, * gnu/xml/transform/TemplatesImpl.java, * gnu/xml/transform/TextNode.java, * gnu/xml/transform/TransformerFactoryImpl.java, * gnu/xml/transform/TransformerImpl.java, * gnu/xml/transform/TransformerOutputProperties.java, * gnu/xml/transform/URIResolverEntityResolver.java, * gnu/xml/transform/UnparsedEntityUriFunction.java, * gnu/xml/transform/ValueOfNode.java, * gnu/xml/transform/WhenNode.java, * gnu/xml/transform/WithParam.java, * gnu/xml/transform/XSLComparator.java, * gnu/xml/transform/XSLURIResolver.java, * gnu/xml/util/DoParse.java, * gnu/xml/util/DomParser.java, * gnu/xml/util/Resolver.java, * gnu/xml/util/SAXNullTransformerFactory.java, * gnu/xml/util/XCat.java, * gnu/xml/util/XHTMLWriter.java, * gnu/xml/util/XMLWriter.java, * gnu/xml/validation/datatype/Annotation.java, * gnu/xml/validation/datatype/AnySimpleType.java, * gnu/xml/validation/datatype/AnyType.java, * gnu/xml/validation/datatype/AnyURIType.java, * gnu/xml/validation/datatype/AtomicSimpleType.java, * gnu/xml/validation/datatype/Base64BinaryType.java, * gnu/xml/validation/datatype/BooleanType.java, * gnu/xml/validation/datatype/ByteType.java, * gnu/xml/validation/datatype/DateTimeType.java, * gnu/xml/validation/datatype/DateType.java, * gnu/xml/validation/datatype/DecimalType.java, * gnu/xml/validation/datatype/DoubleType.java, * gnu/xml/validation/datatype/DurationType.java, * gnu/xml/validation/datatype/EntitiesType.java, * gnu/xml/validation/datatype/EntityType.java, * gnu/xml/validation/datatype/EnumerationFacet.java, * gnu/xml/validation/datatype/Facet.java, * gnu/xml/validation/datatype/FloatType.java, * gnu/xml/validation/datatype/FractionDigitsFacet.java, * gnu/xml/validation/datatype/GDayType.java, * gnu/xml/validation/datatype/GMonthDayType.java, * gnu/xml/validation/datatype/GMonthType.java, * gnu/xml/validation/datatype/GYearMonthType.java, * gnu/xml/validation/datatype/GYearType.java, * gnu/xml/validation/datatype/HexBinaryType.java, * gnu/xml/validation/datatype/IDRefType.java, * gnu/xml/validation/datatype/IDRefsType.java, * gnu/xml/validation/datatype/IDType.java, * gnu/xml/validation/datatype/IntType.java, * gnu/xml/validation/datatype/IntegerType.java, * gnu/xml/validation/datatype/LanguageType.java, * gnu/xml/validation/datatype/LengthFacet.java, * gnu/xml/validation/datatype/ListSimpleType.java, * gnu/xml/validation/datatype/LongType.java, * gnu/xml/validation/datatype/MaxExclusiveFacet.java, * gnu/xml/validation/datatype/MaxInclusiveFacet.java, * gnu/xml/validation/datatype/MaxLengthFacet.java, * gnu/xml/validation/datatype/MinExclusiveFacet.java, * gnu/xml/validation/datatype/MinInclusiveFacet.java, * gnu/xml/validation/datatype/MinLengthFacet.java, * gnu/xml/validation/datatype/NCNameType.java, * gnu/xml/validation/datatype/NMTokenType.java, * gnu/xml/validation/datatype/NMTokensType.java, * gnu/xml/validation/datatype/NameType.java, * gnu/xml/validation/datatype/NegativeIntegerType.java, * gnu/xml/validation/datatype/NonNegativeIntegerType.java, * gnu/xml/validation/datatype/NonPositiveIntegerType.java, * gnu/xml/validation/datatype/NormalizedStringType.java, * gnu/xml/validation/datatype/NotationType.java, * gnu/xml/validation/datatype/PatternFacet.java, * gnu/xml/validation/datatype/PositiveIntegerType.java, * gnu/xml/validation/datatype/QNameType.java, * gnu/xml/validation/datatype/ShortType.java, * gnu/xml/validation/datatype/SimpleType.java, * gnu/xml/validation/datatype/StringType.java, * gnu/xml/validation/datatype/TimeType.java, * gnu/xml/validation/datatype/TokenType.java, * gnu/xml/validation/datatype/TotalDigitsFacet.java, * gnu/xml/validation/datatype/Type.java, * gnu/xml/validation/datatype/TypeBuilder.java, * gnu/xml/validation/datatype/TypeLibrary.java, * gnu/xml/validation/datatype/TypeLibraryFactory.java, * gnu/xml/validation/datatype/UnionSimpleType.java, * gnu/xml/validation/datatype/UnsignedByteType.java, * gnu/xml/validation/datatype/UnsignedIntType.java, * gnu/xml/validation/datatype/UnsignedLongType.java, * gnu/xml/validation/datatype/UnsignedShortType.java, * gnu/xml/validation/datatype/WhiteSpaceFacet.java, * gnu/xml/validation/relaxng/AnyNameNameClass.java, * gnu/xml/validation/relaxng/AttributePattern.java, * gnu/xml/validation/relaxng/ChoiceNameClass.java, * gnu/xml/validation/relaxng/ChoicePattern.java, * gnu/xml/validation/relaxng/DataPattern.java, * gnu/xml/validation/relaxng/Define.java, * gnu/xml/validation/relaxng/ElementPattern.java, * gnu/xml/validation/relaxng/EmptyPattern.java, * gnu/xml/validation/relaxng/FullSyntaxBuilder.java, * gnu/xml/validation/relaxng/Grammar.java, * gnu/xml/validation/relaxng/GrammarException.java, * gnu/xml/validation/relaxng/GrammarValidator.java, * gnu/xml/validation/relaxng/GroupPattern.java, * gnu/xml/validation/relaxng/InterleavePattern.java, * gnu/xml/validation/relaxng/ListPattern.java, * gnu/xml/validation/relaxng/NSNameNameClass.java, * gnu/xml/validation/relaxng/NameClass.java, * gnu/xml/validation/relaxng/NameNameClass.java, * gnu/xml/validation/relaxng/NotAllowedPattern.java, * gnu/xml/validation/relaxng/OneOrMorePattern.java, * gnu/xml/validation/relaxng/Param.java, * gnu/xml/validation/relaxng/Pattern.java, * gnu/xml/validation/relaxng/RELAXNGSchemaFactory.java, * gnu/xml/validation/relaxng/RefPattern.java, * gnu/xml/validation/relaxng/TextPattern.java, * gnu/xml/validation/relaxng/ValuePattern.java, * gnu/xml/validation/xmlschema/AnyAttribute.java, * gnu/xml/validation/xmlschema/AttributeDeclaration.java, * gnu/xml/validation/xmlschema/AttributeUse.java, * gnu/xml/validation/xmlschema/ComplexType.java, * gnu/xml/validation/xmlschema/ElementDeclaration.java, * gnu/xml/validation/xmlschema/Particle.java, * gnu/xml/validation/xmlschema/ValidationException.java, * gnu/xml/validation/xmlschema/XMLSchema.java, * gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java, * gnu/xml/validation/xmlschema/XMLSchemaBuilder.java, * gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java, * gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.java, * gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.java, * gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.java, * gnu/xml/validation/xmlschema/XMLSchemaValidator.java, * gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.java, * gnu/xml/xpath/AndExpr.java, * gnu/xml/xpath/ArithmeticExpr.java, * gnu/xml/xpath/BooleanFunction.java, * gnu/xml/xpath/CeilingFunction.java, * gnu/xml/xpath/ConcatFunction.java, * gnu/xml/xpath/Constant.java, * gnu/xml/xpath/ContainsFunction.java, * gnu/xml/xpath/CountFunction.java, * gnu/xml/xpath/DocumentOrderComparator.java, * gnu/xml/xpath/EqualityExpr.java, * gnu/xml/xpath/Expr.java, * gnu/xml/xpath/FalseFunction.java, * gnu/xml/xpath/FloorFunction.java, * gnu/xml/xpath/Function.java, * gnu/xml/xpath/FunctionCall.java, * gnu/xml/xpath/IdFunction.java, * gnu/xml/xpath/LangFunction.java, * gnu/xml/xpath/LastFunction.java, * gnu/xml/xpath/LocalNameFunction.java, * gnu/xml/xpath/NameFunction.java, * gnu/xml/xpath/NameTest.java, * gnu/xml/xpath/NamespaceTest.java, * gnu/xml/xpath/NamespaceUriFunction.java, * gnu/xml/xpath/NegativeExpr.java, * gnu/xml/xpath/NodeTypeTest.java, * gnu/xml/xpath/NormalizeSpaceFunction.java, * gnu/xml/xpath/NotFunction.java, * gnu/xml/xpath/NumberFunction.java, * gnu/xml/xpath/OrExpr.java, * gnu/xml/xpath/ParenthesizedExpr.java, * gnu/xml/xpath/Path.java, * gnu/xml/xpath/Pattern.java, * gnu/xml/xpath/PositionFunction.java, * gnu/xml/xpath/Predicate.java, * gnu/xml/xpath/RelationalExpr.java, * gnu/xml/xpath/Root.java, * gnu/xml/xpath/RoundFunction.java, * gnu/xml/xpath/Selector.java, * gnu/xml/xpath/StartsWithFunction.java, * gnu/xml/xpath/Steps.java, * gnu/xml/xpath/StringFunction.java, * gnu/xml/xpath/StringLengthFunction.java, * gnu/xml/xpath/SubstringAfterFunction.java, * gnu/xml/xpath/SubstringBeforeFunction.java, * gnu/xml/xpath/SubstringFunction.java, * gnu/xml/xpath/SumFunction.java, * gnu/xml/xpath/Test.java, * gnu/xml/xpath/TranslateFunction.java, * gnu/xml/xpath/TrueFunction.java, * gnu/xml/xpath/UnionExpr.java, * gnu/xml/xpath/VariableReference.java, * gnu/xml/xpath/XPathFactoryImpl.java, * gnu/xml/xpath/XPathImpl.java, * gnu/xml/xpath/XPathParser.java, * gnu/xml/xpath/XPathTokenizer.java, * java/applet/Applet.java, * java/awt/AWTEvent.java, * java/awt/AWTEventMulticaster.java, * java/awt/AWTKeyStroke.java, * java/awt/AlphaComposite.java, * java/awt/BasicStroke.java, * java/awt/BorderLayout.java, * java/awt/BufferCapabilities.java, * java/awt/Button.java, * java/awt/Canvas.java, * java/awt/CardLayout.java, * java/awt/Checkbox.java, * java/awt/CheckboxGroup.java, * java/awt/CheckboxMenuItem.java, * java/awt/Choice.java, * java/awt/Color.java, * java/awt/ColorPaintContext.java, * java/awt/Component.java, * java/awt/Container.java, * java/awt/ContainerOrderFocusTraversalPolicy.java, * java/awt/Cursor.java, * java/awt/DefaultFocusTraversalPolicy.java, * java/awt/DefaultKeyboardFocusManager.java, * java/awt/Desktop.java, * java/awt/Dialog.java, * java/awt/DisplayMode.java, * java/awt/Event.java, * java/awt/EventDispatchThread.java, * java/awt/EventQueue.java, * java/awt/FileDialog.java, * java/awt/FlowLayout.java, * java/awt/FocusTraversalPolicy.java, * java/awt/Font.java, * java/awt/FontMetrics.java, * java/awt/Frame.java, * java/awt/GradientPaint.java, * java/awt/Graphics.java, * java/awt/Graphics2D.java, * java/awt/GraphicsConfiguration.java, * java/awt/GraphicsDevice.java, * java/awt/GridBagConstraints.java, * java/awt/GridBagLayout.java, * java/awt/GridLayout.java, * java/awt/Image.java, * java/awt/Insets.java, * java/awt/JobAttributes.java, * java/awt/KeyboardFocusManager.java, * java/awt/Label.java, * java/awt/LightweightDispatcher.java, * java/awt/List.java, * java/awt/MediaTracker.java, * java/awt/Menu.java, * java/awt/MenuBar.java, * java/awt/MenuComponent.java, * java/awt/MenuItem.java, * java/awt/MenuShortcut.java, * java/awt/MouseInfo.java, * java/awt/PageAttributes.java, * java/awt/Point.java, * java/awt/PointerInfo.java, * java/awt/Polygon.java, * java/awt/PopupMenu.java, * java/awt/Rectangle.java, * java/awt/RenderingHints.java, * java/awt/Robot.java, * java/awt/ScrollPane.java, * java/awt/ScrollPaneAdjustable.java, * java/awt/Scrollbar.java, * java/awt/Shape.java, * java/awt/SystemColor.java, * java/awt/TextArea.java, * java/awt/TextComponent.java, * java/awt/TextField.java, * java/awt/TexturePaint.java, * java/awt/Toolkit.java, * java/awt/Window.java, * java/awt/color/ICC_ColorSpace.java, * java/awt/color/ICC_Profile.java, * java/awt/color/ICC_ProfileGray.java, * java/awt/color/ICC_ProfileRGB.java, * java/awt/datatransfer/Clipboard.java, * java/awt/datatransfer/ClipboardOwner.java, * java/awt/datatransfer/DataFlavor.java, * java/awt/datatransfer/FlavorEvent.java, * java/awt/datatransfer/FlavorListener.java, * java/awt/datatransfer/MimeType.java, * java/awt/datatransfer/StringSelection.java, * java/awt/datatransfer/SystemFlavorMap.java, * java/awt/datatransfer/Transferable.java, * java/awt/datatransfer/UnsupportedFlavorException.java, * java/awt/dnd/Autoscroll.java, * java/awt/dnd/DnDEventMulticaster.java, * java/awt/dnd/DragGestureEvent.java, * java/awt/dnd/DragGestureRecognizer.java, * java/awt/dnd/DragSource.java, * java/awt/dnd/DragSourceContext.java, * java/awt/dnd/DragSourceDropEvent.java, * java/awt/dnd/DragSourceEvent.java, * java/awt/dnd/DropTarget.java, * java/awt/dnd/DropTargetContext.java, * java/awt/dnd/DropTargetDragEvent.java, * java/awt/dnd/DropTargetDropEvent.java, * java/awt/dnd/DropTargetEvent.java, * java/awt/dnd/MouseDragGestureRecognizer.java, * java/awt/dnd/peer/DropTargetContextPeer.java, * java/awt/event/AWTEventListener.java, * java/awt/event/ActionEvent.java, * java/awt/event/ComponentAdapter.java, * java/awt/event/ComponentEvent.java, * java/awt/event/InputEvent.java, * java/awt/event/InputMethodEvent.java, * java/awt/event/InvocationEvent.java, * java/awt/event/KeyEvent.java, * java/awt/event/MouseEvent.java, * java/awt/event/MouseListener.java, * java/awt/event/MouseWheelEvent.java, * java/awt/event/WindowEvent.java, * java/awt/font/FontRenderContext.java, * java/awt/font/GlyphJustificationInfo.java, * java/awt/font/GlyphMetrics.java, * java/awt/font/GlyphVector.java, * java/awt/font/GraphicAttribute.java, * java/awt/font/ImageGraphicAttribute.java, * java/awt/font/LineBreakMeasurer.java, * java/awt/font/LineMetrics.java, * java/awt/font/MultipleMaster.java, * java/awt/font/OpenType.java, * java/awt/font/ShapeGraphicAttribute.java, * java/awt/font/TextAttribute.java, * java/awt/font/TextHitInfo.java, * java/awt/font/TextLayout.java, * java/awt/font/TextMeasurer.java, * java/awt/font/TransformAttribute.java, * java/awt/geom/AffineTransform.java, * java/awt/geom/Arc2D.java, * java/awt/geom/Area.java, * java/awt/geom/CubicCurve2D.java, * java/awt/geom/Ellipse2D.java, * java/awt/geom/FlatteningPathIterator.java, * java/awt/geom/GeneralPath.java, * java/awt/geom/Line2D.java, * java/awt/geom/QuadCurve2D.java, * java/awt/geom/RectangularShape.java, * java/awt/geom/RoundRectangle2D.java, * java/awt/im/InputContext.java, * java/awt/im/spi/InputMethodDescriptor.java, * java/awt/image/AffineTransformOp.java, * java/awt/image/AreaAveragingScaleFilter.java, * java/awt/image/BandCombineOp.java, * java/awt/image/BandedSampleModel.java, * java/awt/image/BufferedImage.java, * java/awt/image/BufferedImageFilter.java, * java/awt/image/BufferedImageOp.java, * java/awt/image/ByteLookupTable.java, * java/awt/image/ColorConvertOp.java, * java/awt/image/ColorModel.java, * java/awt/image/ComponentColorModel.java, * java/awt/image/ComponentSampleModel.java, * java/awt/image/ConvolveOp.java, * java/awt/image/CropImageFilter.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/DirectColorModel.java, * java/awt/image/FilteredImageSource.java, * java/awt/image/ImageConsumer.java, * java/awt/image/ImageFilter.java, * java/awt/image/ImageObserver.java, * java/awt/image/ImageProducer.java, * java/awt/image/IndexColorModel.java, * java/awt/image/Kernel.java, * java/awt/image/LookupOp.java, * java/awt/image/LookupTable.java, * java/awt/image/MemoryImageSource.java, * java/awt/image/MultiPixelPackedSampleModel.java, * java/awt/image/PackedColorModel.java, * java/awt/image/PixelGrabber.java, * java/awt/image/PixelInterleavedSampleModel.java, * java/awt/image/RGBImageFilter.java, * java/awt/image/Raster.java, * java/awt/image/RasterOp.java, * java/awt/image/RenderedImage.java, * java/awt/image/ReplicateScaleFilter.java, * java/awt/image/RescaleOp.java, * java/awt/image/SampleModel.java, * java/awt/image/ShortLookupTable.java, * java/awt/image/SinglePixelPackedSampleModel.java, * java/awt/image/TileObserver.java, * java/awt/image/WritableRaster.java, * java/awt/image/WritableRenderedImage.java, * java/awt/image/renderable/ContextualRenderedImageFactory.java, * java/awt/image/renderable/ParameterBlock.java, * java/awt/image/renderable/RenderContext.java, * java/awt/image/renderable/RenderableImage.java, * java/awt/image/renderable/RenderableImageOp.java, * java/awt/image/renderable/RenderableImageProducer.java, * java/awt/image/renderable/RenderedImageFactory.java, * java/awt/peer/ButtonPeer.java, * java/awt/peer/CanvasPeer.java, * java/awt/peer/CheckboxMenuItemPeer.java, * java/awt/peer/CheckboxPeer.java, * java/awt/peer/ChoicePeer.java, * java/awt/peer/ComponentPeer.java, * java/awt/peer/ContainerPeer.java, * java/awt/peer/DesktopPeer.java, * java/awt/peer/DialogPeer.java, * java/awt/peer/FileDialogPeer.java, * java/awt/peer/FontPeer.java, * java/awt/peer/FramePeer.java, * java/awt/peer/LabelPeer.java, * java/awt/peer/LightweightPeer.java, * java/awt/peer/ListPeer.java, * java/awt/peer/MenuBarPeer.java, * java/awt/peer/MenuComponentPeer.java, * java/awt/peer/MenuItemPeer.java, * java/awt/peer/MenuPeer.java, * java/awt/peer/MouseInfoPeer.java, * java/awt/peer/PanelPeer.java, * java/awt/peer/PopupMenuPeer.java, * java/awt/peer/RobotPeer.java, * java/awt/peer/ScrollPanePeer.java, * java/awt/peer/ScrollbarPeer.java, * java/awt/peer/TextComponentPeer.java, * java/awt/peer/TextFieldPeer.java, * java/awt/peer/WindowPeer.java, * java/awt/print/Book.java, * java/awt/print/PageFormat.java, * java/awt/print/Pageable.java, * java/awt/print/Paper.java, * java/awt/print/PrinterGraphics.java, * java/awt/print/PrinterIOException.java, * java/awt/print/PrinterJob.java, * java/beans/AppletInitializer.java, * java/beans/BeanDescriptor.java, * java/beans/BeanInfo.java, * java/beans/Beans.java, * java/beans/Customizer.java, * java/beans/DefaultPersistenceDelegate.java, * java/beans/DesignMode.java, * java/beans/Encoder.java, * java/beans/EventHandler.java, * java/beans/EventSetDescriptor.java, * java/beans/Expression.java, * java/beans/FeatureDescriptor.java, * java/beans/IndexedPropertyChangeEvent.java, * java/beans/IndexedPropertyDescriptor.java, * java/beans/Introspector.java, * java/beans/MethodDescriptor.java, * java/beans/ParameterDescriptor.java, * java/beans/PersistenceDelegate.java, * java/beans/PropertyChangeSupport.java, * java/beans/PropertyDescriptor.java, * java/beans/PropertyEditor.java, * java/beans/PropertyEditorManager.java, * java/beans/SimpleBeanInfo.java, * java/beans/Statement.java, * java/beans/VetoableChangeSupport.java, * java/beans/Visibility.java, * java/beans/XMLDecoder.java, * java/beans/XMLEncoder.java, * java/beans/beancontext/BeanContext.java, * java/beans/beancontext/BeanContextChild.java, * java/beans/beancontext/BeanContextChildComponentProxy.java, * java/beans/beancontext/BeanContextChildSupport.java, * java/beans/beancontext/BeanContextContainerProxy.java, * java/beans/beancontext/BeanContextEvent.java, * java/beans/beancontext/BeanContextMembershipEvent.java, * java/beans/beancontext/BeanContextMembershipListener.java, * java/beans/beancontext/BeanContextProxy.java, * java/beans/beancontext/BeanContextServiceAvailableEvent.java, * java/beans/beancontext/BeanContextServiceProvider.java, * java/beans/beancontext/BeanContextServiceProviderBeanInfo.java, * java/beans/beancontext/BeanContextServiceRevokedEvent.java, * java/beans/beancontext/BeanContextServiceRevokedListener.java, * java/beans/beancontext/BeanContextServices.java, * java/beans/beancontext/BeanContextServicesListener.java, * java/beans/beancontext/BeanContextServicesSupport.java, * java/beans/beancontext/BeanContextSupport.java, * java/io/BufferedInputStream.java, * java/io/BufferedOutputStream.java, * java/io/BufferedReader.java, * java/io/BufferedWriter.java, * java/io/ByteArrayInputStream.java, * java/io/ByteArrayOutputStream.java, * java/io/CharArrayReader.java, * java/io/CharArrayWriter.java, * java/io/DataInput.java, * java/io/DataInputStream.java, * java/io/DataOutput.java, * java/io/DataOutputStream.java, * java/io/DeleteFileHelper.java, * java/io/EOFException.java, * java/io/Externalizable.java, * java/io/File.java, * java/io/FileDescriptor.java, * java/io/FileFilter.java, * java/io/FileInputStream.java, * java/io/FileOutputStream.java, * java/io/FilePermission.java, * java/io/FileReader.java, * java/io/FileWriter.java, * java/io/FilenameFilter.java, * java/io/FilterInputStream.java, * java/io/FilterOutputStream.java, * java/io/FilterReader.java, * java/io/FilterWriter.java, * java/io/InputStream.java, * java/io/InputStreamReader.java, * java/io/InvalidClassException.java, * java/io/LineNumberInputStream.java, * java/io/LineNumberReader.java, * java/io/ObjectInput.java, * java/io/ObjectInputStream.java, * java/io/ObjectInputValidation.java, * java/io/ObjectOutput.java, * java/io/ObjectOutputStream.java, * java/io/ObjectStreamClass.java, * java/io/ObjectStreamConstants.java, * java/io/ObjectStreamField.java, * java/io/OutputStream.java, * java/io/OutputStreamWriter.java, * java/io/PipedInputStream.java, * java/io/PipedOutputStream.java, * java/io/PipedReader.java, * java/io/PipedWriter.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/SerializablePermission.java, * java/io/StreamTokenizer.java, * java/io/StringBufferInputStream.java, * java/io/StringReader.java, * java/io/StringWriter.java, * java/io/UnsupportedEncodingException.java, * java/io/Writer.java, * java/lang/AbstractStringBuffer.java, * java/lang/Boolean.java, * java/lang/Character.java, * java/lang/Class.java, * java/lang/ClassLoader.java, * java/lang/Comparable.java, * java/lang/Double.java, * java/lang/Enum.java, * java/lang/EnumConstantNotPresentException.java, * java/lang/Float.java, * java/lang/IllegalArgumentException.java, * java/lang/IllegalStateException.java, * java/lang/IndexOutOfBoundsException.java, * java/lang/Integer.java, * java/lang/Long.java, * java/lang/Math.java, * java/lang/NoClassDefFoundError.java, * java/lang/Object.java, * java/lang/Package.java, * java/lang/ProcessBuilder.java, * java/lang/Runtime.java, * java/lang/SecurityException.java, * java/lang/SecurityManager.java, * java/lang/StackTraceElement.java, * java/lang/StrictMath.java, * java/lang/String.java, * java/lang/StringBuffer.java, * java/lang/StringBuilder.java, * java/lang/System.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java, * java/lang/Throwable.java, * java/lang/TypeNotPresentException.java, * java/lang/UnsupportedOperationException.java, * java/lang/annotation/Annotation.java, * java/lang/annotation/AnnotationTypeMismatchException.java, * java/lang/annotation/IncompleteAnnotationException.java, * java/lang/instrument/ClassFileTransformer.java, * java/lang/instrument/Instrumentation.java, * java/lang/management/ClassLoadingMXBean.java, * java/lang/management/CompilationMXBean.java, * java/lang/management/GarbageCollectorMXBean.java, * java/lang/management/ManagementFactory.java, * java/lang/management/ManagementPermission.java, * java/lang/management/MemoryMXBean.java, * java/lang/management/MemoryManagerMXBean.java, * java/lang/management/MemoryNotificationInfo.java, * java/lang/management/MemoryPoolMXBean.java, * java/lang/management/MemoryType.java, * java/lang/management/MemoryUsage.java, * java/lang/management/MonitorInfo.java, * java/lang/management/OperatingSystemMXBean.java, * java/lang/management/RuntimeMXBean.java, * java/lang/management/ThreadInfo.java, * java/lang/management/ThreadMXBean.java, * java/lang/ref/PhantomReference.java, * java/lang/ref/Reference.java, * java/lang/ref/ReferenceQueue.java, * java/lang/ref/SoftReference.java, * java/lang/ref/WeakReference.java, * java/lang/reflect/AccessibleObject.java, * java/lang/reflect/AnnotatedElement.java, * java/lang/reflect/Array.java, * java/lang/reflect/Constructor.java, * java/lang/reflect/Field.java, * java/lang/reflect/GenericArrayType.java, * java/lang/reflect/GenericDeclaration.java, * java/lang/reflect/InvocationHandler.java, * java/lang/reflect/MalformedParameterizedTypeException.java, * java/lang/reflect/Method.java, * java/lang/reflect/Modifier.java, * java/lang/reflect/Proxy.java, * java/lang/reflect/Type.java, * java/lang/reflect/TypeVariable.java, * java/lang/reflect/WildcardType.java, * java/math/BigDecimal.java, * java/math/BigInteger.java, * java/math/MathContext.java, * java/math/RoundingMode.java, * java/net/ContentHandler.java, * java/net/DatagramSocket.java, * java/net/DatagramSocketImpl.java, * java/net/HttpURLConnection.java, * java/net/Inet4Address.java, * java/net/Inet6Address.java, * java/net/InetAddress.java, * java/net/InetSocketAddress.java, * java/net/MimeTypeMapper.java, * java/net/MulticastSocket.java, * java/net/NetworkInterface.java, * java/net/Proxy.java, * java/net/ProxySelector.java, * java/net/ResolverCache.java, * java/net/ServerSocket.java, * java/net/Socket.java, * java/net/SocketPermission.java, * java/net/URI.java, * java/net/URL.java, * java/net/URLClassLoader.java, * java/net/URLConnection.java, * java/net/URLDecoder.java, * java/net/URLEncoder.java, * java/net/URLStreamHandler.java, * java/nio/Buffer.java, * java/nio/BufferOverflowException.java, * java/nio/BufferUnderflowException.java, * java/nio/ByteBuffer.java, * java/nio/ByteBufferHelper.java, * java/nio/ByteBufferImpl.java, * java/nio/ByteOrder.java, * java/nio/CharBuffer.java, * java/nio/CharBufferImpl.java, * java/nio/CharSequenceBuffer.java, * java/nio/CharViewBufferImpl.java, * java/nio/DirectByteBufferImpl.java, * java/nio/DoubleBuffer.java, * java/nio/DoubleBufferImpl.java, * java/nio/DoubleViewBufferImpl.java, * java/nio/FloatBuffer.java, * java/nio/FloatBufferImpl.java, * java/nio/FloatViewBufferImpl.java, * java/nio/IntBuffer.java, * java/nio/IntBufferImpl.java, * java/nio/IntViewBufferImpl.java, * java/nio/InvalidMarkException.java, * java/nio/LongBuffer.java, * java/nio/LongBufferImpl.java, * java/nio/LongViewBufferImpl.java, * java/nio/MappedByteBuffer.java, * java/nio/MappedByteBufferImpl.java, * java/nio/ReadOnlyBufferException.java, * java/nio/ShortBuffer.java, * java/nio/ShortBufferImpl.java, * java/nio/ShortViewBufferImpl.java, * java/nio/channels/FileChannel.java, * java/nio/channels/SocketChannel.java, * java/nio/channels/spi/AbstractInterruptibleChannel.java, * java/nio/channels/spi/AbstractSelectableChannel.java, * java/nio/channels/spi/AbstractSelectionKey.java, * java/nio/channels/spi/AbstractSelector.java, * java/nio/channels/spi/SelectorProvider.java, * java/nio/charset/CharacterCodingException.java, * java/nio/charset/Charset.java, * java/nio/charset/CharsetDecoder.java, * java/nio/charset/CharsetEncoder.java, * java/nio/charset/CoderMalfunctionError.java, * java/nio/charset/CoderResult.java, * java/nio/charset/CodingErrorAction.java, * java/nio/charset/IllegalCharsetNameException.java, * java/nio/charset/MalformedInputException.java, * java/nio/charset/UnmappableCharacterException.java, * java/nio/charset/UnsupportedCharsetException.java, * java/rmi/AccessException.java, * java/rmi/AlreadyBoundException.java, * java/rmi/MarshalledObject.java, * java/rmi/Naming.java, * java/rmi/NoSuchObjectException.java, * java/rmi/NotBoundException.java, * java/rmi/RMISecurityException.java, * java/rmi/RMISecurityManager.java, * java/rmi/Remote.java, * java/rmi/RemoteException.java, * java/rmi/StubNotFoundException.java, * java/rmi/UnknownHostException.java, * java/rmi/activation/Activatable.java, * java/rmi/activation/ActivationDesc.java, * java/rmi/activation/ActivationGroup.java, * java/rmi/activation/ActivationGroupDesc.java, * java/rmi/activation/ActivationGroupID.java, * java/rmi/activation/ActivationID.java, * java/rmi/activation/ActivationInstantiator.java, * java/rmi/activation/ActivationMonitor.java, * java/rmi/activation/ActivationSystem.java, * java/rmi/activation/Activator.java, * java/rmi/activation/UnknownGroupException.java, * java/rmi/dgc/DGC.java, * java/rmi/dgc/Lease.java, * java/rmi/dgc/VMID.java, * java/rmi/registry/LocateRegistry.java, * java/rmi/registry/Registry.java, * java/rmi/registry/RegistryHandler.java, * java/rmi/server/LoaderHandler.java, * java/rmi/server/LogStream.java, * java/rmi/server/ObjID.java, * java/rmi/server/Operation.java, * java/rmi/server/RMIClassLoader.java, * java/rmi/server/RMIClientSocketFactory.java, * java/rmi/server/RMIFailureHandler.java, * java/rmi/server/RMIServerSocketFactory.java, * java/rmi/server/RMISocketFactory.java, * java/rmi/server/RemoteCall.java, * java/rmi/server/RemoteObject.java, * java/rmi/server/RemoteObjectInvocationHandler.java, * java/rmi/server/RemoteRef.java, * java/rmi/server/RemoteServer.java, * java/rmi/server/RemoteStub.java, * java/rmi/server/ServerRef.java, * java/rmi/server/Skeleton.java, * java/rmi/server/UID.java, * java/rmi/server/UnicastRemoteObject.java, * java/rmi/server/Unreferenced.java, * java/security/AccessControlContext.java, * java/security/AccessController.java, * java/security/AlgorithmParameterGenerator.java, * java/security/AlgorithmParameterGeneratorSpi.java, * java/security/AlgorithmParameters.java, * java/security/AlgorithmParametersSpi.java, * java/security/CodeSource.java, * java/security/DigestInputStream.java, * java/security/DigestOutputStream.java, * java/security/GeneralSecurityException.java, * java/security/Identity.java, * java/security/IdentityScope.java, * java/security/KeyFactory.java, * java/security/KeyFactorySpi.java, * java/security/KeyPairGenerator.java, * java/security/KeyPairGeneratorSpi.java, * java/security/KeyStore.java, * java/security/KeyStoreSpi.java, * java/security/MessageDigest.java, * java/security/MessageDigestSpi.java, * java/security/Permission.java, * java/security/Permissions.java, * java/security/Policy.java, * java/security/ProtectionDomain.java, * java/security/Provider.java, * java/security/ProviderException.java, * java/security/SecureClassLoader.java, * java/security/SecureRandom.java, * java/security/SecureRandomSpi.java, * java/security/Security.java, * java/security/Signature.java, * java/security/SignatureSpi.java, * java/security/SignedObject.java, * java/security/Signer.java, * java/security/acl/Acl.java, * java/security/acl/AclEntry.java, * java/security/acl/Group.java, * java/security/acl/Owner.java, * java/security/cert/CRL.java, * java/security/cert/CRLSelector.java, * java/security/cert/CertPathBuilder.java, * java/security/cert/CertPathBuilderResult.java, * java/security/cert/CertPathValidator.java, * java/security/cert/CertPathValidatorResult.java, * java/security/cert/CertPathValidatorSpi.java, * java/security/cert/CertSelector.java, * java/security/cert/CertStore.java, * java/security/cert/CertStoreParameters.java, * java/security/cert/CertStoreSpi.java, * java/security/cert/Certificate.java, * java/security/cert/CertificateFactory.java, * java/security/cert/CertificateFactorySpi.java, * java/security/cert/CollectionCertStoreParameters.java, * java/security/cert/LDAPCertStoreParameters.java, * java/security/cert/PKIXBuilderParameters.java, * java/security/cert/PKIXCertPathBuilderResult.java, * java/security/cert/PKIXCertPathChecker.java, * java/security/cert/PKIXCertPathValidatorResult.java, * java/security/cert/PKIXParameters.java, * java/security/cert/PolicyNode.java, * java/security/cert/PolicyQualifierInfo.java, * java/security/cert/X509CRL.java, * java/security/cert/X509CRLEntry.java, * java/security/cert/X509CertSelector.java, * java/security/cert/X509Certificate.java, * java/security/cert/X509Extension.java, * java/security/spec/AlgorithmParameterSpec.java, * java/security/spec/DSAParameterSpec.java, * java/security/spec/DSAPrivateKeySpec.java, * java/security/spec/DSAPublicKeySpec.java, * java/security/spec/EncodedKeySpec.java, * java/security/spec/InvalidParameterSpecException.java, * java/security/spec/KeySpec.java, * java/security/spec/PKCS8EncodedKeySpec.java, * java/security/spec/PSSParameterSpec.java, * java/security/spec/RSAKeyGenParameterSpec.java, * java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java, * java/security/spec/RSAOtherPrimeInfo.java, * java/security/spec/RSAPrivateCrtKeySpec.java, * java/security/spec/RSAPrivateKeySpec.java, * java/security/spec/RSAPublicKeySpec.java, * java/security/spec/X509EncodedKeySpec.java, * java/sql/Array.java, * java/sql/BatchUpdateException.java, * java/sql/Blob.java, * java/sql/CallableStatement.java, * java/sql/Clob.java, * java/sql/Connection.java, * java/sql/DataTruncation.java, * java/sql/DatabaseMetaData.java, * java/sql/Date.java, * java/sql/Driver.java, * java/sql/DriverManager.java, * java/sql/DriverPropertyInfo.java, * java/sql/ParameterMetaData.java, * java/sql/PreparedStatement.java, * java/sql/Ref.java, * java/sql/ResultSet.java, * java/sql/ResultSetMetaData.java, * java/sql/SQLData.java, * java/sql/SQLException.java, * java/sql/SQLInput.java, * java/sql/SQLOutput.java, * java/sql/SQLPermission.java, * java/sql/SQLWarning.java, * java/sql/Savepoint.java, * java/sql/Statement.java, * java/sql/Struct.java, * java/sql/Time.java, * java/sql/Timestamp.java, * java/sql/Types.java, * java/text/Annotation.java, * java/text/AttributedCharacterIterator.java, * java/text/AttributedString.java, * java/text/AttributedStringIterator.java, * java/text/Bidi.java, * java/text/BreakIterator.java, * java/text/CharacterIterator.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/DecimalFormat.java, * java/text/DecimalFormatSymbols.java, * java/text/FieldPosition.java, * java/text/Format.java, * java/text/MessageFormat.java, * java/text/NumberFormat.java, * java/text/ParsePosition.java, * java/text/RuleBasedCollator.java, * java/text/SimpleDateFormat.java, * java/text/StringCharacterIterator.java, * java/text/spi/DateFormatProvider.java, * java/text/spi/NumberFormatProvider.java, * java/util/AbstractCollection.java, * java/util/AbstractList.java, * java/util/AbstractMap.java, * java/util/AbstractSet.java, * java/util/ArrayList.java, * java/util/Arrays.java, * java/util/BitSet.java, * java/util/Calendar.java, * java/util/Collections.java, * java/util/Currency.java, * java/util/Date.java, * java/util/Dictionary.java, * java/util/DuplicateFormatFlagsException.java, * java/util/EnumMap.java, * java/util/EnumSet.java, * java/util/FormatFlagsConversionMismatchException.java, * java/util/Formattable.java, * java/util/FormattableFlags.java, * java/util/Formatter.java, * java/util/FormatterClosedException.java, * java/util/GregorianCalendar.java, * java/util/HashMap.java, * java/util/Hashtable.java, * java/util/IdentityHashMap.java, * java/util/IllegalFormatCodePointException.java, * java/util/IllegalFormatConversionException.java, * java/util/IllegalFormatException.java, * java/util/IllegalFormatFlagsException.java, * java/util/IllegalFormatPrecisionException.java, * java/util/IllegalFormatWidthException.java, * java/util/InputMismatchException.java, * java/util/LinkedHashMap.java, * java/util/LinkedHashSet.java, * java/util/LinkedList.java, * java/util/List.java, * java/util/Locale.java, * java/util/Map.java, * java/util/MissingFormatArgumentException.java, * java/util/MissingFormatWidthException.java, * java/util/PriorityQueue.java, * java/util/Properties.java, * java/util/PropertyPermission.java, * java/util/PropertyPermissionCollection.java, * java/util/Random.java, * java/util/ResourceBundle.java, * java/util/ServiceConfigurationError.java, * java/util/ServiceLoader.java, * java/util/SimpleTimeZone.java, * java/util/StringTokenizer.java, * java/util/TimeZone.java, * java/util/Timer.java, * java/util/TreeMap.java, * java/util/TreeSet.java, * java/util/UUID.java, * java/util/UnknownFormatConversionException.java, * java/util/UnknownFormatFlagsException.java, * java/util/Vector.java, * java/util/WeakHashMap.java, * java/util/concurrent/CopyOnWriteArrayList.java, * java/util/jar/Attributes.java, * java/util/jar/JarEntry.java, * java/util/jar/JarFile.java, * java/util/jar/JarInputStream.java, * java/util/jar/JarOutputStream.java, * java/util/jar/Manifest.java, * java/util/logging/ConsoleHandler.java, * java/util/logging/ErrorManager.java, * java/util/logging/FileHandler.java, * java/util/logging/Formatter.java, * java/util/logging/Handler.java, * java/util/logging/Level.java, * java/util/logging/LogManager.java, * java/util/logging/LogRecord.java, * java/util/logging/Logger.java, * java/util/logging/LoggingMXBean.java, * java/util/logging/LoggingPermission.java, * java/util/logging/MemoryHandler.java, * java/util/logging/SocketHandler.java, * java/util/logging/StreamHandler.java, * java/util/logging/XMLFormatter.java, * java/util/prefs/AbstractPreferences.java, * java/util/prefs/NodeChangeEvent.java, * java/util/prefs/NodeChangeListener.java, * java/util/prefs/PreferenceChangeEvent.java, * java/util/prefs/PreferenceChangeListener.java, * java/util/prefs/Preferences.java, * java/util/prefs/PreferencesFactory.java, * java/util/regex/MatchResult.java, * java/util/regex/Pattern.java, * java/util/regex/PatternSyntaxException.java, * java/util/spi/LocaleNameProvider.java, * java/util/spi/TimeZoneNameProvider.java, * java/util/zip/Adler32.java, * java/util/zip/CRC32.java, * java/util/zip/CheckedInputStream.java, * java/util/zip/CheckedOutputStream.java, * java/util/zip/Deflater.java, * java/util/zip/DeflaterEngine.java, * java/util/zip/DeflaterHuffman.java, * java/util/zip/DeflaterOutputStream.java, * java/util/zip/DeflaterPending.java, * java/util/zip/GZIPInputStream.java, * java/util/zip/GZIPOutputStream.java, * java/util/zip/Inflater.java, * java/util/zip/InflaterDynHeader.java, * java/util/zip/InflaterHuffmanTree.java, * java/util/zip/InflaterInputStream.java, * java/util/zip/OutputWindow.java, * java/util/zip/PendingBuffer.java, * java/util/zip/StreamManipulator.java, * java/util/zip/ZipConstants.java, * java/util/zip/ZipEntry.java, * java/util/zip/ZipFile.java, * java/util/zip/ZipInputStream.java, * java/util/zip/ZipOutputStream.java, * javax/accessibility/AccessibleExtendedText.java, * javax/accessibility/AccessibleRelation.java, * javax/accessibility/AccessibleRole.java, * javax/accessibility/AccessibleState.java, * javax/activation/ActivationDataFlavor.java, * javax/activation/CommandInfo.java, * javax/activation/CommandMap.java, * javax/activation/CommandObject.java, * javax/activation/DataContentHandler.java, * javax/activation/DataContentHandlerFactory.java, * javax/activation/DataHandler.java, * javax/activation/DataHandlerDataSource.java, * javax/activation/DataSource.java, * javax/activation/DataSourceDataContentHandler.java, * javax/activation/FileDataSource.java, * javax/activation/FileTypeMap.java, * javax/activation/MailcapCommandMap.java, * javax/activation/MimeType.java, * javax/activation/MimeTypeParameterList.java, * javax/activation/MimeTypeParseException.java, * javax/activation/MimetypesFileTypeMap.java, * javax/activation/ObjectDataContentHandler.java, * javax/activation/URLDataSource.java, * javax/activation/UnsupportedDataTypeException.java, * javax/crypto/Cipher.java, * javax/crypto/CipherOutputStream.java, * javax/crypto/ExemptionMechanism.java, * javax/crypto/KeyAgreement.java, * javax/crypto/KeyGenerator.java, * javax/crypto/Mac.java, * javax/crypto/MacSpi.java, * javax/crypto/SecretKeyFactory.java, * javax/crypto/spec/PBEKeySpec.java, * javax/imageio/IIOImage.java, * javax/imageio/IIOParam.java, * javax/imageio/IIOParamController.java, * javax/imageio/ImageIO.java, * javax/imageio/ImageReadParam.java, * javax/imageio/ImageReader.java, * javax/imageio/ImageTranscoder.java, * javax/imageio/ImageTypeSpecifier.java, * javax/imageio/ImageWriteParam.java, * javax/imageio/ImageWriter.java, * javax/imageio/event/IIOReadProgressListener.java, * javax/imageio/event/IIOReadUpdateListener.java, * javax/imageio/event/IIOWriteProgressListener.java, * javax/imageio/metadata/IIOInvalidTreeException.java, * javax/imageio/metadata/IIOMetadata.java, * javax/imageio/metadata/IIOMetadataFormatImpl.java, * javax/imageio/metadata/IIOMetadataNode.java, * javax/imageio/plugins/bmp/BMPImageWriteParam.java, * javax/imageio/plugins/jpeg/JPEGHuffmanTable.java, * javax/imageio/spi/IIORegistry.java, * javax/imageio/spi/ImageReaderSpi.java, * javax/imageio/spi/ImageWriterSpi.java, * javax/imageio/spi/RegisterableService.java, * javax/imageio/spi/ServiceRegistry.java, * javax/imageio/stream/FileCacheImageInputStream.java, * javax/imageio/stream/FileCacheImageOutputStream.java, * javax/imageio/stream/FileImageInputStream.java, * javax/imageio/stream/FileImageOutputStream.java, * javax/imageio/stream/ImageInputStream.java, * javax/imageio/stream/ImageInputStreamImpl.java, * javax/imageio/stream/ImageOutputStreamImpl.java, * javax/imageio/stream/MemoryCacheImageInputStream.java, * javax/imageio/stream/MemoryCacheImageOutputStream.java, * javax/management/Attribute.java, * javax/management/AttributeChangeNotification.java, * javax/management/AttributeChangeNotificationFilter.java, * javax/management/AttributeList.java, * javax/management/AttributeNotFoundException.java, * javax/management/AttributeValueExp.java, * javax/management/BadAttributeValueExpException.java, * javax/management/BadBinaryOpValueExpException.java, * javax/management/BadStringOperationException.java, * javax/management/DefaultLoaderRepository.java, * javax/management/Descriptor.java, * javax/management/DynamicMBean.java, * javax/management/InstanceAlreadyExistsException.java, * javax/management/InstanceNotFoundException.java, * javax/management/IntrospectionException.java, * javax/management/InvalidApplicationException.java, * javax/management/InvalidAttributeValueException.java, * javax/management/JMException.java, * javax/management/JMRuntimeException.java, * javax/management/JMX.java, * javax/management/ListenerNotFoundException.java, * javax/management/MBeanAttributeInfo.java, * javax/management/MBeanConstructorInfo.java, * javax/management/MBeanException.java, * javax/management/MBeanFeatureInfo.java, * javax/management/MBeanInfo.java, * javax/management/MBeanNotificationInfo.java, * javax/management/MBeanOperationInfo.java, * javax/management/MBeanParameterInfo.java, * javax/management/MBeanPermission.java, * javax/management/MBeanRegistrationException.java, * javax/management/MBeanServer.java, * javax/management/MBeanServerBuilder.java, * javax/management/MBeanServerConnection.java, * javax/management/MBeanServerDelegate.java, * javax/management/MBeanServerFactory.java, * javax/management/MBeanServerInvocationHandler.java, * javax/management/MBeanServerNotification.java, * javax/management/MBeanServerPermission.java, * javax/management/MBeanTrustPermission.java, * javax/management/MalformedObjectNameException.java, * javax/management/NotCompliantMBeanException.java, * javax/management/Notification.java, * javax/management/NotificationBroadcaster.java, * javax/management/NotificationBroadcasterSupport.java, * javax/management/NotificationEmitter.java, * javax/management/NotificationFilter.java, * javax/management/NotificationFilterSupport.java, * javax/management/NotificationListener.java, * javax/management/ObjectInstance.java, * javax/management/ObjectName.java, * javax/management/OperationsException.java, * javax/management/PersistentMBean.java, * javax/management/Query.java, * javax/management/QueryEval.java, * javax/management/QueryExp.java, * javax/management/ReflectionException.java, * javax/management/RuntimeErrorException.java, * javax/management/RuntimeMBeanException.java, * javax/management/RuntimeOperationsException.java, * javax/management/ServiceNotFoundException.java, * javax/management/StandardMBean.java, * javax/management/StringValueExp.java, * javax/management/ValueExp.java, * javax/management/loading/ClassLoaderRepository.java, * javax/management/openmbean/ArrayType.java, * javax/management/openmbean/CompositeData.java, * javax/management/openmbean/CompositeDataInvocationHandler.java, * javax/management/openmbean/CompositeDataSupport.java, * javax/management/openmbean/CompositeType.java, * javax/management/openmbean/InvalidKeyException.java, * javax/management/openmbean/InvalidOpenTypeException.java, * javax/management/openmbean/KeyAlreadyExistsException.java, * javax/management/openmbean/OpenDataException.java, * javax/management/openmbean/OpenMBeanAttributeInfo.java, * javax/management/openmbean/OpenMBeanAttributeInfoSupport.java, * javax/management/openmbean/OpenMBeanConstructorInfo.java, * javax/management/openmbean/OpenMBeanConstructorInfoSupport.java, * javax/management/openmbean/OpenMBeanInfo.java, * javax/management/openmbean/OpenMBeanInfoSupport.java, * javax/management/openmbean/OpenMBeanOperationInfo.java, * javax/management/openmbean/OpenMBeanOperationInfoSupport.java, * javax/management/openmbean/OpenMBeanParameterInfo.java, * javax/management/openmbean/OpenMBeanParameterInfoSupport.java, * javax/management/openmbean/OpenType.java, * javax/management/openmbean/SimpleType.java, * javax/management/openmbean/TabularData.java, * javax/management/openmbean/TabularDataSupport.java, * javax/management/openmbean/TabularType.java, * javax/management/remote/NotificationResult.java, * javax/management/remote/TargetedNotification.java, * javax/management/remote/rmi/RMIConnection.java, * javax/naming/AuthenticationException.java, * javax/naming/AuthenticationNotSupportedException.java, * javax/naming/BinaryRefAddr.java, * javax/naming/Binding.java, * javax/naming/CannotProceedException.java, * javax/naming/CommunicationException.java, * javax/naming/CompositeName.java, * javax/naming/CompoundName.java, * javax/naming/ConfigurationException.java, * javax/naming/Context.java, * javax/naming/ContextNotEmptyException.java, * javax/naming/InitialContext.java, * javax/naming/InsufficientResourcesException.java, * javax/naming/InterruptedNamingException.java, * javax/naming/InvalidNameException.java, * javax/naming/LimitExceededException.java, * javax/naming/LinkException.java, * javax/naming/LinkLoopException.java, * javax/naming/MalformedLinkException.java, * javax/naming/Name.java, * javax/naming/NameAlreadyBoundException.java, * javax/naming/NameClassPair.java, * javax/naming/NameNotFoundException.java, * javax/naming/NameParser.java, * javax/naming/NamingEnumeration.java, * javax/naming/NamingException.java, * javax/naming/NamingSecurityException.java, * javax/naming/NoInitialContextException.java, * javax/naming/NoPermissionException.java, * javax/naming/NotContextException.java, * javax/naming/PartialResultException.java, * javax/naming/RefAddr.java, * javax/naming/Reference.java, * javax/naming/Referenceable.java, * javax/naming/ReferralException.java, * javax/naming/ServiceUnavailableException.java, * javax/naming/SizeLimitExceededException.java, * javax/naming/StringRefAddr.java, * javax/naming/TimeLimitExceededException.java, * javax/naming/directory/AttributeInUseException.java, * javax/naming/directory/Attributes.java, * javax/naming/directory/BasicAttribute.java, * javax/naming/directory/BasicAttributes.java, * javax/naming/directory/InitialDirContext.java, * javax/naming/directory/ModificationItem.java, * javax/naming/directory/SearchControls.java, * javax/naming/directory/SearchResult.java, * javax/naming/event/EventContext.java, * javax/naming/event/NamespaceChangeListener.java, * javax/naming/event/NamingEvent.java, * javax/naming/event/NamingExceptionEvent.java, * javax/naming/event/NamingListener.java, * javax/naming/event/ObjectChangeListener.java, * javax/naming/ldap/Control.java, * javax/naming/ldap/ControlFactory.java, * javax/naming/ldap/ExtendedRequest.java, * javax/naming/ldap/ExtendedResponse.java, * javax/naming/ldap/HasControls.java, * javax/naming/ldap/InitialLdapContext.java, * javax/naming/ldap/LdapContext.java, * javax/naming/ldap/LdapReferralException.java, * javax/naming/ldap/StartTlsRequest.java, * javax/naming/ldap/UnsolicitedNotification.java, * javax/naming/ldap/UnsolicitedNotificationEvent.java, * javax/naming/ldap/UnsolicitedNotificationListener.java, * javax/naming/spi/DirObjectFactory.java, * javax/naming/spi/DirStateFactory.java, * javax/naming/spi/DirectoryManager.java, * javax/naming/spi/InitialContextFactory.java, * javax/naming/spi/InitialContextFactoryBuilder.java, * javax/naming/spi/NamingManager.java, * javax/naming/spi/ObjectFactory.java, * javax/naming/spi/ObjectFactoryBuilder.java, * javax/naming/spi/ResolveResult.java, * javax/naming/spi/Resolver.java, * javax/naming/spi/StateFactory.java, * javax/net/ssl/CertPathTrustManagerParameters.java, * javax/net/ssl/KeyManagerFactory.java, * javax/net/ssl/KeyStoreBuilderParameters.java, * javax/net/ssl/SSLContext.java, * javax/net/ssl/SSLEngine.java, * javax/net/ssl/SSLEngineResult.java, * javax/net/ssl/SSLException.java, * javax/net/ssl/TrustManagerFactory.java, * javax/net/ssl/X509ExtendedKeyManager.java, * javax/print/AttributeException.java, * javax/print/CancelablePrintJob.java, * javax/print/Doc.java, * javax/print/DocFlavor.java, * javax/print/DocPrintJob.java, * javax/print/FlavorException.java, * javax/print/MultiDoc.java, * javax/print/MultiDocPrintJob.java, * javax/print/MultiDocPrintService.java, * javax/print/PrintException.java, * javax/print/PrintService.java, * javax/print/PrintServiceLookup.java, * javax/print/ServiceUI.java, * javax/print/ServiceUIFactory.java, * javax/print/SimpleDoc.java, * javax/print/StreamPrintService.java, * javax/print/StreamPrintServiceFactory.java, * javax/print/URIException.java, * javax/print/attribute/Attribute.java, * javax/print/attribute/AttributeSet.java, * javax/print/attribute/AttributeSetUtilities.java, * javax/print/attribute/DateTimeSyntax.java, * javax/print/attribute/DocAttribute.java, * javax/print/attribute/DocAttributeSet.java, * javax/print/attribute/EnumSyntax.java, * javax/print/attribute/HashAttributeSet.java, * javax/print/attribute/HashDocAttributeSet.java, * javax/print/attribute/HashPrintJobAttributeSet.java, * javax/print/attribute/HashPrintRequestAttributeSet.java, * javax/print/attribute/HashPrintServiceAttributeSet.java, * javax/print/attribute/IntegerSyntax.java, * javax/print/attribute/PrintJobAttribute.java, * javax/print/attribute/PrintJobAttributeSet.java, * javax/print/attribute/PrintRequestAttribute.java, * javax/print/attribute/PrintRequestAttributeSet.java, * javax/print/attribute/PrintServiceAttribute.java, * javax/print/attribute/PrintServiceAttributeSet.java, * javax/print/attribute/ResolutionSyntax.java, * javax/print/attribute/SetOfIntegerSyntax.java, * javax/print/attribute/Size2DSyntax.java, * javax/print/attribute/SupportedValuesAttribute.java, * javax/print/attribute/TextSyntax.java, * javax/print/attribute/URISyntax.java, * javax/print/attribute/UnmodifiableSetException.java, * javax/print/attribute/standard/Chromaticity.java, * javax/print/attribute/standard/ColorSupported.java, * javax/print/attribute/standard/Compression.java, * javax/print/attribute/standard/Copies.java, * javax/print/attribute/standard/CopiesSupported.java, * javax/print/attribute/standard/DateTimeAtCompleted.java, * javax/print/attribute/standard/DateTimeAtCreation.java, * javax/print/attribute/standard/DateTimeAtProcessing.java, * javax/print/attribute/standard/Destination.java, * javax/print/attribute/standard/DocumentName.java, * javax/print/attribute/standard/Fidelity.java, * javax/print/attribute/standard/Finishings.java, * javax/print/attribute/standard/JobHoldUntil.java, * javax/print/attribute/standard/JobImpressions.java, * javax/print/attribute/standard/JobImpressionsCompleted.java, * javax/print/attribute/standard/JobImpressionsSupported.java, * javax/print/attribute/standard/JobKOctets.java, * javax/print/attribute/standard/JobKOctetsProcessed.java, * javax/print/attribute/standard/JobKOctetsSupported.java, * javax/print/attribute/standard/JobMediaSheets.java, * javax/print/attribute/standard/JobMediaSheetsCompleted.java, * javax/print/attribute/standard/JobMediaSheetsSupported.java, * javax/print/attribute/standard/JobMessageFromOperator.java, * javax/print/attribute/standard/JobName.java, * javax/print/attribute/standard/JobOriginatingUserName.java, * javax/print/attribute/standard/JobPriority.java, * javax/print/attribute/standard/JobPrioritySupported.java, * javax/print/attribute/standard/JobSheets.java, * javax/print/attribute/standard/JobState.java, * javax/print/attribute/standard/JobStateReason.java, * javax/print/attribute/standard/JobStateReasons.java, * javax/print/attribute/standard/Media.java, * javax/print/attribute/standard/MediaName.java, * javax/print/attribute/standard/MediaPrintableArea.java, * javax/print/attribute/standard/MediaSize.java, * javax/print/attribute/standard/MediaSizeName.java, * javax/print/attribute/standard/MediaTray.java, * javax/print/attribute/standard/MultipleDocumentHandling.java, * javax/print/attribute/standard/NumberOfDocuments.java, * javax/print/attribute/standard/NumberOfInterveningJobs.java, * javax/print/attribute/standard/NumberUp.java, * javax/print/attribute/standard/NumberUpSupported.java, * javax/print/attribute/standard/OrientationRequested.java, * javax/print/attribute/standard/OutputDeviceAssigned.java, * javax/print/attribute/standard/PDLOverrideSupported.java, * javax/print/attribute/standard/PageRanges.java, * javax/print/attribute/standard/PagesPerMinute.java, * javax/print/attribute/standard/PagesPerMinuteColor.java, * javax/print/attribute/standard/PresentationDirection.java, * javax/print/attribute/standard/PrintQuality.java, * javax/print/attribute/standard/PrinterInfo.java, * javax/print/attribute/standard/PrinterIsAcceptingJobs.java, * javax/print/attribute/standard/PrinterLocation.java, * javax/print/attribute/standard/PrinterMakeAndModel.java, * javax/print/attribute/standard/PrinterMessageFromOperator.java, * javax/print/attribute/standard/PrinterMoreInfo.java, * javax/print/attribute/standard/PrinterMoreInfoManufacturer.java, * javax/print/attribute/standard/PrinterName.java, * javax/print/attribute/standard/PrinterResolution.java, * javax/print/attribute/standard/PrinterState.java, * javax/print/attribute/standard/PrinterStateReason.java, * javax/print/attribute/standard/PrinterStateReasons.java, * javax/print/attribute/standard/PrinterURI.java, * javax/print/attribute/standard/QueuedJobCount.java, * javax/print/attribute/standard/ReferenceUriSchemesSupported.java, * javax/print/attribute/standard/RequestingUserName.java, * javax/print/attribute/standard/Severity.java, * javax/print/attribute/standard/SheetCollate.java, * javax/print/attribute/standard/Sides.java, * javax/print/event/PrintEvent.java, * javax/print/event/PrintJobAdapter.java, * javax/print/event/PrintJobAttributeEvent.java, * javax/print/event/PrintJobAttributeListener.java, * javax/print/event/PrintJobEvent.java, * javax/print/event/PrintJobListener.java, * javax/print/event/PrintServiceAttributeEvent.java, * javax/print/event/PrintServiceAttributeListener.java, * javax/rmi/CORBA/ClassDesc.java, * javax/rmi/CORBA/PortableRemoteObjectDelegate.java, * javax/rmi/CORBA/Stub.java, * javax/rmi/CORBA/StubDelegate.java, * javax/rmi/CORBA/Tie.java, * javax/rmi/CORBA/Util.java, * javax/rmi/CORBA/UtilDelegate.java, * javax/rmi/CORBA/ValueHandler.java, * javax/rmi/CORBA/ValueHandlerMultiFormat.java, * javax/rmi/PortableRemoteObject.java, * javax/rmi/ssl/SslRMIClientSocketFactory.java, * javax/rmi/ssl/SslRMIServerSocketFactory.java, * javax/security/auth/Subject.java, * javax/security/auth/callback/ChoiceCallback.java, * javax/security/auth/callback/ConfirmationCallback.java, * javax/security/auth/callback/NameCallback.java, * javax/security/auth/callback/PasswordCallback.java, * javax/security/auth/callback/TextInputCallback.java, * javax/security/auth/callback/TextOutputCallback.java, * javax/security/auth/kerberos/DelegationPermission.java, * javax/security/auth/kerberos/KerberosKey.java, * javax/security/auth/kerberos/KerberosPrincipal.java, * javax/security/auth/kerberos/ServicePermission.java, * javax/security/auth/login/AccountNotFoundException.java, * javax/security/auth/login/AppConfigurationEntry.java, * javax/security/auth/login/LoginContext.java, * javax/security/sasl/Sasl.java, * javax/sound/midi/ControllerEventListener.java, * javax/sound/midi/Instrument.java, * javax/sound/midi/InvalidMidiDataException.java, * javax/sound/midi/MetaEventListener.java, * javax/sound/midi/MetaMessage.java, * javax/sound/midi/MidiChannel.java, * javax/sound/midi/MidiDevice.java, * javax/sound/midi/MidiEvent.java, * javax/sound/midi/MidiFileFormat.java, * javax/sound/midi/MidiMessage.java, * javax/sound/midi/MidiSystem.java, * javax/sound/midi/MidiUnavailableException.java, * javax/sound/midi/Patch.java, * javax/sound/midi/Receiver.java, * javax/sound/midi/Sequence.java, * javax/sound/midi/Sequencer.java, * javax/sound/midi/ShortMessage.java, * javax/sound/midi/Soundbank.java, * javax/sound/midi/SoundbankResource.java, * javax/sound/midi/Synthesizer.java, * javax/sound/midi/SysexMessage.java, * javax/sound/midi/Track.java, * javax/sound/midi/Transmitter.java, * javax/sound/midi/VoiceStatus.java, * javax/sound/midi/spi/MidiDeviceProvider.java, * javax/sound/midi/spi/MidiFileReader.java, * javax/sound/midi/spi/MidiFileWriter.java, * javax/sound/midi/spi/SoundbankReader.java, * javax/sound/sampled/AudioFileFormat.java, * javax/sound/sampled/AudioFormat.java, * javax/sound/sampled/AudioInputStream.java, * javax/sound/sampled/AudioPermission.java, * javax/sound/sampled/AudioSystem.java, * javax/sound/sampled/BooleanControl.java, * javax/sound/sampled/Clip.java, * javax/sound/sampled/CompoundControl.java, * javax/sound/sampled/DataLine.java, * javax/sound/sampled/EnumControl.java, * javax/sound/sampled/FloatControl.java, * javax/sound/sampled/Line.java, * javax/sound/sampled/LineEvent.java, * javax/sound/sampled/LineUnavailableException.java, * javax/sound/sampled/Mixer.java, * javax/sound/sampled/Port.java, * javax/sound/sampled/ReverbType.java, * javax/sound/sampled/UnsupportedAudioFileException.java, * javax/sound/sampled/spi/AudioFileReader.java, * javax/sound/sampled/spi/AudioFileWriter.java, * javax/sound/sampled/spi/FormatConversionProvider.java, * javax/sql/ConnectionEvent.java, * javax/sql/ConnectionEventListener.java, * javax/sql/ConnectionPoolDataSource.java, * javax/sql/DataSource.java, * javax/sql/PooledConnection.java, * javax/sql/RowSet.java, * javax/sql/RowSetEvent.java, * javax/sql/RowSetInternal.java, * javax/sql/RowSetListener.java, * javax/sql/RowSetMetaData.java, * javax/sql/RowSetReader.java, * javax/sql/RowSetWriter.java, * javax/sql/XAConnection.java, * javax/sql/XADataSource.java, * javax/swing/AbstractAction.java, * javax/swing/AbstractButton.java, * javax/swing/AbstractCellEditor.java, * javax/swing/AbstractListModel.java, * javax/swing/AbstractSpinnerModel.java, * javax/swing/Action.java, * javax/swing/BorderFactory.java, * javax/swing/BoundedRangeModel.java, * javax/swing/Box.java, * javax/swing/BoxLayout.java, * javax/swing/ButtonGroup.java, * javax/swing/ButtonModel.java, * javax/swing/CellEditor.java, * javax/swing/CellRendererPane.java, * javax/swing/ComboBoxModel.java, * javax/swing/ComponentInputMap.java, * javax/swing/DebugGraphics.java, * javax/swing/DefaultBoundedRangeModel.java, * javax/swing/DefaultButtonModel.java, * javax/swing/DefaultCellEditor.java, * javax/swing/DefaultComboBoxModel.java, * javax/swing/DefaultDesktopManager.java, * javax/swing/DefaultFocusManager.java, * javax/swing/DefaultListModel.java, * javax/swing/DefaultListSelectionModel.java, * javax/swing/DefaultSingleSelectionModel.java, * javax/swing/FocusManager.java, * javax/swing/GrayFilter.java, * javax/swing/Icon.java, * javax/swing/ImageIcon.java, * javax/swing/InputMap.java, * javax/swing/InternalFrameFocusTraversalPolicy.java, * javax/swing/JApplet.java, * javax/swing/JButton.java, * javax/swing/JCheckBox.java, * javax/swing/JCheckBoxMenuItem.java, * javax/swing/JComboBox.java, * javax/swing/JComponent.java, * javax/swing/JDesktopPane.java, * javax/swing/JDialog.java, * javax/swing/JEditorPane.java, * javax/swing/JFileChooser.java, * javax/swing/JFormattedTextField.java, * javax/swing/JFrame.java, * javax/swing/JInternalFrame.java, * javax/swing/JLabel.java, * javax/swing/JLayeredPane.java, * javax/swing/JList.java, * javax/swing/JMenu.java, * javax/swing/JMenuBar.java, * javax/swing/JMenuItem.java, * javax/swing/JOptionPane.java, * javax/swing/JPanel.java, * javax/swing/JPasswordField.java, * javax/swing/JPopupMenu.java, * javax/swing/JProgressBar.java, * javax/swing/JRadioButton.java, * javax/swing/JRadioButtonMenuItem.java, * javax/swing/JRootPane.java, * javax/swing/JScrollBar.java, * javax/swing/JScrollPane.java, * javax/swing/JSeparator.java, * javax/swing/JSlider.java, * javax/swing/JSpinner.java, * javax/swing/JSplitPane.java, * javax/swing/JTabbedPane.java, * javax/swing/JTable.java, * javax/swing/JTextArea.java, * javax/swing/JTextField.java, * javax/swing/JTextPane.java, * javax/swing/JToggleButton.java, * javax/swing/JToolBar.java, * javax/swing/JToolTip.java, * javax/swing/JTree.java, * javax/swing/JViewport.java, * javax/swing/JWindow.java, * javax/swing/KeyStroke.java, * javax/swing/KeyboardManager.java, * javax/swing/LayoutFocusTraversalPolicy.java, * javax/swing/ListCellRenderer.java, * javax/swing/ListSelectionModel.java, * javax/swing/LookAndFeel.java, * javax/swing/MenuSelectionManager.java, * javax/swing/OverlayLayout.java, * javax/swing/Popup.java, * javax/swing/PopupFactory.java, * javax/swing/ProgressMonitor.java, * javax/swing/ProgressMonitorInputStream.java, * javax/swing/Renderer.java, * javax/swing/RepaintManager.java, * javax/swing/ScrollPaneLayout.java, * javax/swing/Scrollable.java, * javax/swing/SingleSelectionModel.java, * javax/swing/SizeRequirements.java, * javax/swing/SizeSequence.java, * javax/swing/SortingFocusTraversalPolicy.java, * javax/swing/SpinnerDateModel.java, * javax/swing/SpinnerListModel.java, * javax/swing/SpinnerModel.java, * javax/swing/SpinnerNumberModel.java, * javax/swing/Spring.java, * javax/swing/SpringLayout.java, * javax/swing/SwingConstants.java, * javax/swing/SwingUtilities.java, * javax/swing/Timer.java, * javax/swing/ToolTipManager.java, * javax/swing/TransferHandler.java, * javax/swing/UIDefaults.java, * javax/swing/UIManager.java, * javax/swing/UnsupportedLookAndFeelException.java, * javax/swing/ViewportLayout.java, * javax/swing/WindowConstants.java, * javax/swing/border/AbstractBorder.java, * javax/swing/border/BevelBorder.java, * javax/swing/border/Border.java, * javax/swing/border/CompoundBorder.java, * javax/swing/border/EmptyBorder.java, * javax/swing/border/EtchedBorder.java, * javax/swing/border/LineBorder.java, * javax/swing/border/MatteBorder.java, * javax/swing/border/SoftBevelBorder.java, * javax/swing/border/TitledBorder.java, * javax/swing/colorchooser/AbstractColorChooserPanel.java, * javax/swing/colorchooser/ColorChooserComponentFactory.java, * javax/swing/colorchooser/ColorSelectionModel.java, * javax/swing/colorchooser/DefaultColorSelectionModel.java, * javax/swing/colorchooser/DefaultHSBChooserPanel.java, * javax/swing/colorchooser/DefaultRGBChooserPanel.java, * javax/swing/colorchooser/DefaultSwatchChooserPanel.java, * javax/swing/event/AncestorEvent.java, * javax/swing/event/AncestorListener.java, * javax/swing/event/CaretEvent.java, * javax/swing/event/CaretListener.java, * javax/swing/event/CellEditorListener.java, * javax/swing/event/ChangeEvent.java, * javax/swing/event/ChangeListener.java, * javax/swing/event/DocumentEvent.java, * javax/swing/event/DocumentListener.java, * javax/swing/event/EventListenerList.java, * javax/swing/event/HyperlinkEvent.java, * javax/swing/event/HyperlinkListener.java, * javax/swing/event/InternalFrameAdapter.java, * javax/swing/event/InternalFrameEvent.java, * javax/swing/event/InternalFrameListener.java, * javax/swing/event/ListDataEvent.java, * javax/swing/event/ListDataListener.java, * javax/swing/event/ListSelectionEvent.java, * javax/swing/event/ListSelectionListener.java, * javax/swing/event/MenuDragMouseEvent.java, * javax/swing/event/MenuDragMouseListener.java, * javax/swing/event/MenuEvent.java, * javax/swing/event/MenuKeyEvent.java, * javax/swing/event/MenuKeyListener.java, * javax/swing/event/MenuListener.java, * javax/swing/event/MouseInputListener.java, * javax/swing/event/PopupMenuEvent.java, * javax/swing/event/PopupMenuListener.java, * javax/swing/event/SwingPropertyChangeSupport.java, * javax/swing/event/TableColumnModelEvent.java, * javax/swing/event/TableColumnModelListener.java, * javax/swing/event/TableModelEvent.java, * javax/swing/event/TableModelListener.java, * javax/swing/event/TreeExpansionEvent.java, * javax/swing/event/TreeExpansionListener.java, * javax/swing/event/TreeModelEvent.java, * javax/swing/event/TreeModelListener.java, * javax/swing/event/TreeSelectionEvent.java, * javax/swing/event/TreeSelectionListener.java, * javax/swing/event/TreeWillExpandListener.java, * javax/swing/event/UndoableEditEvent.java, * javax/swing/filechooser/FileFilter.java, * javax/swing/filechooser/FileSystemView.java, * javax/swing/filechooser/FileView.java, * javax/swing/filechooser/UnixFileSystemView.java, * javax/swing/plaf/BorderUIResource.java, * javax/swing/plaf/ColorChooserUI.java, * javax/swing/plaf/ColorUIResource.java, * javax/swing/plaf/ComboBoxUI.java, * javax/swing/plaf/ComponentInputMapUIResource.java, * javax/swing/plaf/ComponentUI.java, * javax/swing/plaf/FileChooserUI.java, * javax/swing/plaf/IconUIResource.java, * javax/swing/plaf/SplitPaneUI.java, * javax/swing/plaf/TabbedPaneUI.java, * javax/swing/plaf/TextUI.java, * javax/swing/plaf/UIResource.java, * javax/swing/plaf/basic/BasicArrowButton.java, * javax/swing/plaf/basic/BasicBorders.java, * javax/swing/plaf/basic/BasicButtonListener.java, * javax/swing/plaf/basic/BasicButtonUI.java, * javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java, * javax/swing/plaf/basic/BasicCheckBoxUI.java, * javax/swing/plaf/basic/BasicColorChooserUI.java, * javax/swing/plaf/basic/BasicComboBoxEditor.java, * javax/swing/plaf/basic/BasicComboBoxRenderer.java, * javax/swing/plaf/basic/BasicComboBoxUI.java, * javax/swing/plaf/basic/BasicComboPopup.java, * javax/swing/plaf/basic/BasicDesktopIconUI.java, * javax/swing/plaf/basic/BasicDesktopPaneUI.java, * javax/swing/plaf/basic/BasicDirectoryModel.java, * javax/swing/plaf/basic/BasicEditorPaneUI.java, * javax/swing/plaf/basic/BasicFileChooserUI.java, * javax/swing/plaf/basic/BasicFormattedTextFieldUI.java, * javax/swing/plaf/basic/BasicGraphicsUtils.java, * javax/swing/plaf/basic/BasicHTML.java, * javax/swing/plaf/basic/BasicIconFactory.java, * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java, * javax/swing/plaf/basic/BasicInternalFrameUI.java, * javax/swing/plaf/basic/BasicLabelUI.java, * javax/swing/plaf/basic/BasicListUI.java, * javax/swing/plaf/basic/BasicLookAndFeel.java, * javax/swing/plaf/basic/BasicMenuBarUI.java, * javax/swing/plaf/basic/BasicMenuItemUI.java, * javax/swing/plaf/basic/BasicMenuUI.java, * javax/swing/plaf/basic/BasicOptionPaneUI.java, * javax/swing/plaf/basic/BasicPanelUI.java, * javax/swing/plaf/basic/BasicPasswordFieldUI.java, * javax/swing/plaf/basic/BasicPopupMenuUI.java, * javax/swing/plaf/basic/BasicProgressBarUI.java, * javax/swing/plaf/basic/BasicRadioButtonUI.java, * javax/swing/plaf/basic/BasicRootPaneUI.java, * javax/swing/plaf/basic/BasicScrollBarUI.java, * javax/swing/plaf/basic/BasicScrollPaneUI.java, * javax/swing/plaf/basic/BasicSeparatorUI.java, * javax/swing/plaf/basic/BasicSliderUI.java, * javax/swing/plaf/basic/BasicSpinnerUI.java, * javax/swing/plaf/basic/BasicSplitPaneDivider.java, * javax/swing/plaf/basic/BasicSplitPaneUI.java, * javax/swing/plaf/basic/BasicTabbedPaneUI.java, * javax/swing/plaf/basic/BasicTableHeaderUI.java, * javax/swing/plaf/basic/BasicTableUI.java, * javax/swing/plaf/basic/BasicTextAreaUI.java, * javax/swing/plaf/basic/BasicTextFieldUI.java, * javax/swing/plaf/basic/BasicTextPaneUI.java, * javax/swing/plaf/basic/BasicTextUI.java, * javax/swing/plaf/basic/BasicToggleButtonUI.java, * javax/swing/plaf/basic/BasicToolBarUI.java, * javax/swing/plaf/basic/BasicToolTipUI.java, * javax/swing/plaf/basic/BasicTreeUI.java, * javax/swing/plaf/basic/BasicViewportUI.java, * javax/swing/plaf/metal/DefaultMetalTheme.java, * javax/swing/plaf/metal/MetalBorders.java, * javax/swing/plaf/metal/MetalButtonListener.java, * javax/swing/plaf/metal/MetalButtonUI.java, * javax/swing/plaf/metal/MetalCheckBoxIcon.java, * javax/swing/plaf/metal/MetalCheckBoxUI.java, * javax/swing/plaf/metal/MetalComboBoxButton.java, * javax/swing/plaf/metal/MetalComboBoxEditor.java, * javax/swing/plaf/metal/MetalComboBoxIcon.java, * javax/swing/plaf/metal/MetalComboBoxUI.java, * javax/swing/plaf/metal/MetalFileChooserUI.java, * javax/swing/plaf/metal/MetalIconFactory.java, * javax/swing/plaf/metal/MetalInternalFrameTitlePane.java, * javax/swing/plaf/metal/MetalInternalFrameUI.java, * javax/swing/plaf/metal/MetalLabelUI.java, * javax/swing/plaf/metal/MetalLookAndFeel.java, * javax/swing/plaf/metal/MetalMenuBarUI.java, * javax/swing/plaf/metal/MetalProgressBarUI.java, * javax/swing/plaf/metal/MetalRadioButtonUI.java, * javax/swing/plaf/metal/MetalRootPaneUI.java, * javax/swing/plaf/metal/MetalScrollBarUI.java, * javax/swing/plaf/metal/MetalScrollButton.java, * javax/swing/plaf/metal/MetalScrollPaneUI.java, * javax/swing/plaf/metal/MetalSeparatorUI.java, * javax/swing/plaf/metal/MetalSliderUI.java, * javax/swing/plaf/metal/MetalSplitPaneDivider.java, * javax/swing/plaf/metal/MetalSplitPaneUI.java, * javax/swing/plaf/metal/MetalTabbedPaneUI.java, * javax/swing/plaf/metal/MetalTextFieldUI.java, * javax/swing/plaf/metal/MetalTheme.java, * javax/swing/plaf/metal/MetalToggleButtonUI.java, * javax/swing/plaf/metal/MetalToolBarUI.java, * javax/swing/plaf/metal/MetalToolTipUI.java, * javax/swing/plaf/metal/MetalTreeUI.java, * javax/swing/plaf/metal/MetalUtils.java, * javax/swing/plaf/metal/OceanTheme.java, * javax/swing/plaf/multi/MultiButtonUI.java, * javax/swing/plaf/multi/MultiColorChooserUI.java, * javax/swing/plaf/multi/MultiComboBoxUI.java, * javax/swing/plaf/multi/MultiDesktopIconUI.java, * javax/swing/plaf/multi/MultiDesktopPaneUI.java, * javax/swing/plaf/multi/MultiFileChooserUI.java, * javax/swing/plaf/multi/MultiInternalFrameUI.java, * javax/swing/plaf/multi/MultiLabelUI.java, * javax/swing/plaf/multi/MultiListUI.java, * javax/swing/plaf/multi/MultiLookAndFeel.java, * javax/swing/plaf/multi/MultiMenuBarUI.java, * javax/swing/plaf/multi/MultiMenuItemUI.java, * javax/swing/plaf/multi/MultiOptionPaneUI.java, * javax/swing/plaf/multi/MultiPanelUI.java, * javax/swing/plaf/multi/MultiPopupMenuUI.java, * javax/swing/plaf/multi/MultiProgressBarUI.java, * javax/swing/plaf/multi/MultiRootPaneUI.java, * javax/swing/plaf/multi/MultiScrollBarUI.java, * javax/swing/plaf/multi/MultiScrollPaneUI.java, * javax/swing/plaf/multi/MultiSeparatorUI.java, * javax/swing/plaf/multi/MultiSliderUI.java, * javax/swing/plaf/multi/MultiSpinnerUI.java, * javax/swing/plaf/multi/MultiSplitPaneUI.java, * javax/swing/plaf/multi/MultiTabbedPaneUI.java, * javax/swing/plaf/multi/MultiTableHeaderUI.java, * javax/swing/plaf/multi/MultiTableUI.java, * javax/swing/plaf/multi/MultiTextUI.java, * javax/swing/plaf/multi/MultiToolBarUI.java, * javax/swing/plaf/multi/MultiToolTipUI.java, * javax/swing/plaf/multi/MultiTreeUI.java, * javax/swing/plaf/multi/MultiViewportUI.java, * javax/swing/plaf/synth/SynthGraphicsUtils.java, * javax/swing/plaf/synth/SynthLookAndFeel.java, * javax/swing/plaf/synth/SynthPainter.java, * javax/swing/table/AbstractTableModel.java, * javax/swing/table/DefaultTableCellRenderer.java, * javax/swing/table/DefaultTableColumnModel.java, * javax/swing/table/DefaultTableModel.java, * javax/swing/table/JTableHeader.java, * javax/swing/table/TableCellEditor.java, * javax/swing/table/TableCellRenderer.java, * javax/swing/table/TableColumn.java, * javax/swing/table/TableColumnModel.java, * javax/swing/table/TableModel.java, * javax/swing/text/AbstractDocument.java, * javax/swing/text/AbstractWriter.java, * javax/swing/text/AsyncBoxView.java, * javax/swing/text/AttributeSet.java, * javax/swing/text/BoxView.java, * javax/swing/text/Caret.java, * javax/swing/text/ComponentView.java, * javax/swing/text/CompositeView.java, * javax/swing/text/DefaultCaret.java, * javax/swing/text/DefaultEditorKit.java, * javax/swing/text/DefaultFormatter.java, * javax/swing/text/DefaultFormatterFactory.java, * javax/swing/text/DefaultHighlighter.java, * javax/swing/text/DefaultStyledDocument.java, * javax/swing/text/DocumentFilter.java, * javax/swing/text/EditorKit.java, * javax/swing/text/Element.java, * javax/swing/text/ElementIterator.java, * javax/swing/text/EmptyAttributeSet.java, * javax/swing/text/FieldView.java, * javax/swing/text/FlowView.java, * javax/swing/text/GapContent.java, * javax/swing/text/GlyphView.java, * javax/swing/text/Highlighter.java, * javax/swing/text/InternationalFormatter.java, * javax/swing/text/JTextComponent.java, * javax/swing/text/Keymap.java, * javax/swing/text/LayeredHighlighter.java, * javax/swing/text/LayoutQueue.java, * javax/swing/text/MaskFormatter.java, * javax/swing/text/MutableAttributeSet.java, * javax/swing/text/NavigationFilter.java, * javax/swing/text/NumberFormatter.java, * javax/swing/text/ParagraphView.java, * javax/swing/text/PasswordView.java, * javax/swing/text/PlainDocument.java, * javax/swing/text/PlainView.java, * javax/swing/text/Position.java, * javax/swing/text/Segment.java, * javax/swing/text/SimpleAttributeSet.java, * javax/swing/text/StringContent.java, * javax/swing/text/Style.java, * javax/swing/text/StyleConstants.java, * javax/swing/text/StyleContext.java, * javax/swing/text/StyledDocument.java, * javax/swing/text/StyledEditorKit.java, * javax/swing/text/TabExpander.java, * javax/swing/text/TabSet.java, * javax/swing/text/TabStop.java, * javax/swing/text/TabableView.java, * javax/swing/text/TableView.java, * javax/swing/text/TextAction.java, * javax/swing/text/Utilities.java, * javax/swing/text/View.java, * javax/swing/text/ViewFactory.java, * javax/swing/text/WrappedPlainView.java, * javax/swing/text/html/BRView.java, * javax/swing/text/html/BlockView.java, * javax/swing/text/html/CSS.java, * javax/swing/text/html/CSSBorder.java, * javax/swing/text/html/CSSParser.java, * javax/swing/text/html/FormView.java, * javax/swing/text/html/HRuleView.java, * javax/swing/text/html/HTMLDocument.java, * javax/swing/text/html/HTMLEditorKit.java, * javax/swing/text/html/HTMLWriter.java, * javax/swing/text/html/ImageView.java, * javax/swing/text/html/InlineView.java, * javax/swing/text/html/ListView.java, * javax/swing/text/html/MinimalHTMLWriter.java, * javax/swing/text/html/MultiAttributeSet.java, * javax/swing/text/html/MultiStyle.java, * javax/swing/text/html/ParagraphView.java, * javax/swing/text/html/StyleSheet.java, * javax/swing/text/html/TableView.java, * javax/swing/text/html/ViewAttributeSet.java, * javax/swing/text/html/parser/Entity.java, * javax/swing/text/html/parser/Parser.java, * javax/swing/text/rtf/RTFParser.java, * javax/swing/text/rtf/RTFScanner.java, * javax/swing/tree/AbstractLayoutCache.java, * javax/swing/tree/DefaultMutableTreeNode.java, * javax/swing/tree/DefaultTreeCellEditor.java, * javax/swing/tree/DefaultTreeCellRenderer.java, * javax/swing/tree/DefaultTreeModel.java, * javax/swing/tree/DefaultTreeSelectionModel.java, * javax/swing/tree/ExpandVetoException.java, * javax/swing/tree/FixedHeightLayoutCache.java, * javax/swing/tree/MutableTreeNode.java, * javax/swing/tree/RowMapper.java, * javax/swing/tree/TreeCellEditor.java, * javax/swing/tree/TreeCellRenderer.java, * javax/swing/tree/TreeNode.java, * javax/swing/tree/TreePath.java, * javax/swing/tree/TreeSelectionModel.java, * javax/swing/tree/VariableHeightLayoutCache.java, * javax/swing/undo/AbstractUndoableEdit.java, * javax/swing/undo/CompoundEdit.java, * javax/swing/undo/StateEdit.java, * javax/swing/undo/UndoManager.java, * javax/swing/undo/UndoableEdit.java, * javax/tools/FileObject.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, * 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/stream/EventFilter.java, * javax/xml/stream/FactoryConfigurationError.java, * javax/xml/stream/Location.java, * javax/xml/stream/StreamFilter.java, * javax/xml/stream/XMLEventFactory.java, * javax/xml/stream/XMLEventReader.java, * javax/xml/stream/XMLEventWriter.java, * javax/xml/stream/XMLInputFactory.java, * javax/xml/stream/XMLOutputFactory.java, * javax/xml/stream/XMLReporter.java, * javax/xml/stream/XMLResolver.java, * javax/xml/stream/XMLStreamConstants.java, * javax/xml/stream/XMLStreamException.java, * javax/xml/stream/XMLStreamReader.java, * javax/xml/stream/XMLStreamWriter.java, * javax/xml/stream/events/Attribute.java, * javax/xml/stream/events/Characters.java, * javax/xml/stream/events/Comment.java, * javax/xml/stream/events/DTD.java, * javax/xml/stream/events/EndDocument.java, * javax/xml/stream/events/EndElement.java, * javax/xml/stream/events/EntityDeclaration.java, * javax/xml/stream/events/EntityReference.java, * javax/xml/stream/events/Namespace.java, * javax/xml/stream/events/NotationDeclaration.java, * javax/xml/stream/events/ProcessingInstruction.java, * javax/xml/stream/events/StartDocument.java, * javax/xml/stream/events/StartElement.java, * javax/xml/stream/events/XMLEvent.java, * javax/xml/stream/util/EventReaderDelegate.java, * javax/xml/stream/util/StreamReaderDelegate.java, * javax/xml/stream/util/XMLEventAllocator.java, * javax/xml/stream/util/XMLEventConsumer.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/SchemaFactoryLoader.java, * javax/xml/validation/TypeInfoProvider.java, * javax/xml/validation/Validator.java, * javax/xml/validation/ValidatorHandler.java, * javax/xml/xpath/XPath.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, * javax/xml/xpath/XPathVariableResolver.java, * org/omg/CORBA/ARG_IN.java, * org/omg/CORBA/ARG_INOUT.java, * org/omg/CORBA/ARG_OUT.java, * org/omg/CORBA/AnySeqHolder.java, * org/omg/CORBA/BAD_CONTEXT.java, * org/omg/CORBA/BAD_INV_ORDER.java, * org/omg/CORBA/BAD_OPERATION.java, * org/omg/CORBA/BAD_PARAM.java, * org/omg/CORBA/BAD_POLICY.java, * org/omg/CORBA/BAD_POLICY_TYPE.java, * org/omg/CORBA/BAD_POLICY_VALUE.java, * org/omg/CORBA/BAD_TYPECODE.java, * org/omg/CORBA/COMM_FAILURE.java, * org/omg/CORBA/CTX_RESTRICT_SCOPE.java, * org/omg/CORBA/CompletionStatus.java, * org/omg/CORBA/CompletionStatusHelper.java, * org/omg/CORBA/Context.java, * org/omg/CORBA/Current.java, * org/omg/CORBA/CurrentHelper.java, * org/omg/CORBA/CurrentHolder.java, * org/omg/CORBA/CustomMarshal.java, * org/omg/CORBA/CustomValue.java, * org/omg/CORBA/DATA_CONVERSION.java, * org/omg/CORBA/DataInputStream.java, * org/omg/CORBA/DataOutputStream.java, * org/omg/CORBA/DefinitionKind.java, * org/omg/CORBA/DefinitionKindHelper.java, * org/omg/CORBA/DynamicImplementation.java, * org/omg/CORBA/FREE_MEM.java, * org/omg/CORBA/FieldNameHelper.java, * org/omg/CORBA/IDLTypeHelper.java, * org/omg/CORBA/IMP_LIMIT.java, * org/omg/CORBA/INITIALIZE.java, * org/omg/CORBA/INTERNAL.java, * org/omg/CORBA/INTF_REPOS.java, * org/omg/CORBA/INVALID_TRANSACTION.java, * org/omg/CORBA/INV_FLAG.java, * org/omg/CORBA/INV_IDENT.java, * org/omg/CORBA/INV_OBJREF.java, * org/omg/CORBA/INV_POLICY.java, * org/omg/CORBA/IRObject.java, * org/omg/CORBA/IRObjectOperations.java, * org/omg/CORBA/IdentifierHelper.java, * org/omg/CORBA/LocalObject.java, * org/omg/CORBA/LongSeqHolder.java, * org/omg/CORBA/MARSHAL.java, * org/omg/CORBA/NO_IMPLEMENT.java, * org/omg/CORBA/NO_MEMORY.java, * org/omg/CORBA/NO_PERMISSION.java, * org/omg/CORBA/NO_RESOURCES.java, * org/omg/CORBA/NO_RESPONSE.java, * org/omg/CORBA/NVList.java, * org/omg/CORBA/OBJECT_NOT_EXIST.java, * org/omg/CORBA/OBJ_ADAPTER.java, * org/omg/CORBA/OMGVMCID.java, * org/omg/CORBA/ORB.java, * org/omg/CORBA/ObjectHelper.java, * org/omg/CORBA/ObjectHolder.java, * org/omg/CORBA/PERSIST_STORE.java, * org/omg/CORBA/ParameterMode.java, * org/omg/CORBA/ParameterModeHelper.java, * org/omg/CORBA/PolicyErrorCodeHelper.java, * org/omg/CORBA/PolicyErrorHelper.java, * org/omg/CORBA/PolicyErrorHolder.java, * org/omg/CORBA/PolicyHelper.java, * org/omg/CORBA/PolicyHolder.java, * org/omg/CORBA/PolicyListHelper.java, * org/omg/CORBA/PolicyListHolder.java, * org/omg/CORBA/PolicyOperations.java, * org/omg/CORBA/PolicyTypeHelper.java, * org/omg/CORBA/RepositoryIdHelper.java, * org/omg/CORBA/Request.java, * org/omg/CORBA/ServiceDetailHelper.java, * org/omg/CORBA/ServiceInformationHelper.java, * org/omg/CORBA/SetOverrideTypeHelper.java, * org/omg/CORBA/StringValueHelper.java, * org/omg/CORBA/StructMember.java, * org/omg/CORBA/StructMemberHelper.java, * org/omg/CORBA/SystemException.java, * org/omg/CORBA/TCKind.java, * org/omg/CORBA/TRANSACTION_REQUIRED.java, * org/omg/CORBA/TRANSACTION_ROLLEDBACK.java, * org/omg/CORBA/TRANSIENT.java, * org/omg/CORBA/TypeCode.java, * org/omg/CORBA/TypeCodePackage/BadKind.java, * org/omg/CORBA/TypeCodePackage/Bounds.java, * org/omg/CORBA/UNSUPPORTED_POLICY.java, * org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java, * org/omg/CORBA/UnionMemberHelper.java, * org/omg/CORBA/UnknownUserException.java, * org/omg/CORBA/UnknownUserExceptionHolder.java, * org/omg/CORBA/ValueBaseHelper.java, * org/omg/CORBA/ValueBaseHolder.java, * org/omg/CORBA/ValueMemberHelper.java, * org/omg/CORBA/VersionSpecHelper.java, * org/omg/CORBA/VisibilityHelper.java, * org/omg/CORBA/WStringValueHelper.java, * org/omg/CORBA/WrongTransactionHelper.java, * org/omg/CORBA/WrongTransactionHolder.java, * org/omg/CORBA/_IDLTypeStub.java, * org/omg/CORBA/_PolicyStub.java, * org/omg/CORBA/portable/CustomValue.java, * org/omg/CORBA/portable/Delegate.java, * org/omg/CORBA/portable/ObjectImpl.java, * org/omg/CORBA/portable/StreamableValue.java, * org/omg/CORBA/portable/ValueBase.java, * org/omg/CORBA_2_3/ORB.java, * org/omg/CORBA_2_3/portable/Delegate.java, * org/omg/CORBA_2_3/portable/InputStream.java, * org/omg/CORBA_2_3/portable/ObjectImpl.java, * org/omg/CORBA_2_3/portable/OutputStream.java, * org/omg/CosNaming/BindingHelper.java, * org/omg/CosNaming/BindingIterator.java, * org/omg/CosNaming/BindingIteratorHelper.java, * org/omg/CosNaming/BindingIteratorOperations.java, * org/omg/CosNaming/BindingIteratorPOA.java, * org/omg/CosNaming/BindingType.java, * org/omg/CosNaming/BindingTypeHelper.java, * org/omg/CosNaming/IstringHelper.java, * org/omg/CosNaming/NameComponentHelper.java, * org/omg/CosNaming/NameHelper.java, * org/omg/CosNaming/NamingContext.java, * org/omg/CosNaming/NamingContextExtHelper.java, * org/omg/CosNaming/NamingContextExtPOA.java, * org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.java, * org/omg/CosNaming/NamingContextHelper.java, * org/omg/CosNaming/NamingContextPOA.java, * org/omg/CosNaming/NamingContextPackage/AlreadyBound.java, * org/omg/CosNaming/NamingContextPackage/CannotProceed.java, * org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java, * org/omg/CosNaming/NamingContextPackage/InvalidName.java, * org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java, * org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java, * org/omg/CosNaming/NamingContextPackage/NotFound.java, * org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java, * org/omg/CosNaming/NamingContextPackage/NotFoundReason.java, * org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java, * org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java, * org/omg/CosNaming/_BindingIteratorImplBase.java, * org/omg/CosNaming/_BindingIteratorStub.java, * org/omg/CosNaming/_NamingContextExtStub.java, * org/omg/CosNaming/_NamingContextStub.java, * org/omg/Dynamic/Parameter.java, * org/omg/DynamicAny/AnySeqHelper.java, * org/omg/DynamicAny/DynAny.java, * org/omg/DynamicAny/DynAnyFactoryHelper.java, * org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.java, * org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java, * org/omg/DynamicAny/DynAnyHelper.java, * org/omg/DynamicAny/DynAnyPackage/InvalidValue.java, * org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java, * org/omg/DynamicAny/DynAnyPackage/TypeMismatch.java, * org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java, * org/omg/DynamicAny/DynAnySeqHelper.java, * org/omg/DynamicAny/DynArrayHelper.java, * org/omg/DynamicAny/DynEnumHelper.java, * org/omg/DynamicAny/DynFixedHelper.java, * org/omg/DynamicAny/DynSequenceHelper.java, * org/omg/DynamicAny/DynStructHelper.java, * org/omg/DynamicAny/DynUnionHelper.java, * org/omg/DynamicAny/DynValueBox.java, * org/omg/DynamicAny/DynValueCommonOperations.java, * org/omg/DynamicAny/DynValueHelper.java, * org/omg/DynamicAny/FieldNameHelper.java, * org/omg/DynamicAny/NameDynAnyPairHelper.java, * org/omg/DynamicAny/NameDynAnyPairSeqHelper.java, * org/omg/DynamicAny/NameValuePair.java, * org/omg/DynamicAny/NameValuePairHelper.java, * org/omg/DynamicAny/NameValuePairSeqHelper.java, * org/omg/DynamicAny/_DynAnyFactoryStub.java, * org/omg/DynamicAny/_DynAnyStub.java, * org/omg/DynamicAny/_DynArrayStub.java, * org/omg/DynamicAny/_DynEnumStub.java, * org/omg/DynamicAny/_DynFixedStub.java, * org/omg/DynamicAny/_DynSequenceStub.java, * org/omg/DynamicAny/_DynStructStub.java, * org/omg/DynamicAny/_DynUnionStub.java, * org/omg/DynamicAny/_DynValueStub.java, * org/omg/IOP/Codec.java, * org/omg/IOP/CodecFactory.java, * org/omg/IOP/CodecFactoryHelper.java, * org/omg/IOP/CodecFactoryOperations.java, * org/omg/IOP/CodecFactoryPackage/UnknownEncoding.java, * org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java, * org/omg/IOP/CodecOperations.java, * org/omg/IOP/CodecPackage/FormatMismatch.java, * org/omg/IOP/CodecPackage/FormatMismatchHelper.java, * org/omg/IOP/CodecPackage/InvalidTypeForEncoding.java, * org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java, * org/omg/IOP/CodecPackage/TypeMismatch.java, * org/omg/IOP/CodecPackage/TypeMismatchHelper.java, * org/omg/IOP/ComponentIdHelper.java, * org/omg/IOP/Encoding.java, * org/omg/IOP/IOR.java, * org/omg/IOP/IORHelper.java, * org/omg/IOP/IORHolder.java, * org/omg/IOP/MultipleComponentProfileHelper.java, * org/omg/IOP/MultipleComponentProfileHolder.java, * org/omg/IOP/ProfileIdHelper.java, * org/omg/IOP/ServiceContext.java, * org/omg/IOP/ServiceContextHelper.java, * org/omg/IOP/ServiceContextHolder.java, * org/omg/IOP/ServiceContextListHelper.java, * org/omg/IOP/ServiceContextListHolder.java, * org/omg/IOP/ServiceIdHelper.java, * org/omg/IOP/TaggedComponent.java, * org/omg/IOP/TaggedComponentHelper.java, * org/omg/IOP/TaggedComponentHolder.java, * org/omg/IOP/TaggedProfile.java, * org/omg/IOP/TaggedProfileHelper.java, * org/omg/IOP/TaggedProfileHolder.java, * org/omg/IOP/TransactionService.java, * org/omg/Messaging/SYNC_WITH_TRANSPORT.java, * org/omg/Messaging/SyncScopeHelper.java, * org/omg/PortableInterceptor/AdapterManagerIdHelper.java, * org/omg/PortableInterceptor/AdapterNameHelper.java, * org/omg/PortableInterceptor/AdapterStateHelper.java, * org/omg/PortableInterceptor/ClientRequestInfo.java, * org/omg/PortableInterceptor/ClientRequestInfoOperations.java, * org/omg/PortableInterceptor/ClientRequestInterceptor.java, * org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java, * org/omg/PortableInterceptor/Current.java, * org/omg/PortableInterceptor/CurrentHelper.java, * org/omg/PortableInterceptor/CurrentOperations.java, * org/omg/PortableInterceptor/ForwardRequest.java, * org/omg/PortableInterceptor/ForwardRequestHelper.java, * org/omg/PortableInterceptor/IORInfo.java, * org/omg/PortableInterceptor/IORInfoOperations.java, * org/omg/PortableInterceptor/IORInterceptor.java, * org/omg/PortableInterceptor/IORInterceptorOperations.java, * org/omg/PortableInterceptor/IORInterceptor_3_0.java, * org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java, * org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java, * org/omg/PortableInterceptor/IORInterceptor_3_0Operations.java, * org/omg/PortableInterceptor/Interceptor.java, * org/omg/PortableInterceptor/InterceptorOperations.java, * org/omg/PortableInterceptor/InvalidSlot.java, * org/omg/PortableInterceptor/InvalidSlotHelper.java, * org/omg/PortableInterceptor/LOCATION_FORWARD.java, * org/omg/PortableInterceptor/ORBIdHelper.java, * org/omg/PortableInterceptor/ORBInitInfo.java, * org/omg/PortableInterceptor/ORBInitInfoOperations.java, * org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java, * org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java, * org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java, * org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java, * org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java, * org/omg/PortableInterceptor/ORBInitializer.java, * org/omg/PortableInterceptor/ORBInitializerOperations.java, * org/omg/PortableInterceptor/ObjectIdHelper.java, * org/omg/PortableInterceptor/ObjectReferenceFactory.java, * org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java, * org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java, * org/omg/PortableInterceptor/ObjectReferenceTemplate.java, * org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java, * org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java, * org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java, * org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java, * org/omg/PortableInterceptor/PolicyFactory.java, * org/omg/PortableInterceptor/PolicyFactoryOperations.java, * org/omg/PortableInterceptor/RequestInfo.java, * org/omg/PortableInterceptor/RequestInfoOperations.java, * org/omg/PortableInterceptor/SUCCESSFUL.java, * org/omg/PortableInterceptor/SYSTEM_EXCEPTION.java, * org/omg/PortableInterceptor/ServerIdHelper.java, * org/omg/PortableInterceptor/ServerRequestInfo.java, * org/omg/PortableInterceptor/ServerRequestInfoOperations.java, * org/omg/PortableInterceptor/ServerRequestInterceptor.java, * org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java, * org/omg/PortableInterceptor/TRANSPORT_RETRY.java, * org/omg/PortableInterceptor/USER_EXCEPTION.java, * org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.java, * org/omg/PortableServer/AdapterActivator.java, * org/omg/PortableServer/AdapterActivatorOperations.java, * org/omg/PortableServer/Current.java, * org/omg/PortableServer/CurrentHelper.java, * org/omg/PortableServer/CurrentOperations.java, * org/omg/PortableServer/CurrentPackage/NoContext.java, * org/omg/PortableServer/CurrentPackage/NoContextHelper.java, * org/omg/PortableServer/DynamicImplementation.java, * org/omg/PortableServer/ForwardRequest.java, * org/omg/PortableServer/ForwardRequestHelper.java, * org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java, * org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java, * org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java, * org/omg/PortableServer/IdAssignmentPolicy.java, * org/omg/PortableServer/IdAssignmentPolicyOperations.java, * org/omg/PortableServer/IdAssignmentPolicyValue.java, * org/omg/PortableServer/IdUniquenessPolicy.java, * org/omg/PortableServer/IdUniquenessPolicyOperations.java, * org/omg/PortableServer/IdUniquenessPolicyValue.java, * org/omg/PortableServer/ImplicitActivationPolicy.java, * org/omg/PortableServer/ImplicitActivationPolicyOperations.java, * org/omg/PortableServer/ImplicitActivationPolicyValue.java, * org/omg/PortableServer/LifespanPolicy.java, * org/omg/PortableServer/LifespanPolicyOperations.java, * org/omg/PortableServer/LifespanPolicyValue.java, * org/omg/PortableServer/POA.java, * org/omg/PortableServer/POAHelper.java, * org/omg/PortableServer/POAManager.java, * org/omg/PortableServer/POAManagerOperations.java, * org/omg/PortableServer/POAManagerPackage/AdapterInactive.java, * org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java, * org/omg/PortableServer/POAManagerPackage/State.java, * org/omg/PortableServer/POAOperations.java, * org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java, * org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java, * org/omg/PortableServer/POAPackage/AdapterNonExistent.java, * org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java, * org/omg/PortableServer/POAPackage/InvalidPolicy.java, * org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java, * org/omg/PortableServer/POAPackage/NoServant.java, * org/omg/PortableServer/POAPackage/NoServantHelper.java, * org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java, * org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java, * org/omg/PortableServer/POAPackage/ObjectNotActive.java, * org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java, * org/omg/PortableServer/POAPackage/ServantAlreadyActive.java, * org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java, * org/omg/PortableServer/POAPackage/ServantNotActive.java, * org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java, * org/omg/PortableServer/POAPackage/WrongAdapter.java, * org/omg/PortableServer/POAPackage/WrongAdapterHelper.java, * org/omg/PortableServer/POAPackage/WrongPolicy.java, * org/omg/PortableServer/POAPackage/WrongPolicyHelper.java, * org/omg/PortableServer/RequestProcessingPolicy.java, * org/omg/PortableServer/RequestProcessingPolicyOperations.java, * org/omg/PortableServer/RequestProcessingPolicyValue.java, * org/omg/PortableServer/Servant.java, * org/omg/PortableServer/ServantActivator.java, * org/omg/PortableServer/ServantActivatorHelper.java, * org/omg/PortableServer/ServantActivatorOperations.java, * org/omg/PortableServer/ServantActivatorPOA.java, * org/omg/PortableServer/ServantLocator.java, * org/omg/PortableServer/ServantLocatorHelper.java, * org/omg/PortableServer/ServantLocatorOperations.java, * org/omg/PortableServer/ServantLocatorPOA.java, * org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java, * org/omg/PortableServer/ServantManager.java, * org/omg/PortableServer/ServantManagerOperations.java, * org/omg/PortableServer/ServantRetentionPolicy.java, * org/omg/PortableServer/ServantRetentionPolicyOperations.java, * org/omg/PortableServer/ServantRetentionPolicyValue.java, * org/omg/PortableServer/ThreadPolicy.java, * org/omg/PortableServer/ThreadPolicyOperations.java, * org/omg/PortableServer/ThreadPolicyValue.java, * org/omg/PortableServer/_ServantActivatorStub.java, * org/omg/PortableServer/_ServantLocatorStub.java, * org/omg/PortableServer/portable/Delegate.java, * org/omg/SendingContext/RunTime.java, * org/omg/SendingContext/RunTimeOperations.java, * sun/misc/Service.java, * sun/misc/ServiceConfigurationError.java, * sun/reflect/annotation/AnnotationInvocationHandler.java, * sun/reflect/annotation/AnnotationParser.java, * sun/reflect/annotation/AnnotationType.java, * sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java, * sun/reflect/annotation/ExceptionProxy.java, * tools/com/sun/javadoc/ClassDoc.java, * tools/com/sun/javadoc/ConstructorDoc.java, * tools/com/sun/javadoc/Doc.java, * tools/com/sun/javadoc/DocErrorReporter.java, * tools/com/sun/javadoc/Doclet.java, * tools/com/sun/javadoc/ExecutableMemberDoc.java, * tools/com/sun/javadoc/FieldDoc.java, * tools/com/sun/javadoc/MemberDoc.java, * tools/com/sun/javadoc/MethodDoc.java, * tools/com/sun/javadoc/PackageDoc.java, * tools/com/sun/javadoc/ParamTag.java, * tools/com/sun/javadoc/Parameter.java, * tools/com/sun/javadoc/ProgramElementDoc.java, * tools/com/sun/javadoc/RootDoc.java, * tools/com/sun/javadoc/SeeTag.java, * tools/com/sun/javadoc/SerialFieldTag.java, * tools/com/sun/javadoc/Tag.java, * tools/com/sun/javadoc/ThrowsTag.java, * tools/com/sun/javadoc/Type.java, * tools/com/sun/javadoc/TypeVariable.java, * tools/com/sun/tools/javadoc/Main.java, * tools/com/sun/tools/javah/Main.java, * tools/external/asm/org/objectweb/asm/AnnotationVisitor.java, * tools/external/asm/org/objectweb/asm/AnnotationWriter.java, * tools/external/asm/org/objectweb/asm/Attribute.java, * tools/external/asm/org/objectweb/asm/ByteVector.java, * tools/external/asm/org/objectweb/asm/ClassAdapter.java, * tools/external/asm/org/objectweb/asm/ClassReader.java, * tools/external/asm/org/objectweb/asm/ClassVisitor.java, * tools/external/asm/org/objectweb/asm/ClassWriter.java, * tools/external/asm/org/objectweb/asm/Edge.java, * tools/external/asm/org/objectweb/asm/FieldVisitor.java, * tools/external/asm/org/objectweb/asm/FieldWriter.java, * tools/external/asm/org/objectweb/asm/Handler.java, * tools/external/asm/org/objectweb/asm/Item.java, * tools/external/asm/org/objectweb/asm/Label.java, * tools/external/asm/org/objectweb/asm/MethodAdapter.java, * tools/external/asm/org/objectweb/asm/MethodVisitor.java, * tools/external/asm/org/objectweb/asm/MethodWriter.java, * tools/external/asm/org/objectweb/asm/Opcodes.java, * tools/external/asm/org/objectweb/asm/Type.java, * tools/external/asm/org/objectweb/asm/attrs/StackMapAttribute.java, * tools/external/asm/org/objectweb/asm/attrs/StackMapFrame.java, * tools/external/asm/org/objectweb/asm/attrs/StackMapTableAttribute.java, * tools/external/asm/org/objectweb/asm/attrs/StackMapType.java, * tools/external/asm/org/objectweb/asm/commons/AdviceAdapter.java, * tools/external/asm/org/objectweb/asm/commons/EmptyVisitor.java, * tools/external/asm/org/objectweb/asm/commons/GeneratorAdapter.java, * tools/external/asm/org/objectweb/asm/commons/LocalVariablesSorter.java, * tools/external/asm/org/objectweb/asm/commons/Method.java, * tools/external/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java, * tools/external/asm/org/objectweb/asm/commons/StaticInitMerger.java, * tools/external/asm/org/objectweb/asm/commons/TableSwitchGenerator.java, * tools/external/asm/org/objectweb/asm/optimizer/AnnotationConstantsCollector.java, * tools/external/asm/org/objectweb/asm/optimizer/ClassConstantsCollector.java, * tools/external/asm/org/objectweb/asm/optimizer/ClassOptimizer.java, * tools/external/asm/org/objectweb/asm/optimizer/Constant.java, * tools/external/asm/org/objectweb/asm/optimizer/ConstantPool.java, * tools/external/asm/org/objectweb/asm/optimizer/FieldConstantsCollector.java, * tools/external/asm/org/objectweb/asm/optimizer/JarOptimizer.java, * tools/external/asm/org/objectweb/asm/optimizer/MethodConstantsCollector.java, * tools/external/asm/org/objectweb/asm/optimizer/MethodOptimizer.java, * tools/external/asm/org/objectweb/asm/optimizer/NameMapping.java, * tools/external/asm/org/objectweb/asm/optimizer/Shrinker.java, * tools/external/asm/org/objectweb/asm/signature/SignatureReader.java, * tools/external/asm/org/objectweb/asm/signature/SignatureVisitor.java, * tools/external/asm/org/objectweb/asm/signature/SignatureWriter.java, * tools/external/asm/org/objectweb/asm/tree/AbstractInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/AnnotationNode.java, * tools/external/asm/org/objectweb/asm/tree/ClassNode.java, * tools/external/asm/org/objectweb/asm/tree/FieldInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/FieldNode.java, * tools/external/asm/org/objectweb/asm/tree/IincInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/InnerClassNode.java, * tools/external/asm/org/objectweb/asm/tree/InsnNode.java, * tools/external/asm/org/objectweb/asm/tree/IntInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/JumpInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/LabelNode.java, * tools/external/asm/org/objectweb/asm/tree/LdcInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/LineNumberNode.java, * tools/external/asm/org/objectweb/asm/tree/LocalVariableNode.java, * tools/external/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/MemberNode.java, * tools/external/asm/org/objectweb/asm/tree/MethodInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/MethodNode.java, * tools/external/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/TryCatchBlockNode.java, * tools/external/asm/org/objectweb/asm/tree/TypeInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/VarInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/analysis/Analyzer.java, * tools/external/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java, * tools/external/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java, * tools/external/asm/org/objectweb/asm/tree/analysis/BasicValue.java, * tools/external/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java, * tools/external/asm/org/objectweb/asm/tree/analysis/DataflowInterpreter.java, * tools/external/asm/org/objectweb/asm/tree/analysis/DataflowValue.java, * tools/external/asm/org/objectweb/asm/tree/analysis/Frame.java, * tools/external/asm/org/objectweb/asm/tree/analysis/IntMap.java, * tools/external/asm/org/objectweb/asm/tree/analysis/Interpreter.java, * tools/external/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java, * tools/external/asm/org/objectweb/asm/tree/analysis/SmallSet.java, * tools/external/asm/org/objectweb/asm/tree/analysis/Subroutine.java, * tools/external/asm/org/objectweb/asm/tree/analysis/Value.java, * tools/external/asm/org/objectweb/asm/util/ASMifierAbstractVisitor.java, * tools/external/asm/org/objectweb/asm/util/ASMifierAnnotationVisitor.java, * tools/external/asm/org/objectweb/asm/util/ASMifierClassVisitor.java, * tools/external/asm/org/objectweb/asm/util/ASMifierFieldVisitor.java, * tools/external/asm/org/objectweb/asm/util/ASMifierMethodVisitor.java, * tools/external/asm/org/objectweb/asm/util/AbstractVisitor.java, * tools/external/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java, * tools/external/asm/org/objectweb/asm/util/CheckClassAdapter.java, * tools/external/asm/org/objectweb/asm/util/CheckMethodAdapter.java, * tools/external/asm/org/objectweb/asm/util/TraceAbstractVisitor.java, * tools/external/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java, * tools/external/asm/org/objectweb/asm/util/TraceClassVisitor.java, * tools/external/asm/org/objectweb/asm/util/TraceFieldVisitor.java, * tools/external/asm/org/objectweb/asm/util/TraceMethodVisitor.java, * tools/external/asm/org/objectweb/asm/util/TraceSignatureVisitor.java, * tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapAttribute.java, * tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapTableAttribute.java, * tools/external/asm/org/objectweb/asm/util/attrs/ASMifiable.java, * tools/external/asm/org/objectweb/asm/util/attrs/Traceable.java, * tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java, * tools/external/asm/org/objectweb/asm/xml/Processor.java, * tools/external/asm/org/objectweb/asm/xml/SAXAdapter.java, * tools/external/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java, * tools/external/asm/org/objectweb/asm/xml/SAXClassAdapter.java, * tools/external/asm/org/objectweb/asm/xml/SAXCodeAdapter.java, * tools/external/asm/org/objectweb/asm/xml/SAXFieldAdapter.java, * tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java, * tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java, * tools/generated/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java, * tools/gnu/classpath/tools/FileSystemClassLoader.java, * tools/gnu/classpath/tools/IOToolkit.java, * tools/gnu/classpath/tools/MalformedInputEvent.java, * tools/gnu/classpath/tools/MalformedInputListener.java, * tools/gnu/classpath/tools/NotifyingInputStreamReader.java, * tools/gnu/classpath/tools/StringToolkit.java, * tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java, * tools/gnu/classpath/tools/appletviewer/AppletTag.java, * tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java, * tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java, * tools/gnu/classpath/tools/appletviewer/Main.java, * tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java, * tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java, * tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java, * tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java, * tools/gnu/classpath/tools/appletviewer/TagParser.java, * tools/gnu/classpath/tools/common/CallbackUtil.java, * tools/gnu/classpath/tools/common/ClasspathToolParser.java, * tools/gnu/classpath/tools/common/Persistent.java, * tools/gnu/classpath/tools/common/ProviderUtil.java, * tools/gnu/classpath/tools/common/SecurityProviderInfo.java, * tools/gnu/classpath/tools/doclets/AbstractDoclet.java, * tools/gnu/classpath/tools/doclets/DocletConfigurationException.java, * tools/gnu/classpath/tools/doclets/DocletOption.java, * tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java, * tools/gnu/classpath/tools/doclets/DocletOptionFile.java, * tools/gnu/classpath/tools/doclets/DocletOptionFlag.java, * tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java, * tools/gnu/classpath/tools/doclets/DocletOptionString.java, * tools/gnu/classpath/tools/doclets/InlineTagRenderer.java, * tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java, * tools/gnu/classpath/tools/doclets/PackageGroup.java, * tools/gnu/classpath/tools/doclets/PackageMatcher.java, * tools/gnu/classpath/tools/doclets/StandardTaglet.java, * tools/gnu/classpath/tools/doclets/TagletPrinter.java, * tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java, * tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java, * tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java, * tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java, * tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java, * tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java, * tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java, * tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java, * tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java, * tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java, * tools/gnu/classpath/tools/getopt/FileArgumentCallback.java, * tools/gnu/classpath/tools/getopt/Option.java, * tools/gnu/classpath/tools/getopt/OptionGroup.java, * tools/gnu/classpath/tools/getopt/Parser.java, * tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java, * tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java, * tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java, * tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java, * tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java, * tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java, * tools/gnu/classpath/tools/gjdoc/Debug.java, * tools/gnu/classpath/tools/gjdoc/DirectoryTree.java, * tools/gnu/classpath/tools/gjdoc/DocImpl.java, * tools/gnu/classpath/tools/gjdoc/ErrorReporter.java, * tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java, * tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java, * tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java, * tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java, * tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java, * tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java, * tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java, * tools/gnu/classpath/tools/gjdoc/Main.java, * tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java, * tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java, * tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java, * tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java, * tools/gnu/classpath/tools/gjdoc/ParameterImpl.java, * tools/gnu/classpath/tools/gjdoc/ParseException.java, * tools/gnu/classpath/tools/gjdoc/Parser.java, * tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java, * tools/gnu/classpath/tools/gjdoc/RootDocImpl.java, * tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java, * tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java, * tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java, * tools/gnu/classpath/tools/gjdoc/TagContainer.java, * tools/gnu/classpath/tools/gjdoc/TagImpl.java, * tools/gnu/classpath/tools/gjdoc/TemporaryStore.java, * tools/gnu/classpath/tools/gjdoc/TextTagImpl.java, * tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java, * tools/gnu/classpath/tools/gjdoc/Timer.java, * tools/gnu/classpath/tools/gjdoc/TimerDoclet.java, * tools/gnu/classpath/tools/gjdoc/TypeImpl.java, * tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java, * tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java, * tools/gnu/classpath/tools/gjdoc/WritableType.java, * tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java, * tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java, * tools/gnu/classpath/tools/gjdoc/expr/Context.java, * tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java, * tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java, * tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/Expression.java, * tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java, * tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/Type.java, * tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java, * tools/gnu/classpath/tools/jar/Creator.java, * tools/gnu/classpath/tools/jar/Indexer.java, * tools/gnu/classpath/tools/jar/Main.java, * tools/gnu/classpath/tools/jar/Updater.java, * tools/gnu/classpath/tools/jarsigner/JarVerifier.java, * tools/gnu/classpath/tools/jarsigner/Main.java, * tools/gnu/classpath/tools/jarsigner/SFHelper.java, * tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java, * tools/gnu/classpath/tools/javah/ClassWrapper.java, * tools/gnu/classpath/tools/javah/CniPrintStream.java, * tools/gnu/classpath/tools/javah/GcjhMain.java, * tools/gnu/classpath/tools/javah/JniHelper.java, * tools/gnu/classpath/tools/javah/JniIncludePrinter.java, * tools/gnu/classpath/tools/javah/JniStubPrinter.java, * tools/gnu/classpath/tools/javah/Keywords.java, * tools/gnu/classpath/tools/javah/Main.java, * tools/gnu/classpath/tools/javah/MethodHelper.java, * tools/gnu/classpath/tools/keytool/CACertCmd.java, * tools/gnu/classpath/tools/keytool/CertReqCmd.java, * tools/gnu/classpath/tools/keytool/Command.java, * tools/gnu/classpath/tools/keytool/DeleteCmd.java, * tools/gnu/classpath/tools/keytool/ExportCmd.java, * tools/gnu/classpath/tools/keytool/GenKeyCmd.java, * tools/gnu/classpath/tools/keytool/IdentityDBCmd.java, * tools/gnu/classpath/tools/keytool/ImportCmd.java, * tools/gnu/classpath/tools/keytool/KeyCloneCmd.java, * tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java, * tools/gnu/classpath/tools/keytool/ListCmd.java, * tools/gnu/classpath/tools/keytool/PrintCertCmd.java, * tools/gnu/classpath/tools/keytool/SelfCertCmd.java, * tools/gnu/classpath/tools/keytool/StorePasswdCmd.java, * tools/gnu/classpath/tools/orbd/Main.java, * tools/gnu/classpath/tools/orbd/PersistentContext.java, * tools/gnu/classpath/tools/orbd/PersistentContextMap.java, * tools/gnu/classpath/tools/orbd/PersistentMap.java, * tools/gnu/classpath/tools/rmic/AbstractMethodGenerator.java, * tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java, * tools/gnu/classpath/tools/rmic/CompilationError.java, * tools/gnu/classpath/tools/rmic/Generator.java, * tools/gnu/classpath/tools/rmic/GiopIo.java, * tools/gnu/classpath/tools/rmic/HashFinder.java, * tools/gnu/classpath/tools/rmic/Main.java, * tools/gnu/classpath/tools/rmic/MethodGenerator.java, * tools/gnu/classpath/tools/rmic/RMICException.java, * tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java, * tools/gnu/classpath/tools/rmic/RmicBackend.java, * tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java, * tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java, * tools/gnu/classpath/tools/rmic/Variables.java, * tools/gnu/classpath/tools/rmic/WrapUnWrapper.java, * tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java, * tools/gnu/classpath/tools/rmid/ActivationSystemImpl_Stub.java, * tools/gnu/classpath/tools/rmid/Main.java, * tools/gnu/classpath/tools/rmid/PersistentBidiHashTable.java, * tools/gnu/classpath/tools/rmiregistry/Main.java, * tools/gnu/classpath/tools/rmiregistry/PersistentHashTable.java, * tools/gnu/classpath/tools/rmiregistry/RegistryImpl.java, * tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Skel.java, * tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Stub.java, * tools/gnu/classpath/tools/serialver/SerialVer.java, * tools/gnu/classpath/tools/taglets/AuthorTaglet.java, * tools/gnu/classpath/tools/taglets/CodeTaglet.java, * tools/gnu/classpath/tools/taglets/CopyrightTaglet.java, * tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java, * tools/gnu/classpath/tools/taglets/GenericTaglet.java, * tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java, * tools/gnu/classpath/tools/taglets/SinceTaglet.java, * tools/gnu/classpath/tools/taglets/TagletContext.java, * tools/gnu/classpath/tools/taglets/ValueTaglet.java, * tools/gnu/classpath/tools/taglets/VersionTaglet.java, * tools/gnu/classpath/tools/tnameserv/Main.java, * vm/reference/gnu/classpath/jdwp/VMFrame.java, * vm/reference/gnu/classpath/jdwp/VMIdManager.java, * vm/reference/gnu/classpath/jdwp/VMMethod.java, * vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java, * vm/reference/gnu/java/lang/VMCPStringBuilder.java, * vm/reference/gnu/java/lang/VMInstrumentationImpl.java, * vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java, * vm/reference/gnu/java/lang/management/VMCompilationMXBeanImpl.java, * vm/reference/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java, * vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java, * vm/reference/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java, * vm/reference/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java, * vm/reference/gnu/java/lang/management/VMThreadMXBeanImpl.java, * vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java, * vm/reference/gnu/java/net/VMPlainSocketImpl.java, * vm/reference/gnu/java/nio/VMChannel.java, * vm/reference/gnu/java/nio/VMPipe.java, * vm/reference/gnu/java/nio/VMSelector.java, * vm/reference/gnu/java/security/jce/prng/VMSecureRandom.java, * vm/reference/java/io/VMFile.java, * vm/reference/java/io/VMObjectInputStream.java, * vm/reference/java/io/VMObjectStreamClass.java, * vm/reference/java/lang/VMClass.java, * vm/reference/java/lang/VMClassLoader.java, * vm/reference/java/lang/VMDouble.java, * vm/reference/java/lang/VMFloat.java, * vm/reference/java/lang/VMMath.java, * vm/reference/java/lang/VMObject.java, * vm/reference/java/lang/VMProcess.java, * vm/reference/java/lang/VMRuntime.java, * vm/reference/java/lang/VMString.java, * vm/reference/java/lang/VMSystem.java, * vm/reference/java/lang/VMThread.java, * vm/reference/java/lang/reflect/VMConstructor.java, * vm/reference/java/lang/reflect/VMField.java, * vm/reference/java/lang/reflect/VMMethod.java, * vm/reference/java/net/VMNetworkInterface.java, * vm/reference/java/nio/channels/VMChannels.java, * vm/reference/java/security/VMAccessController.java, * vm/reference/java/security/VMSecureRandom.java, * vm/reference/java/util/VMTimeZone.java, * vm/reference/sun/misc/Unsafe.java, * vm/reference/sun/reflect/Reflection.java, * vm/reference/sun/reflect/misc/ReflectUtil.java: Normalise whitespace. From-SVN: r168680
Diffstat (limited to 'libjava/classpath/javax/swing')
-rw-r--r--libjava/classpath/javax/swing/AbstractAction.java60
-rw-r--r--libjava/classpath/javax/swing/AbstractButton.java166
-rw-r--r--libjava/classpath/javax/swing/AbstractCellEditor.java16
-rw-r--r--libjava/classpath/javax/swing/AbstractListModel.java4
-rw-r--r--libjava/classpath/javax/swing/AbstractSpinnerModel.java4
-rw-r--r--libjava/classpath/javax/swing/Action.java38
-rw-r--r--libjava/classpath/javax/swing/BorderFactory.java2
-rw-r--r--libjava/classpath/javax/swing/BoundedRangeModel.java42
-rw-r--r--libjava/classpath/javax/swing/Box.java56
-rw-r--r--libjava/classpath/javax/swing/BoxLayout.java12
-rw-r--r--libjava/classpath/javax/swing/ButtonGroup.java16
-rw-r--r--libjava/classpath/javax/swing/ButtonModel.java14
-rw-r--r--libjava/classpath/javax/swing/CellEditor.java20
-rw-r--r--libjava/classpath/javax/swing/CellRendererPane.java2
-rw-r--r--libjava/classpath/javax/swing/ComboBoxModel.java8
-rw-r--r--libjava/classpath/javax/swing/ComponentInputMap.java10
-rw-r--r--libjava/classpath/javax/swing/DebugGraphics.java74
-rw-r--r--libjava/classpath/javax/swing/DefaultBoundedRangeModel.java10
-rw-r--r--libjava/classpath/javax/swing/DefaultButtonModel.java10
-rw-r--r--libjava/classpath/javax/swing/DefaultCellEditor.java134
-rw-r--r--libjava/classpath/javax/swing/DefaultComboBoxModel.java34
-rw-r--r--libjava/classpath/javax/swing/DefaultDesktopManager.java48
-rw-r--r--libjava/classpath/javax/swing/DefaultFocusManager.java20
-rw-r--r--libjava/classpath/javax/swing/DefaultListModel.java10
-rw-r--r--libjava/classpath/javax/swing/DefaultListSelectionModel.java126
-rw-r--r--libjava/classpath/javax/swing/DefaultSingleSelectionModel.java16
-rw-r--r--libjava/classpath/javax/swing/FocusManager.java6
-rw-r--r--libjava/classpath/javax/swing/GrayFilter.java6
-rw-r--r--libjava/classpath/javax/swing/Icon.java12
-rw-r--r--libjava/classpath/javax/swing/ImageIcon.java30
-rw-r--r--libjava/classpath/javax/swing/InputMap.java26
-rw-r--r--libjava/classpath/javax/swing/InternalFrameFocusTraversalPolicy.java2
-rw-r--r--libjava/classpath/javax/swing/JApplet.java4
-rw-r--r--libjava/classpath/javax/swing/JButton.java20
-rw-r--r--libjava/classpath/javax/swing/JCheckBox.java26
-rw-r--r--libjava/classpath/javax/swing/JCheckBoxMenuItem.java30
-rw-r--r--libjava/classpath/javax/swing/JComboBox.java54
-rw-r--r--libjava/classpath/javax/swing/JComponent.java280
-rw-r--r--libjava/classpath/javax/swing/JDesktopPane.java12
-rw-r--r--libjava/classpath/javax/swing/JDialog.java38
-rw-r--r--libjava/classpath/javax/swing/JEditorPane.java68
-rw-r--r--libjava/classpath/javax/swing/JFileChooser.java404
-rw-r--r--libjava/classpath/javax/swing/JFormattedTextField.java182
-rw-r--r--libjava/classpath/javax/swing/JFrame.java62
-rw-r--r--libjava/classpath/javax/swing/JInternalFrame.java244
-rw-r--r--libjava/classpath/javax/swing/JLabel.java152
-rw-r--r--libjava/classpath/javax/swing/JLayeredPane.java64
-rw-r--r--libjava/classpath/javax/swing/JList.java250
-rw-r--r--libjava/classpath/javax/swing/JMenu.java26
-rw-r--r--libjava/classpath/javax/swing/JMenuBar.java60
-rw-r--r--libjava/classpath/javax/swing/JMenuItem.java76
-rw-r--r--libjava/classpath/javax/swing/JOptionPane.java106
-rw-r--r--libjava/classpath/javax/swing/JPanel.java36
-rw-r--r--libjava/classpath/javax/swing/JPasswordField.java60
-rw-r--r--libjava/classpath/javax/swing/JPopupMenu.java38
-rw-r--r--libjava/classpath/javax/swing/JProgressBar.java278
-rw-r--r--libjava/classpath/javax/swing/JRadioButton.java41
-rw-r--r--libjava/classpath/javax/swing/JRadioButtonMenuItem.java16
-rw-r--r--libjava/classpath/javax/swing/JRootPane.java26
-rw-r--r--libjava/classpath/javax/swing/JScrollBar.java76
-rw-r--r--libjava/classpath/javax/swing/JScrollPane.java72
-rw-r--r--libjava/classpath/javax/swing/JSeparator.java28
-rw-r--r--libjava/classpath/javax/swing/JSlider.java228
-rw-r--r--libjava/classpath/javax/swing/JSpinner.java96
-rw-r--r--libjava/classpath/javax/swing/JSplitPane.java56
-rw-r--r--libjava/classpath/javax/swing/JTabbedPane.java120
-rw-r--r--libjava/classpath/javax/swing/JTable.java578
-rw-r--r--libjava/classpath/javax/swing/JTextArea.java60
-rw-r--r--libjava/classpath/javax/swing/JTextField.java34
-rw-r--r--libjava/classpath/javax/swing/JTextPane.java4
-rw-r--r--libjava/classpath/javax/swing/JToggleButton.java61
-rw-r--r--libjava/classpath/javax/swing/JToolBar.java168
-rw-r--r--libjava/classpath/javax/swing/JToolTip.java18
-rw-r--r--libjava/classpath/javax/swing/JTree.java572
-rw-r--r--libjava/classpath/javax/swing/JViewport.java32
-rw-r--r--libjava/classpath/javax/swing/JWindow.java2
-rw-r--r--libjava/classpath/javax/swing/KeyStroke.java28
-rw-r--r--libjava/classpath/javax/swing/KeyboardManager.java88
-rw-r--r--libjava/classpath/javax/swing/LayoutFocusTraversalPolicy.java16
-rw-r--r--libjava/classpath/javax/swing/ListCellRenderer.java2
-rw-r--r--libjava/classpath/javax/swing/ListSelectionModel.java156
-rw-r--r--libjava/classpath/javax/swing/LookAndFeel.java114
-rw-r--r--libjava/classpath/javax/swing/MenuSelectionManager.java112
-rw-r--r--libjava/classpath/javax/swing/OverlayLayout.java4
-rw-r--r--libjava/classpath/javax/swing/Popup.java16
-rw-r--r--libjava/classpath/javax/swing/PopupFactory.java2
-rw-r--r--libjava/classpath/javax/swing/ProgressMonitor.java38
-rw-r--r--libjava/classpath/javax/swing/ProgressMonitorInputStream.java46
-rw-r--r--libjava/classpath/javax/swing/Renderer.java2
-rw-r--r--libjava/classpath/javax/swing/RepaintManager.java42
-rw-r--r--libjava/classpath/javax/swing/ScrollPaneLayout.java64
-rw-r--r--libjava/classpath/javax/swing/Scrollable.java24
-rw-r--r--libjava/classpath/javax/swing/SingleSelectionModel.java16
-rw-r--r--libjava/classpath/javax/swing/SizeRequirements.java2
-rw-r--r--libjava/classpath/javax/swing/SizeSequence.java48
-rw-r--r--libjava/classpath/javax/swing/SortingFocusTraversalPolicy.java48
-rw-r--r--libjava/classpath/javax/swing/SpinnerDateModel.java114
-rw-r--r--libjava/classpath/javax/swing/SpinnerListModel.java18
-rw-r--r--libjava/classpath/javax/swing/SpinnerModel.java4
-rw-r--r--libjava/classpath/javax/swing/SpinnerNumberModel.java60
-rw-r--r--libjava/classpath/javax/swing/Spring.java14
-rw-r--r--libjava/classpath/javax/swing/SpringLayout.java64
-rw-r--r--libjava/classpath/javax/swing/SwingConstants.java11
-rw-r--r--libjava/classpath/javax/swing/SwingUtilities.java158
-rw-r--r--libjava/classpath/javax/swing/Timer.java32
-rw-r--r--libjava/classpath/javax/swing/ToolTipManager.java32
-rw-r--r--libjava/classpath/javax/swing/TransferHandler.java62
-rw-r--r--libjava/classpath/javax/swing/UIDefaults.java74
-rw-r--r--libjava/classpath/javax/swing/UIManager.java294
-rw-r--r--libjava/classpath/javax/swing/UnsupportedLookAndFeelException.java6
-rw-r--r--libjava/classpath/javax/swing/ViewportLayout.java32
-rw-r--r--libjava/classpath/javax/swing/WindowConstants.java10
-rw-r--r--libjava/classpath/javax/swing/border/AbstractBorder.java44
-rw-r--r--libjava/classpath/javax/swing/border/BevelBorder.java35
-rw-r--r--libjava/classpath/javax/swing/border/Border.java6
-rw-r--r--libjava/classpath/javax/swing/border/CompoundBorder.java10
-rw-r--r--libjava/classpath/javax/swing/border/EmptyBorder.java6
-rw-r--r--libjava/classpath/javax/swing/border/EtchedBorder.java42
-rw-r--r--libjava/classpath/javax/swing/border/LineBorder.java56
-rw-r--r--libjava/classpath/javax/swing/border/MatteBorder.java54
-rw-r--r--libjava/classpath/javax/swing/border/SoftBevelBorder.java6
-rw-r--r--libjava/classpath/javax/swing/border/TitledBorder.java38
-rw-r--r--libjava/classpath/javax/swing/colorchooser/AbstractColorChooserPanel.java14
-rw-r--r--libjava/classpath/javax/swing/colorchooser/ColorChooserComponentFactory.java2
-rw-r--r--libjava/classpath/javax/swing/colorchooser/ColorSelectionModel.java14
-rw-r--r--libjava/classpath/javax/swing/colorchooser/DefaultColorSelectionModel.java4
-rw-r--r--libjava/classpath/javax/swing/colorchooser/DefaultHSBChooserPanel.java234
-rw-r--r--libjava/classpath/javax/swing/colorchooser/DefaultRGBChooserPanel.java28
-rw-r--r--libjava/classpath/javax/swing/colorchooser/DefaultSwatchChooserPanel.java116
-rw-r--r--libjava/classpath/javax/swing/event/AncestorEvent.java4
-rw-r--r--libjava/classpath/javax/swing/event/AncestorListener.java30
-rw-r--r--libjava/classpath/javax/swing/event/CaretEvent.java6
-rw-r--r--libjava/classpath/javax/swing/event/CaretListener.java10
-rw-r--r--libjava/classpath/javax/swing/event/CellEditorListener.java22
-rw-r--r--libjava/classpath/javax/swing/event/ChangeEvent.java12
-rw-r--r--libjava/classpath/javax/swing/event/ChangeListener.java12
-rw-r--r--libjava/classpath/javax/swing/event/DocumentEvent.java2
-rw-r--r--libjava/classpath/javax/swing/event/DocumentListener.java30
-rw-r--r--libjava/classpath/javax/swing/event/EventListenerList.java10
-rw-r--r--libjava/classpath/javax/swing/event/HyperlinkEvent.java20
-rw-r--r--libjava/classpath/javax/swing/event/HyperlinkListener.java10
-rw-r--r--libjava/classpath/javax/swing/event/InternalFrameAdapter.java2
-rw-r--r--libjava/classpath/javax/swing/event/InternalFrameEvent.java20
-rw-r--r--libjava/classpath/javax/swing/event/InternalFrameListener.java82
-rw-r--r--libjava/classpath/javax/swing/event/ListDataEvent.java42
-rw-r--r--libjava/classpath/javax/swing/event/ListDataListener.java12
-rw-r--r--libjava/classpath/javax/swing/event/ListSelectionEvent.java50
-rw-r--r--libjava/classpath/javax/swing/event/ListSelectionListener.java8
-rw-r--r--libjava/classpath/javax/swing/event/MenuDragMouseEvent.java16
-rw-r--r--libjava/classpath/javax/swing/event/MenuDragMouseListener.java40
-rw-r--r--libjava/classpath/javax/swing/event/MenuEvent.java4
-rw-r--r--libjava/classpath/javax/swing/event/MenuKeyEvent.java14
-rw-r--r--libjava/classpath/javax/swing/event/MenuKeyListener.java30
-rw-r--r--libjava/classpath/javax/swing/event/MenuListener.java30
-rw-r--r--libjava/classpath/javax/swing/event/MouseInputListener.java2
-rw-r--r--libjava/classpath/javax/swing/event/PopupMenuEvent.java14
-rw-r--r--libjava/classpath/javax/swing/event/PopupMenuListener.java30
-rw-r--r--libjava/classpath/javax/swing/event/SwingPropertyChangeSupport.java8
-rw-r--r--libjava/classpath/javax/swing/event/TableColumnModelEvent.java14
-rw-r--r--libjava/classpath/javax/swing/event/TableColumnModelListener.java20
-rw-r--r--libjava/classpath/javax/swing/event/TableModelEvent.java86
-rw-r--r--libjava/classpath/javax/swing/event/TableModelListener.java12
-rw-r--r--libjava/classpath/javax/swing/event/TreeExpansionEvent.java10
-rw-r--r--libjava/classpath/javax/swing/event/TreeExpansionListener.java2
-rw-r--r--libjava/classpath/javax/swing/event/TreeModelEvent.java48
-rw-r--r--libjava/classpath/javax/swing/event/TreeModelListener.java40
-rw-r--r--libjava/classpath/javax/swing/event/TreeSelectionEvent.java112
-rw-r--r--libjava/classpath/javax/swing/event/TreeSelectionListener.java8
-rw-r--r--libjava/classpath/javax/swing/event/TreeWillExpandListener.java6
-rw-r--r--libjava/classpath/javax/swing/event/UndoableEditEvent.java10
-rw-r--r--libjava/classpath/javax/swing/filechooser/FileFilter.java18
-rw-r--r--libjava/classpath/javax/swing/filechooser/FileSystemView.java46
-rw-r--r--libjava/classpath/javax/swing/filechooser/FileView.java56
-rw-r--r--libjava/classpath/javax/swing/filechooser/UnixFileSystemView.java42
-rw-r--r--libjava/classpath/javax/swing/plaf/BorderUIResource.java145
-rw-r--r--libjava/classpath/javax/swing/plaf/ColorChooserUI.java1
-rw-r--r--libjava/classpath/javax/swing/plaf/ColorUIResource.java4
-rw-r--r--libjava/classpath/javax/swing/plaf/ComboBoxUI.java6
-rw-r--r--libjava/classpath/javax/swing/plaf/ComponentInputMapUIResource.java1
-rw-r--r--libjava/classpath/javax/swing/plaf/ComponentUI.java28
-rw-r--r--libjava/classpath/javax/swing/plaf/FileChooserUI.java2
-rw-r--r--libjava/classpath/javax/swing/plaf/IconUIResource.java2
-rw-r--r--libjava/classpath/javax/swing/plaf/SplitPaneUI.java4
-rw-r--r--libjava/classpath/javax/swing/plaf/TabbedPaneUI.java7
-rw-r--r--libjava/classpath/javax/swing/plaf/TextUI.java10
-rw-r--r--libjava/classpath/javax/swing/plaf/UIResource.java12
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicArrowButton.java72
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicBorders.java102
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicButtonListener.java50
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicButtonUI.java64
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java4
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java16
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicColorChooserUI.java58
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicComboBoxEditor.java6
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java8
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java86
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicComboPopup.java28
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicDesktopIconUI.java72
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicDesktopPaneUI.java28
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java25
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicEditorPaneUI.java2
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java152
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java2
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java32
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicHTML.java2
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicIconFactory.java64
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java34
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java74
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicLabelUI.java28
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicListUI.java74
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java164
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicMenuBarUI.java22
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java102
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicMenuUI.java8
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java370
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicPanelUI.java22
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicPasswordFieldUI.java2
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java34
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java84
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java26
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicRootPaneUI.java2
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java168
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java132
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicSeparatorUI.java38
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicSliderUI.java136
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicSpinnerUI.java124
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneDivider.java320
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java50
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java358
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java66
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicTableUI.java286
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicTextAreaUI.java10
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicTextFieldUI.java4
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicTextPaneUI.java2
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicTextUI.java34
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java26
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicToolBarUI.java198
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicToolTipUI.java8
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicTreeUI.java436
-rw-r--r--libjava/classpath/javax/swing/plaf/basic/BasicViewportUI.java6
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/DefaultMetalTheme.java60
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalBorders.java334
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalButtonListener.java12
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalButtonUI.java36
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxIcon.java2
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java5
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalComboBoxButton.java58
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalComboBoxEditor.java16
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java14
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalComboBoxUI.java80
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalFileChooserUI.java598
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalIconFactory.java1018
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java109
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java36
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalLabelUI.java6
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java186
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalMenuBarUI.java4
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalProgressBarUI.java4
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java50
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalRootPaneUI.java56
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalScrollBarUI.java153
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalScrollButton.java134
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalScrollPaneUI.java36
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalSeparatorUI.java12
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalSliderUI.java136
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java6
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneUI.java2
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java146
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalTextFieldUI.java4
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalTheme.java158
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalToggleButtonUI.java28
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalToolBarUI.java62
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalToolTipUI.java76
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalTreeUI.java68
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/MetalUtils.java8
-rw-r--r--libjava/classpath/javax/swing/plaf/metal/OceanTheme.java10
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiButtonUI.java158
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiColorChooserUI.java162
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiComboBoxUI.java208
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiDesktopIconUI.java162
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiDesktopPaneUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiFileChooserUI.java248
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiInternalFrameUI.java164
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiLabelUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiListUI.java214
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiLookAndFeel.java76
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiMenuBarUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiMenuItemUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java182
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiPanelUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiPopupMenuUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiProgressBarUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiRootPaneUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiScrollBarUI.java158
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiScrollPaneUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiSeparatorUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiSliderUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiSpinnerUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java236
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java218
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiTableHeaderUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiTableUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiTextUI.java310
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiToolBarUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiToolTipUI.java158
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiTreeUI.java324
-rw-r--r--libjava/classpath/javax/swing/plaf/multi/MultiViewportUI.java160
-rw-r--r--libjava/classpath/javax/swing/plaf/synth/SynthGraphicsUtils.java6
-rw-r--r--libjava/classpath/javax/swing/plaf/synth/SynthLookAndFeel.java2
-rw-r--r--libjava/classpath/javax/swing/plaf/synth/SynthPainter.java226
-rw-r--r--libjava/classpath/javax/swing/table/AbstractTableModel.java52
-rw-r--r--libjava/classpath/javax/swing/table/DefaultTableCellRenderer.java10
-rw-r--r--libjava/classpath/javax/swing/table/DefaultTableColumnModel.java210
-rw-r--r--libjava/classpath/javax/swing/table/DefaultTableModel.java232
-rw-r--r--libjava/classpath/javax/swing/table/JTableHeader.java206
-rw-r--r--libjava/classpath/javax/swing/table/TableCellEditor.java4
-rw-r--r--libjava/classpath/javax/swing/table/TableCellRenderer.java4
-rw-r--r--libjava/classpath/javax/swing/table/TableColumn.java192
-rw-r--r--libjava/classpath/javax/swing/table/TableColumnModel.java64
-rw-r--r--libjava/classpath/javax/swing/table/TableModel.java38
-rw-r--r--libjava/classpath/javax/swing/text/AbstractDocument.java106
-rw-r--r--libjava/classpath/javax/swing/text/AbstractWriter.java84
-rw-r--r--libjava/classpath/javax/swing/text/AsyncBoxView.java20
-rw-r--r--libjava/classpath/javax/swing/text/AttributeSet.java6
-rw-r--r--libjava/classpath/javax/swing/text/BoxView.java18
-rw-r--r--libjava/classpath/javax/swing/text/Caret.java16
-rw-r--r--libjava/classpath/javax/swing/text/ComponentView.java4
-rw-r--r--libjava/classpath/javax/swing/text/CompositeView.java22
-rw-r--r--libjava/classpath/javax/swing/text/DefaultCaret.java202
-rw-r--r--libjava/classpath/javax/swing/text/DefaultEditorKit.java128
-rw-r--r--libjava/classpath/javax/swing/text/DefaultFormatter.java16
-rw-r--r--libjava/classpath/javax/swing/text/DefaultFormatterFactory.java62
-rw-r--r--libjava/classpath/javax/swing/text/DefaultHighlighter.java168
-rw-r--r--libjava/classpath/javax/swing/text/DefaultStyledDocument.java136
-rw-r--r--libjava/classpath/javax/swing/text/DocumentFilter.java16
-rw-r--r--libjava/classpath/javax/swing/text/EditorKit.java2
-rw-r--r--libjava/classpath/javax/swing/text/Element.java2
-rw-r--r--libjava/classpath/javax/swing/text/ElementIterator.java10
-rw-r--r--libjava/classpath/javax/swing/text/EmptyAttributeSet.java2
-rw-r--r--libjava/classpath/javax/swing/text/FieldView.java68
-rw-r--r--libjava/classpath/javax/swing/text/FlowView.java6
-rw-r--r--libjava/classpath/javax/swing/text/GapContent.java76
-rw-r--r--libjava/classpath/javax/swing/text/GlyphView.java18
-rw-r--r--libjava/classpath/javax/swing/text/Highlighter.java3
-rw-r--r--libjava/classpath/javax/swing/text/InternationalFormatter.java2
-rw-r--r--libjava/classpath/javax/swing/text/JTextComponent.java126
-rw-r--r--libjava/classpath/javax/swing/text/Keymap.java28
-rw-r--r--libjava/classpath/javax/swing/text/LayeredHighlighter.java6
-rw-r--r--libjava/classpath/javax/swing/text/LayoutQueue.java32
-rw-r--r--libjava/classpath/javax/swing/text/MaskFormatter.java114
-rw-r--r--libjava/classpath/javax/swing/text/MutableAttributeSet.java42
-rw-r--r--libjava/classpath/javax/swing/text/NavigationFilter.java6
-rw-r--r--libjava/classpath/javax/swing/text/NumberFormatter.java16
-rw-r--r--libjava/classpath/javax/swing/text/ParagraphView.java2
-rw-r--r--libjava/classpath/javax/swing/text/PasswordView.java18
-rw-r--r--libjava/classpath/javax/swing/text/PlainDocument.java16
-rw-r--r--libjava/classpath/javax/swing/text/PlainView.java77
-rw-r--r--libjava/classpath/javax/swing/text/Position.java6
-rw-r--r--libjava/classpath/javax/swing/text/Segment.java108
-rw-r--r--libjava/classpath/javax/swing/text/SimpleAttributeSet.java114
-rw-r--r--libjava/classpath/javax/swing/text/StringContent.java79
-rw-r--r--libjava/classpath/javax/swing/text/Style.java2
-rw-r--r--libjava/classpath/javax/swing/text/StyleConstants.java602
-rw-r--r--libjava/classpath/javax/swing/text/StyleContext.java88
-rw-r--r--libjava/classpath/javax/swing/text/StyledDocument.java4
-rw-r--r--libjava/classpath/javax/swing/text/StyledEditorKit.java82
-rw-r--r--libjava/classpath/javax/swing/text/TabExpander.java2
-rw-r--r--libjava/classpath/javax/swing/text/TabSet.java60
-rw-r--r--libjava/classpath/javax/swing/text/TabStop.java60
-rw-r--r--libjava/classpath/javax/swing/text/TabableView.java2
-rw-r--r--libjava/classpath/javax/swing/text/TableView.java4
-rw-r--r--libjava/classpath/javax/swing/text/TextAction.java52
-rw-r--r--libjava/classpath/javax/swing/text/Utilities.java116
-rw-r--r--libjava/classpath/javax/swing/text/View.java36
-rw-r--r--libjava/classpath/javax/swing/text/ViewFactory.java2
-rw-r--r--libjava/classpath/javax/swing/text/WrappedPlainView.java202
-rw-r--r--libjava/classpath/javax/swing/text/html/BRView.java4
-rw-r--r--libjava/classpath/javax/swing/text/html/BlockView.java70
-rw-r--r--libjava/classpath/javax/swing/text/html/CSS.java4
-rw-r--r--libjava/classpath/javax/swing/text/html/CSSBorder.java2
-rw-r--r--libjava/classpath/javax/swing/text/html/CSSParser.java106
-rw-r--r--libjava/classpath/javax/swing/text/html/FormView.java8
-rw-r--r--libjava/classpath/javax/swing/text/html/HRuleView.java28
-rw-r--r--libjava/classpath/javax/swing/text/html/HTMLDocument.java378
-rw-r--r--libjava/classpath/javax/swing/text/html/HTMLEditorKit.java264
-rw-r--r--libjava/classpath/javax/swing/text/html/HTMLWriter.java48
-rw-r--r--libjava/classpath/javax/swing/text/html/ImageView.java64
-rw-r--r--libjava/classpath/javax/swing/text/html/InlineView.java2
-rw-r--r--libjava/classpath/javax/swing/text/html/ListView.java2
-rw-r--r--libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java164
-rw-r--r--libjava/classpath/javax/swing/text/html/MultiAttributeSet.java2
-rw-r--r--libjava/classpath/javax/swing/text/html/MultiStyle.java2
-rw-r--r--libjava/classpath/javax/swing/text/html/ParagraphView.java2
-rw-r--r--libjava/classpath/javax/swing/text/html/StyleSheet.java232
-rw-r--r--libjava/classpath/javax/swing/text/html/TableView.java2
-rw-r--r--libjava/classpath/javax/swing/text/html/ViewAttributeSet.java2
-rw-r--r--libjava/classpath/javax/swing/text/html/parser/Entity.java8
-rw-r--r--libjava/classpath/javax/swing/text/html/parser/Parser.java2
-rw-r--r--libjava/classpath/javax/swing/text/rtf/RTFParser.java2
-rw-r--r--libjava/classpath/javax/swing/text/rtf/RTFScanner.java2
-rw-r--r--libjava/classpath/javax/swing/tree/AbstractLayoutCache.java90
-rw-r--r--libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java138
-rw-r--r--libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java148
-rw-r--r--libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java190
-rw-r--r--libjava/classpath/javax/swing/tree/DefaultTreeModel.java128
-rw-r--r--libjava/classpath/javax/swing/tree/DefaultTreeSelectionModel.java112
-rw-r--r--libjava/classpath/javax/swing/tree/ExpandVetoException.java12
-rw-r--r--libjava/classpath/javax/swing/tree/FixedHeightLayoutCache.java150
-rw-r--r--libjava/classpath/javax/swing/tree/MutableTreeNode.java4
-rw-r--r--libjava/classpath/javax/swing/tree/RowMapper.java4
-rw-r--r--libjava/classpath/javax/swing/tree/TreeCellEditor.java12
-rw-r--r--libjava/classpath/javax/swing/tree/TreeCellRenderer.java8
-rw-r--r--libjava/classpath/javax/swing/tree/TreeNode.java35
-rw-r--r--libjava/classpath/javax/swing/tree/TreePath.java62
-rw-r--r--libjava/classpath/javax/swing/tree/TreeSelectionModel.java2
-rw-r--r--libjava/classpath/javax/swing/tree/VariableHeightLayoutCache.java122
-rw-r--r--libjava/classpath/javax/swing/undo/AbstractUndoableEdit.java24
-rw-r--r--libjava/classpath/javax/swing/undo/CompoundEdit.java14
-rw-r--r--libjava/classpath/javax/swing/undo/StateEdit.java18
-rw-r--r--libjava/classpath/javax/swing/undo/UndoManager.java6
-rw-r--r--libjava/classpath/javax/swing/undo/UndoableEdit.java16
421 files changed, 15279 insertions, 15319 deletions
diff --git a/libjava/classpath/javax/swing/AbstractAction.java b/libjava/classpath/javax/swing/AbstractAction.java
index ffd122f..535a3e7 100644
--- a/libjava/classpath/javax/swing/AbstractAction.java
+++ b/libjava/classpath/javax/swing/AbstractAction.java
@@ -47,7 +47,7 @@ import javax.swing.event.SwingPropertyChangeSupport;
/**
* A base class for implementing the {@link Action} interface.
- *
+ *
* @author Andrew Selkirk
*/
public abstract class AbstractAction
@@ -59,9 +59,9 @@ public abstract class AbstractAction
* A flag that indicates whether or not the action is enabled.
*/
protected boolean enabled = true;
-
+
/**
- * Provides support for property change event notification.
+ * Provides support for property change event notification.
*/
protected SwingPropertyChangeSupport changeSupport =
new SwingPropertyChangeSupport(this);
@@ -80,7 +80,7 @@ public abstract class AbstractAction
}
/**
- * Creates a new action with the specified name. The name is stored as a
+ * Creates a new action with the specified name. The name is stored as a
* property with the key {@link Action#NAME}, and no other properties are
* initialised.
*
@@ -94,7 +94,7 @@ public abstract class AbstractAction
/**
* Creates a new action with the specified name and icon. The name is stored
* as a property with the key {@link Action#NAME}, the icon is stored as a
- * property with the key {@link Action#SMALL_ICON}, and no other properties
+ * property with the key {@link Action#SMALL_ICON}, and no other properties
* are initialised.
*
* @param name the name (<code>null</code> permitted).
@@ -123,12 +123,12 @@ public abstract class AbstractAction
/**
* Returns the value associated with the specified key.
- *
+ *
* @param key the key (not <code>null</code>).
- *
- * @return The value associated with the specified key, or
+ *
+ * @return The value associated with the specified key, or
* <code>null</code> if the key is not found.
- *
+ *
* @see #putValue(String, Object)
*/
public Object getValue(String key)
@@ -137,20 +137,20 @@ public abstract class AbstractAction
}
/**
- * Sets the value associated with the specified key and sends a
- * {@link java.beans.PropertyChangeEvent} to all registered listeners.
- * The standard keys are:
+ * Sets the value associated with the specified key and sends a
+ * {@link java.beans.PropertyChangeEvent} to all registered listeners.
+ * The standard keys are:
* <ul>
* <li>{@link #NAME}</li>
- * <li>{@link #SHORT_DESCRIPTION}</li>
+ * <li>{@link #SHORT_DESCRIPTION}</li>
* <li>{@link #LONG_DESCRIPTION}</li>
- * <li>{@link #SMALL_ICON}</li>
+ * <li>{@link #SMALL_ICON}</li>
* <li>{@link #ACTION_COMMAND_KEY}</li>
- * <li>{@link #ACCELERATOR_KEY}</li>
+ * <li>{@link #ACCELERATOR_KEY}</li>
* <li>{@link #MNEMONIC_KEY}</li>
* </ul>
* Any existing value associated with the key will be overwritten.
- *
+ *
* @param key the key (not <code>null</code>).
* @param value the value (<code>null</code> permitted).
*/
@@ -168,7 +168,7 @@ public abstract class AbstractAction
* Returns the flag that indicates whether or not the action is enabled.
*
* @return The flag.
- *
+ *
* @see #setEnabled(boolean)
*/
public boolean isEnabled()
@@ -178,12 +178,12 @@ public abstract class AbstractAction
/**
* Sets the flag that indicates whether or not the action is enabled and, if
- * the value of the flag changed from the previous setting, sends a
- * {@link java.beans.PropertyChangeEvent} to all registered listeners (using
+ * the value of the flag changed from the previous setting, sends a
+ * {@link java.beans.PropertyChangeEvent} to all registered listeners (using
* the property name 'enabled').
*
* @param enabled the new flag value.
- *
+ *
* @see #isEnabled()
*/
public void setEnabled(boolean enabled)
@@ -196,10 +196,10 @@ public abstract class AbstractAction
}
/**
- * Returns an array of the keys for the property values that have been
+ * Returns an array of the keys for the property values that have been
* defined via the {@link #putValue(String, Object)} method (or the class
* constructor).
- *
+ *
* @return An array of keys.
*/
public Object[] getKeys()
@@ -208,7 +208,7 @@ public abstract class AbstractAction
}
/**
- * Sends a {@link PropertyChangeEvent} for the named property to all
+ * Sends a {@link PropertyChangeEvent} for the named property to all
* registered listeners.
*
* @param propertyName the property name.
@@ -220,17 +220,17 @@ public abstract class AbstractAction
{
changeSupport.firePropertyChange(propertyName, oldValue, newValue);
}
-
+
/**
* Sends a {@link PropertyChangeEvent} for the named property to all
- * registered listeners. This private method is called by the
+ * registered listeners. This private method is called by the
* {@link #setEnabled(boolean)} method.
*
* @param propertyName the property name.
* @param oldValue the old value of the property.
* @param newValue the new value of the property.
*/
- private void firePropertyChange(String propertyName, boolean oldValue,
+ private void firePropertyChange(String propertyName, boolean oldValue,
boolean newValue)
{
changeSupport.firePropertyChange(propertyName, oldValue, newValue);
@@ -241,7 +241,7 @@ public abstract class AbstractAction
* from this action.
*
* @param listener the listener.
- *
+ *
* @see #removePropertyChangeListener(PropertyChangeListener)
*/
public void addPropertyChangeListener(PropertyChangeListener listener)
@@ -250,11 +250,11 @@ public abstract class AbstractAction
}
/**
- * Deregisters a listener so that it no longer receives
+ * Deregisters a listener so that it no longer receives
* {@link PropertyChangeEvent} notifications from this action.
*
* @param listener the listener.
- *
+ *
* @see #addPropertyChangeListener(PropertyChangeListener)
*/
public void removePropertyChangeListener(PropertyChangeListener listener)
@@ -266,7 +266,7 @@ public abstract class AbstractAction
* Returns all registered listeners.
*
* @return An array of listeners.
- *
+ *
* @since 1.4
*/
public PropertyChangeListener[] getPropertyChangeListeners()
diff --git a/libjava/classpath/javax/swing/AbstractButton.java b/libjava/classpath/javax/swing/AbstractButton.java
index 8764f6f..6cbc775 100644
--- a/libjava/classpath/javax/swing/AbstractButton.java
+++ b/libjava/classpath/javax/swing/AbstractButton.java
@@ -129,11 +129,11 @@ import javax.swing.text.View;
*
* <p>The various behavioral aspects of these properties follows:</p>
*
- * <ul>
+ * <ul>
*
* <li>When non-bound properties stored in the button change, the button
* fires ChangeEvents to its ChangeListeners.</li>
- *
+ *
* <li>When bound properties stored in the button change, the button fires
* PropertyChangeEvents to its PropertyChangeListeners</li>
*
@@ -271,7 +271,7 @@ public abstract class AbstractButton extends JComponent
/** Whether or not the button fills its content area. */
boolean contentAreaFilled;
-
+
/** Whether rollover is enabled. */
boolean rollOverEnabled;
@@ -302,7 +302,7 @@ public abstract class AbstractButton extends JComponent
/**
* Listener the button uses to receive ChangeEvents from its model.
- */
+ */
protected ChangeListener changeListener;
/**
@@ -317,16 +317,16 @@ public abstract class AbstractButton extends JComponent
* <code>ActionEvent</code>.
*/
long multiClickThreshhold;
-
+
/**
* Listener the button uses to receive PropertyChangeEvents from its
* Action.
*/
PropertyChangeListener actionPropertyChangeListener;
-
- /** ChangeEvent that is fired to button's ChangeEventListeners */
+
+ /** ChangeEvent that is fired to button's ChangeEventListeners */
protected ChangeEvent changeEvent = new ChangeEvent(this);
-
+
/**
* Indicates if the borderPainted property has been set by a client
* program or by the UI.
@@ -367,26 +367,26 @@ public abstract class AbstractButton extends JComponent
* Fired in a PropertyChangeEvent when the "borderPainted" property changes.
*/
public static final String BORDER_PAINTED_CHANGED_PROPERTY = "borderPainted";
-
+
/**
* Fired in a PropertyChangeEvent when the "contentAreaFilled" property
* changes.
*/
public static final String CONTENT_AREA_FILLED_CHANGED_PROPERTY =
"contentAreaFilled";
-
+
/**
* Fired in a PropertyChangeEvent when the "disabledIcon" property changes.
*/
public static final String DISABLED_ICON_CHANGED_PROPERTY = "disabledIcon";
-
+
/**
* Fired in a PropertyChangeEvent when the "disabledSelectedIcon" property
* changes.
*/
public static final String DISABLED_SELECTED_ICON_CHANGED_PROPERTY =
"disabledSelectedIcon";
-
+
/**
* Fired in a PropertyChangeEvent when the "focusPainted" property changes.
*/
@@ -433,14 +433,14 @@ public abstract class AbstractButton extends JComponent
* Fired in a PropertyChangeEvent when the "rolloverIcon" property changes.
*/
public static final String ROLLOVER_ICON_CHANGED_PROPERTY = "rolloverIcon";
-
+
/**
* Fired in a PropertyChangeEvent when the "rolloverSelectedIcon" property
* changes.
*/
public static final String ROLLOVER_SELECTED_ICON_CHANGED_PROPERTY =
"rolloverSelectedIcon";
-
+
/**
* Fired in a PropertyChangeEvent when the "selectedIcon" property changes.
*/
@@ -471,7 +471,7 @@ public abstract class AbstractButton extends JComponent
AccessibleText
{
private static final long serialVersionUID = -5673062525319836790L;
-
+
protected AccessibleAbstractButton()
{
// Nothing to do here yet.
@@ -553,7 +553,7 @@ public abstract class AbstractButton extends JComponent
{
Object[] target = new Object[group.getButtonCount()];
Enumeration els = group.getElements();
-
+
for (int index = 0; els.hasMoreElements(); ++index)
{
target[index] = els.nextElement();
@@ -663,7 +663,7 @@ public abstract class AbstractButton extends JComponent
}
/**
- * Sets the current accessible value as object. If the specified number
+ * Sets the current accessible value as object. If the specified number
* is 0 the button will be deselected, otherwise the button will
* be selected.
*
@@ -942,7 +942,7 @@ public abstract class AbstractButton extends JComponent
public AttributeSet getCharacterAttribute(int i)
{
AttributeSet atts = null;
- View view = (View) getClientProperty(BasicHTML.propertyKey);
+ View view = (View) getClientProperty(BasicHTML.propertyKey);
if (view != null)
{
Document doc = view.getDocument();
@@ -1019,8 +1019,8 @@ public abstract class AbstractButton extends JComponent
setDisplayedMnemonicIndex(-1);
setOpaque(true);
text = "";
- // testing on JRE1.5 shows that the iconTextGap default value is
- // hard-coded here and the 'Button.iconTextGap' setting in the
+ // testing on JRE1.5 shows that the iconTextGap default value is
+ // hard-coded here and the 'Button.iconTextGap' setting in the
// UI defaults is ignored, at least by the MetalLookAndFeel
iconTextGap = 4;
}
@@ -1036,7 +1036,7 @@ public abstract class AbstractButton extends JComponent
}
/**
- * Set the model the button is currently using. This un-registers all
+ * Set the model the button is currently using. This un-registers all
* listeners associated with the current model, and re-registers them
* with the new model.
*
@@ -1072,7 +1072,7 @@ public abstract class AbstractButton extends JComponent
repaint();
}
- protected void init(String text, Icon icon)
+ protected void init(String text, Icon icon)
{
// If text is null, we fall back to the empty
// string (which is set using AbstractButton's
@@ -1083,10 +1083,10 @@ public abstract class AbstractButton extends JComponent
if (icon != null)
default_icon = icon;
-
+
updateUI();
}
-
+
/**
* <p>Returns the action command string for this button's model.</p>
*
@@ -1140,9 +1140,9 @@ public abstract class AbstractButton extends JComponent
/**
* Returns all added <code>ActionListener</code> objects.
- *
+ *
* @return an array of listeners
- *
+ *
* @since 1.4
*/
public ActionListener[] getActionListeners()
@@ -1175,9 +1175,9 @@ public abstract class AbstractButton extends JComponent
/**
* Returns all added <code>ItemListener</code> objects.
- *
+ *
* @return an array of listeners
- *
+ *
* @since 1.4
*/
public ItemListener[] getItemListeners()
@@ -1188,7 +1188,7 @@ public abstract class AbstractButton extends JComponent
/**
* Adds a ChangeListener to the button's listener list. When the button's
* model changes any of its (non-bound) properties, these listeners will be
- * called.
+ * called.
*
* @param l The new listener to add
*/
@@ -1209,9 +1209,9 @@ public abstract class AbstractButton extends JComponent
/**
* Returns all added <code>ChangeListener</code> objects.
- *
+ *
* @return an array of listeners
- *
+ *
* @since 1.4
*/
public ChangeListener[] getChangeListeners()
@@ -1229,7 +1229,7 @@ public abstract class AbstractButton extends JComponent
{
e.setSource(this);
ItemListener[] listeners = getItemListeners();
-
+
for (int i = 0; i < listeners.length; i++)
listeners[i].itemStateChanged(e);
}
@@ -1242,8 +1242,8 @@ public abstract class AbstractButton extends JComponent
*/
protected void fireActionPerformed(ActionEvent e)
{
- // Dispatch a copy of the given ActionEvent in order to
- // set the source and action command correctly.
+ // Dispatch a copy of the given ActionEvent in order to
+ // set the source and action command correctly.
ActionEvent ae = new ActionEvent(
this,
e.getID(),
@@ -1252,7 +1252,7 @@ public abstract class AbstractButton extends JComponent
e.getModifiers());
ActionListener[] listeners = getActionListeners();
-
+
for (int i = 0; i < listeners.length; i++)
listeners[i].actionPerformed(ae);
}
@@ -1338,12 +1338,12 @@ public abstract class AbstractButton extends JComponent
}
}
- /**
+ /**
* Sets the button's mnemonic index. The mnemonic index is a hint to the
* look and feel class, suggesting which character in the button's label
* should be underlined when drawing the label. If the mnemonic index is
- * -1, no mnemonic will be displayed.
- *
+ * -1, no mnemonic will be displayed.
+ *
* If no mnemonic index is set, the button will choose a mnemonic index
* by default, which will be the first occurrence of the mnemonic
* character in the button's text.
@@ -1358,11 +1358,11 @@ public abstract class AbstractButton extends JComponent
{
if (index < -1 || (text != null && index >= text.length()))
throw new IllegalArgumentException();
-
+
mnemonicIndex = index;
}
-
- /**
+
+ /**
* Get the button's mnemonic index, which is an offset into the button's
* "text" property. The character specified by this offset should be
* underlined when the look and feel class draws this button.
@@ -1373,7 +1373,7 @@ public abstract class AbstractButton extends JComponent
{
return mnemonicIndex;
}
-
+
/**
* Set the "rolloverEnabled" property. When rollover is enabled, and the
@@ -1450,15 +1450,15 @@ public abstract class AbstractButton extends JComponent
mod.setEnabled(b);
}
- /**
+ /**
* Set the horizontal alignment of the button's text and icon. The
* alignment is a numeric constant from {@link SwingConstants}. It must
* be one of: <code>RIGHT</code>, <code>LEFT</code>, <code>CENTER</code>,
* <code>LEADING</code> or <code>TRAILING</code>. The default is
* <code>CENTER</code>.
- *
+ *
* @return The current horizontal alignment
- *
+ *
* @see #setHorizontalAlignment(int)
*/
public int getHorizontalAlignment()
@@ -1476,14 +1476,14 @@ public abstract class AbstractButton extends JComponent
* @param a The new horizontal alignment
* @throws IllegalArgumentException If alignment is not one of the legal
* constants.
- *
+ *
* @see #getHorizontalAlignment()
*/
public void setHorizontalAlignment(int a)
{
if (horizontalAlignment == a)
return;
- if (a != LEFT && a != CENTER && a != RIGHT && a != LEADING
+ if (a != LEFT && a != CENTER && a != RIGHT && a != LEADING
&& a != TRAILING)
throw new IllegalArgumentException("Invalid alignment.");
int old = horizontalAlignment;
@@ -1522,7 +1522,7 @@ public abstract class AbstractButton extends JComponent
{
if (horizontalTextPosition == t)
return;
- if (t != LEFT && t != CENTER && t != RIGHT && t != LEADING
+ if (t != LEFT && t != CENTER && t != RIGHT && t != LEADING
&& t != TRAILING)
throw new IllegalArgumentException("Invalid alignment.");
@@ -1540,7 +1540,7 @@ public abstract class AbstractButton extends JComponent
* <code>BOTTOM</code>. The default is <code>CENTER</code>.
*
* @return The current vertical alignment
- *
+ *
* @see #setVerticalAlignment(int)
*/
public int getVerticalAlignment()
@@ -1557,7 +1557,7 @@ public abstract class AbstractButton extends JComponent
* @param a The new vertical alignment
* @throws IllegalArgumentException If alignment is not one of the legal
* constants.
- *
+ *
* @see #getVerticalAlignment()
*/
public void setVerticalAlignment(int a)
@@ -1605,7 +1605,7 @@ public abstract class AbstractButton extends JComponent
return;
if (t != TOP && t != CENTER && t != BOTTOM)
throw new IllegalArgumentException("Invalid alignment.");
-
+
int old = verticalTextPosition;
verticalTextPosition = t;
firePropertyChange(VERTICAL_TEXT_POSITION_CHANGED_PROPERTY, old, t);
@@ -1645,7 +1645,7 @@ public abstract class AbstractButton extends JComponent
}
/**
- * Get the value of the "action" property.
+ * Get the value of the "action" property.
*
* @return The current value of the "action" property
*/
@@ -1664,7 +1664,7 @@ public abstract class AbstractButton extends JComponent
* <p>This method also configures several of the button's properties from
* the Action, by calling {@link #configurePropertiesFromAction}, and
* subscribes the button to the Action as a PropertyChangeListener.
- * Subsequent changes to the Action will thus reconfigure the button
+ * Subsequent changes to the Action will thus reconfigure the button
* automatically.</p>
*
* @param a The new value of the "action" property
@@ -1687,7 +1687,7 @@ public abstract class AbstractButton extends JComponent
configurePropertiesFromAction(action);
if (action != null)
{
- actionPropertyChangeListener = createActionPropertyChangeListener(a);
+ actionPropertyChangeListener = createActionPropertyChangeListener(a);
action.addPropertyChangeListener(actionPropertyChangeListener);
addActionListener(action);
}
@@ -1713,9 +1713,9 @@ public abstract class AbstractButton extends JComponent
{
if (default_icon == i)
return;
-
- Icon old = default_icon;
- default_icon = i;
+
+ Icon old = default_icon;
+ default_icon = i;
firePropertyChange(ICON_CHANGED_PROPERTY, old, i);
revalidate();
repaint();
@@ -1768,7 +1768,7 @@ public abstract class AbstractButton extends JComponent
{
if (text == t)
return;
-
+
String old = text;
text = t;
firePropertyChange(TEXT_CHANGED_PROPERTY, old, t);
@@ -1778,9 +1778,9 @@ public abstract class AbstractButton extends JComponent
/**
* Set the value of the {@link #iconTextGap} property.
- *
+ *
* @param i The new value of the property
- *
+ *
* @since 1.4
*/
public void setIconTextGap(int i)
@@ -1788,7 +1788,7 @@ public abstract class AbstractButton extends JComponent
clientIconTextGapSet = true;
if (iconTextGap == i)
return;
-
+
int old = iconTextGap;
iconTextGap = i;
firePropertyChange("iconTextGap", new Integer(old), new Integer(i));
@@ -1800,7 +1800,7 @@ public abstract class AbstractButton extends JComponent
* Get the value of the {@link #iconTextGap} property.
*
* @return The current value of the property
- *
+ *
* @since 1.4
*/
public int getIconTextGap()
@@ -1831,7 +1831,7 @@ public abstract class AbstractButton extends JComponent
{
if (margin == m)
return;
-
+
Insets old = margin;
margin = m;
firePropertyChange(MARGIN_CHANGED_PROPERTY, old, m);
@@ -1864,7 +1864,7 @@ public abstract class AbstractButton extends JComponent
{
if (pressed_icon == pressedIcon)
return;
-
+
Icon old = pressed_icon;
pressed_icon = pressedIcon;
firePropertyChange(PRESSED_ICON_CHANGED_PROPERTY, old, pressed_icon);
@@ -1889,7 +1889,7 @@ public abstract class AbstractButton extends JComponent
Image grayImage = GrayFilter.createDisabledImage(iconImage);
disabledIcon = new ImageIcon(grayImage);
}
-
+
return disabledIcon;
}
@@ -1940,7 +1940,7 @@ public abstract class AbstractButton extends JComponent
{
if (focusPainted == p)
return;
-
+
boolean old = focusPainted;
focusPainted = p;
firePropertyChange(FOCUS_PAINTED_CHANGED_PROPERTY, old, p);
@@ -2077,7 +2077,7 @@ public abstract class AbstractButton extends JComponent
* is changed, this listener is unsubscribed from the old model and
* subscribed to the new one.</p>
*
- * @return A new ActionListener
+ * @return A new ActionListener
*/
protected ActionListener createActionListener()
{
@@ -2098,7 +2098,7 @@ public abstract class AbstractButton extends JComponent
* button's action is changed subsequently, the listener is unsubscribed
* from the old action and subscribed to the new one.</p>
*
- * @param a The Action which will be listened to, and which should be
+ * @param a The Action which will be listened to, and which should be
* the same as the source of any PropertyChangeEvents received by the
* new listener returned from this method.
*
@@ -2238,12 +2238,12 @@ public abstract class AbstractButton extends JComponent
{
if (disabledSelectedIcon == icon)
return;
-
+
Icon old = disabledSelectedIcon;
disabledSelectedIcon = icon;
firePropertyChange(DISABLED_SELECTED_ICON_CHANGED_PROPERTY, old, icon);
revalidate();
- repaint();
+ repaint();
}
/**
@@ -2270,7 +2270,7 @@ public abstract class AbstractButton extends JComponent
{
if (rolloverIcon == r)
return;
-
+
Icon old = rolloverIcon;
rolloverIcon = r;
firePropertyChange(ROLLOVER_ICON_CHANGED_PROPERTY, old, rolloverIcon);
@@ -2293,10 +2293,10 @@ public abstract class AbstractButton extends JComponent
}
/**
- * Set the button's rollover selected icon and sets the
- * <code>rolloverEnabled</code> property to <code>true</code>. The look and
- * feel class should paint this icon when the "rolloverEnabled" property of
- * the button is <code>true</code>, the "selected" property of the button's
+ * Set the button's rollover selected icon and sets the
+ * <code>rolloverEnabled</code> property to <code>true</code>. The look and
+ * feel class should paint this icon when the "rolloverEnabled" property of
+ * the button is <code>true</code>, the "selected" property of the button's
* model is <code>true</code>, and the mouse rolls over the button.
*
* @param r The new rollover selected icon.
@@ -2305,7 +2305,7 @@ public abstract class AbstractButton extends JComponent
{
if (rolloverSelectedIcon == r)
return;
-
+
Icon old = rolloverSelectedIcon;
rolloverSelectedIcon = r;
firePropertyChange(ROLLOVER_SELECTED_ICON_CHANGED_PROPERTY, old, r);
@@ -2341,7 +2341,7 @@ public abstract class AbstractButton extends JComponent
{
if (selectedIcon == s)
return;
-
+
Icon old = selectedIcon;
selectedIcon = s;
firePropertyChange(SELECTED_ICON_CHANGED_PROPERTY, old, s);
@@ -2418,7 +2418,7 @@ public abstract class AbstractButton extends JComponent
clientContentAreaFilledSet = true;
if (contentAreaFilled == b)
return;
-
+
// The JDK sets the opaque property to the value of the contentAreaFilled
// property, so should we do.
setOpaque(b);
@@ -2492,7 +2492,7 @@ public abstract class AbstractButton extends JComponent
{
super.setUI(ui);
}
-
+
/**
* Set the "UI" property of the button, which is a look and feel class
* responsible for handling the button's input events and painting it.
@@ -2503,7 +2503,7 @@ public abstract class AbstractButton extends JComponent
{
return (ButtonUI) ui;
}
-
+
/**
* Set the "UI" property to a class constructed, via the {@link
* UIManager}, from the current look and feel. This should be overridden
@@ -2520,7 +2520,7 @@ public abstract class AbstractButton extends JComponent
* into a single <code>ActionEvent</code>.
*
* @return the time in milliseconds
- *
+ *
* @since 1.4
*/
public long getMultiClickThreshhold()
@@ -2533,7 +2533,7 @@ public abstract class AbstractButton extends JComponent
* <code>ActionEvent</code>.
*
* @param threshhold the time in milliseconds
- *
+ *
* @since 1.4
*/
public void setMultiClickThreshhold(long threshhold)
@@ -2586,7 +2586,7 @@ public abstract class AbstractButton extends JComponent
/**
* Helper method for
* {@link LookAndFeel#installProperty(JComponent, String, Object)}.
- *
+ *
* @param propertyName the name of the property
* @param value the value of the property
*
diff --git a/libjava/classpath/javax/swing/AbstractCellEditor.java b/libjava/classpath/javax/swing/AbstractCellEditor.java
index e993df5..eade00c 100644
--- a/libjava/classpath/javax/swing/AbstractCellEditor.java
+++ b/libjava/classpath/javax/swing/AbstractCellEditor.java
@@ -69,7 +69,7 @@ public abstract class AbstractCellEditor
/**
* Creates a new instance of AbstractCellEditor.
*/
- public AbstractCellEditor()
+ public AbstractCellEditor()
{
listenerList = new EventListenerList();
changeEvent = new ChangeEvent(this);
@@ -85,10 +85,10 @@ public abstract class AbstractCellEditor
* @return <code>true</code> if the cell is editable using
* <code>event</code>, <code>false</code> if it's not
*/
- public boolean isCellEditable(EventObject event)
+ public boolean isCellEditable(EventObject event)
{
return true;
- }
+ }
/**
* Returns <code>true</code> if the editing cell should be selected,
@@ -101,7 +101,7 @@ public abstract class AbstractCellEditor
* @return <code>true</code> if the editing cell should be selected,
* <code>false</code> otherwise
*/
- public boolean shouldSelectCell(EventObject event)
+ public boolean shouldSelectCell(EventObject event)
{
return true;
}
@@ -113,7 +113,7 @@ public abstract class AbstractCellEditor
* @return <code>true</code> if editing has been stopped successfully,
* <code>false</code>otherwise
*/
- public boolean stopCellEditing()
+ public boolean stopCellEditing()
{
fireEditingStopped();
return true;
@@ -123,10 +123,10 @@ public abstract class AbstractCellEditor
* Stop editing the cell and do not accept any partial value that has
* been entered into the cell.
*/
- public void cancelCellEditing()
+ public void cancelCellEditing()
{
fireEditingCanceled();
- }
+ }
/**
* Adds a CellEditorListener to the list of CellEditorListeners of this
@@ -149,7 +149,7 @@ public abstract class AbstractCellEditor
{
listenerList.remove(CellEditorListener.class, listener);
}
-
+
/**
* Returns the list of CellEditorListeners that have been registered
* in this CellEditor.
diff --git a/libjava/classpath/javax/swing/AbstractListModel.java b/libjava/classpath/javax/swing/AbstractListModel.java
index 7d4b2bb..72aefbc 100644
--- a/libjava/classpath/javax/swing/AbstractListModel.java
+++ b/libjava/classpath/javax/swing/AbstractListModel.java
@@ -125,7 +125,7 @@ public abstract class AbstractListModel implements ListModel, Serializable
{
ListDataEvent event =
new ListDataEvent(source, ListDataEvent.INTERVAL_ADDED,
- startIndex, endIndex);
+ startIndex, endIndex);
ListDataListener[] listeners = getListDataListeners();
for (int index = 0; index < listeners.length; index++)
@@ -148,7 +148,7 @@ public abstract class AbstractListModel implements ListModel, Serializable
{
ListDataEvent event =
new ListDataEvent(source, ListDataEvent.INTERVAL_REMOVED,
- startIndex, endIndex);
+ startIndex, endIndex);
ListDataListener[] listeners = getListDataListeners();
for (int index = 0; index < listeners.length; index++)
diff --git a/libjava/classpath/javax/swing/AbstractSpinnerModel.java b/libjava/classpath/javax/swing/AbstractSpinnerModel.java
index d247a33..984e52a 100644
--- a/libjava/classpath/javax/swing/AbstractSpinnerModel.java
+++ b/libjava/classpath/javax/swing/AbstractSpinnerModel.java
@@ -47,7 +47,7 @@ import javax.swing.event.EventListenerList;
/**
* Provides standard implementations for some of the methods in
* {@link SpinnerModel}.
- *
+ *
* @since 1.4
*
* @author Ka-Hing Cheung
@@ -55,7 +55,7 @@ import javax.swing.event.EventListenerList;
public abstract class AbstractSpinnerModel implements SpinnerModel
{
private ChangeEvent changeEvent = new ChangeEvent(this);
-
+
/** Stores the listeners registered with the model. */
protected EventListenerList listenerList = new EventListenerList();
diff --git a/libjava/classpath/javax/swing/Action.java b/libjava/classpath/javax/swing/Action.java
index 3dd6353..fa1925f 100644
--- a/libjava/classpath/javax/swing/Action.java
+++ b/libjava/classpath/javax/swing/Action.java
@@ -44,9 +44,9 @@ import java.beans.PropertyChangeListener;
* Provides a convenient central point of control for some task
* that can be triggered by more than one control in a Swing user interface
* (for example, a menu item and a toolbar button).
- *
+ *
* @see AbstractButton#setAction(Action)
- *
+ *
* @author Ronald Veldema (rveldema@cs.vu.nl)
* @author Andrew Selkirk
*/
@@ -96,23 +96,23 @@ public interface Action extends ActionListener {
/**
* Returns the value associated with the specified key.
- *
+ *
* @param key the key (not <code>null</code>).
- *
- * @return The value associated with the specified key, or
+ *
+ * @return The value associated with the specified key, or
* <code>null</code> if the key is not found.
*/
Object getValue(String key);
/**
- * Sets the value associated with the specified key and sends a
- * {@link java.beans.PropertyChangeEvent} to all registered listeners.
- * The standard keys are defined in this interface: {@link #NAME},
- * {@link #SHORT_DESCRIPTION}, {@link #LONG_DESCRIPTION},
- * {@link #SMALL_ICON}, {@link #ACTION_COMMAND_KEY},
- * {@link #ACCELERATOR_KEY} and {@link #MNEMONIC_KEY}. Any existing value
- * associated with the key will be overwritten.
- *
+ * Sets the value associated with the specified key and sends a
+ * {@link java.beans.PropertyChangeEvent} to all registered listeners.
+ * The standard keys are defined in this interface: {@link #NAME},
+ * {@link #SHORT_DESCRIPTION}, {@link #LONG_DESCRIPTION},
+ * {@link #SMALL_ICON}, {@link #ACTION_COMMAND_KEY},
+ * {@link #ACCELERATOR_KEY} and {@link #MNEMONIC_KEY}. Any existing value
+ * associated with the key will be overwritten.
+ *
* @param key the key (not <code>null</code>).
* @param value the value (<code>null</code> permitted).
*/
@@ -120,16 +120,16 @@ public interface Action extends ActionListener {
/**
* Returns the flag that indicates whether or not this action is enabled.
- *
+ *
* @return The flag.
*/
boolean isEnabled();
/**
* Sets the flag that indicates whether or not this action is enabled. If
- * the value changes, a {@link java.beans.PropertyChangeEvent} is sent to
+ * the value changes, a {@link java.beans.PropertyChangeEvent} is sent to
* all registered listeners.
- *
+ *
* @param b the new value of the flag.
*/
void setEnabled(boolean b);
@@ -137,15 +137,15 @@ public interface Action extends ActionListener {
/**
* Registers a listener to receive notification whenever one of the
* action's properties is modified.
- *
+ *
* @param listener the listener.
*/
void addPropertyChangeListener(PropertyChangeListener listener);
/**
* Deregisters a listener so that it no longer receives notification of
- * changes to the action's properties.
- *
+ * changes to the action's properties.
+ *
* @param listener the listener.
*/
void removePropertyChangeListener(PropertyChangeListener listener);
diff --git a/libjava/classpath/javax/swing/BorderFactory.java b/libjava/classpath/javax/swing/BorderFactory.java
index ca78deb..f5c4cbb 100644
--- a/libjava/classpath/javax/swing/BorderFactory.java
+++ b/libjava/classpath/javax/swing/BorderFactory.java
@@ -413,7 +413,7 @@ public class BorderFactory
* Create a matte-look border using a solid color. (The difference between
* this border and a line border is that you can specify the individual border
* dimensions.)
- *
+ *
* @param top
* An int specifying the width of the top in pixels
* @param left
diff --git a/libjava/classpath/javax/swing/BoundedRangeModel.java b/libjava/classpath/javax/swing/BoundedRangeModel.java
index 54446ac..87fec5f 100644
--- a/libjava/classpath/javax/swing/BoundedRangeModel.java
+++ b/libjava/classpath/javax/swing/BoundedRangeModel.java
@@ -42,11 +42,11 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
/**
- * The data model that represents a <i>range</i> that is constrained to fit
- * within specified <i>bounds</i>. The range is defined as <code>value</code>
- * to <code>value + extent</code>, where both <code>value</code> and
+ * The data model that represents a <i>range</i> that is constrained to fit
+ * within specified <i>bounds</i>. The range is defined as <code>value</code>
+ * to <code>value + extent</code>, where both <code>value</code> and
* <code>extent</code> are integers, and <code>extent >= 0</code>. The bounds
- * are defined by integers <code>minimum</code> and <code>maximum</code>.
+ * are defined by integers <code>minimum</code> and <code>maximum</code>.
* <p>
* This type of model is used in components that display a range of values,
* like {@link JProgressBar} and {@link JSlider}.
@@ -57,7 +57,7 @@ public interface BoundedRangeModel
{
/**
* Returns the current value for the model.
- *
+ *
* @return The current value for the model.
*
* @see #setValue(int)
@@ -68,7 +68,7 @@ public interface BoundedRangeModel
* Sets the value for the model and sends a {@link ChangeEvent} to
* all registered listeners. The new value must satisfy the constraint
* <code>min <= value <= value + extent <= max</code>.
- *
+ *
* @param value the value
*
* @see #getValue()
@@ -76,9 +76,9 @@ public interface BoundedRangeModel
void setValue(int value);
/**
- * Returns the lower bound for the model. The start of the model's range
+ * Returns the lower bound for the model. The start of the model's range
* (see {@link #getValue()}) cannot be less than this lower bound.
- *
+ *
* @return The lower bound for the model.
*
* @see #setMinimum(int)
@@ -90,7 +90,7 @@ public interface BoundedRangeModel
* Sets the lower bound for the model and sends a {@link ChangeEvent} to all
* registered listeners. The new minimum must be less than or equal to the
* start value of the model's range (as returned by {@link #getValue()}).
- *
+ *
* @param minimum the minimum value
*
* @see #getMinimum()
@@ -99,9 +99,9 @@ public interface BoundedRangeModel
/**
* Returns the upper bound for the model. This sets an upper limit for the
- * end value of the model's range ({@link #getValue()} +
+ * end value of the model's range ({@link #getValue()} +
* {@link #getExtent()}).
- *
+ *
* @return The upper bound for the model.
*
* @see #setMaximum(int)
@@ -112,9 +112,9 @@ public interface BoundedRangeModel
/**
* Sets the upper bound for the model and sends a {@link ChangeEvent} to all
* registered listeners. The new maximum must be greater than or equal to the
- * end value of the model's range (as returned by {@link #getValue()} +
+ * end value of the model's range (as returned by {@link #getValue()} +
* {@link #getExtent()}).
- *
+ *
* @param maximum the maximum value
*
* @see #getMaximum()
@@ -123,7 +123,7 @@ public interface BoundedRangeModel
/**
* Returns the value of the <code>valueIsAdjusting</code> property.
- *
+ *
* @return <code>true</code> if value is adjusting,
* otherwise <code>false</code>
*
@@ -133,7 +133,7 @@ public interface BoundedRangeModel
/**
* Sets the <code>valueIsAdjusting</code> property.
- *
+ *
* @param adjusting <code>true</code> if adjusting,
* <code>false</code> otherwise
*
@@ -153,7 +153,7 @@ public interface BoundedRangeModel
/**
* Sets the extent, which is the length of the model's range, and sends a
* {@link ChangeEvent} to all registered listeners.
- *
+ *
* @param extent the extent
*
* @see #getExtent()
@@ -162,12 +162,12 @@ public interface BoundedRangeModel
/**
* Sets all the properties for the model in a single call.
- *
+ *
* @param value the value
* @param extent the extent
* @param minimum the minimum value
* @param maximum the maximum value
- * @param adjusting a flag that indicates the model is being adjusted
+ * @param adjusting a flag that indicates the model is being adjusted
* continuously.
*/
void setRangeProperties(int value, int extent, int minimum, int maximum,
@@ -175,16 +175,16 @@ public interface BoundedRangeModel
/**
* Adds a <code>ChangeListener</code> to this object.
- *
+ *
* @param listener the listener to add
- *
+ *
* @see #removeChangeListener(ChangeListener)
*/
void addChangeListener(ChangeListener listener);
/**
* Removes a <code>ChangeListener</code> from this object.
- *
+ *
* @param listener the listener to remove
*
* @see #addChangeListener(ChangeListener)
diff --git a/libjava/classpath/javax/swing/Box.java b/libjava/classpath/javax/swing/Box.java
index 0f984a9..ce9cb8f 100644
--- a/libjava/classpath/javax/swing/Box.java
+++ b/libjava/classpath/javax/swing/Box.java
@@ -60,19 +60,19 @@ import javax.accessibility.AccessibleRole;
public class Box extends JComponent implements Accessible
{
private static final long serialVersionUID = 1525417495883046342L;
-
+
/**
* Provides accessibility support for <code>Box</code>es.
*/
protected class AccessibleBox extends Container.AccessibleAWTContainer
{
private static final long serialVersionUID = -7775079816389931944L;
-
+
protected AccessibleBox()
{
// Nothing to do here.
}
-
+
public AccessibleRole getAccessibleRole()
{
return null;
@@ -85,7 +85,7 @@ public class Box extends JComponent implements Accessible
public static class Filler extends JComponent implements Accessible
{
private static final long serialVersionUID = -1204263191910183998L;
-
+
/**
* Provides accessibility support for <code>Box.Filler</code>.
*/
@@ -93,20 +93,20 @@ public class Box extends JComponent implements Accessible
extends Component.AccessibleAWTComponent
{
private static final long serialVersionUID = 164963348357479321L;
-
+
protected AccessibleBoxFiller()
{
// Nothing to do here.
}
-
+
public AccessibleRole getAccessibleRole()
{
return null;
}
}
-
+
private transient Dimension min, pref, max;
-
+
/**
* Creates a new instance of Filler.
*
@@ -118,7 +118,7 @@ public class Box extends JComponent implements Accessible
{
changeShape(min, pref, max);
}
-
+
/**
* Changes the dimensions of this Filler.
*
@@ -130,16 +130,16 @@ public class Box extends JComponent implements Accessible
{
this.min = min;
this.pref = pref;
- this.max = max;
+ this.max = max;
}
-
+
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
accessibleContext = new AccessibleBoxFiller();
return accessibleContext;
}
-
+
/**
* Returns the maximum size of this Filler.
*
@@ -149,7 +149,7 @@ public class Box extends JComponent implements Accessible
{
return max;
}
-
+
/**
* Returns the minimum size of this Filler.
*
@@ -159,7 +159,7 @@ public class Box extends JComponent implements Accessible
{
return min;
}
-
+
/**
* Returns the preferred size of this Filler.
*
@@ -170,7 +170,7 @@ public class Box extends JComponent implements Accessible
return pref;
}
}
-
+
/**
* Creates a new Box component, that lays out its children according
* to the <code>axis</code> parameter.
@@ -184,9 +184,9 @@ public class Box extends JComponent implements Accessible
*/
public Box(int axis)
{
- super.setLayout(new BoxLayout(this, axis));
+ super.setLayout(new BoxLayout(this, axis));
}
-
+
/**
* Creates a filler component which acts as glue between components.
* It does not take space unless some extra space is available. If extra
@@ -200,12 +200,12 @@ public class Box extends JComponent implements Accessible
new Dimension(Short.MAX_VALUE, Short.MAX_VALUE));
return glue;
}
-
+
public static Box createHorizontalBox()
{
return new Box(BoxLayout.X_AXIS);
}
-
+
/**
* Creates a filler component which acts as glue between components.
* It does not take space unless some extra space is available. If extra
@@ -219,7 +219,7 @@ public class Box extends JComponent implements Accessible
new Dimension(Short.MAX_VALUE, 0));
return glue;
}
-
+
/**
* Creates a filler component which acts as strut between components.
* It will fill exactly the specified horizontal size.
@@ -235,17 +235,17 @@ public class Box extends JComponent implements Accessible
new Dimension(width, Integer.MAX_VALUE));
return strut;
}
-
+
public static Component createRigidArea(Dimension d)
{
return new Filler(d, d, d);
}
-
+
public static Box createVerticalBox()
{
return new Box(BoxLayout.Y_AXIS);
}
-
+
/**
* Creates a filler component which acts as glue between components.
* It does not take space unless some extra space is available. If extra
@@ -257,7 +257,7 @@ public class Box extends JComponent implements Accessible
{
return createGlue();
}
-
+
/**
* Creates a filler component which acts as strut between components.
* It will fill exactly the specified vertical size.
@@ -273,18 +273,18 @@ public class Box extends JComponent implements Accessible
new Dimension(Integer.MAX_VALUE, height));
return strut;
}
-
+
public void setLayout(LayoutManager l)
{
throw new AWTError("Not allowed to set layout managers for boxes.");
}
-
+
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
accessibleContext = new AccessibleBox();
return accessibleContext;
}
-
-
+
+
}
diff --git a/libjava/classpath/javax/swing/BoxLayout.java b/libjava/classpath/javax/swing/BoxLayout.java
index a7f9dd6..55c489e 100644
--- a/libjava/classpath/javax/swing/BoxLayout.java
+++ b/libjava/classpath/javax/swing/BoxLayout.java
@@ -85,7 +85,7 @@ public class BoxLayout implements LayoutManager2, Serializable
* The container given to the constructor.
*/
private Container container;
-
+
/**
* Current type of component layouting. Defaults to X_AXIS.
*/
@@ -174,14 +174,14 @@ public class BoxLayout implements LayoutManager2, Serializable
private boolean isHorizontalIn(Container parent)
{
ComponentOrientation orientation = parent.getComponentOrientation();
- return this.way == X_AXIS
- || (this.way == LINE_AXIS
+ return this.way == X_AXIS
+ || (this.way == LINE_AXIS
&& orientation.isHorizontal())
|| (this.way == PAGE_AXIS
&& (!orientation.isHorizontal()));
}
-
+
/**
* Returns the preferred size of the layout.
@@ -236,7 +236,7 @@ public class BoxLayout implements LayoutManager2, Serializable
{
if (container != parent)
throw new AWTError("BoxLayout can't be shared");
-
+
checkLayout();
Component[] children = container.getComponents();
Insets in = container.getInsets();
@@ -337,7 +337,7 @@ public class BoxLayout implements LayoutManager2, Serializable
Insets i = container.getInsets();
int xDim = xTotal.maximum + i.left + i.right;
int yDim = yTotal.maximum + i.top + i.bottom;
-
+
// Check for overflow
if (xDim < xTotal.maximum)
xDim = Integer.MAX_VALUE;
diff --git a/libjava/classpath/javax/swing/ButtonGroup.java b/libjava/classpath/javax/swing/ButtonGroup.java
index 6a474f9..d4168bb 100644
--- a/libjava/classpath/javax/swing/ButtonGroup.java
+++ b/libjava/classpath/javax/swing/ButtonGroup.java
@@ -84,7 +84,7 @@ public class ButtonGroup implements Serializable
/**
* Adds a button to this group. If the button is in the selected state, then:
* <ul>
- * <li>if the group has no current selection, the new button becomes the
+ * <li>if the group has no current selection, the new button becomes the
* selected button for the group;</li>
* <li>if the group already has a selected button, the new button is set to
* "not selected".</li>
@@ -103,14 +103,14 @@ public class ButtonGroup implements Serializable
sel = b.getModel();
else
b.setSelected(false);
- }
+ }
buttons.addElement(b);
}
/**
- * Removes the specified button from this group. If the button is the
- * selected button, the current selection is set to <code>null</code>.
- * The group for the removed button's model is set to <code>null</code>.
+ * Removes the specified button from this group. If the button is the
+ * selected button, the current selection is set to <code>null</code>.
+ * The group for the removed button's model is set to <code>null</code>.
*
* @param b the button to remove (<code>null</code> is ignored).
*/
@@ -180,13 +180,13 @@ public class ButtonGroup implements Serializable
{
ButtonModel old = sel;
sel = m;
-
+
if (old != null)
old.setSelected(false);
-
+
if (m != null)
sel.setSelected(true);
-
+
AbstractButton button = findButton(old);
if (button != null)
button.repaint();
diff --git a/libjava/classpath/javax/swing/ButtonModel.java b/libjava/classpath/javax/swing/ButtonModel.java
index 03fac13..d48eb1e 100644
--- a/libjava/classpath/javax/swing/ButtonModel.java
+++ b/libjava/classpath/javax/swing/ButtonModel.java
@@ -48,7 +48,7 @@ import javax.swing.event.ChangeListener;
* The data model that is used in all kinds of buttons.
*/
public interface ButtonModel extends ItemSelectable
-{
+{
/**
* Returns <code>true</code> if the button is armed, <code>false</code>
@@ -56,7 +56,7 @@ public interface ButtonModel extends ItemSelectable
*
* A button is armed, when the user has pressed the mouse over it, but has
* not yet released the mouse.
- *
+ *
* @return <code>true</code> if the button is armed, <code>false</code>
* otherwise
*
@@ -145,7 +145,7 @@ public interface ButtonModel extends ItemSelectable
*
* An <code>ActionEvent</code> is usually fired when the user clicks on a
* button.
- *
+ *
* @param l the action listener to add
*
* @see #removeActionListener(ActionListener)
@@ -225,7 +225,7 @@ public interface ButtonModel extends ItemSelectable
/**
* Returns the keyboard mnemonic for the button. This specifies a shortcut
* or accelerator key that can be used to activate the button.
- *
+ *
* @return the keyboard mnemonic for the button
*
* @see #setMnemonic(int)
@@ -235,7 +235,7 @@ public interface ButtonModel extends ItemSelectable
/**
* Sets the keyboard mnemonic for the button. This specifies a shortcut
* or accelerator key that can be used to activate the button.
- *
+ *
* @param key the keyboard mnemonic for the button
*
* @see #getMnemonic()
@@ -276,7 +276,7 @@ public interface ButtonModel extends ItemSelectable
* Some kinds of buttons (e.g. toggle buttons, check boxes, radio buttons)
* can be in one of two states: selected or unselected. The selected state
* is usually toggled by clicking on the button.
- *
+ *
* @param b <code>true</code> if the button is selected, <code>false</code>
* otherwise
*
@@ -291,7 +291,7 @@ public interface ButtonModel extends ItemSelectable
* Some kinds of buttons (e.g. toggle buttons, check boxes, radio buttons)
* can be in one of two states: selected or unselected. The selected state
* is usually toggled by clicking on the button.
- *
+ *
* @return <code>true</code> if the button is selected, <code>false</code>
* otherwise
*
diff --git a/libjava/classpath/javax/swing/CellEditor.java b/libjava/classpath/javax/swing/CellEditor.java
index 9eb083a..134c316 100644
--- a/libjava/classpath/javax/swing/CellEditor.java
+++ b/libjava/classpath/javax/swing/CellEditor.java
@@ -53,17 +53,17 @@ public interface CellEditor
{
/**
* Returns the current value for the <code>CellEditor</code>.
- *
+ *
* @return The value.
*/
Object getCellEditorValue();
/**
- * Returns <code>true</code> if the specified event makes the editor
+ * Returns <code>true</code> if the specified event makes the editor
* editable, and <code>false</code> otherwise.
- *
+ *
* @param event the event.
- *
+ *
* @return A boolean.
*/
boolean isCellEditable(EventObject event);
@@ -76,10 +76,10 @@ public interface CellEditor
boolean shouldSelectCell(EventObject event);
/**
- * Signals to the <code>CellEditor</code> that it should stop editing,
+ * Signals to the <code>CellEditor</code> that it should stop editing,
* accepting the current cell value, and returns <code>true</code> if the
* editor actually stops editing, and <code>false</code> otherwise.
- *
+ *
* @return A boolean.
*/
boolean stopCellEditing();
@@ -90,17 +90,17 @@ public interface CellEditor
void cancelCellEditing();
/**
- * Registers a listener to receive {@link ChangeEvent} notifications from the
+ * Registers a listener to receive {@link ChangeEvent} notifications from the
* <code>CellEditor</code>.
- *
+ *
* @param listener the listener.
*/
void addCellEditorListener(CellEditorListener listener);
/**
- * Deregisters a listener so that it no longer receives {@link ChangeEvent}
+ * Deregisters a listener so that it no longer receives {@link ChangeEvent}
* notifications from the <code>CellEditor</code>.
- *
+ *
* @param listener the listener.
*/
void removeCellEditorListener(CellEditorListener listener);
diff --git a/libjava/classpath/javax/swing/CellRendererPane.java b/libjava/classpath/javax/swing/CellRendererPane.java
index 764a4c5..0140b4c 100644
--- a/libjava/classpath/javax/swing/CellRendererPane.java
+++ b/libjava/classpath/javax/swing/CellRendererPane.java
@@ -162,7 +162,7 @@ public class CellRendererPane extends Container implements Accessible
* painting
*/
public void paintComponent(Graphics graphics, Component c,
- Container p, int x, int y, int w, int h,
+ Container p, int x, int y, int w, int h,
boolean shouldValidate)
{
// reparent c
diff --git a/libjava/classpath/javax/swing/ComboBoxModel.java b/libjava/classpath/javax/swing/ComboBoxModel.java
index 6105275..ce252fa 100644
--- a/libjava/classpath/javax/swing/ComboBoxModel.java
+++ b/libjava/classpath/javax/swing/ComboBoxModel.java
@@ -41,9 +41,9 @@ import javax.swing.event.ListDataEvent;
import javax.swing.event.ListDataListener;
/**
- * The data model for a {@link JComboBox}. This model keeps track of elements
+ * The data model for a {@link JComboBox}. This model keeps track of elements
* contained in the <code>JComboBox</code> as well as the current
- * combo box selection. Whenever the selection in the <code>JComboBox</code>
+ * combo box selection. Whenever the selection in the <code>JComboBox</code>
* changes, the <code>ComboBoxModel</code> should fire a {@link ListDataEvent}
* to the model's {@link ListDataListener}s.
*
@@ -52,8 +52,8 @@ import javax.swing.event.ListDataListener;
public interface ComboBoxModel extends ListModel
{
/**
- * Sets the selected item in the combo box. Classes implementing this
- * interface should fire a {@link ListDataEvent} to all registered
+ * Sets the selected item in the combo box. Classes implementing this
+ * interface should fire a {@link ListDataEvent} to all registered
* {@link ListDataListener}s to indicate that the selection has changed.
*
* @param item the selected item (<code>null</code> permitted).
diff --git a/libjava/classpath/javax/swing/ComponentInputMap.java b/libjava/classpath/javax/swing/ComponentInputMap.java
index 28aa8e2..dc4d0bf 100644
--- a/libjava/classpath/javax/swing/ComponentInputMap.java
+++ b/libjava/classpath/javax/swing/ComponentInputMap.java
@@ -64,7 +64,7 @@ public class ComponentInputMap extends InputMap
{
if (comp == null)
throw new IllegalArgumentException();
-
+
this.component = comp;
}
@@ -117,13 +117,13 @@ public class ComponentInputMap extends InputMap
if (parentMap != null && !(parentMap instanceof ComponentInputMap))
throw new IllegalArgumentException("ComponentInputMaps can only have " +
"ComponentInputMaps for parents");
-
- if (parentMap != null &&
+
+ if (parentMap != null &&
((ComponentInputMap) parentMap).getComponent() != component)
- throw new
+ throw new
IllegalArgumentException("ComponentInputMaps' parents must " +
"be associated with the same JComponents");
-
+
super.setParent(parentMap);
if (component != null)
component.updateComponentInputMap(this);
diff --git a/libjava/classpath/javax/swing/DebugGraphics.java b/libjava/classpath/javax/swing/DebugGraphics.java
index 126309a..d96de4a 100644
--- a/libjava/classpath/javax/swing/DebugGraphics.java
+++ b/libjava/classpath/javax/swing/DebugGraphics.java
@@ -153,7 +153,7 @@ public class DebugGraphics extends Graphics
/**
* Sets the color to draw stuff with.
- *
+ *
* @param color The color
*/
public void setColor(Color color)
@@ -301,7 +301,7 @@ public class DebugGraphics extends Graphics
/**
* Returns the color used for drawing.
- *
+ *
* @return The color.
*/
public Color getColor()
@@ -454,7 +454,7 @@ public class DebugGraphics extends Graphics
// Ignore this.
}
}
-
+
/**
* Draws a rectangle.
*
@@ -552,8 +552,8 @@ public class DebugGraphics extends Graphics
* @param arcWidth TODO
* @param arcHeight TODO
*/
- public void drawRoundRect(int x, int y, int width, int height,
- int arcWidth, int arcHeight)
+ public void drawRoundRect(int x, int y, int width, int height,
+ int arcWidth, int arcHeight)
{
if ((debugOptions & LOG_OPTION) != 0)
{
@@ -576,8 +576,8 @@ public class DebugGraphics extends Graphics
* @param arcWidth TODO
* @param arcHeight TODO
*/
- public void fillRoundRect(int x, int y, int width, int height,
- int arcWidth, int arcHeight)
+ public void fillRoundRect(int x, int y, int width, int height,
+ int arcWidth, int arcHeight)
{
if ((debugOptions & LOG_OPTION) != 0)
{
@@ -593,7 +593,7 @@ public class DebugGraphics extends Graphics
/**
* drawLine
*
- * @param x1 The x-position of the start
+ * @param x1 The x-position of the start
* @param y1 The y-position of the start
* @param x2 The x-position of the end
* @param y2 The y-position of the end
@@ -699,8 +699,8 @@ public class DebugGraphics extends Graphics
* @param startAngle TODO
* @param arcAngle TODO
*/
- public void drawArc(int x, int y, int width, int height,
- int startAngle, int arcAngle)
+ public void drawArc(int x, int y, int width, int height,
+ int startAngle, int arcAngle)
{
if ((debugOptions & LOG_OPTION) != 0)
{
@@ -723,8 +723,8 @@ public class DebugGraphics extends Graphics
* @param startAngle TODO
* @param arcAngle TODO
*/
- public void fillArc(int x, int y, int width, int height,
- int startAngle, int arcAngle)
+ public void fillArc(int x, int y, int width, int height,
+ int startAngle, int arcAngle)
{
if ((debugOptions & LOG_OPTION) != 0)
{
@@ -817,7 +817,7 @@ public class DebugGraphics extends Graphics
* @param y the y coordinate
*/
public void drawString(AttributedCharacterIterator iterator,
- int x, int y)
+ int x, int y)
{
if ((debugOptions & LOG_OPTION) != 0)
{
@@ -830,7 +830,7 @@ public class DebugGraphics extends Graphics
/**
* drawBytes
- *
+ *
* @param data TODO
* @param offset TODO
* @param length TODO
@@ -838,7 +838,7 @@ public class DebugGraphics extends Graphics
* @param y the y coordinate
*/
public void drawBytes(byte[] data, int offset, int length,
- int x, int y)
+ int x, int y)
{
if ((debugOptions & LOG_OPTION) != 0)
logStream().println(prefix() + " Drawing bytes at: " + new Point(x, y));
@@ -848,15 +848,15 @@ public class DebugGraphics extends Graphics
/**
* drawChars
- *
+ *
* @param data array of characters to draw
* @param offset offset in array
* @param length number of characters in array to draw
* @param x x-position
* @param y y-position
*/
- public void drawChars(char[] data, int offset, int length,
- int x, int y)
+ public void drawChars(char[] data, int offset, int length,
+ int x, int y)
{
if ((debugOptions & LOG_OPTION) != 0)
logStream().println(prefix() + " Drawing chars at: " + new Point(x, y));
@@ -889,7 +889,7 @@ public class DebugGraphics extends Graphics
* @return boolean
*/
public boolean drawImage(Image image, int x, int y,
- ImageObserver observer)
+ ImageObserver observer)
{
if ((debugOptions & LOG_OPTION) != 0)
{
@@ -902,7 +902,7 @@ public class DebugGraphics extends Graphics
/**
* drawImage
- *
+ *
* @param image The image to draw
* @param x The x position
* @param y The y position
@@ -912,8 +912,8 @@ public class DebugGraphics extends Graphics
*
* @return boolean
*/
- public boolean drawImage(Image image, int x, int y, int width,
- int height, ImageObserver observer)
+ public boolean drawImage(Image image, int x, int y, int width,
+ int height, ImageObserver observer)
{
if ((debugOptions & LOG_OPTION) != 0)
{
@@ -926,7 +926,7 @@ public class DebugGraphics extends Graphics
/**
* drawImage
- *
+ *
* @param image The image to draw
* @param x The x position
* @param y The y position
@@ -936,8 +936,8 @@ public class DebugGraphics extends Graphics
*
* @return boolean
*/
- public boolean drawImage(Image image, int x, int y,
- Color background, ImageObserver observer)
+ public boolean drawImage(Image image, int x, int y,
+ Color background, ImageObserver observer)
{
if ((debugOptions & LOG_OPTION) != 0)
{
@@ -951,7 +951,7 @@ public class DebugGraphics extends Graphics
/**
* drawImage
- *
+ *
* @param image The image to draw
* @param x The x position
* @param y The y position
@@ -963,8 +963,8 @@ public class DebugGraphics extends Graphics
*
* @return boolean
*/
- public boolean drawImage(Image image, int x, int y, int width, int height,
- Color background, ImageObserver observer)
+ public boolean drawImage(Image image, int x, int y, int width, int height,
+ Color background, ImageObserver observer)
{
if ((debugOptions & LOG_OPTION) != 0)
{
@@ -978,7 +978,7 @@ public class DebugGraphics extends Graphics
/**
* drawImage
- *
+ *
* @param image The image to draw
* @param dx1 TODO
* @param dy1 TODO
@@ -989,12 +989,12 @@ public class DebugGraphics extends Graphics
* @param sx2 TODO
* @param sy2 TODO
* @param observer The image observer
- *
+ *
* @return boolean
*/
public boolean drawImage(Image image, int dx1, int dy1,
- int dx2, int dy2, int sx1, int sy1, int sx2, int sy2,
- ImageObserver observer)
+ int dx2, int dy2, int sx1, int sy1, int sx2, int sy2,
+ ImageObserver observer)
{
if ((debugOptions & LOG_OPTION) != 0)
{
@@ -1025,8 +1025,8 @@ public class DebugGraphics extends Graphics
* @return boolean
*/
public boolean drawImage(Image image, int dx1, int dy1,
- int dx2, int dy2, int sx1, int sy1, int sx2, int sy2,
- Color background, ImageObserver observer)
+ int dx2, int dy2, int sx1, int sy1, int sx2, int sy2,
+ Color background, ImageObserver observer)
{
if ((debugOptions & LOG_OPTION) != 0)
{
@@ -1049,8 +1049,8 @@ public class DebugGraphics extends Graphics
* @param destx The x position of the destination area
* @param desty The y posiiton of the destination area
*/
- public void copyArea(int x, int y, int width, int height,
- int destx, int desty)
+ public void copyArea(int x, int y, int width, int height,
+ int destx, int desty)
{
if ((debugOptions & LOG_OPTION) != 0)
{
@@ -1109,7 +1109,7 @@ public class DebugGraphics extends Graphics
/**
* Creates and returns the prefix that should be prepended to all logging
* messages. The prefix is made up like this:
- *
+ *
* <code>Graphics(<counter>-1)</code> where counter is an integer number
* saying how many DebugGraphics objects have been created so far. The second
* number always seem to be 1 on Sun's JDK, this has to be investigated a
diff --git a/libjava/classpath/javax/swing/DefaultBoundedRangeModel.java b/libjava/classpath/javax/swing/DefaultBoundedRangeModel.java
index 786e4ee..c1d0fe7 100644
--- a/libjava/classpath/javax/swing/DefaultBoundedRangeModel.java
+++ b/libjava/classpath/javax/swing/DefaultBoundedRangeModel.java
@@ -371,7 +371,7 @@ public class DefaultBoundedRangeModel
this.minimum = minimum;
this.maximum = maximum;
this.isAdjusting = isAdjusting;
-
+
fireStateChanged();
}
@@ -405,7 +405,7 @@ public class DefaultBoundedRangeModel
protected void fireStateChanged()
{
ChangeListener[] listeners = getChangeListeners();
-
+
if (changeEvent == null)
changeEvent = new ChangeEvent(this);
@@ -443,7 +443,7 @@ public class DefaultBoundedRangeModel
{
return (ChangeListener[]) getListeners(ChangeListener.class);
}
-
+
/**
* Provides serialization support.
*
@@ -451,8 +451,8 @@ public class DefaultBoundedRangeModel
*
* @throws IOException if there is an I/O error.
*/
- private void writeObject(ObjectOutputStream stream)
- throws IOException
+ private void writeObject(ObjectOutputStream stream)
+ throws IOException
{
stream.defaultWriteObject();
}
diff --git a/libjava/classpath/javax/swing/DefaultButtonModel.java b/libjava/classpath/javax/swing/DefaultButtonModel.java
index c0eaea2..d29a23e 100644
--- a/libjava/classpath/javax/swing/DefaultButtonModel.java
+++ b/libjava/classpath/javax/swing/DefaultButtonModel.java
@@ -331,7 +331,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable
// if this call does not represent a CHANGE in state, then return
if ((a && isArmed()) || (!a && !isArmed()))
return;
-
+
// cannot change ARMED state unless button is enabled
if (!isEnabled())
return;
@@ -427,7 +427,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable
// if this call does not represent a CHANGE in state, then return
if (r == isRollover())
return;
-
+
// cannot set ROLLOVER property unless button is enabled
if (!isEnabled())
return;
@@ -452,7 +452,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable
// if this call does not represent a CHANGE in state, then return
if ((s && isSelected()) || (!s && !isSelected()))
return;
-
+
// make the change
if (s)
stateMask = stateMask | SELECTED;
@@ -556,7 +556,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable
* <code>true</code> at a time.
*
* @param g The new "group" property (<code>null</code> permitted).
- *
+ *
* @see #getGroup()
*/
public void setGroup(ButtonGroup g)
@@ -568,7 +568,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable
* Returns the current value of the model's "group" property.
*
* @return The value of the "group" property
- *
+ *
* @see #setGroup(ButtonGroup)
*/
public ButtonGroup getGroup()
diff --git a/libjava/classpath/javax/swing/DefaultCellEditor.java b/libjava/classpath/javax/swing/DefaultCellEditor.java
index 16ed1ec..46f6370 100644
--- a/libjava/classpath/javax/swing/DefaultCellEditor.java
+++ b/libjava/classpath/javax/swing/DefaultCellEditor.java
@@ -57,7 +57,7 @@ import javax.swing.tree.TreeCellEditor;
* The default implementation of {@link TableCellEditor} and
* {@link TreeCellEditor}. It provides editor components for
* some standard object types.
- *
+ *
* @author Andrew Selkirk
* @author Audrius Meskauskas
*/
@@ -69,12 +69,12 @@ public class DefaultCellEditor
/**
* This changeable module access the editor component in the component
- * specific way. For instance, to set the value for JTextField, we need to
- * call setText(String), and for JCheckBox we need to call
+ * specific way. For instance, to set the value for JTextField, we need to
+ * call setText(String), and for JCheckBox we need to call
* setSelected(boolean). Each default editor has the component specific
* derivative of this class. These derivatives are private inner classes of
* the DefaultCellEditor.
- *
+ *
* The editor delegate is also set for the editor component as the action
* listener. It listens for the events that indicate that editing has stopped.
*/
@@ -98,7 +98,7 @@ public class DefaultCellEditor
{
// Nothing to do here.
}
-
+
/**
* Set the value for the editor component. This method is normally
* overridden to set the value in the way, specific for the text
@@ -121,12 +121,12 @@ public class DefaultCellEditor
public Object getCellEditorValue()
{
return value;
- }
+ }
/**
- * The default method returns true for the {@link MouseEvent} and false
+ * The default method returns true for the {@link MouseEvent} and false
* for any other events.
- *
+ *
* @param event the event to check
*
* @return true if the passed event is the mouse event and false otherwise.
@@ -141,10 +141,10 @@ public class DefaultCellEditor
/**
* Returns true to indicate that the editing cell can be selected.
- *
+ *
* The default method returns true without action but may be overridden
* in derived classes for more specific behavior.
- *
+ *
* @param event unused in default method
*
* @return true always
@@ -158,8 +158,8 @@ public class DefaultCellEditor
/**
* Finish the cell editing session. This method notifies the registered
* cell editor listeners (including the table) that the editing has been
- * stopped.
- *
+ * stopped.
+ *
* @return boolean
*/
public boolean stopCellEditing()
@@ -182,9 +182,9 @@ public class DefaultCellEditor
* Start editing session and returns true to indicate the editing has begun.
* The default method returns true without action but may be overridden
* in derived classes for more specific behavior.
- *
+ *
* @param event the event.
- *
+ *
* @return true, always
*/
public boolean startCellEditing(EventObject event)
@@ -196,8 +196,8 @@ public class DefaultCellEditor
/**
* This event is fired by the editor component (for instance, by pressing
* ENTER in the {@link JTextField}. The default method delegates call to
- * the {@link #stopCellEditing}, finishing the editing session.
- *
+ * the {@link #stopCellEditing}, finishing the editing session.
+ *
* @param event unused in default method
*/
public void actionPerformed(ActionEvent event)
@@ -207,8 +207,8 @@ public class DefaultCellEditor
/**
* This event is fired by the editor component.The default method delegates
- * call to the {@link #stopCellEditing}, finishing the editing session.
- *
+ * call to the {@link #stopCellEditing}, finishing the editing session.
+ *
* @param event unused in default method
*/
public void itemStateChanged(ItemEvent event)
@@ -225,9 +225,9 @@ public class DefaultCellEditor
CellEditorListener[] listeners = getCellEditorListeners();
for (int index = 0; index < listeners.length; index++)
listeners[index].editingStopped(changeEvent);
-
+
}
-
+
/**
* Notify the registered listeners (including the table) that the editing
* has been canceled.
@@ -239,10 +239,10 @@ public class DefaultCellEditor
listeners[index].editingCanceled(changeEvent);
}
} // EditorDelegate
-
+
/**
* Provides getter and setter methods to work with the text component.
- *
+ *
* @author Audrius Meskauskas (audriusa@Bioinformatics.org)
*/
private class JTextFieldDelegate extends EditorDelegate
@@ -251,7 +251,7 @@ public class DefaultCellEditor
* Use the serial version UID for interoperability.
*/
private static final long serialVersionUID = 1;
-
+
/**
* Set the value for the editor component.
*
@@ -268,21 +268,21 @@ public class DefaultCellEditor
}
/**
- * Get the value for the editor component.
+ * Get the value for the editor component.
*
* @return value the value of the component (String)
*/
public Object getCellEditorValue()
{
JTextField f = (JTextField) editorComponent;
- return value = f.getText();
- }
+ return value = f.getText();
+ }
}
/**
* Provides getter and setter methods to work with the combo box.
- *
- * @author Audrius Meskauskas (audriusa@Bioinformatics.org)
+ *
+ * @author Audrius Meskauskas (audriusa@Bioinformatics.org)
*/
private class JComboBoxDelegate extends EditorDelegate
{
@@ -290,7 +290,7 @@ public class DefaultCellEditor
* Use the serial version UID for interoperability.
*/
private static final long serialVersionUID = 1;
-
+
/**
* Set the value for the editor component.
*
@@ -298,14 +298,14 @@ public class DefaultCellEditor
*/
public void setValue(Object aValue)
{
- value = aValue;
+ value = aValue;
JComboBox c = (JComboBox) editorComponent;
if (value != null)
c.setSelectedItem(value);
}
/**
- * Get the value for the editor component.
+ * Get the value for the editor component.
*
* @return value the value of the component (as String)
*/
@@ -313,13 +313,13 @@ public class DefaultCellEditor
{
JComboBox c = (JComboBox) editorComponent;
return value = c.getSelectedItem();
- }
-
+ }
+
/**
* Returns true to indicate that the editing cell can be selected. If the
* check box is not editable, expands it. If it is editable, brings
* focus to the editor field.
- *
+ *
* @param event unused in default method
*
* @return true always
@@ -330,13 +330,13 @@ public class DefaultCellEditor
if (!c.isEditable)
c.showPopup();
return true;
- }
+ }
}
/**
* Provides getter and setter methods to work with the check box.
- *
- * @author Audrius Meskauskas (audriusa@Bioinformatics.org)
+ *
+ * @author Audrius Meskauskas (audriusa@Bioinformatics.org)
*/
private class JCheckBoxDelegate extends EditorDelegate
{
@@ -344,7 +344,7 @@ public class DefaultCellEditor
* Use the serial version UID for interoperability.
*/
private static final long serialVersionUID = 1;
-
+
/**
* Set the value for the editor component.
*
@@ -353,7 +353,7 @@ public class DefaultCellEditor
public void setValue(Object value)
{
JCheckBox c = (JCheckBox) editorComponent;
-
+
if (value == null)
c.setSelected(false);
else
@@ -361,7 +361,7 @@ public class DefaultCellEditor
}
/**
- * Get the value for the editor component.
+ * Get the value for the editor component.
*
* @return value the value of the component (must be CharSequence)
*/
@@ -370,9 +370,9 @@ public class DefaultCellEditor
JCheckBox c = (JCheckBox) editorComponent;
value = c.isSelected() ? Boolean.TRUE : Boolean.FALSE;
return value;
- }
+ }
}
-
+
/**
* The Swing JComponent, performing the editing session.
*/
@@ -392,7 +392,7 @@ public class DefaultCellEditor
/**
* Create the DefaultCellEditor that uses the text field as its editor
* component (appropriate for the text content)
- *
+ *
* @param textfield the text field as will be used as the editor component
*/
public DefaultCellEditor(JTextField textfield)
@@ -406,7 +406,7 @@ public class DefaultCellEditor
/**
* Constructor DefaultCellEditor that uses the checkbox (appropriate
* for boolean values)
- *
+ *
* @param checkbox the checkbox that will be used with this editor.
*/
public DefaultCellEditor(JCheckBox checkbox)
@@ -419,7 +419,7 @@ public class DefaultCellEditor
/**
* Constructor DefaultCellEditor that uses the combo box.
- *
+ *
* @param combobox the combo box that will be used with this editor.
*/
public DefaultCellEditor(JComboBox combobox)
@@ -431,19 +431,19 @@ public class DefaultCellEditor
} // DefaultCellEditor()
/**
- * Get the component that performs the editing sessions. It is the same
+ * Get the component that performs the editing sessions. It is the same
* component that was passed in constructor.
- *
- * @return the component, performing the editing sessions.
+ *
+ * @return the component, performing the editing sessions.
*/
public Component getComponent()
{
- return editorComponent;
+ return editorComponent;
} // getComponent()
/**
* Get the number of mouse clicks, required to start the editing session.
- *
+ *
* @return int the number of mouse clicks, required to start the session
*/
public int getClickCountToStart()
@@ -453,7 +453,7 @@ public class DefaultCellEditor
/**
* Set the number of mouse clicks, required to start the editing session.
- *
+ *
* @param count the number of clicks, required to start the session
*/
public void setClickCountToStart(int count)
@@ -462,9 +462,9 @@ public class DefaultCellEditor
} // setClickCountToStart()
/**
- * Get the value, currently being displayed by the editor component. The
+ * Get the value, currently being displayed by the editor component. The
* call is forwarded to the {@link #delegate}.
- *
+ *
* @return Object the value (class depends on the editor component)
*/
public Object getCellEditorValue()
@@ -474,7 +474,7 @@ public class DefaultCellEditor
/**
* Forwards call to the {@link #delegate}.
- *
+ *
* @param event forwarded to the delegate.
*
* @return boolean returned by delegate
@@ -486,7 +486,7 @@ public class DefaultCellEditor
/**
* Forwards call to the {@link #delegate}.
- *
+ *
* @param event forwarded to the delegate.
*
* @return boolean returned by delegate
@@ -498,7 +498,7 @@ public class DefaultCellEditor
/**
* Forwards call to the {@link #delegate}.
- *
+ *
* @return boolean returned by delegate
*/
public boolean stopCellEditing()
@@ -515,14 +515,14 @@ public class DefaultCellEditor
} // cancelCellEditing()
/**
- * Sets an initial value for the editor.
- * This will cause the editor to stopEditing and lose any partially
+ * Sets an initial value for the editor.
+ * This will cause the editor to stopEditing and lose any partially
* edited value if the editor is editing when this method is called.
- * Returns the component that should be added to the client's Component
- * hierarchy. Once installed in the client's hierarchy this component will
- * then be able to draw and receive user input.
- *
- * @param tree - the JTree that is asking the editor to edit; this
+ * Returns the component that should be added to the client's Component
+ * hierarchy. Once installed in the client's hierarchy this component will
+ * then be able to draw and receive user input.
+ *
+ * @param tree - the JTree that is asking the editor to edit; this
* parameter can be null
* @param value - the value of the cell to be edited
* @param isSelected - true is the cell is to be renderer with selection
@@ -546,21 +546,21 @@ public class DefaultCellEditor
* Get the cell editor component that will perform the editing session. If
* returned once, the same component is also returned on the repetetive calls
* again (reused).
- *
+ *
* @param table the table where the editing is performed
- * @param value the current value of the table. It is set as the initial
+ * @param value the current value of the table. It is set as the initial
* component value.
* @param isSelected if true, the cell is currently selected
* @param row the row of the cell being edited
* @param column the column of the cell being edited
- *
+ *
* @return Component the component that will perform the editing session
*/
public Component getTableCellEditorComponent(JTable table, Object value,
boolean isSelected, int row,
int column)
{
- // NOTE: as specified by Sun, we don't call new() everytime, we return
+ // NOTE: as specified by Sun, we don't call new() everytime, we return
// editorComponent on each call to getTableCellEditorComponent or
// getTreeCellEditorComponent.
delegate.setValue(value);
diff --git a/libjava/classpath/javax/swing/DefaultComboBoxModel.java b/libjava/classpath/javax/swing/DefaultComboBoxModel.java
index 9b5bdb6..a90b89d 100644
--- a/libjava/classpath/javax/swing/DefaultComboBoxModel.java
+++ b/libjava/classpath/javax/swing/DefaultComboBoxModel.java
@@ -78,13 +78,13 @@ public class DefaultComboBoxModel extends AbstractListModel
}
/**
- * Creates a new model and initializes its item list to the values in the
- * given array. The selected item is set to the first item in the array, or
+ * Creates a new model and initializes its item list to the values in the
+ * given array. The selected item is set to the first item in the array, or
* <code>null</code> if the array length is zero.
*
* @param items an array containing items for the model (<code>null</code>
* not permitted).
- *
+ *
* @throws NullPointerException if <code>items</code> is <code>null</code>.
*/
public DefaultComboBoxModel(Object[] items)
@@ -95,13 +95,13 @@ public class DefaultComboBoxModel extends AbstractListModel
}
/**
- * Creates a new model and initializes its item list to the values in the
- * given vector. The selected item is set to the first item in the vector,
+ * Creates a new model and initializes its item list to the values in the
+ * given vector. The selected item is set to the first item in the vector,
* or <code>null</code> if the vector length is zero.
*
* @param vector a vector containing items for the model (<code>null</code>
* not permitted).
- *
+ *
* @throws NullPointerException if <code>vector</code> is <code>null</code>.
*/
public DefaultComboBoxModel(Vector<?> vector)
@@ -114,7 +114,7 @@ public class DefaultComboBoxModel extends AbstractListModel
/**
* Adds an element to the model's item list and sends a {@link ListDataEvent}
* to all registered listeners. If the new element is the first item added
- * to the list, and the selected item is <code>null</code>, the new element
+ * to the list, and the selected item is <code>null</code>, the new element
* is set as the selected item.
*
* @param object item to add to the model's item list.
@@ -131,12 +131,12 @@ public class DefaultComboBoxModel extends AbstractListModel
/**
* Removes the element at the specified index from the model's item list
* and sends a {@link ListDataEvent} to all registered listeners. If the
- * element removed was the selected item, then the preceding element becomes
- * the new selected item (or the next element, if there is no preceding
+ * element removed was the selected item, then the preceding element becomes
+ * the new selected item (or the next element, if there is no preceding
* element).
*
* @param index the index of the item to remove.
- *
+ *
* @throws ArrayIndexOutOfBoundsException if <code>index</code> is out of
* bounds.
*/
@@ -147,7 +147,7 @@ public class DefaultComboBoxModel extends AbstractListModel
{
if (selected > 0)
setSelectedItem(getElementAt(selected - 1));
- else
+ else
setSelectedItem(getElementAt(selected + 1));
}
list.removeElementAt(index);
@@ -161,10 +161,10 @@ public class DefaultComboBoxModel extends AbstractListModel
* @param object element to insert
* @param index index specifing position in the list where given element
* should be inserted.
- *
- * @throws ArrayIndexOutOfBoundsException if <code>index</code> is out of
+ *
+ * @throws ArrayIndexOutOfBoundsException if <code>index</code> is out of
* bounds.
- *
+ *
* @see #addElement(Object)
*/
public void insertElementAt(Object object, int index)
@@ -174,7 +174,7 @@ public class DefaultComboBoxModel extends AbstractListModel
}
/**
- * Removes an element from the model's item list and sends a
+ * Removes an element from the model's item list and sends a
* {@link ListDataEvent} to all registered listeners. If the item to be
* removed is the current selected item, a new selected item will be set.
* If the element is not found in the model's item list, this method does
@@ -191,7 +191,7 @@ public class DefaultComboBoxModel extends AbstractListModel
/**
* Removes all the items from the model's item list, resets and selected item
- * to <code>null</code>, and sends a {@link ListDataEvent} to all registered
+ * to <code>null</code>, and sends a {@link ListDataEvent} to all registered
* listeners.
*/
public void removeAllElements()
@@ -217,7 +217,7 @@ public class DefaultComboBoxModel extends AbstractListModel
/**
* Sets the selected item for the model and sends a {@link ListDataEvent} to
- * all registered listeners. The start and end index of the event is set to
+ * all registered listeners. The start and end index of the event is set to
* -1 to indicate the model's selection has changed, and not its contents.
*
* @param object the new selected item (<code>null</code> permitted).
diff --git a/libjava/classpath/javax/swing/DefaultDesktopManager.java b/libjava/classpath/javax/swing/DefaultDesktopManager.java
index cad8818..9613449 100644
--- a/libjava/classpath/javax/swing/DefaultDesktopManager.java
+++ b/libjava/classpath/javax/swing/DefaultDesktopManager.java
@@ -126,11 +126,11 @@ public class DefaultDesktopManager implements DesktopManager, Serializable
Container c = frame.getParent();
if (c != null)
{
- if (frame.isIcon())
- c.remove(frame.getDesktopIcon());
- else
- c.remove(frame);
- c.repaint();
+ if (frame.isIcon())
+ c.remove(frame.getDesktopIcon());
+ else
+ c.remove(frame);
+ c.repaint();
}
}
@@ -151,25 +151,25 @@ public class DefaultDesktopManager implements DesktopManager, Serializable
Container p = frame.getParent();
if (p != null)
{
- Rectangle pBounds = p.getBounds();
- Insets insets = p.getInsets();
- pBounds.width -= insets.left + insets.right;
- pBounds.height -= insets.top + insets.bottom;
+ Rectangle pBounds = p.getBounds();
+ Insets insets = p.getInsets();
+ pBounds.width -= insets.left + insets.right;
+ pBounds.height -= insets.top + insets.bottom;
- setBoundsForFrame(frame, 0, 0, pBounds.width, pBounds.height);
+ setBoundsForFrame(frame, 0, 0, pBounds.width, pBounds.height);
}
if (p instanceof JDesktopPane)
((JDesktopPane) p).setSelectedFrame(frame);
else
{
- try
- {
- frame.setSelected(true);
- }
- catch (PropertyVetoException e)
- {
- // Do nothing.
- }
+ try
+ {
+ frame.setSelected(true);
+ }
+ catch (PropertyVetoException e)
+ {
+ // Do nothing.
+ }
}
}
@@ -320,7 +320,7 @@ public class DefaultDesktopManager implements DesktopManager, Serializable
{
p.setSelectedFrame(frame);
}
-
+
}
frame.toFront();
}
@@ -414,7 +414,7 @@ public class DefaultDesktopManager implements DesktopManager, Serializable
dragCache.width, dragCache.height);
pane = null;
dragCache = null;
- component.repaint();
+ component.repaint();
}
}
@@ -477,7 +477,7 @@ public class DefaultDesktopManager implements DesktopManager, Serializable
dragCache.width, dragCache.height);
pane = null;
dragCache = null;
- component.repaint();
+ component.repaint();
}
}
@@ -527,9 +527,9 @@ public class DefaultDesktopManager implements DesktopManager, Serializable
protected Rectangle getBoundsForIconOf(JInternalFrame frame)
{
// IconRects has no order to it.
- // The icon _must_ be placed in the first free slot (working from
+ // The icon _must_ be placed in the first free slot (working from
// the bottom left corner)
- // The icon also must not be placed where another icon is placed
+ // The icon also must not be placed where another icon is placed
// (regardless whether that frame is an icon currently or not)
JDesktopPane desktopPane = frame.getDesktopPane();
@@ -547,7 +547,7 @@ public class DefaultDesktopManager implements DesktopManager, Serializable
if (frames[i] instanceof JDesktopIcon
|| frames[i] instanceof JInternalFrame
&& ((JInternalFrame) frames[i]).getWasIcon() && frames[i] != frame)
- count++;
+ count++;
iconRects = new Rectangle[count];
for (int i = 0, j = 0; i < frames.length; i++)
if (frames[i] instanceof JDesktopIcon)
diff --git a/libjava/classpath/javax/swing/DefaultFocusManager.java b/libjava/classpath/javax/swing/DefaultFocusManager.java
index 103a7f3..3c5daa0 100644
--- a/libjava/classpath/javax/swing/DefaultFocusManager.java
+++ b/libjava/classpath/javax/swing/DefaultFocusManager.java
@@ -49,7 +49,7 @@ import java.util.Stack;
*
* @author Andrew Selkirk
*/
-public class DefaultFocusManager extends FocusManager
+public class DefaultFocusManager extends FocusManager
{
/**
@@ -65,9 +65,9 @@ public class DefaultFocusManager extends FocusManager
// TODO
} // DefaultFocusManager()
- /**
+ /**
* processKeyEvent
- *
+ *
* @param component
* TODO
* @param event
@@ -80,7 +80,7 @@ public class DefaultFocusManager extends FocusManager
/**
* focusNextComponent
- *
+ *
* @param component
* TODO
*/
@@ -91,7 +91,7 @@ public class DefaultFocusManager extends FocusManager
/**
* focusPreviousComponent
- *
+ *
* @param component
* TODO
*/
@@ -102,7 +102,7 @@ public class DefaultFocusManager extends FocusManager
/**
* getFirstComponent
- *
+ *
* @param container
* TODO
* @return Component
@@ -114,7 +114,7 @@ public class DefaultFocusManager extends FocusManager
/**
* getLastComponent
- *
+ *
* @param container
* TODO
* @return Component
@@ -126,7 +126,7 @@ public class DefaultFocusManager extends FocusManager
/**
* getComponentBefore
- *
+ *
* @param container
* TODO
* @param component
@@ -140,7 +140,7 @@ public class DefaultFocusManager extends FocusManager
/**
* getComponentAfter
- *
+ *
* @param container
* TODO
* @param component
@@ -154,7 +154,7 @@ public class DefaultFocusManager extends FocusManager
/**
* compareTabOrder
- *
+ *
* @param component1
* TODO
* @param component2
diff --git a/libjava/classpath/javax/swing/DefaultListModel.java b/libjava/classpath/javax/swing/DefaultListModel.java
index 674864c..aa26007 100644
--- a/libjava/classpath/javax/swing/DefaultListModel.java
+++ b/libjava/classpath/javax/swing/DefaultListModel.java
@@ -166,7 +166,7 @@ public class DefaultListModel extends AbstractListModel
/**
* Sets the list element at a particular index.
*
- * @param index The list index at which to set a value
+ * @param index The list index at which to set a value
* @param element The value to set at the specified index
*
* @return The value previously held at the specified index
@@ -253,7 +253,7 @@ public class DefaultListModel extends AbstractListModel
* least as large as the list.
*
* @param array The array to copy the list into
- *
+ *
* @throws IndexOutOfBoundsException if the array is too small to hold the
* elements of the list
*/
@@ -317,7 +317,7 @@ public class DefaultListModel extends AbstractListModel
/**
* Sets the capacity of the list to be equal to its size. The list's capacity
* is the number of elements it can hold before it needs to be reallocated.
- * The list's size is the number of elements it currently holds.
+ * The list's size is the number of elements it currently holds.
*/
public void trimToSize()
{
@@ -360,7 +360,7 @@ public class DefaultListModel extends AbstractListModel
/**
* Gets the capacity of the list. The list's capacity is the number of
- * elements it can hold before it needs to be reallocated.
+ * elements it can hold before it needs to be reallocated.
*
* @return The capacity of the list
*/
@@ -393,7 +393,7 @@ public class DefaultListModel extends AbstractListModel
* Sets the list element at a particular index.
*
* @param element The value to set at the specified index
- * @param index The list index at which to set a value
+ * @param index The list index at which to set a value
*
* @throws ArrayIndexOutOfBoundsException If the provided index is
* outside the bounds of the list <code>[0, size())</code>
diff --git a/libjava/classpath/javax/swing/DefaultListSelectionModel.java b/libjava/classpath/javax/swing/DefaultListSelectionModel.java
index d1e2da8..273ca0d 100644
--- a/libjava/classpath/javax/swing/DefaultListSelectionModel.java
+++ b/libjava/classpath/javax/swing/DefaultListSelectionModel.java
@@ -69,7 +69,7 @@ public class DefaultListSelectionModel implements Cloneable,
protected EventListenerList listenerList = new EventListenerList();
- /**
+ /**
* The current list selection mode. Must be one of the numeric constants
* <code>SINGLE_SELECTION</code>, <code>SINGLE_INTERVAL_SELECTION</code>
* or <code>MULTIPLE_INTERVAL_SELECTION</code> from {@link
@@ -129,7 +129,7 @@ public class DefaultListSelectionModel implements Cloneable,
boolean valueIsAdjusting = false;
- /**
+ /**
* The current set of "intervals", represented simply by a {@link
* java.util.BitSet}. A set bit indicates a selected index, whereas a
* cleared bit indicates a non-selected index.
@@ -150,13 +150,13 @@ public class DefaultListSelectionModel implements Cloneable,
boolean setLeadCalledFromAdd = false;
/**
- * Returns the selection mode, which is one of {@link #SINGLE_SELECTION},
- * {@link #SINGLE_INTERVAL_SELECTION} and
+ * Returns the selection mode, which is one of {@link #SINGLE_SELECTION},
+ * {@link #SINGLE_INTERVAL_SELECTION} and
* {@link #MULTIPLE_INTERVAL_SELECTION}. The default value is
* {@link #MULTIPLE_INTERVAL_SELECTION}.
- *
+ *
* @return The selection mode.
- *
+ *
* @see #setSelectionMode(int)
*/
public int getSelectionMode()
@@ -171,7 +171,7 @@ public class DefaultListSelectionModel implements Cloneable,
*/
public void setSelectionMode(int mode)
{
- if (mode < ListSelectionModel.SINGLE_SELECTION
+ if (mode < ListSelectionModel.SINGLE_SELECTION
|| mode > ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
throw new IllegalArgumentException("Unrecognised mode: " + mode);
selectionMode = mode;
@@ -179,7 +179,7 @@ public class DefaultListSelectionModel implements Cloneable,
/**
* Gets the value of the {@link #anchorSelectionIndex} property.
- *
+ *
* @return The current property value
*
* @see #setAnchorSelectionIndex
@@ -191,7 +191,7 @@ public class DefaultListSelectionModel implements Cloneable,
/**
* Sets the value of the {@link #anchorSelectionIndex} property.
- *
+ *
* @param index The new property value
*
* @see #getAnchorSelectionIndex
@@ -206,10 +206,10 @@ public class DefaultListSelectionModel implements Cloneable,
fireValueChanged(index, old);
}
}
-
+
/**
* Gets the value of the {@link #leadSelectionIndex} property.
- *
+ *
* @return The current property value
*
* @see #setLeadSelectionIndex
@@ -245,7 +245,7 @@ public class DefaultListSelectionModel implements Cloneable,
* {@link ListSelectionEvent} includes only the minimum range of values
* which changed selection status between the beginning and end of the
* method.</p>
- *
+ *
* @param leadIndex The new property value
*
* @see #getAnchorSelectionIndex
@@ -267,7 +267,7 @@ public class DefaultListSelectionModel implements Cloneable,
if (selectionMode == SINGLE_SELECTION)
setSelectionInterval (leadIndex, leadIndex);
-
+
int oldLeadIndex = leadSelectionIndex;
if (oldLeadIndex == -1)
oldLeadIndex = leadIndex;
@@ -276,8 +276,8 @@ public class DefaultListSelectionModel implements Cloneable,
leadSelectionIndex = leadIndex;
if (anchorSelectionIndex == -1)
- return;
-
+ return;
+
int R1 = Math.min(anchorSelectionIndex, oldLeadIndex);
int R2 = Math.max(anchorSelectionIndex, oldLeadIndex);
int S1 = Math.min(anchorSelectionIndex, leadIndex);
@@ -295,28 +295,28 @@ public class DefaultListSelectionModel implements Cloneable,
{
sel.set(R1, R2+1);
sel.clear(S1, S2+1);
- }
+ }
int beg = sel.nextSetBit(0), end = -1;
- for(int i=beg; i >= 0; i=sel.nextSetBit(i+1))
+ for(int i=beg; i >= 0; i=sel.nextSetBit(i+1))
end = i;
-
+
BitSet old = (BitSet) oldSel;
-
+
// The new and previous lead location requires repainting.
old.set(oldLeadIndex, !sel.get(oldLeadIndex));
old.set(leadSelectionIndex, !sel.get(leadSelectionIndex));
-
+
fireDifference(sel, old);
}
/**
- * Moves the lead selection index to <code>leadIndex</code> without
+ * Moves the lead selection index to <code>leadIndex</code> without
* changing the selection values.
- *
+ *
* If leadAnchorNotificationEnabled is true, send a notification covering the
* old and new lead cells.
- *
+ *
* @param leadIndex the new lead selection index
* @since 1.5
*/
@@ -324,16 +324,16 @@ public class DefaultListSelectionModel implements Cloneable,
{
if (leadSelectionIndex == leadIndex)
return;
-
+
leadSelectionIndex = leadIndex;
if (isLeadAnchorNotificationEnabled())
fireValueChanged(Math.min(leadSelectionIndex, leadIndex),
Math.max(leadSelectionIndex, leadIndex));
}
-
+
/**
* Gets the value of the {@link #leadAnchorNotificationEnabled} property.
- *
+ *
* @return The current property value
*
* @see #setLeadAnchorNotificationEnabled
@@ -345,7 +345,7 @@ public class DefaultListSelectionModel implements Cloneable,
/**
* Sets the value of the {@link #leadAnchorNotificationEnabled} property.
- *
+ *
* @param l The new property value
*
* @see #isLeadAnchorNotificationEnabled
@@ -404,7 +404,7 @@ public class DefaultListSelectionModel implements Cloneable,
{
if (isSelectionEmpty())
return -1;
-
+
return sel.nextSetBit(0);
}
@@ -424,8 +424,8 @@ public class DefaultListSelectionModel implements Cloneable,
return -1;
int mx = -1;
- for(int i=sel.nextSetBit(0); i >= 0; i=sel.nextSetBit(i+1))
- {
+ for(int i=sel.nextSetBit(0); i >= 0; i=sel.nextSetBit(i+1))
+ {
mx = i;
}
return mx;
@@ -451,12 +451,12 @@ public class DefaultListSelectionModel implements Cloneable,
/**
* If the {@link #selectionMode} property is equal to
* <code>SINGLE_SELECTION</code> equivalent to calling
- * <code>setSelectionInterval(index1, index2)</code>;
- * If the {@link #selectionMode} property is equal to
+ * <code>setSelectionInterval(index1, index2)</code>;
+ * If the {@link #selectionMode} property is equal to
* <code>SINGLE_INTERVAL_SELECTION</code> and the interval being
* added is not adjacent to an already selected interval,
* equivalent to <code>setSelectionInterval(index1, index2)</code>.
- * Otherwise adds the range <code>[index0, index1]</code>
+ * Otherwise adds the range <code>[index0, index1]</code>
* to the selection interval set.
*
* @param index0 The beginning of the range of indices to select
@@ -465,11 +465,11 @@ public class DefaultListSelectionModel implements Cloneable,
* @see #setSelectionInterval
* @see #removeSelectionInterval
*/
- public void addSelectionInterval(int index0, int index1)
+ public void addSelectionInterval(int index0, int index1)
{
if (index0 == -1 || index1 == -1)
return;
-
+
if (selectionMode == SINGLE_SELECTION)
setSelectionInterval(index0, index1);
else
@@ -479,27 +479,27 @@ public class DefaultListSelectionModel implements Cloneable,
oldSel = sel.clone();
- // COMPAT: Like Sun (but not like IBM), we allow calls to
+ // COMPAT: Like Sun (but not like IBM), we allow calls to
// addSelectionInterval when selectionMode is
// SINGLE_SELECTION_INTERVAL iff the interval being added
// is adjacent to an already selected interval
if (selectionMode == SINGLE_INTERVAL_SELECTION)
- if (!(isSelectedIndex(index0) ||
- isSelectedIndex(index1) ||
- isSelectedIndex(Math.max(lo-1,0)) ||
+ if (!(isSelectedIndex(index0) ||
+ isSelectedIndex(index1) ||
+ isSelectedIndex(Math.max(lo-1,0)) ||
isSelectedIndex(Math.min(hi+1,sel.size()))))
- sel.clear();
+ sel.clear();
// We have to update the anchorSelectionIndex and leadSelectionIndex
// variables
-
+
// The next if statements breaks down to "if this selection is adjacent
// to the previous selection and going in the same direction"
- if ((isSelectedIndex(leadSelectionIndex))
- && ((index0 - 1 == leadSelectionIndex
- && (index1 >= index0)
+ if ((isSelectedIndex(leadSelectionIndex))
+ && ((index0 - 1 == leadSelectionIndex
+ && (index1 >= index0)
&& (leadSelectionIndex >= anchorSelectionIndex))
- || (index0 + 1 == leadSelectionIndex && (index1 <= index0)
+ || (index0 + 1 == leadSelectionIndex && (index1 <= index0)
&& (leadSelectionIndex <= anchorSelectionIndex)))
&& (anchorSelectionIndex != -1 || leadSelectionIndex != -1))
{
@@ -535,24 +535,24 @@ public class DefaultListSelectionModel implements Cloneable,
{
if (index0 == -1 || index1 == -1)
return;
-
+
oldSel = sel.clone();
int lo = Math.min(index0, index1);
int hi = Math.max(index0, index1);
-
+
// if selectionMode is SINGLE_INTERVAL_SELECTION and removing the interval
// (index0,index1) would leave two disjoint selection intervals, remove all
// selected indices from lo to the last selected index
- if (getMinSelectionIndex() > 0 && getMinSelectionIndex() < lo &&
+ if (getMinSelectionIndex() > 0 && getMinSelectionIndex() < lo &&
selectionMode == SINGLE_INTERVAL_SELECTION)
hi = sel.size() - 1;
- sel.clear(lo, hi+1);
+ sel.clear(lo, hi+1);
//update anchorSelectionIndex and leadSelectionIndex variables
//TODO: will probably need MouseDragged to test properly and know if this works
setAnchorSelectionIndex(index0);
leadSelectionIndex = index1;
-
+
fireDifference(sel, (BitSet) oldSel);
}
@@ -566,19 +566,19 @@ public class DefaultListSelectionModel implements Cloneable,
if (from < 0)
return; // Empty selection - nothing to do.
int to = from;
-
+
int i;
for (i = from; i>=0; i=sel.nextSetBit(i+1))
to = i;
-
+
sel.clear();
fireValueChanged(from, to, valueIsAdjusting);
}
-
+
/**
* Fire the change event, covering the difference between the two sets.
- *
+ *
* @param current the current set
* @param x the previous set, the object will be reused.
*/
@@ -596,12 +596,12 @@ public class DefaultListSelectionModel implements Cloneable,
fireValueChanged(from, to, valueIsAdjusting);
}
-
+
/**
* Clears the current selection and marks a given interval as "selected". If
* the current selection mode is <code>SINGLE_SELECTION</code> only the
* index <code>index2</code> is selected.
- *
+ *
* @param anchor the anchor selection index.
* @param lead the lead selection index.
*/
@@ -639,7 +639,7 @@ public class DefaultListSelectionModel implements Cloneable,
int last = first;
if (first >= 0)
last += (sel.cardinality() - 1);
-
+
// update the selection
int lo = Math.min(anchor, lead);
int hi = Math.max(anchor, lead);
@@ -647,7 +647,7 @@ public class DefaultListSelectionModel implements Cloneable,
return; // selected interval is not being changed
sel.clear();
sel.set(lo, hi + 1);
-
+
// include the old selection in the event range
if (first >= 0)
lo = Math.min(lo, first);
@@ -661,7 +661,7 @@ public class DefaultListSelectionModel implements Cloneable,
anchorSelectionIndex = anchor;
leadSelectionIndex = lead;
fireValueChanged(lo, hi);
- }
+ }
else
{
BitSet oldSel = (BitSet) sel.clone();
@@ -675,7 +675,7 @@ public class DefaultListSelectionModel implements Cloneable,
// update the anchorSelectionIndex and leadSelectionIndex variables
setAnchorSelectionIndex(anchor);
leadSelectionIndex = lead;
-
+
fireDifference(sel, oldSel);
}
}
@@ -697,7 +697,7 @@ public class DefaultListSelectionModel implements Cloneable,
boolean before)
{
if (!before)
- {
+ {
index++;
length--;
}
@@ -759,7 +759,7 @@ public class DefaultListSelectionModel implements Cloneable,
{
fireValueChanged(firstIndex, lastIndex, getValueIsAdjusting());
}
-
+
/**
* Fires a {@link ListSelectionEvent} to all the listeners of type {@link
* ListSelectionListener} registered with this selection model.
@@ -770,7 +770,7 @@ public class DefaultListSelectionModel implements Cloneable,
* made to the selection, such as during interactive scrolling
*/
protected void fireValueChanged(int firstIndex, int lastIndex,
- boolean isAdjusting)
+ boolean isAdjusting)
{
ListSelectionEvent evt = new ListSelectionEvent(this, firstIndex,
lastIndex, isAdjusting);
diff --git a/libjava/classpath/javax/swing/DefaultSingleSelectionModel.java b/libjava/classpath/javax/swing/DefaultSingleSelectionModel.java
index 3f79f0d..93d129e 100644
--- a/libjava/classpath/javax/swing/DefaultSingleSelectionModel.java
+++ b/libjava/classpath/javax/swing/DefaultSingleSelectionModel.java
@@ -82,9 +82,9 @@ public class DefaultSingleSelectionModel
/**
* Returns the selected index or <code>-1</code> if there is no selection.
- *
+ *
* @return The selected index.
- *
+ *
* @see #setSelectedIndex(int)
*/
public int getSelectedIndex()
@@ -93,11 +93,11 @@ public class DefaultSingleSelectionModel
}
/**
- * Sets the selected index and, if this is different to the previous
+ * Sets the selected index and, if this is different to the previous
* selection, sends a {@link ChangeEvent} to all registered listeners.
- *
+ *
* @param index the index (use <code>-1</code> to represent no selection).
- *
+ *
* @see #getSelectedIndex()
* @see #clearSelection
*/
@@ -113,7 +113,7 @@ public class DefaultSingleSelectionModel
/**
* Clears the selection by setting the selected index to <code>-1</code> and
* sends a {@link ChangeEvent} to all registered listeners. If the selected
- * index is already <code>-1</code>, this method does nothing.
+ * index is already <code>-1</code>, this method does nothing.
*/
public void clearSelection()
{
@@ -122,8 +122,8 @@ public class DefaultSingleSelectionModel
/**
* Returns <code>true</code> if there is a selection, and <code>false</code>
- * otherwise.
- *
+ * otherwise.
+ *
* @return A boolean.
*/
public boolean isSelected()
diff --git a/libjava/classpath/javax/swing/FocusManager.java b/libjava/classpath/javax/swing/FocusManager.java
index 21e4482..b8459d4 100644
--- a/libjava/classpath/javax/swing/FocusManager.java
+++ b/libjava/classpath/javax/swing/FocusManager.java
@@ -199,7 +199,7 @@ public abstract class FocusManager
{
wrapped.addKeyEventPostProcessor(p);
}
-
+
/**
* Wraps {@link KeyboardFocusManager#addPropertyChangeListener(PropertyChangeListener)}.
*
@@ -366,7 +366,7 @@ public abstract class FocusManager
return wrapped.getVetoableChangeListeners(n);
}
-
+
/**
* Wraps
* {@link KeyboardFocusManager#removeKeyEventDispatcher(KeyEventDispatcher)}.
@@ -490,7 +490,7 @@ public abstract class FocusManager
public static FocusManager getCurrentManager()
{
KeyboardFocusManager m =
- KeyboardFocusManager.getCurrentKeyboardFocusManager();
+ KeyboardFocusManager.getCurrentKeyboardFocusManager();
return new WrappingFocusManager(m);
}
diff --git a/libjava/classpath/javax/swing/GrayFilter.java b/libjava/classpath/javax/swing/GrayFilter.java
index ef0d147..a7f9693 100644
--- a/libjava/classpath/javax/swing/GrayFilter.java
+++ b/libjava/classpath/javax/swing/GrayFilter.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -57,7 +57,7 @@ public class GrayFilter extends RGBImageFilter
/**
* Create a GrayFilter. If b is true then brighten. Also, indicate how much
* gray.
- *
+ *
* @param b if brighten
* @param p percent of gray, 0 - 100
*/
@@ -79,7 +79,7 @@ public class GrayFilter extends RGBImageFilter
return (Toolkit.getDefaultToolkit().createImage(new FilteredImageSource(
src.getSource(), new GrayFilter(true, 0))));
}
-
+
/**
* Filter RGB to gray
*/
diff --git a/libjava/classpath/javax/swing/Icon.java b/libjava/classpath/javax/swing/Icon.java
index c73ad2d..ed7f94f 100644
--- a/libjava/classpath/javax/swing/Icon.java
+++ b/libjava/classpath/javax/swing/Icon.java
@@ -1,4 +1,4 @@
-/* Icon.java --
+/* Icon.java --
Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -48,21 +48,21 @@ public interface Icon
{
/**
* Returns the height of the icon.
- *
+ *
* @return The height of the icon.
*/
int getIconHeight();
-
+
/**
* Returns the width of the icon.
- *
+ *
* @return The width of the icon.
*/
int getIconWidth();
-
+
/**
* Draws the icon at the location (x, y) on the specified graphics device.
- *
+ *
* @param c a component related to the icon in some way (can be ignored by
some implementing classes).
* @param g the graphics device.
diff --git a/libjava/classpath/javax/swing/ImageIcon.java b/libjava/classpath/javax/swing/ImageIcon.java
index cedf4be..c78d04c 100644
--- a/libjava/classpath/javax/swing/ImageIcon.java
+++ b/libjava/classpath/javax/swing/ImageIcon.java
@@ -90,7 +90,7 @@ public class ImageIcon
/**
* Returns the accessible state for the <code>ImageIcon</code>. To
- * match the reference implementation, this method always returns
+ * match the reference implementation, this method always returns
* <code>null</code>.
*
* @return <code>null</code>.
@@ -138,7 +138,7 @@ public class ImageIcon
/**
* Returns the accessible child at index <code>i</code>, which is
- * <code>null</code> in this case because an {@link ImageIcon} has no
+ * <code>null</code> in this case because an {@link ImageIcon} has no
* children.
*
* @param i the index of the child to be fetched
@@ -151,12 +151,12 @@ public class ImageIcon
}
/**
- * Returns the locale of this object. To match the reference
+ * Returns the locale of this object. To match the reference
* implementation, this method always returns <code>null</code>.
*
* @return <code>null</code>.
*/
- public Locale getLocale()
+ public Locale getLocale()
throws IllegalComponentStateException
{
// refer to Sun's bug report 4269253
@@ -168,7 +168,7 @@ public class ImageIcon
* <code>description</code> property of the underlying {@link ImageIcon}.
*
* @return The description (possibly <code>null</code>).
- *
+ *
* @see #setAccessibleIconDescription(String)
*/
public String getAccessibleIconDescription()
@@ -177,11 +177,11 @@ public class ImageIcon
}
/**
- * Sets the accessible icon description. This sets the
+ * Sets the accessible icon description. This sets the
* <code>description</code> property of the underlying {@link ImageIcon}.
*
* @param newDescr the description (<code>null</code> permitted).
- *
+ *
* @see #getAccessibleIconDescription()
*/
public void setAccessibleIconDescription(String newDescr)
@@ -190,7 +190,7 @@ public class ImageIcon
}
/**
- * Returns the icon height. This returns the <code>iconHeight</code>
+ * Returns the icon height. This returns the <code>iconHeight</code>
* property of the underlying {@link ImageIcon}.
*
* @return The icon height.
@@ -199,9 +199,9 @@ public class ImageIcon
{
return getIconHeight();
}
-
+
/**
- * Returns the icon width. This returns the <code>iconWidth</code> property
+ * Returns the icon width. This returns the <code>iconWidth</code> property
* of the underlying {@link ImageIcon}.
*
* @return The icon width.
@@ -217,7 +217,7 @@ public class ImageIcon
/** A dummy Component that is used in the MediaTracker. */
protected static final Component component = new Component()
{
- // No need to implement this.
+ // No need to implement this.
};
/** The MediaTracker used to monitor the loading of images. */
@@ -243,7 +243,7 @@ public class ImageIcon
{
// Nothing to do here.
}
-
+
/**
* Constructs an ImageIcon given a filename. The icon's description
* is initially set to the filename itself. A filename of "" means
@@ -277,7 +277,7 @@ public class ImageIcon
{
this(imageData, null);
}
-
+
/**
* Creates an ImageIcon from the given byte array and sets the given
* description.
@@ -332,7 +332,7 @@ public class ImageIcon
{
return observer;
}
-
+
/**
* Sets the ImageObserver that will be used for all Image
* operations. Can be set to null (the default) when no observer is
@@ -459,7 +459,7 @@ public class ImageIcon
* Returns the object that provides accessibility features for this
* <code>ImageIcon</code> instance.
*
- * @return The accessible context (an instance of
+ * @return The accessible context (an instance of
* {@link AccessibleImageIcon}).
*/
public AccessibleContext getAccessibleContext()
diff --git a/libjava/classpath/javax/swing/InputMap.java b/libjava/classpath/javax/swing/InputMap.java
index 19a75f4..40c43da 100644
--- a/libjava/classpath/javax/swing/InputMap.java
+++ b/libjava/classpath/javax/swing/InputMap.java
@@ -87,7 +87,7 @@ public class InputMap
*
* @param keystroke the key of the entry (<code>null</code> is ignored).
*
- * @return The binding associated with the specified keystroke (or
+ * @return The binding associated with the specified keystroke (or
* <code>null</code>).
*/
public Object get(KeyStroke keystroke)
@@ -102,11 +102,11 @@ public class InputMap
}
/**
- * Puts a new entry into the <code>InputMap</code>. If
- * <code>actionMapKey</code> is <code>null</code> any existing entry will be
+ * Puts a new entry into the <code>InputMap</code>. If
+ * <code>actionMapKey</code> is <code>null</code> any existing entry will be
* removed.
*
- * @param keystroke the keystroke for the entry (<code>null</code> is
+ * @param keystroke the keystroke for the entry (<code>null</code> is
* ignored).
* @param actionMapKey the action (<code>null</code> permitted).
*/
@@ -126,7 +126,7 @@ public class InputMap
* Removes an entry from this <code>InputMap</code>. Note that this will
* not remove any entry from the parent map, if there is one.
*
- * @param keystroke the key of the entry to remove (<code>null</code> is
+ * @param keystroke the key of the entry to remove (<code>null</code> is
* ignored).
*/
public void remove(KeyStroke keystroke)
@@ -140,7 +140,7 @@ public class InputMap
* is <code>null</code>.
*
* @return The parent map (possibly <code>null</code>).
- *
+ *
* @see #setParent(InputMap)
*/
public InputMap getParent()
@@ -154,7 +154,7 @@ public class InputMap
* find an entry in this map.
*
* @param parentMap the new parent (<code>null</code> permitted).
- *
+ *
* @see #getParent()
*/
public void setParent(InputMap parentMap)
@@ -163,7 +163,7 @@ public class InputMap
}
/**
- * Returns the number of entries in this <code>InputMap</code>. This count
+ * Returns the number of entries in this <code>InputMap</code>. This count
* does not include any entries from the parent map, if there is one.
*
* @return The number of entries.
@@ -188,12 +188,12 @@ public class InputMap
/**
* Returns all keys of entries in this <code>InputMap</code>. This does not
- * include keys defined in the parent, if there is one (use the
+ * include keys defined in the parent, if there is one (use the
* {@link #allKeys()} method for that case).
* <br><br>
* Following the behaviour of the reference implementation, this method will
- * return <code>null</code> when no entries have been added to the map,
- * and a zero length array if entries have been added but subsequently
+ * return <code>null</code> when no entries have been added to the map,
+ * and a zero length array if entries have been added but subsequently
* removed (or cleared) from the map.
*
* @return An array of keys (may be <code>null</code> or have zero length).
@@ -209,7 +209,7 @@ public class InputMap
}
/**
- * Returns all keys of entries in this <code>InputMap</code> and all its
+ * Returns all keys of entries in this <code>InputMap</code> and all its
* parents.
*
* @return An array of keys (may be <code>null</code> or have zero length).
@@ -227,7 +227,7 @@ public class InputMap
if (inputMap != null)
set.addAll(inputMap.keySet());
if (set.size() == 0)
- return null;
+ return null;
KeyStroke[] array = new KeyStroke[set.size()];
return (KeyStroke[]) set.toArray(array);
}
diff --git a/libjava/classpath/javax/swing/InternalFrameFocusTraversalPolicy.java b/libjava/classpath/javax/swing/InternalFrameFocusTraversalPolicy.java
index 4780a67..9187f29 100644
--- a/libjava/classpath/javax/swing/InternalFrameFocusTraversalPolicy.java
+++ b/libjava/classpath/javax/swing/InternalFrameFocusTraversalPolicy.java
@@ -47,7 +47,7 @@ import java.awt.FocusTraversalPolicy;
* when it is selected.
*
* @author Michael Koch
- *
+ *
* @since 1.4
*/
public abstract class InternalFrameFocusTraversalPolicy
diff --git a/libjava/classpath/javax/swing/JApplet.java b/libjava/classpath/javax/swing/JApplet.java
index 68eb983..d725131 100644
--- a/libjava/classpath/javax/swing/JApplet.java
+++ b/libjava/classpath/javax/swing/JApplet.java
@@ -79,7 +79,7 @@ public class JApplet extends Applet
protected AccessibleContext accessibleContext;
private static final long serialVersionUID = 7269359214497372587L;
-
+
protected JRootPane rootPane;
/**
@@ -196,7 +196,7 @@ public class JApplet extends Applet
{
super.processKeyEvent(e);
}
-
+
public void remove(Component comp)
{
// If we're removing the root pane, use super.remove. Otherwise
diff --git a/libjava/classpath/javax/swing/JButton.java b/libjava/classpath/javax/swing/JButton.java
index 705a863..40c1041 100644
--- a/libjava/classpath/javax/swing/JButton.java
+++ b/libjava/classpath/javax/swing/JButton.java
@@ -91,9 +91,9 @@ public class JButton extends AbstractButton
/**
* Creates a new button from the specified action.
- *
+ *
* @param a the action (<code>null</code> permitted).
- *
+ *
* @see AbstractButton#setAction(Action)
*/
public JButton(Action a)
@@ -105,7 +105,7 @@ public class JButton extends AbstractButton
/**
* Creates a new button with the specified icon (and an empty string for
* the button text).
- *
+ *
* @param icon the icon (<code>null</code> permitted).
*/
public JButton(Icon icon)
@@ -115,7 +115,7 @@ public class JButton extends AbstractButton
/**
* Creates a new button with the specified text and no icon.
- *
+ *
* @param text the button text (<code>null</code> permitted, will be
* substituted by an empty string).
*/
@@ -126,7 +126,7 @@ public class JButton extends AbstractButton
/**
* Creates a new button with the specified text and icon.
- *
+ *
* @param text the button text (<code>null</code> permitted, will be
* substituted by an empty string).
* @param icon the icon (<code>null</code> permitted).
@@ -140,7 +140,7 @@ public class JButton extends AbstractButton
}
protected void configurePropertiesFromAction(Action a)
- {
+ {
super.configurePropertiesFromAction(a);
}
@@ -158,8 +158,8 @@ public class JButton extends AbstractButton
}
/**
- * Returns the suffix (<code>"ButtonUI"</code> in this case) used to
- * determine the class name for a UI delegate that can provide the look and
+ * Returns the suffix (<code>"ButtonUI"</code> in this case) used to
+ * determine the class name for a UI delegate that can provide the look and
* feel for a <code>JButton</code>.
*
* @return <code>"ButtonUI"</code>.
@@ -167,7 +167,7 @@ public class JButton extends AbstractButton
public String getUIClassID()
{
// Returns a string that specifies the name of the L&F class that renders
- // this component.
+ // this component.
return "ButtonUI";
}
@@ -211,7 +211,7 @@ public class JButton extends AbstractButton
public boolean isDefaultCapable()
{
// Returns whether or not this button is capable of being the default
- // button on the RootPane.
+ // button on the RootPane.
return defaultCapable;
}
diff --git a/libjava/classpath/javax/swing/JCheckBox.java b/libjava/classpath/javax/swing/JCheckBox.java
index 26f9f6c..0bf871a 100644
--- a/libjava/classpath/javax/swing/JCheckBox.java
+++ b/libjava/classpath/javax/swing/JCheckBox.java
@@ -1,4 +1,4 @@
-/* JCheckBox.java --
+/* JCheckBox.java --
Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -74,7 +74,7 @@ public class JCheckBox extends JToggleButton implements Accessible
/**
* Returns the accessble role of <code>JCheckBox</code>,
- * {@link AccessibleRole#CHECK_BOX}.
+ * {@link AccessibleRole#CHECK_BOX}.
*/
public AccessibleRole getAccessibleRole()
{
@@ -86,7 +86,7 @@ public class JCheckBox extends JToggleButton implements Accessible
public static final String BORDER_PAINTED_FLAT_CHANGED_PROPERTY =
"borderPaintedFlat";
-
+
private boolean borderPaintedFlat;
private void init()
@@ -94,7 +94,7 @@ public class JCheckBox extends JToggleButton implements Accessible
borderPainted = false;
contentAreaFilled = false;
}
-
+
public JCheckBox()
{
this(null, null, false);
@@ -106,25 +106,25 @@ public class JCheckBox extends JToggleButton implements Accessible
}
public JCheckBox(Icon icon)
- {
+ {
this(null, icon, false);
- }
-
+ }
+
public JCheckBox(Icon icon, boolean selected)
- {
+ {
this(null, icon, selected);
- }
-
+ }
+
public JCheckBox(String text)
{
this(text, null, false);
}
-
+
public JCheckBox(String text, boolean selected)
{
this(text, null, selected);
}
-
+
public JCheckBox(String text, Icon icon)
{
this(text, icon, false);
@@ -145,7 +145,7 @@ public class JCheckBox extends JToggleButton implements Accessible
{
return "CheckBoxUI";
}
-
+
protected String paramString()
{
return super.paramString() + ",borderPaintedFlat=" + borderPaintedFlat;
diff --git a/libjava/classpath/javax/swing/JCheckBoxMenuItem.java b/libjava/classpath/javax/swing/JCheckBoxMenuItem.java
index 51634c9..b3045be 100644
--- a/libjava/classpath/javax/swing/JCheckBoxMenuItem.java
+++ b/libjava/classpath/javax/swing/JCheckBoxMenuItem.java
@@ -49,7 +49,7 @@ import javax.accessibility.AccessibleRole;
* {@link AbstractButton#setSelected} and {@link #setState} can be use used for
* the same purpose. <code>JCheckBoxMenuItem</code> uses
* <code>ToggleButtonModel</code> to keep track of its selection.
- *
+ *
* @author original author unknown
*/
public class JCheckBoxMenuItem
@@ -80,7 +80,7 @@ public class JCheckBoxMenuItem
/**
* Creates a new JCheckBoxMenuItem with given icon
- *
+ *
* @param icon Icon for this menu item
*/
public JCheckBoxMenuItem(Icon icon)
@@ -90,7 +90,7 @@ public class JCheckBoxMenuItem
/**
* Creates a new JCheckBoxMenuItem with given label
- *
+ *
* @param text Label for this menu item
*/
public JCheckBoxMenuItem(String text)
@@ -100,7 +100,7 @@ public class JCheckBoxMenuItem
/**
* Creates a new JCheckBoxMenuItem using given action
- *
+ *
* @param action Action for this menu item.
*/
public JCheckBoxMenuItem(Action action)
@@ -111,7 +111,7 @@ public class JCheckBoxMenuItem
/**
* Creates a new JCheckBoxMenuItem object with given label and icon
- *
+ *
* @param text Label for this menu item
* @param icon Icon for this menu item
*/
@@ -123,7 +123,7 @@ public class JCheckBoxMenuItem
/**
* Creates a new JCheckBoxMenuItem object using specified label and marked as
* checked if given 'state' is true.
- *
+ *
* @param text Label for this menu item
* @param state <code>true</code> if this item should be in checked state
* and <code>false</code> otherwise
@@ -136,7 +136,7 @@ public class JCheckBoxMenuItem
/**
* Creates a new JCheckBoxMenuItem object with given label, icon, and marked
* as checked if given 'state' is true.
- *
+ *
* @param text Label for this menu item
* @param icon icon for this menu item
* @param state <code>true</code> if this item should be in checked state
@@ -155,7 +155,7 @@ public class JCheckBoxMenuItem
/**
* This method returns a name to identify which look and feel class will be
* the UI delegate for the menuItem.
- *
+ *
* @return The Look and Feel classID. "JCheckBoxMenuItemUI"
*/
public String getUIClassID()
@@ -165,7 +165,7 @@ public class JCheckBoxMenuItem
/**
* Returns checked state for this check box menu item.
- *
+ *
* @return Returns true if this menu item is in checked state and false
* otherwise.
*/
@@ -177,7 +177,7 @@ public class JCheckBoxMenuItem
/**
* Sets state for this check box menu item. If given 'state' is true, then
* mark menu item as checked, and uncheck this menu item otherwise.
- *
+ *
* @param state new state for this menu item
*/
public synchronized void setState(boolean state)
@@ -188,7 +188,7 @@ public class JCheckBoxMenuItem
/**
* This method returns array containing label of this menu item if it is
* selected and null otherwise.
- *
+ *
* @return Array containing label of this menu item if this menu item is
* selected or null otherwise.
*/
@@ -216,7 +216,7 @@ public class JCheckBoxMenuItem
* <code>JCheckBoxMenuItem</code> component, for use in debugging. The
* return value is guaranteed to be non-<code>null</code>, but the format
* of the string may vary between implementations.
- *
+ *
* @return A string describing the attributes of the
* <code>JCheckBoxMenuItem</code>.
*/
@@ -230,7 +230,7 @@ public class JCheckBoxMenuItem
/**
* Returns the object that provides accessibility features for this
* <code>JCheckBoxMenuItem</code> component.
- *
+ *
* @return The accessible context (an instance of
* {@link AccessibleJCheckBoxMenuItem}).
*/
@@ -245,7 +245,7 @@ public class JCheckBoxMenuItem
/**
* Provides the accessibility features for the <code>JCheckBoxMenuItem</code>
* component.
- *
+ *
* @see JCheckBoxMenuItem#getAccessibleContext()
*/
protected class AccessibleJCheckBoxMenuItem
@@ -264,7 +264,7 @@ public class JCheckBoxMenuItem
/**
* Returns the accessible role for the <code>JCheckBoxMenuItem</code>
* component.
- *
+ *
* @return {@link AccessibleRole#CHECK_BOX}.
*/
public AccessibleRole getAccessibleRole()
diff --git a/libjava/classpath/javax/swing/JComboBox.java b/libjava/classpath/javax/swing/JComboBox.java
index 74ff315..0d2be0c 100644
--- a/libjava/classpath/javax/swing/JComboBox.java
+++ b/libjava/classpath/javax/swing/JComboBox.java
@@ -188,8 +188,8 @@ public class JComboBox extends JComponent implements ItemSelectable,
public JComboBox(Object[] itemArray)
{
this(new DefaultComboBoxModel(itemArray));
-
- if (itemArray.length > 0)
+
+ if (itemArray.length > 0)
setSelectedIndex(0);
}
@@ -298,7 +298,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
// Removes itself (as DataListener) from the to-be-replaced model.
dataModel.removeListDataListener(this);
}
-
+
/* Adds itself as a DataListener to the new model.
* It is intentioned that this operation will fail with a NullPointerException if the
* caller delivered a null argument.
@@ -309,7 +309,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
ComboBoxModel oldDataModel = dataModel;
dataModel = newDataModel;
selectedItemReminder = newDataModel.getSelectedItem();
-
+
// Notifies the listeners of the model change.
firePropertyChange("model", oldDataModel, dataModel);
}
@@ -500,7 +500,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
*/
public void setSelectedIndex(int index)
{
- if (index < -1 || index >= dataModel.getSize())
+ if (index < -1 || index >= dataModel.getSize())
// Fails because index is out of bounds.
throw new IllegalArgumentException("illegal index: " + index);
else
@@ -518,7 +518,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
* <code>DefaultComboBoxModel</code> the complexity is O(n) where n is the
* number of elements in the combo box.
* </p>
- *
+ *
* @return int Index specifying location of the currently selected item in the
* combo box or -1 if nothing is selected in the combo box.
*/
@@ -552,12 +552,12 @@ public class JComboBox extends JComponent implements ItemSelectable,
}
/**
- * Returns an object that is used as the display value when calculating the
- * preferred size for the combo box. This value is, of course, never
+ * Returns an object that is used as the display value when calculating the
+ * preferred size for the combo box. This value is, of course, never
* displayed anywhere.
- *
+ *
* @return The prototype display value (possibly <code>null</code>).
- *
+ *
* @since 1.4
* @see #setPrototypeDisplayValue(Object)
*/
@@ -569,11 +569,11 @@ public class JComboBox extends JComponent implements ItemSelectable,
/**
* Sets the object that is assumed to be the displayed item when calculating
* the preferred size for the combo box. A {@link PropertyChangeEvent} (with
- * the name <code>prototypeDisplayValue</code>) is sent to all registered
- * listeners.
- *
+ * the name <code>prototypeDisplayValue</code>) is sent to all registered
+ * listeners.
+ *
* @param value the new value (<code>null</code> permitted).
- *
+ *
* @since 1.4
* @see #getPrototypeDisplayValue()
*/
@@ -593,7 +593,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
*/
public void addItem(Object element)
{
- if (dataModel instanceof MutableComboBoxModel)
+ if (dataModel instanceof MutableComboBoxModel)
((MutableComboBoxModel) dataModel).addElement(element);
else
throw new RuntimeException("Unable to add the item because the data "
@@ -611,7 +611,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
*/
public void insertItemAt(Object element, int index)
{
- if (dataModel instanceof MutableComboBoxModel)
+ if (dataModel instanceof MutableComboBoxModel)
((MutableComboBoxModel) dataModel).insertElementAt(element, index);
else
throw new RuntimeException("Unable to insert the item because the data "
@@ -628,7 +628,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
*/
public void removeItem(Object element)
{
- if (dataModel instanceof MutableComboBoxModel)
+ if (dataModel instanceof MutableComboBoxModel)
((MutableComboBoxModel) dataModel).removeElement(element);
else
throw new RuntimeException("Unable to remove the item because the data "
@@ -753,7 +753,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
action = a;
configurePropertiesFromAction(action);
if (action != null)
- // FIXME: remove from old action and add to new action
+ // FIXME: remove from old action and add to new action
// PropertyChangeListener to listen to changes in the action
addActionListener(action);
}
@@ -856,7 +856,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
}
/**
- * Fires a popupMenuWillBecomeInvisible() event to all
+ * Fires a popupMenuWillBecomeInvisible() event to all
* <code>PopupMenuListeners</code>.
*
* Note: This method is intended for use by plaf classes only.
@@ -870,7 +870,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
}
/**
- * Fires a popupMenuWillBecomeVisible() event to all
+ * Fires a popupMenuWillBecomeVisible() event to all
* <code>PopupMenuListeners</code>.
*
* Note: This method is intended for use by plaf classes only.
@@ -892,19 +892,19 @@ public class JComboBox extends JComponent implements ItemSelectable,
protected void selectedItemChanged()
{
// Fire ItemEvent to indicated that previously selected item is now
- // deselected
+ // deselected
if (selectedItemReminder != null)
fireItemStateChanged(new ItemEvent(this, ItemEvent.ITEM_STATE_CHANGED,
selectedItemReminder,
ItemEvent.DESELECTED));
- // Fire ItemEvent to indicate that new item is selected
+ // Fire ItemEvent to indicate that new item is selected
Object newSelection = getSelectedItem();
if (newSelection != null)
fireItemStateChanged(new ItemEvent(this, ItemEvent.ITEM_STATE_CHANGED,
newSelection, ItemEvent.SELECTED));
- // Fire Action Event to JComboBox's registered listeners
+ // Fire Action Event to JComboBox's registered listeners
fireActionEvent();
selectedItemReminder = newSelection;
@@ -997,7 +997,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
{
// if first and last index of the given ListDataEvent are both -1,
// then it indicates that selected item in the combo box data model
- // have changed.
+ // have changed.
if (event.getIndex0() == -1 && event.getIndex1() == -1)
selectedItemChanged();
}
@@ -1110,7 +1110,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
sb.append(",isEditable=").append(isEditable());
sb.append(",lightWeightPopupEnabled=").append(isLightWeightPopupEnabled());
sb.append(",maximumRowCount=").append(getMaximumRowCount());
-
+
sb.append(",selectedItemReminder=");
if (selectedItemReminder != null)
sb.append(selectedItemReminder);
@@ -1121,7 +1121,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
* Returns the object that provides accessibility features for this
* <code>JComboBox</code> component.
*
- * @return The accessible context (an instance of
+ * @return The accessible context (an instance of
* {@link AccessibleJComboBox}).
*/
public AccessibleContext getAccessibleContext()
@@ -1466,7 +1466,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
// Nothing to do here.
}
}
-
+
private class DefaultKeySelectionManager
implements KeySelectionManager
{
diff --git a/libjava/classpath/javax/swing/JComponent.java b/libjava/classpath/javax/swing/JComponent.java
index f712178..365f62a 100644
--- a/libjava/classpath/javax/swing/JComponent.java
+++ b/libjava/classpath/javax/swing/JComponent.java
@@ -105,7 +105,7 @@ public abstract class JComponent extends Container implements Serializable
{
private static final long serialVersionUID = -7908749299918704233L;
- /**
+ /**
* The accessible context of this <code>JComponent</code>.
*/
protected AccessibleContext accessibleContext;
@@ -114,7 +114,7 @@ public abstract class JComponent extends Container implements Serializable
* Basic accessibility support for <code>JComponent</code> derived
* widgets.
*/
- public abstract class AccessibleJComponent
+ public abstract class AccessibleJComponent
extends AccessibleAWTContainer
implements AccessibleExtendedComponent
{
@@ -123,7 +123,7 @@ public abstract class JComponent extends Container implements Serializable
* fires appropriate PropertyChangeEvents to listeners registered with
* the AccessibleJComponent.
*/
- protected class AccessibleFocusHandler
+ protected class AccessibleFocusHandler
implements FocusListener
{
/**
@@ -168,7 +168,7 @@ public abstract class JComponent extends Container implements Serializable
* from the JComponent and fires appropriate PropertyChangeEvents to
* interested listeners on the AccessibleJComponent.
*/
- protected class AccessibleContainerHandler
+ protected class AccessibleContainerHandler
implements ContainerListener
{
/**
@@ -464,7 +464,7 @@ public abstract class JComponent extends Container implements Serializable
else if (border instanceof TitledBorder)
{
TitledBorder titled = (TitledBorder) border;
- title = titled.getTitle();
+ title = titled.getTitle();
}
return title;
}
@@ -489,7 +489,7 @@ public abstract class JComponent extends Container implements Serializable
*/
public String getTitledBorderText()
{
- return getBorderTitle(getBorder());
+ return getBorderTitle(getBorder());
}
/**
@@ -536,29 +536,29 @@ public abstract class JComponent extends Container implements Serializable
*/
float alignmentY = -1.0F;
- /**
+ /**
* The border painted around this component.
- *
+ *
* @see #paintBorder
*/
Border border;
/**
* The popup menu for the component.
- *
+ *
* @see #getComponentPopupMenu()
* @see #setComponentPopupMenu(JPopupMenu)
*/
JPopupMenu componentPopupMenu;
-
+
/**
* A flag that controls whether the {@link #getComponentPopupMenu()} method
* looks to the component's parent when the <code>componentPopupMenu</code>
* field is <code>null</code>.
*/
boolean inheritsPopupMenu;
-
- /**
+
+ /**
* <p>Whether to double buffer this component when painting. This flag
* should generally be <code>true</code>, to ensure good painting
* performance.</p>
@@ -587,7 +587,7 @@ public abstract class JComponent extends Container implements Serializable
*/
int debugGraphicsOptions;
- /**
+ /**
* <p>This property controls two independent behaviors simultaneously.</p>
*
* <p>First, it controls whether to fill the background of this widget
@@ -616,9 +616,9 @@ public abstract class JComponent extends Container implements Serializable
*/
boolean opaque = false;
- /**
+ /**
* The user interface delegate for this component. Event delivery and
- * repainting of the component are usually delegated to this object.
+ * repainting of the component are usually delegated to this object.
*
* @see #setUI
* @see #getUIClassID
@@ -630,7 +630,7 @@ public abstract class JComponent extends Container implements Serializable
* A hint to the focus system that this component should or should not
* get focus. If this is <code>false</code>, swing will not try to
* request focus on this component; if <code>true</code>, swing might
- * try to request focus, but the request might fail. Thus it is only
+ * try to request focus, but the request might fail. Thus it is only
* a hint guiding swing's behavior.
*
* @see #requestFocus()
@@ -653,7 +653,7 @@ public abstract class JComponent extends Container implements Serializable
/**
* Indicates whether the current paint call is already double buffered or
- * not.
+ * not.
*/
static boolean paintingDoubleBuffered = false;
@@ -675,14 +675,14 @@ public abstract class JComponent extends Container implements Serializable
*/
private VetoableChangeSupport vetoableChangeSupport;
- /**
+ /**
* Storage for "client properties", which are key/value pairs associated
* with this component by a "client", such as a user application or a
* layout manager. This is lazily constructed when the component gets its
* first client property.
*/
private Hashtable clientProperties;
-
+
private InputMap inputMap_whenFocused;
private InputMap inputMap_whenAncestorOfFocused;
private ComponentInputMap inputMap_whenInFocusedWindow;
@@ -717,12 +717,12 @@ public abstract class JComponent extends Container implements Serializable
/**
* The default locale of the component.
- *
+ *
* @see #getDefaultLocale
* @see #setDefaultLocale
*/
private static Locale defaultLocale;
-
+
public static final String TOOL_TIP_TEXT_KEY = "ToolTipText";
/**
@@ -734,7 +734,7 @@ public abstract class JComponent extends Container implements Serializable
public static final int UNDEFINED_CONDITION = -1;
/**
- * Constant used to indicate that an action should be performed only when
+ * Constant used to indicate that an action should be performed only when
* the component has focus.
*
* @see #registerKeyboardAction(ActionListener, KeyStroke, int)
@@ -742,7 +742,7 @@ public abstract class JComponent extends Container implements Serializable
public static final int WHEN_FOCUSED = 0;
/**
- * Constant used to indicate that an action should be performed only when
+ * Constant used to indicate that an action should be performed only when
* the component is an ancestor of the component which has focus.
*
* @see #registerKeyboardAction(ActionListener, KeyStroke, int)
@@ -750,7 +750,7 @@ public abstract class JComponent extends Container implements Serializable
public static final int WHEN_ANCESTOR_OF_FOCUSED_COMPONENT = 1;
/**
- * Constant used to indicate that an action should be performed only when
+ * Constant used to indicate that an action should be performed only when
* the component is in the window which has focus.
*
* @see #registerKeyboardAction(ActionListener, KeyStroke, int)
@@ -796,7 +796,7 @@ public abstract class JComponent extends Container implements Serializable
/**
* Helper to lazily construct and return the client properties table.
- *
+ *
* @return The current client properties table
*
* @see #clientProperties
@@ -861,7 +861,7 @@ public abstract class JComponent extends Container implements Serializable
* Unregister an <code>AncestorListener</code>.
*
* @param listener The listener to unregister
- *
+ *
* @see #addAncestorListener
*/
public void removeAncestorListener(AncestorListener listener)
@@ -911,22 +911,22 @@ public abstract class JComponent extends Container implements Serializable
}
/**
- * Returns all registered {@link EventListener}s of the given
+ * Returns all registered {@link EventListener}s of the given
* <code>listenerType</code>.
*
- * @param listenerType the class of listeners to filter (<code>null</code>
+ * @param listenerType the class of listeners to filter (<code>null</code>
* not permitted).
- *
+ *
* @return An array of registered listeners.
- *
+ *
* @throws ClassCastException if <code>listenerType</code> does not implement
* the {@link EventListener} interface.
- * @throws NullPointerException if <code>listenerType</code> is
+ * @throws NullPointerException if <code>listenerType</code> is
* <code>null</code>.
- *
+ *
* @see #getAncestorListeners()
* @see #listenerList
- *
+ *
* @since 1.3
*/
public <T extends EventListener> T[] getListeners(Class<T> listenerType)
@@ -953,14 +953,14 @@ public abstract class JComponent extends Container implements Serializable
/**
* Return all registered <code>VetoableChangeListener</code> objects.
*
- * @return An array of the <code>VetoableChangeListener</code> objects
- * registered with this component (possibly empty but never
+ * @return An array of the <code>VetoableChangeListener</code> objects
+ * registered with this component (possibly empty but never
* <code>null</code>).
- *
+ *
* @since 1.4
*/
public VetoableChangeListener[] getVetoableChangeListeners()
- {
+ {
return vetoableChangeSupport == null ? new VetoableChangeListener[0]
: vetoableChangeSupport.getVetoableChangeListeners();
}
@@ -1004,7 +1004,7 @@ public abstract class JComponent extends Container implements Serializable
{
super.firePropertyChange(property, oldValue, newValue);
}
-
+
/**
* Fires a property change for a primitive boolean property.
*
@@ -1081,7 +1081,7 @@ public abstract class JComponent extends Container implements Serializable
/**
* Set the value of the {@link #border} property.
- *
+ *
* @param newBorder The new value of the property
*
* @see #getBorder
@@ -1257,7 +1257,7 @@ public abstract class JComponent extends Container implements Serializable
*/
public Dimension getMaximumSize()
{
- Dimension size = null;
+ Dimension size = null;
if (isMaximumSizeSet())
size = super.getMaximumSize();
else
@@ -1287,7 +1287,7 @@ public abstract class JComponent extends Container implements Serializable
*/
public Dimension getMinimumSize()
{
- Dimension size = null;
+ Dimension size = null;
if (isMinimumSizeSet())
size = super.getMinimumSize();
else
@@ -1317,7 +1317,7 @@ public abstract class JComponent extends Container implements Serializable
*/
public Dimension getPreferredSize()
{
- Dimension size = null;
+ Dimension size = null;
if (isPreferredSizeSet())
size = super.getPreferredSize();
else
@@ -1335,7 +1335,7 @@ public abstract class JComponent extends Container implements Serializable
*
* @return The current value of the property, or <code>null</code>
* if none has been set.
- *
+ *
* @deprecated See {@link java.awt.FocusTraversalPolicy}
*/
public Component getNextFocusableComponent()
@@ -1362,11 +1362,11 @@ public abstract class JComponent extends Container implements Serializable
KeyStroke[] ks2;
if (inputMap_whenFocused != null)
ks0 = inputMap_whenFocused.keys();
- else
+ else
ks0 = new KeyStroke[0];
if (inputMap_whenAncestorOfFocused != null)
ks1 = inputMap_whenAncestorOfFocused.keys();
- else
+ else
ks1 = new KeyStroke[0];
if (inputMap_whenInFocusedWindow != null)
ks2 = inputMap_whenInFocusedWindow.keys();
@@ -1428,7 +1428,7 @@ public abstract class JComponent extends Container implements Serializable
/**
* Return the location at which the <code>toolTipText</code> property should
- * be displayed, when triggered by a particular mouse event.
+ * be displayed, when triggered by a particular mouse event.
*
* @param event The event the tooltip is being presented in response to
*
@@ -1496,31 +1496,31 @@ public abstract class JComponent extends Container implements Serializable
{
return getToolTipText();
}
-
+
/**
* Returns the flag that controls whether or not the component inherits its
* parent's popup menu when no popup menu is specified for this component.
- *
+ *
* @return A boolean.
- *
+ *
* @since 1.5
- *
+ *
* @see #setInheritsPopupMenu(boolean)
*/
public boolean getInheritsPopupMenu()
{
- return inheritsPopupMenu;
+ return inheritsPopupMenu;
}
-
+
/**
* Sets the flag that controls whether or not the component inherits its
* parent's popup menu when no popup menu is specified for this component.
* This is a bound property with the property name 'inheritsPopupMenu'.
- *
+ *
* @param inherit the new flag value.
- *
+ *
* @since 1.5
- *
+ *
* @see #getInheritsPopupMenu()
*/
public void setInheritsPopupMenu(boolean inherit)
@@ -1531,17 +1531,17 @@ public abstract class JComponent extends Container implements Serializable
this.firePropertyChange("inheritsPopupMenu", ! inherit, inherit);
}
}
-
+
/**
- * Returns the popup menu for this component. If the popup menu is
+ * Returns the popup menu for this component. If the popup menu is
* <code>null</code> AND the {@link #getInheritsPopupMenu()} method returns
* <code>true</code>, this method will return the parent's popup menu (if it
* has one).
- *
+ *
* @return The popup menu (possibly <code>null</code>.
- *
+ *
* @since 1.5
- *
+ *
* @see #setComponentPopupMenu(JPopupMenu)
* @see #getInheritsPopupMenu()
*/
@@ -1549,7 +1549,7 @@ public abstract class JComponent extends Container implements Serializable
{
if (componentPopupMenu == null && getInheritsPopupMenu())
{
- Container parent = getParent();
+ Container parent = getParent();
if (parent instanceof JComponent)
return ((JComponent) parent).getComponentPopupMenu();
else
@@ -1560,13 +1560,13 @@ public abstract class JComponent extends Container implements Serializable
}
/**
- * Sets the popup menu for this component (this is a bound property with
+ * Sets the popup menu for this component (this is a bound property with
* the property name 'componentPopupMenu').
- *
+ *
* @param popup the popup menu (<code>null</code> permitted).
*
* @since 1.5
- *
+ *
* @see #getComponentPopupMenu()
*/
public void setComponentPopupMenu(JPopupMenu popup)
@@ -1578,7 +1578,7 @@ public abstract class JComponent extends Container implements Serializable
firePropertyChange("componentPopupMenu", old, popup);
}
}
-
+
/**
* Return the top level ancestral container (usually a {@link
* java.awt.Window} or {@link java.applet.Applet}) which this component is
@@ -1689,7 +1689,7 @@ public abstract class JComponent extends Container implements Serializable
}
/**
- * Return the current value of the {@link #opaque} property.
+ * Return the current value of the {@link #opaque} property.
*
* @return The current property value
*/
@@ -2149,7 +2149,7 @@ public abstract class JComponent extends Container implements Serializable
// The component that is finally triggered for painting.
JComponent paintRoot = this;
-
+
// Stores the component and all its parents. This will be used to limit
// the actually painted components in paintChildren by setting
// the field paintChild.
@@ -2200,7 +2200,7 @@ public abstract class JComponent extends Container implements Serializable
else if (jc.isPartiallyObscured(i, paintX, paintY, paintW,
paintH))
updatePaintRoot = true;
-
+
}
}
if (updatePaintRoot)
@@ -2430,27 +2430,27 @@ public abstract class JComponent extends Container implements Serializable
* A variant of {@link
* #registerKeyboardAction(ActionListener,String,KeyStroke,int)} which
* provides <code>null</code> for the command name.
- *
+ *
* @param act the action listener to notify when the keystroke occurs.
* @param stroke the key stroke.
- * @param cond the condition (one of {@link #WHEN_FOCUSED},
- * {@link #WHEN_IN_FOCUSED_WINDOW} and
+ * @param cond the condition (one of {@link #WHEN_FOCUSED},
+ * {@link #WHEN_IN_FOCUSED_WINDOW} and
* {@link #WHEN_ANCESTOR_OF_FOCUSED_COMPONENT}).
*/
public void registerKeyboardAction(ActionListener act,
- KeyStroke stroke,
+ KeyStroke stroke,
int cond)
{
registerKeyboardAction(act, null, stroke, cond);
}
- /*
+ /*
* There is some charmingly undocumented behavior sun seems to be using
* to simulate the old register/unregister keyboard binding API. It's not
* clear to me why this matters, but we shall endeavour to follow suit.
*
* Two main thing seem to be happening when you do registerKeyboardAction():
- *
+ *
* - no actionMap() entry gets created, just an entry in inputMap()
*
* - the inputMap() entry is a proxy class which invokes the the
@@ -2470,7 +2470,7 @@ public abstract class JComponent extends Container implements Serializable
ActionListener target;
String bindingCommandName;
- public ActionListenerProxy(ActionListener li,
+ public ActionListenerProxy(ActionListener li,
String cmd)
{
target = li;
@@ -2487,7 +2487,7 @@ public abstract class JComponent extends Container implements Serializable
}
}
-
+
/**
* An obsolete method to register a keyboard action on this component.
* You should use <code>getInputMap</code> and <code>getActionMap</code>
@@ -2507,9 +2507,9 @@ public abstract class JComponent extends Container implements Serializable
* @see #getConditionForKeyStroke
* @see #resetKeyboardActions
*/
- public void registerKeyboardAction(ActionListener act,
+ public void registerKeyboardAction(ActionListener act,
String cmd,
- KeyStroke stroke,
+ KeyStroke stroke,
int cond)
{
ActionListenerProxy proxy = new ActionListenerProxy(act, cmd);
@@ -2519,12 +2519,12 @@ public abstract class JComponent extends Container implements Serializable
/**
* Sets the input map for the given condition.
- *
- * @param condition the condition (one of {@link #WHEN_FOCUSED},
- * {@link #WHEN_IN_FOCUSED_WINDOW} and
+ *
+ * @param condition the condition (one of {@link #WHEN_FOCUSED},
+ * {@link #WHEN_IN_FOCUSED_WINDOW} and
* {@link #WHEN_ANCESTOR_OF_FOCUSED_COMPONENT}).
* @param map the map.
- *
+ *
* @throws IllegalArgumentException if <code>condition</code> is not one of
* the specified values.
*/
@@ -2543,12 +2543,12 @@ public abstract class JComponent extends Container implements Serializable
case WHEN_IN_FOCUSED_WINDOW:
if (map != null && !(map instanceof ComponentInputMap))
- throw new
- IllegalArgumentException("WHEN_IN_FOCUSED_WINDOW " +
+ throw new
+ IllegalArgumentException("WHEN_IN_FOCUSED_WINDOW " +
"InputMap must be a ComponentInputMap");
inputMap_whenInFocusedWindow = (ComponentInputMap)map;
break;
-
+
case UNDEFINED_CONDITION:
default:
throw new IllegalArgumentException();
@@ -2558,13 +2558,13 @@ public abstract class JComponent extends Container implements Serializable
/**
* Returns the input map associated with this component for the given
* state/condition.
- *
- * @param condition the state (one of {@link #WHEN_FOCUSED},
- * {@link #WHEN_ANCESTOR_OF_FOCUSED_COMPONENT} and
+ *
+ * @param condition the state (one of {@link #WHEN_FOCUSED},
+ * {@link #WHEN_ANCESTOR_OF_FOCUSED_COMPONENT} and
* {@link #WHEN_IN_FOCUSED_WINDOW}).
- *
+ *
* @return The input map.
- * @throws IllegalArgumentException if <code>condition</code> is not one of
+ * @throws IllegalArgumentException if <code>condition</code> is not one of
* the specified values.
* @since 1.3
*/
@@ -2590,17 +2590,17 @@ public abstract class JComponent extends Container implements Serializable
case UNDEFINED_CONDITION:
default:
- throw new IllegalArgumentException("Invalid 'condition' argument: "
+ throw new IllegalArgumentException("Invalid 'condition' argument: "
+ condition);
}
}
/**
- * Returns the input map associated with this component for the
+ * Returns the input map associated with this component for the
* {@link #WHEN_FOCUSED} state.
- *
+ *
* @return The input map.
- *
+ *
* @since 1.3
* @see #getInputMap(int)
*/
@@ -2634,19 +2634,19 @@ public abstract class JComponent extends Container implements Serializable
* #WHEN_ANCESTOR_OF_FOCUSED_COMPONENT}, {@link #WHEN_FOCUSED}, or {@link
* #WHEN_IN_FOCUSED_WINDOW}
*
- * @see #registerKeyboardAction(ActionListener, KeyStroke, int)
- * @see #unregisterKeyboardAction
+ * @see #registerKeyboardAction(ActionListener, KeyStroke, int)
+ * @see #unregisterKeyboardAction
* @see #resetKeyboardActions
*/
public int getConditionForKeyStroke(KeyStroke ks)
{
- if (inputMap_whenFocused != null
+ if (inputMap_whenFocused != null
&& inputMap_whenFocused.get(ks) != null)
return WHEN_FOCUSED;
- else if (inputMap_whenAncestorOfFocused != null
+ else if (inputMap_whenAncestorOfFocused != null
&& inputMap_whenAncestorOfFocused.get(ks) != null)
return WHEN_ANCESTOR_OF_FOCUSED_COMPONENT;
- else if (inputMap_whenInFocusedWindow != null
+ else if (inputMap_whenInFocusedWindow != null
&& inputMap_whenInFocusedWindow.get(ks) != null)
return WHEN_IN_FOCUSED_WINDOW;
else
@@ -2655,7 +2655,7 @@ public abstract class JComponent extends Container implements Serializable
/**
* Get the ActionListener (typically an {@link Action} object) which is
- * associated with a particular keystroke.
+ * associated with a particular keystroke.
*
* @param ks The keystroke to retrieve the action of
*
@@ -2711,10 +2711,10 @@ public abstract class JComponent extends Container implements Serializable
// Note: Input maps for disabled components are skipped.
// 4. The WHEN_IN_FOCUSED_WINDOW maps of all the enabled components in
// the focused window are searched.
-
+
KeyStroke keyStroke = KeyStroke.getKeyStrokeForEvent(e);
boolean pressed = e.getID() == KeyEvent.KEY_PRESSED;
-
+
if (processKeyBinding(keyStroke, e, WHEN_FOCUSED, pressed))
{
// This is step 1 from above comment.
@@ -2728,37 +2728,37 @@ public abstract class JComponent extends Container implements Serializable
e.consume();
return;
}
-
+
// This is step 3 from above comment.
- Container current = getParent();
+ Container current = getParent();
while (current != null)
- {
+ {
// If current is a JComponent, see if it handles the event in its
// WHEN_ANCESTOR_OF_FOCUSED_COMPONENT maps.
- if ((current instanceof JComponent) &&
- ((JComponent)current).processKeyBinding
+ if ((current instanceof JComponent) &&
+ ((JComponent)current).processKeyBinding
(keyStroke, e,WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, pressed))
{
e.consume();
return;
- }
-
+ }
+
// Stop when we've tried a top-level container and it didn't handle it
if (current instanceof Window || current instanceof Applet)
- break;
-
+ break;
+
// Move up the hierarchy
current = current.getParent();
}
-
+
// Current being null means the JComponent does not currently have a
- // top-level ancestor, in which case we don't need to check
+ // top-level ancestor, in which case we don't need to check
// WHEN_IN_FOCUSED_WINDOW bindings.
if (current == null || e.isConsumed())
return;
-
+
// This is step 4 from above comment. KeyboardManager maintains mappings
- // related to WHEN_IN_FOCUSED_WINDOW bindings so that we don't have to
+ // related to WHEN_IN_FOCUSED_WINDOW bindings so that we don't have to
// traverse the containment hierarchy each time.
if (KeyboardManager.getManager().processKeyStroke(current, keyStroke, e))
e.consume();
@@ -2781,7 +2781,7 @@ public abstract class JComponent extends Container implements Serializable
{
if (cmd instanceof ActionListenerProxy)
act = (Action) cmd;
- else
+ else
act = getActionMap().get(cmd);
}
}
@@ -2806,7 +2806,7 @@ public abstract class JComponent extends Container implements Serializable
}
return false;
}
-
+
/**
* Remove a keyboard action registry.
*
@@ -2899,7 +2899,7 @@ public abstract class JComponent extends Container implements Serializable
}
/**
- * Queue a an invalidation and revalidation of this component, using
+ * Queue a an invalidation and revalidation of this component, using
* {@link RepaintManager#addInvalidComponent}.
*/
public void revalidate()
@@ -2925,7 +2925,7 @@ public abstract class JComponent extends Container implements Serializable
}
/**
- * Calls <code>scrollRectToVisible</code> on the component's parent.
+ * Calls <code>scrollRectToVisible</code> on the component's parent.
* Components which can service this call should override.
*
* @param r The rectangle to make visible
@@ -3069,7 +3069,7 @@ public abstract class JComponent extends Container implements Serializable
}
/**
- * Set the specified component to be the next component in the
+ * Set the specified component to be the next component in the
* focus cycle, overriding the {@link FocusTraversalPolicy} for
* this component.
*
@@ -3151,7 +3151,7 @@ public abstract class JComponent extends Container implements Serializable
* background.
*
* @param isOpaque if true, paint all pixels. If false, expect the clean
- * background.
+ * background.
*
* @see ComponentUI#update
*/
@@ -3192,8 +3192,8 @@ public abstract class JComponent extends Container implements Serializable
}
/**
- * Call {@link #paint}.
- *
+ * Call {@link #paint}.
+ *
* @param g The graphics context to paint into
*/
public void update(Graphics g)
@@ -3258,12 +3258,12 @@ public abstract class JComponent extends Container implements Serializable
}
/**
- * Returns the locale used as the default for all new components. The
+ * Returns the locale used as the default for all new components. The
* default value is {@link Locale#getDefault()} (that is, the platform
* default locale).
- *
+ *
* @return The locale (never <code>null</code>).
- *
+ *
* @see #setDefaultLocale(Locale)
*/
public static Locale getDefaultLocale()
@@ -3272,19 +3272,19 @@ public abstract class JComponent extends Container implements Serializable
defaultLocale = Locale.getDefault();
return defaultLocale;
}
-
+
/**
* Sets the locale to be used as the default for all new components. If this
* is set to <code>null</code>, the {@link #getDefaultLocale()} method will
* return the platform default locale.
- *
+ *
* @param l the locale (<code>null</code> permitted).
*/
public static void setDefaultLocale(Locale l)
{
defaultLocale = l;
}
-
+
/**
* Returns the currently set input verifier for this component.
*
@@ -3357,7 +3357,7 @@ public abstract class JComponent extends Container implements Serializable
* by look and feel implementations.
*
* You should not use this method directly. Instead you are strongly
- * encouraged to call {@link #requestFocus()} or
+ * encouraged to call {@link #requestFocus()} or
* {@link #requestFocusInWindow()} instead.
*
* @param temporary if the focus change is temporary
@@ -3406,7 +3406,7 @@ public abstract class JComponent extends Container implements Serializable
* by look and feel implementations.
*
* You should not use this method directly. Instead you are strongly
- * encouraged to call {@link #requestFocus()} or
+ * encouraged to call {@link #requestFocus()} or
* {@link #requestFocusInWindow()} instead.
*
* @param temporary if the focus change is temporary
@@ -3470,7 +3470,7 @@ public abstract class JComponent extends Container implements Serializable
* has changed.
*
* This method is called before the component is actually removed from
- * its parent, so the parent is still visible through
+ * its parent, so the parent is still visible through
* {@link Component#getParent}.
*/
public void removeNotify()
@@ -3478,7 +3478,7 @@ public abstract class JComponent extends Container implements Serializable
super.removeNotify();
KeyboardManager.getManager().clearBindingsForComp(this);
-
+
// Notify ancestor listeners.
fireAncestorEvent(this, AncestorEvent.ANCESTOR_REMOVED);
@@ -3727,7 +3727,7 @@ public abstract class JComponent extends Container implements Serializable
jc.fireAncestorEvent(ancestor, id);
}
}
-
+
/**
* This is the method that gets called when the WHEN_IN_FOCUSED_WINDOW map
* is changed.
@@ -3743,26 +3743,26 @@ public abstract class JComponent extends Container implements Serializable
InputMap curr = getInputMap(WHEN_IN_FOCUSED_WINDOW);
while (curr != null && curr != changed)
curr = curr.getParent();
-
+
// If curr is null then changed is not in the hierarchy
if (curr == null)
return;
-
+
// Now we have to update the keyboard manager's hashtable
KeyboardManager km = KeyboardManager.getManager();
-
- // This is a poor strategy, should be improved. We currently
+
+ // This is a poor strategy, should be improved. We currently
// delete all the old bindings for the component and then register
// the current bindings.
km.clearBindingsForComp(changed.getComponent());
- km.registerEntireMap((ComponentInputMap)
+ km.registerEntireMap((ComponentInputMap)
getInputMap(WHEN_IN_FOCUSED_WINDOW));
}
/**
* Helper method for
* {@link LookAndFeel#installProperty(JComponent, String, Object)}.
- *
+ *
* @param propertyName the name of the property
* @param value the value of the property
*
diff --git a/libjava/classpath/javax/swing/JDesktopPane.java b/libjava/classpath/javax/swing/JDesktopPane.java
index b068a29..6d8b212 100644
--- a/libjava/classpath/javax/swing/JDesktopPane.java
+++ b/libjava/classpath/javax/swing/JDesktopPane.java
@@ -329,13 +329,13 @@ public class JDesktopPane extends JLayeredPane implements Accessible
int count = 0;
for (int i = 0; i < components.length; i++)
- if (components[i] instanceof JInternalFrame)
- count++;
-
+ if (components[i] instanceof JInternalFrame)
+ count++;
+
JInternalFrame[] value = new JInternalFrame[count];
for (int i = 0, j = 0; i < components.length && j != count; i++)
if (components[i] instanceof JInternalFrame)
- value[j++] = (JInternalFrame) components[i];
+ value[j++] = (JInternalFrame) components[i];
return value;
}
@@ -343,7 +343,7 @@ public class JDesktopPane extends JLayeredPane implements Accessible
* Returns the object that provides accessibility features for this
* <code>JDesktopPane</code> component.
*
- * @return The accessible context (an instance of
+ * @return The accessible context (an instance of
* {@link AccessibleJDesktopPane}).
*/
public AccessibleContext getAccessibleContext()
@@ -357,7 +357,7 @@ public class JDesktopPane extends JLayeredPane implements Accessible
/**
* Helper method for
* {@link LookAndFeel#installProperty(JComponent, String, Object)}.
- *
+ *
* @param propertyName the name of the property
* @param value the value of the property
*
diff --git a/libjava/classpath/javax/swing/JDialog.java b/libjava/classpath/javax/swing/JDialog.java
index 495c9c7..04ec825 100644
--- a/libjava/classpath/javax/swing/JDialog.java
+++ b/libjava/classpath/javax/swing/JDialog.java
@@ -61,7 +61,7 @@ import javax.accessibility.AccessibleContext;
*
* Also, unlike <code>java.awt.Dialog</code>s, JDialogs support the
* Swing Pluggable Look &amp; Feel architecture.
- *
+ *
* @author Ronald Veldema (rveldema@cs.vu.nl)
*/
public class JDialog extends Dialog implements Accessible, WindowConstants,
@@ -94,16 +94,16 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
* Whether checking is enabled on the RootPane.
*
* @specnote Should be false to comply with J2SE 5.0
- */
+ */
protected boolean rootPaneCheckingEnabled = false;
/** The default action taken when closed. */
private int closeAction = HIDE_ON_CLOSE;
-
+
/** Whether JDialogs are decorated by the Look and Feel. */
private static boolean decorated;
- /* Creates a new non-modal JDialog with no title
+ /* Creates a new non-modal JDialog with no title
* using a shared Frame as the owner.
*/
public JDialog()
@@ -135,7 +135,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
}
/**
- * Creates a new non-modal JDialog using the
+ * Creates a new non-modal JDialog using the
* given title and owner.
*
* @param owner The owner of the JDialog.
@@ -147,7 +147,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
}
/**
- * Creates a new JDialog using the given modal
+ * Creates a new JDialog using the given modal
* settings, title, and owner.
*
* @param owner The owner of the JDialog.
@@ -160,7 +160,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
}
/**
- * Creates a new JDialog using the given modal
+ * Creates a new JDialog using the given modal
* settings, title, owner and graphics configuration.
*
* @param owner The owner of the JDialog.
@@ -199,7 +199,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
}
/**
- * Creates a new non-modal JDialog using the
+ * Creates a new non-modal JDialog using the
* given title and owner.
*
* @param owner The owner of the JDialog.
@@ -211,7 +211,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
}
/**
- * Creates a new JDialog using the given modal
+ * Creates a new JDialog using the given modal
* settings, title, and owner.
*
* @param owner The owner of the JDialog.
@@ -224,7 +224,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
}
/**
- * Creates a new JDialog using the given modal
+ * Creates a new JDialog using the given modal
* settings, title, owner and graphics configuration.
*
* @param owner The owner of the JDialog.
@@ -240,8 +240,8 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
}
/**
- * This method is called to initialize the
- * JDialog. It sets the layout used, the locale,
+ * This method is called to initialize the
+ * JDialog. It sets the layout used, the locale,
* and creates the RootPane.
*/
protected void dialogInit()
@@ -283,7 +283,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
}
/**
- * This method returns the preferred size of
+ * This method returns the preferred size of
* the JDialog.
*
* @return The preferred size.
@@ -306,7 +306,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
}
/**
- * This method sets the JMenuBar used
+ * This method sets the JMenuBar used
* in this JDialog.
*
* @param menubar The JMenuBar to use.
@@ -318,7 +318,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
/**
* This method sets the LayoutManager used in the JDialog.
- * This method will throw an Error if rootPaneChecking is
+ * This method will throw an Error if rootPaneChecking is
* enabled.
*
* @param manager The LayoutManager to use.
@@ -440,7 +440,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
}
/**
- * This method is called when a component is added to the
+ * This method is called when a component is added to the
* the JDialog. Calling this method with rootPaneCheckingEnabled
* will cause an Error to be thrown.
*
@@ -469,7 +469,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
// pass it on to the content pane instead.
if (comp == rootPane)
super.remove(rootPane);
- else
+ else
getContentPane().remove(comp);
}
@@ -502,8 +502,8 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
{
paint(g);
}
-
-
+
+
/**
* This method handles window events. This allows the JDialog
* to honour its default close operation.
diff --git a/libjava/classpath/javax/swing/JEditorPane.java b/libjava/classpath/javax/swing/JEditorPane.java
index d6b8776..8ad1095 100644
--- a/libjava/classpath/javax/swing/JEditorPane.java
+++ b/libjava/classpath/javax/swing/JEditorPane.java
@@ -125,7 +125,7 @@ public class JEditorPane extends JTextComponent
*/
public String getAccessibleDescription()
{
- String descr = super.getAccessibleDescription();
+ String descr = super.getAccessibleDescription();
if (descr == null)
return getContentType();
else
@@ -183,9 +183,9 @@ public class JEditorPane extends JTextComponent
{
super();
}
-
+
/**
- * The accessible representation of a HTML link.
+ * The accessible representation of a HTML link.
*
* @author Roman Kennke (kennke@aicas.com)
*/
@@ -230,7 +230,7 @@ public class JEditorPane extends JTextComponent
* general, link have 1 AccessibleAction associated with them. There are
* special cases where links can have multiple actions associated, like
* in image maps.
- *
+ *
* @return the number of AccessibleActions in this link object
*/
public int getAccessibleActionCount()
@@ -352,7 +352,7 @@ public class JEditorPane extends JTextComponent
{
return element.getEndOffset();
}
-
+
}
/**
@@ -503,7 +503,7 @@ public class JEditorPane extends JTextComponent
/**
* Creates a new EditorKitMapping object.
- *
+ *
* @param cn the classname
* @param cl the classloader
*/
@@ -655,11 +655,11 @@ public class JEditorPane extends JTextComponent
}
private static final long serialVersionUID = 3140472492599046285L;
-
+
private EditorKit editorKit;
-
+
boolean focus_root;
-
+
/**
* Maps content-types to editor kit instances.
*/
@@ -684,7 +684,7 @@ public class JEditorPane extends JTextComponent
}
// A mapping between content types and used EditorKits
- HashMap editorMap;
+ HashMap editorMap;
/**
* The currently loading stream, if any.
@@ -715,9 +715,9 @@ public class JEditorPane extends JTextComponent
setEditorKit(createEditorKitForContentType("text/html"));
setPage(url);
}
-
+
/**
- * Called by the constructors to set up the default bindings for content
+ * Called by the constructors to set up the default bindings for content
* types and EditorKits.
*/
void init()
@@ -731,10 +731,10 @@ public class JEditorPane extends JTextComponent
}
/**
- * Creates and returns an EditorKit that is appropriate for the given
+ * Creates and returns an EditorKit that is appropriate for the given
* content type. This is created using the default recognized types
* plus any EditorKit types that have been registered.
- *
+ *
* @see #registerEditorKitForContentType(String, String)
* @see #registerEditorKitForContentType(String, String, ClassLoader)
* @param type the content type
@@ -756,7 +756,7 @@ public class JEditorPane extends JTextComponent
e = (EditorKit) loader.loadClass(className).newInstance();
}
catch (Exception e2)
- {
+ {
// The reference implementation returns null when class is not
// loadable or instantiatable.
}
@@ -817,7 +817,7 @@ public class JEditorPane extends JTextComponent
/**
* Returns the class name of the EditorKit associated with the given
* content type.
- *
+ *
* @since 1.3
* @param type the content type
* @return the class name of the EditorKit associated with this content type
@@ -831,13 +831,13 @@ public class JEditorPane extends JTextComponent
/**
* Returns the EditorKit to use for the given content type. If an
- * EditorKit has been explicitly set via
+ * EditorKit has been explicitly set via
* <code>setEditorKitForContentType</code>
* then it will be returned. Otherwise an attempt will be made to create
* an EditorKit from the default recognzied content types or any
* EditorKits that have been registered. If none can be created, a
* PlainEditorKit is created.
- *
+ *
* @see #registerEditorKitForContentType(String, String)
* @see #registerEditorKitForContentType(String, String, ClassLoader)
* @param type the content type
@@ -975,7 +975,7 @@ public class JEditorPane extends JTextComponent
}
/**
- * This method initializes from a stream.
+ * This method initializes from a stream.
*/
public void read(InputStream in, Object desc) throws IOException
{
@@ -1004,9 +1004,9 @@ public class JEditorPane extends JTextComponent
/**
* Establishes a binding between type and classname. This enables
* us to create an EditorKit later for the given content type.
- *
+ *
* @param type the content type
- * @param classname the name of the class that is associated with this
+ * @param classname the name of the class that is associated with this
* content type
*/
public static void registerEditorKitForContentType(String type,
@@ -1055,11 +1055,11 @@ public class JEditorPane extends JTextComponent
type = type.substring(0, paramIndex).trim();
}
if (editorKit != null
- && editorKit.getContentType().equals(type))
+ && editorKit.getContentType().equals(type))
return;
-
+
EditorKit kit = getEditorKitForContentType(type);
-
+
if (kit != null)
setEditorKit(kit);
}
@@ -1068,19 +1068,19 @@ public class JEditorPane extends JTextComponent
{
if (editorKit == newValue)
return;
-
+
if (editorKit != null)
editorKit.deinstall(this);
-
+
EditorKit oldValue = editorKit;
editorKit = newValue;
-
+
if (editorKit != null)
{
- editorKit.install(this);
- setDocument(editorKit.createDefaultDocument());
+ editorKit.install(this);
+ setDocument(editorKit.createDefaultDocument());
}
-
+
firePropertyChange("editorKit", oldValue, newValue);
invalidate();
repaint();
@@ -1099,7 +1099,7 @@ public class JEditorPane extends JTextComponent
}
/**
- * Sets the current URL being displayed.
+ * Sets the current URL being displayed.
*/
public void setPage(String url) throws IOException
{
@@ -1107,7 +1107,7 @@ public class JEditorPane extends JTextComponent
}
/**
- * Sets the current URL being displayed.
+ * Sets the current URL being displayed.
*/
public void setPage(URL page) throws IOException
{
@@ -1162,7 +1162,7 @@ public class JEditorPane extends JTextComponent
* the content of the current document and uses the EditorKit to read in the
* new text. This allows the EditorKit to handle the String rather than just
* inserting in plain text.
- *
+ *
* @param t the text to display in this JEditorPane
*/
public void setText(String t)
@@ -1174,7 +1174,7 @@ public class JEditorPane extends JTextComponent
doc.remove(0, doc.getLength());
if (t == null || t.equals(""))
return;
-
+
// Let the EditorKit read the text into the Document.
getEditorKit().read(new StringReader(t), doc, 0);
}
diff --git a/libjava/classpath/javax/swing/JFileChooser.java b/libjava/classpath/javax/swing/JFileChooser.java
index b7615a5..61b2fde 100644
--- a/libjava/classpath/javax/swing/JFileChooser.java
+++ b/libjava/classpath/javax/swing/JFileChooser.java
@@ -77,72 +77,72 @@ public class JFileChooser extends JComponent implements Accessible
{
private static final long serialVersionUID = 3162921138695327837L;
- /**
- * A dialog type for selecting a file to open.
+ /**
+ * A dialog type for selecting a file to open.
* @see #setDialogType(int)
*/
public static final int OPEN_DIALOG = 0;
- /**
- * A dialog type for selecting a file to save.
+ /**
+ * A dialog type for selecting a file to save.
* @see #setDialogType(int)
*/
public static final int SAVE_DIALOG = 1;
- /**
+ /**
* A dialog type for some custom purpose.
* @see #setDialogType(int)
*/
public static final int CUSTOM_DIALOG = 2;
- /**
+ /**
* A return value indicating the file chooser has been closed by cancelling.
- *
+ *
* @see #showOpenDialog(Component)
- * @see #showSaveDialog(Component)
+ * @see #showSaveDialog(Component)
*/
public static final int CANCEL_OPTION = 1;
- /**
+ /**
* A return value indicating the file chooser has been closed by approving
* the selection.
* @see #showOpenDialog(Component)
- * @see #showSaveDialog(Component)
+ * @see #showSaveDialog(Component)
*/
public static final int APPROVE_OPTION = 0;
- /**
+ /**
* A return value indicating the file chooser has been closed by some error.
* @see #showOpenDialog(Component)
- * @see #showSaveDialog(Component)
+ * @see #showSaveDialog(Component)
*/
public static final int ERROR_OPTION = -1;
- /**
+ /**
* A selection mode constant indicating acceptance of files only.
* @see #setFileSelectionMode(int)
*/
public static final int FILES_ONLY = 0;
- /**
- * A selection mode constant indicating acceptance of directories only.
+ /**
+ * A selection mode constant indicating acceptance of directories only.
* @see #setFileSelectionMode(int)
*/
public static final int DIRECTORIES_ONLY = 1;
- /**
+ /**
* A selection mode constant indicating acceptance of files and directories.
* @see #setFileSelectionMode(int)
*/
public static final int FILES_AND_DIRECTORIES = 2;
- /**
+ /**
* Action command string for cancelling the current selection.
* @see #cancelSelection()
*/
public static final String CANCEL_SELECTION = "CancelSelection";
- /**
+ /**
* Action command string for approving the current selection.
* @see #cancelSelection()
*/
@@ -150,7 +150,7 @@ public class JFileChooser extends JComponent implements Accessible
/**
* The name of the property for the approve button text.
- * @see #setApproveButtonText(String)
+ * @see #setApproveButtonText(String)
*/
public static final String APPROVE_BUTTON_TEXT_CHANGED_PROPERTY =
"ApproveButtonTextChangedProperty";
@@ -178,7 +178,7 @@ public class JFileChooser extends JComponent implements Accessible
/**
* The name of the property for the current directory.
- * @see #setCurrentDirectory(File)
+ * @see #setCurrentDirectory(File)
*/
public static final String DIRECTORY_CHANGED_PROPERTY = "directoryChanged";
@@ -196,23 +196,23 @@ public class JFileChooser extends JComponent implements Accessible
public static final String SELECTED_FILES_CHANGED_PROPERTY =
"SelectedFilesChangedProperty";
- /**
+ /**
* The name of the property for multi-selection.
- * @see #setMultiSelectionEnabled(boolean)
+ * @see #setMultiSelectionEnabled(boolean)
*/
public static final String MULTI_SELECTION_ENABLED_CHANGED_PROPERTY =
"MultiSelectionEnabledChangedProperty";
/**
* The name of the 'file system view' property.
- * @see #setFileSystemView(FileSystemView)
+ * @see #setFileSystemView(FileSystemView)
*/
public static final String FILE_SYSTEM_VIEW_CHANGED_PROPERTY =
"FileSystemViewChanged";
/**
* The name of the 'file view' property.
- * @see #setFileView(FileView)
+ * @see #setFileView(FileView)
*/
public static final String FILE_VIEW_CHANGED_PROPERTY = "fileViewChanged";
@@ -272,13 +272,13 @@ public class JFileChooser extends JComponent implements Accessible
public static final String CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY =
"ChoosableFileFilterChangedProperty";
- /**
- * The accessible context.
+ /**
+ * The accessible context.
* @see #getAccessibleContext()
*/
protected AccessibleContext accessibleContext;
- /**
+ /**
* The file system view.
* @see #setFileSystemView(FileSystemView)
*/
@@ -353,46 +353,46 @@ public class JFileChooser extends JComponent implements Accessible
/**
* The file selection mode.
- * @see #setFileSelectionMode(int)
+ * @see #setFileSelectionMode(int)
*/
private int fileSelectionMode = FILES_ONLY;
- /**
+ /**
* The file view.
* @see #setFileView(FileView)
*/
private FileView fv = null;
- /**
- * A flag controlling whether or not the control buttons are visible.
- * @see #setControlButtonsAreShown(boolean)
+ /**
+ * A flag controlling whether or not the control buttons are visible.
+ * @see #setControlButtonsAreShown(boolean)
*/
private boolean controlButtonsShown = true;
- /**
- * The current directory.
+ /**
+ * The current directory.
* @see #setCurrentDirectory(File)
*/
private File currentDir = null;
- /**
+ /**
* The current file filter.
* @see #setFileFilter(FileFilter)
*/
private FileFilter currentFilter = null;
- /**
+ /**
* An array of selected files.
- * @see #setSelectedFiles(File[])
+ * @see #setSelectedFiles(File[])
*/
private File[] selectedFiles;
- /**
- * The selected file.
+ /**
+ * The selected file.
* @see #setSelectedFile(File)
*/
private File selectedFile;
-
+
/**
* The drag enabled property.
* @see #setDragEnabled(boolean)
@@ -413,7 +413,7 @@ public class JFileChooser extends JComponent implements Accessible
* Creates a new <code>JFileChooser</code> object.
*
* @param currentDirectoryPath the directory that should initially be
- * shown in the filechooser (if <code>null</code>, the user's home
+ * shown in the filechooser (if <code>null</code>, the user's home
* directory is used).
*/
public JFileChooser(String currentDirectoryPath)
@@ -422,11 +422,11 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Creates a new <code>JFileChooser</code> object with the specified
+ * Creates a new <code>JFileChooser</code> object with the specified
* directory and {@link FileSystemView}.
*
* @param currentDirectoryPath the directory that should initially be
- * shown in the filechooser (if <code>null</code>, the user's home
+ * shown in the filechooser (if <code>null</code>, the user's home
* directory is used).
* @param fsv the file system view (if <code>null</code>, the default file
* system view is used).
@@ -444,7 +444,7 @@ public class JFileChooser extends JComponent implements Accessible
* Creates a new <code>JFileChooser</code> object.
*
* @param currentDirectory the directory that should initially be
- * shown in the filechooser (if <code>null</code>, the user's home
+ * shown in the filechooser (if <code>null</code>, the user's home
* directory is used).
*/
public JFileChooser(File currentDirectory)
@@ -469,7 +469,7 @@ public class JFileChooser extends JComponent implements Accessible
* Creates a new <code>JFileChooser</code> object.
*
* @param currentDirectory the directory that should initially be
- * shown in the filechooser (if <code>null</code>, the user's home
+ * shown in the filechooser (if <code>null</code>, the user's home
* directory is used).
* @param fsv the file system view (if <code>null</code>, the default file
* system view is used).
@@ -485,7 +485,7 @@ public class JFileChooser extends JComponent implements Accessible
*
* @param view the file system view (if <code>null</code>, the default file
* system view is used).
- *
+ *
* @see FileSystemView#getFileSystemView()
*/
protected void setup(FileSystemView view)
@@ -499,18 +499,18 @@ public class JFileChooser extends JComponent implements Accessible
/**
* Sets the dragEnabled property, this disables/enables automatic drag
* handling (drag and drop) on this component. The default value of the
- * dragEnabled property is false.
- *
+ * dragEnabled property is false.
+ *
* Some look and feels might not support automatic drag and drop; they
* will ignore this property.
- *
+ *
* @param b - the new dragEnabled value
*/
public void setDragEnabled(boolean b)
{
if (b && GraphicsEnvironment.isHeadless())
throw new HeadlessException();
-
+
dragEnabled = b;
}
@@ -528,7 +528,7 @@ public class JFileChooser extends JComponent implements Accessible
* Returns the selected file, if there is one.
*
* @return The selected file (possibly <code>null</code>).
- *
+ *
* @see #setSelectedFile(File)
*/
public File getSelectedFile()
@@ -538,7 +538,7 @@ public class JFileChooser extends JComponent implements Accessible
/**
* Sets the selected file and sends a {@link PropertyChangeEvent} to all
- * registered listeners. The property name is
+ * registered listeners. The property name is
* {@link #SELECTED_FILE_CHANGED_PROPERTY}.
*
* @param file the file (<code>null</code> permitted).
@@ -547,9 +547,9 @@ public class JFileChooser extends JComponent implements Accessible
{
if (selectedFile == null || !selectedFile.equals(file))
{
- File old = selectedFile;
- selectedFile = file;
- firePropertyChange(SELECTED_FILE_CHANGED_PROPERTY, old, selectedFile);
+ File old = selectedFile;
+ selectedFile = file;
+ firePropertyChange(SELECTED_FILE_CHANGED_PROPERTY, old, selectedFile);
}
}
@@ -569,9 +569,9 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Sets the selected files and sends a {@link PropertyChangeEvent} (with the
- * name {@link #SELECTED_FILES_CHANGED_PROPERTY}) to all registered
- * listeners.
+ * Sets the selected files and sends a {@link PropertyChangeEvent} (with the
+ * name {@link #SELECTED_FILES_CHANGED_PROPERTY}) to all registered
+ * listeners.
*
* @param selectedFiles the selected files (<code>null</code> permitted).
*/
@@ -585,9 +585,9 @@ public class JFileChooser extends JComponent implements Accessible
setSelectedFile(null);
if (this.selectedFiles != selectedFiles)
{
- File[] old = this.selectedFiles;
- this.selectedFiles = selectedFiles;
- firePropertyChange(SELECTED_FILES_CHANGED_PROPERTY, old, selectedFiles);
+ File[] old = this.selectedFiles;
+ this.selectedFiles = selectedFiles;
+ firePropertyChange(SELECTED_FILES_CHANGED_PROPERTY, old, selectedFiles);
}
}
@@ -603,26 +603,26 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Sets the current directory and fires a {@link PropertyChangeEvent} (with
- * the property name {@link #DIRECTORY_CHANGED_PROPERTY}) to all registered
- * listeners. If <code>dir</code> is <code>null</code>, the current
+ * Sets the current directory and fires a {@link PropertyChangeEvent} (with
+ * the property name {@link #DIRECTORY_CHANGED_PROPERTY}) to all registered
+ * listeners. If <code>dir</code> is <code>null</code>, the current
* directory is set to the default directory returned by the file system
* view.
*
* @param dir the new directory (<code>null</code> permitted).
- *
+ *
* @see FileSystemView#getDefaultDirectory()
*/
public void setCurrentDirectory(File dir)
{
if (currentDir != dir || dir == null)
{
- if (dir == null)
- dir = fsv.getDefaultDirectory();
+ if (dir == null)
+ dir = fsv.getDefaultDirectory();
- File old = currentDir;
- currentDir = dir;
- firePropertyChange(DIRECTORY_CHANGED_PROPERTY, old, currentDir);
+ File old = currentDir;
+ currentDir = dir;
+ firePropertyChange(DIRECTORY_CHANGED_PROPERTY, old, currentDir);
}
}
@@ -643,7 +643,7 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Ensures the the specified file is visible (this is handled by the
+ * Ensures the the specified file is visible (this is handled by the
* UI delegate).
*
* @param f the file.
@@ -654,13 +654,13 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Displays the file chooser in a modal dialog using the
+ * Displays the file chooser in a modal dialog using the
* {@link #OPEN_DIALOG} type.
*
* @param parent the parent component.
*
- * @return A return value indicating how the dialog was closed (one of
- * {@link #APPROVE_OPTION}, {@link #CANCEL_OPTION} and
+ * @return A return value indicating how the dialog was closed (one of
+ * {@link #APPROVE_OPTION}, {@link #CANCEL_OPTION} and
* {@link #ERROR_OPTION}).
*
* @throws HeadlessException DOCUMENT ME!
@@ -681,13 +681,13 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Displays the file chooser in a modal dialog using the
+ * Displays the file chooser in a modal dialog using the
* {@link #SAVE_DIALOG} type.
*
* @param parent the parent component.
*
- * @return A return value indicating how the dialog was closed (one of
- * {@link #APPROVE_OPTION}, {@link #CANCEL_OPTION} and
+ * @return A return value indicating how the dialog was closed (one of
+ * {@link #APPROVE_OPTION}, {@link #CANCEL_OPTION} and
* {@link #ERROR_OPTION}).
*
* @throws HeadlessException DOCUMENT ME!
@@ -705,13 +705,13 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Displays the file chooser in a modal dialog using the
+ * Displays the file chooser in a modal dialog using the
* {@link #CUSTOM_DIALOG} type.
*
* @param parent the parent component.
*
- * @return A return value indicating how the dialog was closed (one of
- * {@link #APPROVE_OPTION}, {@link #CANCEL_OPTION} and
+ * @return A return value indicating how the dialog was closed (one of
+ * {@link #APPROVE_OPTION}, {@link #CANCEL_OPTION} and
* {@link #ERROR_OPTION}).
*
* @throws HeadlessException DOCUMENT ME!
@@ -750,10 +750,10 @@ public class JFileChooser extends JComponent implements Accessible
dialog.getContentPane().add(this);
dialog.addWindowListener( new WindowAdapter()
{
- public void windowClosing(WindowEvent e)
- {
- cancelSelection();
- }
+ public void windowClosing(WindowEvent e)
+ {
+ cancelSelection();
+ }
});
dialog.setModal(true);
dialog.invalidate();
@@ -766,7 +766,7 @@ public class JFileChooser extends JComponent implements Accessible
* shown on the file chooser.
*
* @return A boolean.
- *
+ *
* @see #setControlButtonsAreShown(boolean)
*/
public boolean getControlButtonsAreShown()
@@ -786,18 +786,18 @@ public class JFileChooser extends JComponent implements Accessible
{
if (controlButtonsShown != b)
{
- controlButtonsShown = b;
- firePropertyChange(CONTROL_BUTTONS_ARE_SHOWN_CHANGED_PROPERTY,
- ! controlButtonsShown, controlButtonsShown);
+ controlButtonsShown = b;
+ firePropertyChange(CONTROL_BUTTONS_ARE_SHOWN_CHANGED_PROPERTY,
+ ! controlButtonsShown, controlButtonsShown);
}
}
/**
* Returns the type of file chooser.
*
- * @return {@link #OPEN_DIALOG}, {@link #SAVE_DIALOG} or
+ * @return {@link #OPEN_DIALOG}, {@link #SAVE_DIALOG} or
* {@link #CUSTOM_DIALOG}.
- *
+ *
* @see #setDialogType(int)
*/
public int getDialogType()
@@ -807,12 +807,12 @@ public class JFileChooser extends JComponent implements Accessible
/**
* Sets the dialog type and fires a {@link PropertyChangeEvent} (with the
- * property name {@link #DIALOG_TYPE_CHANGED_PROPERTY}) to all
+ * property name {@link #DIALOG_TYPE_CHANGED_PROPERTY}) to all
* registered listeners.
*
* @param dialogType the dialog type (one of: {@link #OPEN_DIALOG},
* {@link #SAVE_DIALOG}, {@link #CUSTOM_DIALOG}).
- *
+ *
* @throws IllegalArgumentException if <code>dialogType</code> is not valid.
*/
public void setDialogType(int dialogType)
@@ -823,28 +823,28 @@ public class JFileChooser extends JComponent implements Accessible
if (this.dialogType != dialogType)
{
- int old = this.dialogType;
- this.dialogType = dialogType;
- firePropertyChange(DIALOG_TYPE_CHANGED_PROPERTY, old, this.dialogType);
+ int old = this.dialogType;
+ this.dialogType = dialogType;
+ firePropertyChange(DIALOG_TYPE_CHANGED_PROPERTY, old, this.dialogType);
}
}
/**
- * Sets the dialog title and sends a {@link PropertyChangeEvent} (with the
- * property name {@link #DIALOG_TITLE_CHANGED_PROPERTY}) to all
+ * Sets the dialog title and sends a {@link PropertyChangeEvent} (with the
+ * property name {@link #DIALOG_TITLE_CHANGED_PROPERTY}) to all
* registered listeners.
*
* @param dialogTitle the dialog title (<code>null</code> permitted).
- *
+ *
* @see #getDialogTitle()
*/
public void setDialogTitle(String dialogTitle)
{
if (this.dialogTitle != dialogTitle)
{
- String old = this.dialogTitle;
- this.dialogTitle = dialogTitle;
- firePropertyChange(DIALOG_TITLE_CHANGED_PROPERTY, old, this.dialogTitle);
+ String old = this.dialogTitle;
+ this.dialogTitle = dialogTitle;
+ firePropertyChange(DIALOG_TITLE_CHANGED_PROPERTY, old, this.dialogTitle);
}
}
@@ -852,7 +852,7 @@ public class JFileChooser extends JComponent implements Accessible
* Returns the dialog title.
*
* @return The dialog title (possibly <code>null</code>).
- *
+ *
* @see #setDialogTitle(String)
*/
public String getDialogTitle()
@@ -861,9 +861,9 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Sets the tool tip text for the approve button and sends a
+ * Sets the tool tip text for the approve button and sends a
* {@link PropertyChangeEvent} (with the property name
- * {@link #APPROVE_BUTTON_TOOL_TIP_TEXT_CHANGED_PROPERTY}) to all
+ * {@link #APPROVE_BUTTON_TOOL_TIP_TEXT_CHANGED_PROPERTY}) to all
* registered listeners.
*
* @param toolTipText the text.
@@ -872,10 +872,10 @@ public class JFileChooser extends JComponent implements Accessible
{
if (approveButtonToolTipText != toolTipText)
{
- String oldText = approveButtonToolTipText;
- approveButtonToolTipText = toolTipText;
- firePropertyChange(APPROVE_BUTTON_TOOL_TIP_TEXT_CHANGED_PROPERTY,
- oldText, approveButtonToolTipText);
+ String oldText = approveButtonToolTipText;
+ approveButtonToolTipText = toolTipText;
+ firePropertyChange(APPROVE_BUTTON_TOOL_TIP_TEXT_CHANGED_PROPERTY,
+ oldText, approveButtonToolTipText);
}
}
@@ -883,7 +883,7 @@ public class JFileChooser extends JComponent implements Accessible
* Returns the tool tip text for the approve button.
*
* @return The tool tip text for the approve button.
- *
+ *
* @see #setApproveButtonToolTipText(String)
*/
public String getApproveButtonToolTipText()
@@ -895,7 +895,7 @@ public class JFileChooser extends JComponent implements Accessible
* Returns the approve button mnemonic, or zero if no mnemonic has been set.
*
* @return The approve button mnemonic.
- *
+ *
* @see #setApproveButtonMnemonic(int)
*/
public int getApproveButtonMnemonic()
@@ -904,34 +904,34 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Sets the mnemonic for the approve button and sends a
- * {@link PropertyChangeEvent} (with the property name
- * {@link #APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY}) to all registered
+ * Sets the mnemonic for the approve button and sends a
+ * {@link PropertyChangeEvent} (with the property name
+ * {@link #APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY}) to all registered
* listeners.
*
* @param mnemonic the mnemonic.
- *
+ *
* @see #setApproveButtonMnemonic(char)
*/
public void setApproveButtonMnemonic(int mnemonic)
{
if (approveButtonMnemonic != mnemonic)
{
- int oldMnemonic = approveButtonMnemonic;
- approveButtonMnemonic = mnemonic;
- firePropertyChange(APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY,
- oldMnemonic, approveButtonMnemonic);
+ int oldMnemonic = approveButtonMnemonic;
+ approveButtonMnemonic = mnemonic;
+ firePropertyChange(APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY,
+ oldMnemonic, approveButtonMnemonic);
}
}
/**
- * Sets the mnemonic for the approve button and sends a
- * {@link PropertyChangeEvent} (with the property name
- * {@link #APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY}) to all registered
+ * Sets the mnemonic for the approve button and sends a
+ * {@link PropertyChangeEvent} (with the property name
+ * {@link #APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY}) to all registered
* listeners.
*
* @param mnemonic the mnemonic.
- *
+ *
* @see #setApproveButtonMnemonic(int)
*/
public void setApproveButtonMnemonic(char mnemonic)
@@ -940,22 +940,22 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Sets the approve button text and fires a {@link PropertyChangeEvent}
- * (with the property name {@link #APPROVE_BUTTON_TEXT_CHANGED_PROPERTY}) to
+ * Sets the approve button text and fires a {@link PropertyChangeEvent}
+ * (with the property name {@link #APPROVE_BUTTON_TEXT_CHANGED_PROPERTY}) to
* all registered listeners.
*
* @param approveButtonText the text (<code>null</code> permitted).
- *
+ *
* @see #getApproveButtonText()
*/
public void setApproveButtonText(String approveButtonText)
{
if (this.approveButtonText != approveButtonText)
{
- String oldText = this.approveButtonText;
- this.approveButtonText = approveButtonText;
- firePropertyChange(APPROVE_BUTTON_TEXT_CHANGED_PROPERTY, oldText,
- this.approveButtonText);
+ String oldText = this.approveButtonText;
+ this.approveButtonText = approveButtonText;
+ firePropertyChange(APPROVE_BUTTON_TEXT_CHANGED_PROPERTY, oldText,
+ this.approveButtonText);
}
}
@@ -963,7 +963,7 @@ public class JFileChooser extends JComponent implements Accessible
* Returns the approve button text.
*
* @return The approve button text (possibly <code>null</code>).
- *
+ *
* @see #setApproveButtonText(String)
*/
public String getApproveButtonText()
@@ -982,9 +982,9 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Adds a file filter to the list of available filters and sends a
- * {@link PropertyChangeEvent} (with the property name
- * {@link #CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY}) to all registered
+ * Adds a file filter to the list of available filters and sends a
+ * {@link PropertyChangeEvent} (with the property name
+ * {@link #CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY}) to all registered
* listeners.
*
* @param filter the filter (<code>null</code> permitted).
@@ -996,21 +996,21 @@ public class JFileChooser extends JComponent implements Accessible
FileFilter[] old = getChoosableFileFilters();
choosableFilters.add(filter);
FileFilter[] newFilters = getChoosableFileFilters();
- firePropertyChange(CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY, old,
+ firePropertyChange(CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY, old,
newFilters);
}
setFileFilter(filter);
}
/**
- * Removes a file filter from the list of available filters and sends a
- * {@link PropertyChangeEvent} (with the property name
- * {@link #CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY}) to all registered
+ * Removes a file filter from the list of available filters and sends a
+ * {@link PropertyChangeEvent} (with the property name
+ * {@link #CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY}) to all registered
* listeners.
*
* @param f the file filter.
*
- * @return <code>true</code> if the filter was removed and
+ * @return <code>true</code> if the filter was removed and
* <code>false</code> otherwise.
*/
public boolean removeChoosableFileFilter(FileFilter f)
@@ -1047,11 +1047,11 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Returns the flag that controls whether or not the 'accept all' file
+ * Returns the flag that controls whether or not the 'accept all' file
* filter is included in the list of filters.
*
* @return A boolean.
- *
+ *
* @see #setAcceptAllFileFilterUsed(boolean)
*/
public boolean isAcceptAllFileFilterUsed()
@@ -1061,9 +1061,9 @@ public class JFileChooser extends JComponent implements Accessible
/**
* Sets the flag that controls whether or not the 'accept all' file filter
- * is included in the list of filters, and sends a
- * {@link PropertyChangeEvent} (with the property name
- * {@link #ACCEPT_ALL_FILE_FILTER_USED_CHANGED_PROPERTY}) to all registered
+ * is included in the list of filters, and sends a
+ * {@link PropertyChangeEvent} (with the property name
+ * {@link #ACCEPT_ALL_FILE_FILTER_USED_CHANGED_PROPERTY}) to all registered
* listeners.
*
* @param b the new value of the flag.
@@ -1072,13 +1072,13 @@ public class JFileChooser extends JComponent implements Accessible
{
if (isAcceptAll != b)
{
- isAcceptAll = b;
+ isAcceptAll = b;
if (b)
addChoosableFileFilter(getAcceptAllFileFilter());
- else
+ else
removeChoosableFileFilter(getAcceptAllFileFilter());
- firePropertyChange(ACCEPT_ALL_FILE_FILTER_USED_CHANGED_PROPERTY,
- ! isAcceptAll, isAcceptAll);
+ firePropertyChange(ACCEPT_ALL_FILE_FILTER_USED_CHANGED_PROPERTY,
+ ! isAcceptAll, isAcceptAll);
}
}
@@ -1087,7 +1087,7 @@ public class JFileChooser extends JComponent implements Accessible
* value is <code>null</code>.
*
* @return The accessory component (possibly <code>null</code>).
- *
+ *
* @see #setAccessory(JComponent)
*/
public JComponent getAccessory()
@@ -1096,7 +1096,7 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Sets the accessory component for the file chooser and sends a
+ * Sets the accessory component for the file chooser and sends a
* {@link PropertyChangeEvent} to all registered listeners. The property
* name is {@link #ACCESSORY_CHANGED_PROPERTY}.
*
@@ -1106,20 +1106,20 @@ public class JFileChooser extends JComponent implements Accessible
{
if (accessory != newAccessory)
{
- JComponent old = accessory;
- accessory = newAccessory;
- firePropertyChange(ACCESSORY_CHANGED_PROPERTY, old, accessory);
+ JComponent old = accessory;
+ accessory = newAccessory;
+ firePropertyChange(ACCESSORY_CHANGED_PROPERTY, old, accessory);
}
}
/**
* Sets the file selection mode and sends a {@link PropertyChangeEvent}
- * to all registered listeners. The property name is
+ * to all registered listeners. The property name is
* {@link #FILE_SELECTION_MODE_CHANGED_PROPERTY}.
*
* @param mode the mode ({@link #FILES_ONLY}, {@link #DIRECTORIES_ONLY} or
* {@link #FILES_AND_DIRECTORIES}).
- *
+ *
* @throws IllegalArgumentException if the mode is invalid.
*/
public void setFileSelectionMode(int mode)
@@ -1129,20 +1129,20 @@ public class JFileChooser extends JComponent implements Accessible
throw new IllegalArgumentException("Choose a correct file selection mode.");
if (fileSelectionMode != mode)
{
- int old = fileSelectionMode;
- fileSelectionMode = mode;
- firePropertyChange(FILE_SELECTION_MODE_CHANGED_PROPERTY, old,
- fileSelectionMode);
+ int old = fileSelectionMode;
+ fileSelectionMode = mode;
+ firePropertyChange(FILE_SELECTION_MODE_CHANGED_PROPERTY, old,
+ fileSelectionMode);
}
}
/**
- * Returns the file selection mode, one of: {@link #FILES_ONLY},
+ * Returns the file selection mode, one of: {@link #FILES_ONLY},
* {@link #DIRECTORIES_ONLY} or {@link #FILES_AND_DIRECTORIES}. The
* default is {@link #FILES_ONLY}.
*
* @return The file selection mode.
- *
+ *
* @see #setFileSelectionMode(int)
*/
public int getFileSelectionMode()
@@ -1151,13 +1151,13 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Returns <code>true</code> if file selection is enabled, and
+ * Returns <code>true</code> if file selection is enabled, and
* <code>false</code> otherwise. File selection is enabled when the
- * file selection mode is {@link #FILES_ONLY} or
+ * file selection mode is {@link #FILES_ONLY} or
* {@link #FILES_AND_DIRECTORIES}.
*
* @return <code>true</code> if file selection is enabled.
- *
+ *
* @see #getFileSelectionMode()
*/
public boolean isFileSelectionEnabled()
@@ -1167,13 +1167,13 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Returns <code>true</code> if directory selection is enabled, and
+ * Returns <code>true</code> if directory selection is enabled, and
* <code>false</code> otherwise. Directory selection is enabled when the
- * file selection mode is {@link #DIRECTORIES_ONLY} or
+ * file selection mode is {@link #DIRECTORIES_ONLY} or
* {@link #FILES_AND_DIRECTORIES}.
*
* @return <code>true</code> if file selection is enabled.
- *
+ *
* @see #getFileSelectionMode()
*/
public boolean isDirectorySelectionEnabled()
@@ -1183,9 +1183,9 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Sets the flag that controls whether multiple selections are allowed in
- * this filechooser and sends a {@link PropertyChangeEvent} (with the
- * property name {@link #MULTI_SELECTION_ENABLED_CHANGED_PROPERTY}) to all
+ * Sets the flag that controls whether multiple selections are allowed in
+ * this filechooser and sends a {@link PropertyChangeEvent} (with the
+ * property name {@link #MULTI_SELECTION_ENABLED_CHANGED_PROPERTY}) to all
* registered listeners.
*
* @param b the new value of the flag.
@@ -1194,9 +1194,9 @@ public class JFileChooser extends JComponent implements Accessible
{
if (multiSelection != b)
{
- multiSelection = b;
- firePropertyChange(MULTI_SELECTION_ENABLED_CHANGED_PROPERTY,
- ! multiSelection, multiSelection);
+ multiSelection = b;
+ firePropertyChange(MULTI_SELECTION_ENABLED_CHANGED_PROPERTY,
+ ! multiSelection, multiSelection);
}
}
@@ -1205,7 +1205,7 @@ public class JFileChooser extends JComponent implements Accessible
* file chooser, and <code>false</code> otherwise.
*
* @return A boolean.
- *
+ *
* @see #setMultiSelectionEnabled(boolean)
*/
public boolean isMultiSelectionEnabled()
@@ -1214,11 +1214,11 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Returns <code>true</code> if hidden files are to be hidden, and
+ * Returns <code>true</code> if hidden files are to be hidden, and
* <code>false</code> otherwise.
*
* @return A boolean.
- *
+ *
* @see #setFileHidingEnabled(boolean)
*/
public boolean isFileHidingEnabled()
@@ -1237,15 +1237,15 @@ public class JFileChooser extends JComponent implements Accessible
{
if (fileHiding != b)
{
- fileHiding = b;
- firePropertyChange(FILE_HIDING_CHANGED_PROPERTY, ! fileHiding,
- fileHiding);
+ fileHiding = b;
+ firePropertyChange(FILE_HIDING_CHANGED_PROPERTY, ! fileHiding,
+ fileHiding);
}
}
/**
* Sets the file filter and sends a {@link PropertyChangeEvent} (with the
- * property name {@link #FILE_FILTER_CHANGED_PROPERTY}) to all registered
+ * property name {@link #FILE_FILTER_CHANGED_PROPERTY}) to all registered
* listeners.
*
* @param filter the filter (<code>null</code> permitted).
@@ -1266,7 +1266,7 @@ public class JFileChooser extends JComponent implements Accessible
* Returns the file filter.
*
* @return The file filter.
- *
+ *
* @see #setFileFilter(FileFilter)
*/
public FileFilter getFileFilter()
@@ -1275,7 +1275,7 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Sets a custom {@link FileView} for the file chooser and sends a
+ * Sets a custom {@link FileView} for the file chooser and sends a
* {@link PropertyChangeEvent} to all registered listeners. The property
* name is {@link #FILE_VIEW_CHANGED_PROPERTY}.
*
@@ -1287,9 +1287,9 @@ public class JFileChooser extends JComponent implements Accessible
{
if (fv != fileView)
{
- FileView old = fv;
- fv = fileView;
- firePropertyChange(FILE_VIEW_CHANGED_PROPERTY, old, fv);
+ FileView old = fv;
+ fv = fileView;
+ firePropertyChange(FILE_VIEW_CHANGED_PROPERTY, old, fv);
}
}
@@ -1340,7 +1340,7 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Returns the type description for the file, generated by the current (or
+ * Returns the type description for the file, generated by the current (or
* default) {@link FileView}.
*
* @param f the file.
@@ -1375,7 +1375,7 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Returns <code>true</code> if the file is traversable, and
+ * Returns <code>true</code> if the file is traversable, and
* <code>false</code> otherwise.
*
* @param f the file or directory.
@@ -1400,14 +1400,14 @@ public class JFileChooser extends JComponent implements Accessible
if (f == null)
return true;
FileFilter ff = getFileFilter();
- if (ff != null)
+ if (ff != null)
return ff.accept(f);
else
return true;
}
/**
- * Sets the file system view for the file chooser and sends a
+ * Sets the file system view for the file chooser and sends a
* {@link PropertyChangeEvent} to all registered listeners.
*
* @param fsv the file system view.
@@ -1416,9 +1416,9 @@ public class JFileChooser extends JComponent implements Accessible
{
if (this.fsv != fsv)
{
- FileSystemView old = this.fsv;
- this.fsv = fsv;
- firePropertyChange(FILE_SYSTEM_VIEW_CHANGED_PROPERTY, old, this.fsv);
+ FileSystemView old = this.fsv;
+ this.fsv = fsv;
+ firePropertyChange(FILE_SYSTEM_VIEW_CHANGED_PROPERTY, old, this.fsv);
}
}
@@ -1426,7 +1426,7 @@ public class JFileChooser extends JComponent implements Accessible
* Returns the file system view being used by this file chooser.
*
* @return The file system view.
- *
+ *
* @see #setFileSystemView(FileSystemView)
*/
public FileSystemView getFileSystemView()
@@ -1473,11 +1473,11 @@ public class JFileChooser extends JComponent implements Accessible
{
try
{
- listenerList.remove(ActionListener.class, l);
+ listenerList.remove(ActionListener.class, l);
}
catch (IllegalArgumentException e)
{
- e.printStackTrace();
+ e.printStackTrace();
}
}
@@ -1535,12 +1535,12 @@ public class JFileChooser extends JComponent implements Accessible
}
/**
- * Returns a string describing the attributes for the
- * <code>JFileChooser</code> component, for use in debugging. The return
- * value is guaranteed to be non-<code>null</code>, but the format of the
+ * Returns a string describing the attributes for the
+ * <code>JFileChooser</code> component, for use in debugging. The return
+ * value is guaranteed to be non-<code>null</code>, but the format of the
* string may vary between implementations.
*
- * @return A string describing the attributes of the
+ * @return A string describing the attributes of the
* <code>JFileChooser</code>.
*/
protected String paramString()
@@ -1587,7 +1587,7 @@ public class JFileChooser extends JComponent implements Accessible
* Returns the object that provides accessibility features for this
* <code>JFileChooser</code> component.
*
- * @return The accessible context (an instance of
+ * @return The accessible context (an instance of
* {@link AccessibleJFileChooser}).
*/
public AccessibleContext getAccessibleContext()
@@ -1601,7 +1601,7 @@ public class JFileChooser extends JComponent implements Accessible
* Provides the accessibility features for the <code>JFileChooser</code>
* component.
*/
- protected class AccessibleJFileChooser
+ protected class AccessibleJFileChooser
extends JComponent.AccessibleJComponent
{
/**
@@ -1611,9 +1611,9 @@ public class JFileChooser extends JComponent implements Accessible
{
// Nothing to do here.
}
-
+
/**
- * Returns the accessible role for the <code>JFileChooser</code>
+ * Returns the accessible role for the <code>JFileChooser</code>
* component.
*
* @return {@link AccessibleRole#FILE_CHOOSER}.
diff --git a/libjava/classpath/javax/swing/JFormattedTextField.java b/libjava/classpath/javax/swing/JFormattedTextField.java
index 3655485..e4b6fec 100644
--- a/libjava/classpath/javax/swing/JFormattedTextField.java
+++ b/libjava/classpath/javax/swing/JFormattedTextField.java
@@ -84,18 +84,18 @@ public class JFormattedTextField extends JTextField
public abstract static class AbstractFormatter implements Serializable
{
private static final long serialVersionUID = -5193212041738979680L;
-
+
private JFormattedTextField textField;
-
+
public AbstractFormatter ()
{
//Do nothing here.
}
/**
- * Clones the AbstractFormatter and removes the association to any
+ * Clones the AbstractFormatter and removes the association to any
* particular JFormattedTextField.
- *
+ *
* @return a clone of this formatter with no association to any particular
* JFormattedTextField
* @throws CloneNotSupportedException if the Object's class doesn't support
@@ -106,7 +106,7 @@ public class JFormattedTextField extends JTextField
{
// Clone this formatter.
AbstractFormatter newFormatter = (AbstractFormatter) super.clone();
-
+
// And remove the association to the JFormattedTextField.
newFormatter.textField = null;
return newFormatter;
@@ -115,7 +115,7 @@ public class JFormattedTextField extends JTextField
/**
* Returns a custom set of Actions that this formatter supports. Should
* be subclassed by formatters that have a custom set of Actions.
- *
+ *
* @return <code>null</code>. Should be subclassed by formatters that want
* to install custom Actions on the JFormattedTextField.
*/
@@ -128,13 +128,13 @@ public class JFormattedTextField extends JTextField
* Gets the DocumentFilter for this formatter. Should be subclassed
* by formatters wishing to install a filter that oversees Document
* mutations.
- *
+ *
* @return <code>null</code>. Should be subclassed by formatters
* that want to restrict Document mutations.
*/
protected DocumentFilter getDocumentFilter()
{
- // Subclasses should override this if they want to install a
+ // Subclasses should override this if they want to install a
// DocumentFilter.
return null;
}
@@ -142,7 +142,7 @@ public class JFormattedTextField extends JTextField
/**
* Returns the JFormattedTextField on which this formatter is
* currently installed.
- *
+ *
* @return the JFormattedTextField on which this formatter is currently
* installed
*/
@@ -153,29 +153,29 @@ public class JFormattedTextField extends JTextField
/**
* Gets the NavigationFilter for this formatter. Should be subclassed
- * by formatters (such as {@link DefaultFormatter}) that wish to
+ * by formatters (such as {@link DefaultFormatter}) that wish to
* restrict where the cursor can be placed within the text field.
- *
+ *
* @return <code>null</code>. Subclassed by formatters that want to restrict
* cursor location within the JFormattedTextField.
*/
protected NavigationFilter getNavigationFilter()
{
- // This should be subclassed if the formatter wants to install
+ // This should be subclassed if the formatter wants to install
// a NavigationFilter on the JFormattedTextField.
return null;
}
/**
- * Installs this formatter on the specified JFormattedTextField. This
- * converts the current value to a displayable String and displays it,
+ * Installs this formatter on the specified JFormattedTextField. This
+ * converts the current value to a displayable String and displays it,
* and installs formatter specific Actions from <code>getActions</code>.
- * It also installs a DocumentFilter and NavigationFilter on the
- * JFormattedTextField.
+ * It also installs a DocumentFilter and NavigationFilter on the
+ * JFormattedTextField.
* <p>
- * If there is a <code>ParseException</code> this sets the text to an
+ * If there is a <code>ParseException</code> this sets the text to an
* empty String and marks the text field in an invalid state.
- *
+ *
* @param textField the JFormattedTextField on which to install this
* formatter
*/
@@ -184,10 +184,10 @@ public class JFormattedTextField extends JTextField
// Uninstall the current textfield.
if (this.textField != null)
uninstall();
-
+
this.textField = textField;
-
- // Install some state on the text field, including display text,
+
+ // Install some state on the text field, including display text,
// DocumentFilter, NavigationFilter, and formatter specific Actions.
if (textField != null)
{
@@ -196,16 +196,16 @@ public class JFormattedTextField extends JTextField
// Set the text of the field.
textField.setText(valueToString(textField.getValue()));
Document doc = textField.getDocument();
-
+
// Set the DocumentFilter for the field's Document.
if (doc instanceof AbstractDocument)
((AbstractDocument) doc).setDocumentFilter(getDocumentFilter());
-
+
// Set the NavigationFilter.
textField.setNavigationFilter(getNavigationFilter());
-
+
// Set the Formatter Actions
- // FIXME: Have to add the actions from getActions()
+ // FIXME: Have to add the actions from getActions()
}
catch (ParseException pe)
{
@@ -218,8 +218,8 @@ public class JFormattedTextField extends JTextField
/**
* Clears the state installed on the JFormattedTextField by the formatter.
- * This resets the DocumentFilter, NavigationFilter, and any additional
- * Actions (returned by <code>getActions()</code>).
+ * This resets the DocumentFilter, NavigationFilter, and any additional
+ * Actions (returned by <code>getActions()</code>).
*/
public void uninstall()
{
@@ -234,7 +234,7 @@ public class JFormattedTextField extends JTextField
/**
* Invoke this method when invalid values are entered. This forwards the
- * call to the JFormattedTextField.
+ * call to the JFormattedTextField.
*/
protected void invalidEdit()
{
@@ -242,9 +242,9 @@ public class JFormattedTextField extends JTextField
}
/**
- * This method updates the <code>editValid</code> property of
+ * This method updates the <code>editValid</code> property of
* JFormattedTextField.
- *
+ *
* @param valid the new state for the <code>editValid</code> property
*/
protected void setEditValid(boolean valid)
@@ -254,7 +254,7 @@ public class JFormattedTextField extends JTextField
/**
* Parses <code>text</code> to return a corresponding Object.
- *
+ *
* @param text the String to parse
* @return an Object that <code>text</code> represented
* @throws ParseException if there is an error in the conversion
@@ -265,7 +265,7 @@ public class JFormattedTextField extends JTextField
/**
* Returns a String to be displayed, based on the Object
* <code>value</code>.
- *
+ *
* @param value the Object from which to generate a String
* @return a String to be displayed
* @throws ParseException if there is an error in the conversion
@@ -276,7 +276,7 @@ public class JFormattedTextField extends JTextField
/**
* Delivers instances of an {@link AbstractFormatter} for
- * a specific value type for a JFormattedTextField.
+ * a specific value type for a JFormattedTextField.
*/
public abstract static class AbstractFormatterFactory
{
@@ -296,22 +296,22 @@ public class JFormattedTextField extends JTextField
/** The most recent valid and committed value **/
private Object value;
-
+
/** The behaviour for when this text field loses focus **/
private int focusLostBehavior = COMMIT_OR_REVERT;
-
+
/** The formatter factory currently being used **/
private AbstractFormatterFactory formatterFactory;
-
+
/** The formatter currently being used **/
private AbstractFormatter formatter;
-
+
// Package-private to avoid an accessor method.
boolean editValid = true;
-
+
/**
- * Creates a JFormattedTextField with no formatter factory.
- * <code>setValue</code> or <code>setFormatterFactory</code> will
+ * Creates a JFormattedTextField with no formatter factory.
+ * <code>setValue</code> or <code>setFormatterFactory</code> will
* properly configure this text field to edit a particular type
* of value.
*/
@@ -321,10 +321,10 @@ public class JFormattedTextField extends JTextField
}
/**
- * Creates a JFormattedTextField that can handle the specified Format.
- * An appopriate AbstractFormatter and AbstractFormatterFactory will
+ * Creates a JFormattedTextField that can handle the specified Format.
+ * An appopriate AbstractFormatter and AbstractFormatterFactory will
* be created for the specified Format.
- *
+ *
* @param format the Format that this JFormattedTextField should be able
* to handle
*/
@@ -335,10 +335,10 @@ public class JFormattedTextField extends JTextField
}
/**
- * Creates a JFormattedTextField with the specified formatter. This will
+ * Creates a JFormattedTextField with the specified formatter. This will
* create a {@link DefaultFormatterFactory} with this formatter as the default
* formatter.
- *
+ *
* @param formatter the formatter to use for this JFormattedTextField
*/
public JFormattedTextField(AbstractFormatter formatter)
@@ -348,7 +348,7 @@ public class JFormattedTextField extends JTextField
/**
* Creates a JFormattedTextField with the specified formatter factory.
- *
+ *
* @param factory the formatter factory to use for this JFormattedTextField
*/
public JFormattedTextField(AbstractFormatterFactory factory)
@@ -359,12 +359,12 @@ public class JFormattedTextField extends JTextField
/**
* Creates a JFormattedTextField with the specified formatter factory and
* initial value.
- *
+ *
* @param factory the initial formatter factory for this JFormattedTextField
* @param value the initial value for the text field
*/
public JFormattedTextField(AbstractFormatterFactory factory, Object value)
- {
+ {
setFormatterFactory(factory);
setValue(value);
}
@@ -372,14 +372,14 @@ public class JFormattedTextField extends JTextField
/**
* Creates a JFormattedTextField with the specified value. This creates a
* formatter and formatterFactory that are appropriate for the value.
- *
+ *
* @param value the initial value for this JFormattedTextField
*/
public JFormattedTextField(Object value)
{
setValue(value);
}
-
+
/**
* Returns an AbstractFormatterFactory that will give an appropriate
* AbstractFormatter for the given Format.
@@ -396,14 +396,14 @@ public class JFormattedTextField extends JTextField
newFormatter = new NumberFormatter ((NumberFormat) format);
else
newFormatter = new InternationalFormatter(format);
-
+
return new DefaultFormatterFactory(newFormatter);
}
/**
* Forces the current value from the editor to be set as the current
* value. If there is no current formatted this has no effect.
- *
+ *
* @throws ParseException if the formatter cannot format the current value
*/
public void commitEdit()
@@ -414,17 +414,17 @@ public class JFormattedTextField extends JTextField
// Note: this code is a lot like setValue except that we don't want
// to create a new formatter.
Object oldValue = this.value;
-
+
this.value = formatter.stringToValue(getText());
editValid = true;
-
- firePropertyChange("value", oldValue, this.value);
+
+ firePropertyChange("value", oldValue, this.value);
}
/**
* Gets the command list supplied by the UI augmented by the specific
* Actions for JFormattedTextField.
- *
+ *
* @return an array of Actions that this text field supports
*/
public Action[] getActions()
@@ -436,8 +436,8 @@ public class JFormattedTextField extends JTextField
/**
* Returns the behaviour of this JFormattedTextField upon losing focus. This
- * is one of <code>COMMIT</code>, <code>COMMIT_OR_REVERT</code>,
- * <code>PERSIST</code>, or <code>REVERT</code>.
+ * is one of <code>COMMIT</code>, <code>COMMIT_OR_REVERT</code>,
+ * <code>PERSIST</code>, or <code>REVERT</code>.
* @return the behaviour upon losing focus
*/
public int getFocusLostBehavior()
@@ -453,7 +453,7 @@ public class JFormattedTextField extends JTextField
{
return formatter;
}
-
+
/**
* Returns the factory currently used to generate formatters for this
* JFormattedTextField.
@@ -470,9 +470,9 @@ public class JFormattedTextField extends JTextField
}
/**
- * Returns the last valid value. This may not be the value currently shown
- * in the text field depending on whether or not the formatter commits on
- * valid edits and allows invalid input to be temporarily displayed.
+ * Returns the last valid value. This may not be the value currently shown
+ * in the text field depending on whether or not the formatter commits on
+ * valid edits and allows invalid input to be temporarily displayed.
* @return the last committed valid value
*/
public Object getValue()
@@ -482,7 +482,7 @@ public class JFormattedTextField extends JTextField
/**
* This method is used to provide feedback to the user when an invalid value
- * is input during editing.
+ * is input during editing.
*/
protected void invalidEdit()
{
@@ -500,10 +500,10 @@ public class JFormattedTextField extends JTextField
}
/**
- * Processes focus events. This is overridden because we may want to
- * change the formatted depending on whether or not this field has
+ * Processes focus events. This is overridden because we may want to
+ * change the formatted depending on whether or not this field has
* focus.
- *
+ *
* @param evt the FocusEvent
*/
protected void processFocusEvent(FocusEvent evt)
@@ -513,11 +513,11 @@ public class JFormattedTextField extends JTextField
// based on whether or not it has focus.
setFormatter (formatterFactory.getFormatter(this));
}
-
+
/**
* Associates this JFormattedTextField with a Document and propagates
* a PropertyChange event to each listener.
- *
+ *
* @param newDocument the Document to associate with this text field
*/
public void setDocument(Document newDocument)
@@ -528,26 +528,26 @@ public class JFormattedTextField extends JTextField
if (oldDocument == newDocument)
return;
-
+
super.setDocument(newDocument);
}
/**
* Sets the behaviour of this JFormattedTextField upon losing focus.
- * This must be <code>COMMIT</code>, <code>COMMIT_OR_REVERT</code>,
- * <code>PERSIST</code>, or <code>REVERT</code> or an
+ * This must be <code>COMMIT</code>, <code>COMMIT_OR_REVERT</code>,
+ * <code>PERSIST</code>, or <code>REVERT</code> or an
* IllegalArgumentException will be thrown.
- *
+ *
* @param behavior
- * @throws IllegalArgumentException if <code>behaviour</code> is not
+ * @throws IllegalArgumentException if <code>behaviour</code> is not
* one of the above
*/
public void setFocusLostBehavior(int behavior)
{
if (behavior != COMMIT
- && behavior != COMMIT_OR_REVERT
- && behavior != PERSIST
- && behavior != REVERT)
+ && behavior != COMMIT_OR_REVERT
+ && behavior != PERSIST
+ && behavior != REVERT)
throw new IllegalArgumentException("invalid behavior");
this.focusLostBehavior = behavior;
@@ -556,22 +556,22 @@ public class JFormattedTextField extends JTextField
/**
* Sets the formatter for this JFormattedTextField. Normally the formatter
* factory will take care of this, or calls to setValue will also make sure
- * that the formatter is set appropriately.
- *
+ * that the formatter is set appropriately.
+ *
* @param formatter the AbstractFormatter to use for formatting the value for
* this JFormattedTextField
*/
protected void setFormatter(AbstractFormatter formatter)
{
AbstractFormatter oldFormatter = null;
-
+
oldFormatter = this.formatter;
if (oldFormatter != null)
oldFormatter.uninstall();
-
+
this.formatter = formatter;
-
+
if (formatter != null)
formatter.install(this);
@@ -579,9 +579,9 @@ public class JFormattedTextField extends JTextField
}
/**
- * Sets the factory from which this JFormattedTextField should obtain
- * its formatters.
- *
+ * Sets the factory from which this JFormattedTextField should obtain
+ * its formatters.
+ *
* @param factory the AbstractFormatterFactory that will be used to generate
* formatters for this JFormattedTextField
*/
@@ -589,11 +589,11 @@ public class JFormattedTextField extends JTextField
{
if (formatterFactory == factory)
return;
-
+
AbstractFormatterFactory oldFactory = formatterFactory;
formatterFactory = factory;
firePropertyChange("formatterFactory", oldFactory, factory);
-
+
// Now set the formatter according to our new factory.
if (formatterFactory != null)
setFormatter(formatterFactory.getFormatter(this));
@@ -603,7 +603,7 @@ public class JFormattedTextField extends JTextField
/**
* Sets the value that will be formatted and displayed.
- *
+ *
* @param newValue the value to be formatted and displayed
*/
public void setValue(Object newValue)
@@ -613,11 +613,11 @@ public class JFormattedTextField extends JTextField
Object oldValue = value;
value = newValue;
-
+
// If there is no formatterFactory then make one.
if (formatterFactory == null)
setFormatterFactory(createFormatterFactory(newValue));
-
+
// Set the formatter appropriately. This is because there may be a new
// formatterFactory from the line above, or we may want a new formatter
// depending on the type of newValue (or if newValue is null).
@@ -626,7 +626,7 @@ public class JFormattedTextField extends JTextField
}
/**
- * A helper method that attempts to create a formatter factory that is
+ * A helper method that attempts to create a formatter factory that is
* suitable to format objects of the type like <code>value</code>.
*
* @param value an object which should be formatted by the formatter factory.
@@ -642,7 +642,7 @@ public class JFormattedTextField extends JTextField
else if (value instanceof Number)
formatter = new NumberFormatter();
else
- formatter = new DefaultFormatter();
+ formatter = new DefaultFormatter();
return new DefaultFormatterFactory(formatter);
}
}
diff --git a/libjava/classpath/javax/swing/JFrame.java b/libjava/classpath/javax/swing/JFrame.java
index 0c956b3..074d1c7 100644
--- a/libjava/classpath/javax/swing/JFrame.java
+++ b/libjava/classpath/javax/swing/JFrame.java
@@ -64,7 +64,7 @@ import javax.accessibility.AccessibleContext;
*
* Also, unlike <code>java.awt.Frame</code>s, JFrames support the
* Swing Pluggable Look &amp; Feel architecture.
- *
+ *
* @author Ronald Veldema (rveldema@cs.vu.nl)
*/
public class JFrame extends Frame
@@ -100,7 +100,7 @@ public class JFrame extends Frame
private int closeAction = HIDE_ON_CLOSE;
protected AccessibleContext accessibleContext;
protected JRootPane rootPane;
-
+
/**
* @specnote rootPaneCheckingEnabled is false to comply with J2SE 5.0
*/
@@ -117,7 +117,7 @@ public class JFrame extends Frame
/**
* Creates a new <code>JFrame</code> with the specified title.
- *
+ *
* @param title the frame title (<code>null</code> permitted).
*/
public JFrame(String title)
@@ -307,7 +307,7 @@ public class JFrame extends Frame
}
/**
- * Returns the object that provides accessibility features for this
+ * Returns the object that provides accessibility features for this
* <code>JFrame</code>.
*
* @return The accessible context (an instance of {@link AccessibleJFrame}).
@@ -322,11 +322,11 @@ public class JFrame extends Frame
/**
* Returns a code for the default operation when the frame is closed. The
* default value is {@link WindowConstants#HIDE_ON_CLOSE}.
- *
+ *
* @return One of: {@link WindowConstants#DO_NOTHING_ON_CLOSE},
- * {@link WindowConstants#HIDE_ON_CLOSE},
+ * {@link WindowConstants#HIDE_ON_CLOSE},
* {@link WindowConstants#DISPOSE_ON_CLOSE}, {@link #EXIT_ON_CLOSE}.
- *
+ *
* @see #setDefaultCloseOperation(int)
*/
public int getDefaultCloseOperation()
@@ -336,9 +336,9 @@ public class JFrame extends Frame
/**
* Returns a string describing the attributes for the <code>JFrame</code>,
- * for use in debugging. The return value is guaranteed to be
+ * for use in debugging. The return value is guaranteed to be
* non-<code>null</code>, but the format may vary between implementations.
- *
+ *
* @return A string describing the attributes of the <code>JFrame</code>.
*/
protected String paramString()
@@ -360,38 +360,38 @@ public class JFrame extends Frame
if (e.getID() == WindowEvent.WINDOW_CLOSING)
{
switch (closeAction)
- {
- case EXIT_ON_CLOSE:
- System.exit(0);
- break;
- case DISPOSE_ON_CLOSE:
- dispose();
- break;
- case HIDE_ON_CLOSE:
- setVisible(false);
- break;
- case DO_NOTHING_ON_CLOSE:
- break;
- }
+ {
+ case EXIT_ON_CLOSE:
+ System.exit(0);
+ break;
+ case DISPOSE_ON_CLOSE:
+ dispose();
+ break;
+ case HIDE_ON_CLOSE:
+ setVisible(false);
+ break;
+ case DO_NOTHING_ON_CLOSE:
+ break;
+ }
}
}
/**
* Sets the default operation that is performed when this frame is closed.
- * The default is <code>HIDE_ON_CLOSE</code>. When
+ * The default is <code>HIDE_ON_CLOSE</code>. When
* <code>EXIT_ON_CLOSE</code> is specified this method calls
* <code>SecurityManager.checkExit(0)</code> which might throw a
* <code>SecurityException</code>.
- *
- * @param operation a code for the operation (one of:
- * {@link WindowConstants#DO_NOTHING_ON_CLOSE},
- * {@link WindowConstants#HIDE_ON_CLOSE},
- * {@link WindowConstants#DISPOSE_ON_CLOSE} and
+ *
+ * @param operation a code for the operation (one of:
+ * {@link WindowConstants#DO_NOTHING_ON_CLOSE},
+ * {@link WindowConstants#HIDE_ON_CLOSE},
+ * {@link WindowConstants#DISPOSE_ON_CLOSE} and
* {@link WindowConstants#EXIT_ON_CLOSE}).
- *
+ *
* @throws IllegalArgumentException if <code>operation</code> is not one of
* the specified codes.
- *
+ *
* @see #getDefaultCloseOperation()
*/
public void setDefaultCloseOperation(int operation)
@@ -402,7 +402,7 @@ public class JFrame extends Frame
if (operation != EXIT_ON_CLOSE && operation != DISPOSE_ON_CLOSE
&& operation != HIDE_ON_CLOSE && operation != DO_NOTHING_ON_CLOSE)
- throw new IllegalArgumentException("operation must be EXIT_ON_CLOSE, "
+ throw new IllegalArgumentException("operation must be EXIT_ON_CLOSE, "
+ "HIDE_ON_CLOSE, DISPOSE_ON_CLOSE, or DO_NOTHING_ON_CLOSE");
closeAction = operation;
diff --git a/libjava/classpath/javax/swing/JInternalFrame.java b/libjava/classpath/javax/swing/JInternalFrame.java
index ff3ae1f..511bc6e 100644
--- a/libjava/classpath/javax/swing/JInternalFrame.java
+++ b/libjava/classpath/javax/swing/JInternalFrame.java
@@ -101,7 +101,7 @@ public class JInternalFrame extends JComponent implements Accessible,
}
/**
- * Returns the accessible role for the <code>JInternalFrame</code>
+ * Returns the accessible role for the <code>JInternalFrame</code>
* component.
*
* @return {@link AccessibleRole#INTERNAL_FRAME}.
@@ -112,8 +112,8 @@ public class JInternalFrame extends JComponent implements Accessible,
}
/**
- * Returns an object that provides access to the current, minimum and
- * maximum values for the {@link JInternalFrame}. Since this class
+ * Returns an object that provides access to the current, minimum and
+ * maximum values for the {@link JInternalFrame}. Since this class
* implements {@link AccessibleValue}, it returns itself.
*
* @return The accessible value.
@@ -124,7 +124,7 @@ public class JInternalFrame extends JComponent implements Accessible,
}
/**
- * Returns the current layer for the {@link JInternalFrame} component,
+ * Returns the current layer for the {@link JInternalFrame} component,
* as an {@link Integer}.
*
* @return The layer for the {@link JInternalFrame} component.
@@ -194,7 +194,7 @@ public class JInternalFrame extends JComponent implements Accessible,
}
/**
- * Returns the accessible role for the <code>JDesktopIcon</code>
+ * Returns the accessible role for the <code>JDesktopIcon</code>
* component.
*
* @return {@link AccessibleRole#DESKTOP_ICON}.
@@ -205,8 +205,8 @@ public class JInternalFrame extends JComponent implements Accessible,
}
/**
- * Returns an object that provides access to the current, minimum and
- * maximum values for the {@link JDesktopIcon}. Since this class
+ * Returns an object that provides access to the current, minimum and
+ * maximum values for the {@link JDesktopIcon}. Since this class
* implements {@link AccessibleValue}, it returns itself.
*
* @return The accessible value.
@@ -248,10 +248,10 @@ public class JInternalFrame extends JComponent implements Accessible,
}
/**
- * Sets the layer for the internal frame represented by this
+ * Sets the layer for the internal frame represented by this
* <code>JDesktopIcon</code> component.
*
- * @param n the layer (see the constants defined in
+ * @param n the layer (see the constants defined in
* {@link JLayeredPane}).
*
* @return <code>true</code> if the value is set, and <code>false</code>
@@ -286,7 +286,7 @@ public class JInternalFrame extends JComponent implements Accessible,
* Returns the object that provides accessibility features for this
* <code>JDesktopIcon</code> component.
*
- * @return The accessible context (an instance of
+ * @return The accessible context (an instance of
* {@link AccessibleJDesktopIcon}).
*/
public AccessibleContext getAccessibleContext()
@@ -496,8 +496,8 @@ public class JInternalFrame extends JComponent implements Accessible,
private transient boolean wasIcon = false;
/**
- * Creates a new JInternalFrame object that has an empty string for its
- * title, and is non-resizable, non-maximizable, non-iconifiable, and
+ * Creates a new JInternalFrame object that has an empty string for its
+ * title, and is non-resizable, non-maximizable, non-iconifiable, and
* non-closable.
*/
public JInternalFrame()
@@ -672,11 +672,11 @@ public class JInternalFrame extends JComponent implements Accessible,
switch (getDefaultCloseOperation())
{
case HIDE_ON_CLOSE:
- setVisible(false);
- break;
+ setVisible(false);
+ break;
case DISPOSE_ON_CLOSE:
- dispose();
- break;
+ dispose();
+ break;
}
}
@@ -692,59 +692,59 @@ public class JInternalFrame extends JComponent implements Accessible,
switch (id)
{
case InternalFrameEvent.INTERNAL_FRAME_CLOSING:
- for (int i = ifListeners.length - 2; i >= 0; i -= 2)
- {
- if (ifListeners[i] == InternalFrameListener.class)
- ((InternalFrameListener) ifListeners[i + 1])
- .internalFrameClosing(evt);
- }
- break;
+ for (int i = ifListeners.length - 2; i >= 0; i -= 2)
+ {
+ if (ifListeners[i] == InternalFrameListener.class)
+ ((InternalFrameListener) ifListeners[i + 1])
+ .internalFrameClosing(evt);
+ }
+ break;
case InternalFrameEvent.INTERNAL_FRAME_ACTIVATED:
- for (int i = ifListeners.length - 2; i >= 0; i -= 2)
- {
- if (ifListeners[i] == InternalFrameListener.class)
- ((InternalFrameListener) ifListeners[i + 1])
- .internalFrameActivated(evt);
- }
- break;
+ for (int i = ifListeners.length - 2; i >= 0; i -= 2)
+ {
+ if (ifListeners[i] == InternalFrameListener.class)
+ ((InternalFrameListener) ifListeners[i + 1])
+ .internalFrameActivated(evt);
+ }
+ break;
case InternalFrameEvent.INTERNAL_FRAME_CLOSED:
- for (int i = ifListeners.length - 2; i >= 0; i -= 2)
- {
- if (ifListeners[i] == InternalFrameListener.class)
- ((InternalFrameListener) ifListeners[i + 1]).internalFrameClosed(evt);
- }
- break;
+ for (int i = ifListeners.length - 2; i >= 0; i -= 2)
+ {
+ if (ifListeners[i] == InternalFrameListener.class)
+ ((InternalFrameListener) ifListeners[i + 1]).internalFrameClosed(evt);
+ }
+ break;
case InternalFrameEvent.INTERNAL_FRAME_DEACTIVATED:
- for (int i = ifListeners.length - 2; i >= 0; i -= 2)
- {
- if (ifListeners[i] == InternalFrameListener.class)
- ((InternalFrameListener) ifListeners[i + 1])
- .internalFrameDeactivated(evt);
- }
- break;
+ for (int i = ifListeners.length - 2; i >= 0; i -= 2)
+ {
+ if (ifListeners[i] == InternalFrameListener.class)
+ ((InternalFrameListener) ifListeners[i + 1])
+ .internalFrameDeactivated(evt);
+ }
+ break;
case InternalFrameEvent.INTERNAL_FRAME_DEICONIFIED:
- for (int i = ifListeners.length - 2; i >= 0; i -= 2)
- {
- if (ifListeners[i] == InternalFrameListener.class)
- ((InternalFrameListener) ifListeners[i + 1])
- .internalFrameDeiconified(evt);
- }
- break;
+ for (int i = ifListeners.length - 2; i >= 0; i -= 2)
+ {
+ if (ifListeners[i] == InternalFrameListener.class)
+ ((InternalFrameListener) ifListeners[i + 1])
+ .internalFrameDeiconified(evt);
+ }
+ break;
case InternalFrameEvent.INTERNAL_FRAME_ICONIFIED:
- for (int i = ifListeners.length - 2; i >= 0; i -= 2)
- {
- if (ifListeners[i] == InternalFrameListener.class)
- ((InternalFrameListener) ifListeners[i + 1])
- .internalFrameIconified(evt);
- }
- break;
+ for (int i = ifListeners.length - 2; i >= 0; i -= 2)
+ {
+ if (ifListeners[i] == InternalFrameListener.class)
+ ((InternalFrameListener) ifListeners[i + 1])
+ .internalFrameIconified(evt);
+ }
+ break;
case InternalFrameEvent.INTERNAL_FRAME_OPENED:
- for (int i = ifListeners.length - 2; i >= 0; i -= 2)
- {
- if (ifListeners[i] == InternalFrameListener.class)
- ((InternalFrameListener) ifListeners[i + 1]).internalFrameOpened(evt);
- }
- break;
+ for (int i = ifListeners.length - 2; i >= 0; i -= 2)
+ {
+ if (ifListeners[i] == InternalFrameListener.class)
+ ((InternalFrameListener) ifListeners[i + 1]).internalFrameOpened(evt);
+ }
+ break;
}
}
@@ -752,7 +752,7 @@ public class JInternalFrame extends JComponent implements Accessible,
* Returns the object that provides accessibility features for this
* <code>JInternalFrame</code> component.
*
- * @return The accessible context (an instance of
+ * @return The accessible context (an instance of
* {@link AccessibleJInternalFrame}).
*/
public AccessibleContext getAccessibleContext()
@@ -773,14 +773,14 @@ public class JInternalFrame extends JComponent implements Accessible,
}
/**
- * Returns a code for the default action taken when this
+ * Returns a code for the default action taken when this
* <code>JInternalFrame</code> is closed.
*
- * @return The action code (usually one of
- * {@link WindowConstants#DO_NOTHING_ON_CLOSE},
- * {@link WindowConstants#HIDE_ON_CLOSE}, or
+ * @return The action code (usually one of
+ * {@link WindowConstants#DO_NOTHING_ON_CLOSE},
+ * {@link WindowConstants#HIDE_ON_CLOSE}, or
* {@link WindowConstants#DISPOSE_ON_CLOSE}).
- *
+ *
* @see #setDefaultCloseOperation(int)
* @see #doDefaultCloseAction()
*/
@@ -790,7 +790,7 @@ public class JInternalFrame extends JComponent implements Accessible,
}
/**
- * Returns the <code>JDesktopIcon</code> that represents this
+ * Returns the <code>JDesktopIcon</code> that represents this
* <code>JInternalFrame</code> while it is iconified.
*
* @return The desktop icon component.
@@ -840,12 +840,12 @@ public class JInternalFrame extends JComponent implements Accessible,
{
if (isSelected())
{
- Component focus = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
- if (SwingUtilities.isDescendingFrom(focus, this))
- {
- defaultFocus = focus;
- return focus;
- }
+ Component focus = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+ if (SwingUtilities.isDescendingFrom(focus, this))
+ {
+ defaultFocus = focus;
+ return focus;
+ }
}
return null;
}
@@ -975,7 +975,7 @@ public class JInternalFrame extends JComponent implements Accessible,
* Returns the frame's title.
*
* @return The frame's title (can be <code>null</code>).
- *
+ *
* @see #setTitle(String)
*/
public String getTitle()
@@ -1161,14 +1161,14 @@ public class JInternalFrame extends JComponent implements Accessible,
{
try
{
- if (isIcon())
- setIcon(false);
- else if (isMaximum())
- setMaximum(false);
+ if (isIcon())
+ setIcon(false);
+ else if (isMaximum())
+ setMaximum(false);
}
catch (PropertyVetoException e)
{
- // Do nothing if they don't want to be restored first.
+ // Do nothing if they don't want to be restored first.
}
setSize(getPreferredSize());
validate();
@@ -1186,10 +1186,10 @@ public class JInternalFrame extends JComponent implements Accessible,
}
/**
- * An implementation dependent string describing the current state of this
+ * An implementation dependent string describing the current state of this
* <code>JInternalFrame</code> instance.
*
- * @return A string describing the current state of this
+ * @return A string describing the current state of this
* <code>JInternalFrame</code> instance.
*/
protected String paramString()
@@ -1300,22 +1300,22 @@ public class JInternalFrame extends JComponent implements Accessible,
{
if (c != getContentPane())
{
- Container old = getContentPane();
- getRootPane().setContentPane(c);
- firePropertyChange(CONTENT_PANE_PROPERTY, old, c);
+ Container old = getContentPane();
+ getRootPane().setContentPane(c);
+ firePropertyChange(CONTENT_PANE_PROPERTY, old, c);
}
}
/**
- * Sets a code for the action to be taken when this
- * <code>JInternalFrame</code> is closed. Note that no validation is
- * performed on the <code>operation</code> code, any integer will be
+ * Sets a code for the action to be taken when this
+ * <code>JInternalFrame</code> is closed. Note that no validation is
+ * performed on the <code>operation</code> code, any integer will be
* accepted (nevertheless, you should pass in one of the listed values).
*
- * @param operation one of {@link WindowConstants#DO_NOTHING_ON_CLOSE},
- * {@link WindowConstants#HIDE_ON_CLOSE} or
+ * @param operation one of {@link WindowConstants#DO_NOTHING_ON_CLOSE},
+ * {@link WindowConstants#HIDE_ON_CLOSE} or
* {@link WindowConstants#DISPOSE_ON_CLOSE}.
- *
+ *
* @see #getDefaultCloseOperation()
* @see #doDefaultCloseAction()
*/
@@ -1329,14 +1329,14 @@ public class JInternalFrame extends JComponent implements Accessible,
}
/**
- * Sets the <code>JDesktopIcon</code> instance that represents this
+ * Sets the <code>JDesktopIcon</code> instance that represents this
* <code>JInternalFrame</code> while it is iconified and, if the new icon is
- * not the same instance as the existing icon, sends a
- * {@link PropertyChangeEvent} (with the property name
+ * not the same instance as the existing icon, sends a
+ * {@link PropertyChangeEvent} (with the property name
* <code>"desktopIcon"</code>) to all registered listeners..
*
* @param d the icon.
- *
+ *
* @see #getDesktopIcon()
*/
public void setDesktopIcon(JDesktopIcon d)
@@ -1374,9 +1374,9 @@ public class JInternalFrame extends JComponent implements Accessible,
{
if (icon != frameIcon)
{
- Icon old = frameIcon;
- frameIcon = icon;
- firePropertyChange(FRAME_ICON_PROPERTY, old, frameIcon);
+ Icon old = frameIcon;
+ frameIcon = icon;
+ firePropertyChange(FRAME_ICON_PROPERTY, old, frameIcon);
}
}
@@ -1389,9 +1389,9 @@ public class JInternalFrame extends JComponent implements Accessible,
{
if (glass != getGlassPane())
{
- Component old = getGlassPane();
- getRootPane().setGlassPane(glass);
- firePropertyChange(GLASS_PANE_PROPERTY, old, glass);
+ Component old = getGlassPane();
+ getRootPane().setGlassPane(glass);
+ firePropertyChange(GLASS_PANE_PROPERTY, old, glass);
}
}
@@ -1409,15 +1409,15 @@ public class JInternalFrame extends JComponent implements Accessible,
{
if (b != isIcon())
{
- fireVetoableChange(IS_ICON_PROPERTY, b, isIcon);
+ fireVetoableChange(IS_ICON_PROPERTY, b, isIcon);
- isIcon = b;
+ isIcon = b;
- firePropertyChange(IS_ICON_PROPERTY, ! isIcon, isIcon);
- if (b)
- fireInternalFrameEvent(InternalFrameEvent.INTERNAL_FRAME_ICONIFIED);
- else
- fireInternalFrameEvent(InternalFrameEvent.INTERNAL_FRAME_DEICONIFIED);
+ firePropertyChange(IS_ICON_PROPERTY, ! isIcon, isIcon);
+ if (b)
+ fireInternalFrameEvent(InternalFrameEvent.INTERNAL_FRAME_ICONIFIED);
+ else
+ fireInternalFrameEvent(InternalFrameEvent.INTERNAL_FRAME_DEICONIFIED);
}
}
@@ -1496,9 +1496,9 @@ public class JInternalFrame extends JComponent implements Accessible,
if (layered != getLayeredPane())
{
- JLayeredPane old = getLayeredPane();
- getRootPane().setLayeredPane(layered);
- firePropertyChange(LAYERED_PANE_PROPERTY, old, layered);
+ JLayeredPane old = getLayeredPane();
+ getRootPane().setLayeredPane(layered);
+ firePropertyChange(LAYERED_PANE_PROPERTY, old, layered);
}
}
@@ -1549,9 +1549,9 @@ public class JInternalFrame extends JComponent implements Accessible,
{
if (b != isMaximum)
{
- fireVetoableChange(IS_MAXIMUM_PROPERTY, isMaximum, b);
- isMaximum = b;
- firePropertyChange(IS_MAXIMUM_PROPERTY, ! isMaximum, isMaximum);
+ fireVetoableChange(IS_MAXIMUM_PROPERTY, isMaximum, b);
+ isMaximum = b;
+ firePropertyChange(IS_MAXIMUM_PROPERTY, ! isMaximum, isMaximum);
}
}
@@ -1673,12 +1673,12 @@ public class JInternalFrame extends JComponent implements Accessible,
}
/**
- * Sets the title for the <code>JInternalFrame</code> and sends a
- * {@link PropertyChangeEvent} (with the property name
+ * Sets the title for the <code>JInternalFrame</code> and sends a
+ * {@link PropertyChangeEvent} (with the property name
* {@link #TITLE_PROPERTY}) to all registered listeners.
*
* @param title the new title (<code>null</code> permitted).
- *
+ *
* @see #getTitle()
*/
public void setTitle(String title)
@@ -1767,7 +1767,7 @@ public class JInternalFrame extends JComponent implements Accessible,
// We must go into the init stage when updating the UI, so the UI can
// set layout and components directly on the internal frame, not its
// content pane.
- boolean old = isRootPaneCheckingEnabled();
+ boolean old = isRootPaneCheckingEnabled();
setRootPaneCheckingEnabled(false);
setUI((InternalFrameUI) UIManager.getUI(this));
setRootPaneCheckingEnabled(old);
@@ -1785,8 +1785,8 @@ public class JInternalFrame extends JComponent implements Accessible,
{
if (b && ! wasIcon)
{
- wasIcon = b;
- firePropertyChange(ID, ! b, b);
+ wasIcon = b;
+ firePropertyChange(ID, ! b, b);
}
}
diff --git a/libjava/classpath/javax/swing/JLabel.java b/libjava/classpath/javax/swing/JLabel.java
index 2bbd1ee..72354c5 100644
--- a/libjava/classpath/javax/swing/JLabel.java
+++ b/libjava/classpath/javax/swing/JLabel.java
@@ -78,10 +78,10 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
extends JComponent.AccessibleJComponent
implements AccessibleText, AccessibleExtendedComponent
{
-
+
/**
* Returns the accessible name.
- *
+ *
* @return The accessible name.
*/
public String getAccessibleName()
@@ -93,7 +93,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
else
return super.getAccessibleName();
}
-
+
/**
* Returns the accessible role for the <code>JLabel</code> component.
*
@@ -103,7 +103,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
{
return AccessibleRole.LABEL;
}
-
+
/**
* Returns the selected text. This is null since JLabels
* are not selectable.
@@ -456,7 +456,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
}
/**
- * Creates a new horizontally leading and vertically centered JLabel
+ * Creates a new horizontally leading and vertically centered JLabel
* object with no icon and the given text.
*
* @param text The text to use with the label, <code>null</code> permitted.
@@ -492,13 +492,13 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
*/
public JLabel(String text, Icon icon, int horizontalAlignment)
{
- if (horizontalAlignment != SwingConstants.LEFT
- && horizontalAlignment != SwingConstants.RIGHT
- && horizontalAlignment != SwingConstants.CENTER
- && horizontalAlignment != SwingConstants.LEADING
+ if (horizontalAlignment != SwingConstants.LEFT
+ && horizontalAlignment != SwingConstants.RIGHT
+ && horizontalAlignment != SwingConstants.CENTER
+ && horizontalAlignment != SwingConstants.LEADING
&& horizontalAlignment != SwingConstants.TRAILING)
throw new IllegalArgumentException();
-
+
this.text = text;
this.icon = icon;
this.horizontalAlignment = horizontalAlignment;
@@ -528,7 +528,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
}
/**
- * Resets the label's UI delegate to the default UI for the current look and
+ * Resets the label's UI delegate to the default UI for the current look and
* feel.
*/
public void updateUI()
@@ -549,7 +549,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
/**
* Returns a string describing the attributes for the <code>JLabel</code>
- * component, for use in debugging. The return value is guaranteed to be
+ * component, for use in debugging. The return value is guaranteed to be
* non-<code>null</code>, but the format of the string may vary between
* implementations.
*
@@ -590,7 +590,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
* Returns the text displayed by the label.
*
* @return The label text (possibly <code>null</code>).
- *
+ *
* @see #setText(String)
*/
public String getText()
@@ -600,11 +600,11 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
/**
* Sets the text for the label and sends a {@link PropertyChangeEvent} (with
- * the name 'text') to all registered listeners. This method will also
+ * the name 'text') to all registered listeners. This method will also
* update the <code>displayedMnemonicIndex</code>, if necessary.
*
* @param newText The text (<code>null</code> permitted).
- *
+ *
* @see #getText()
* @see #getDisplayedMnemonicIndex()
*/
@@ -628,11 +628,11 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
}
/**
- * Returns the active icon. The active icon is painted when the label is
+ * Returns the active icon. The active icon is painted when the label is
* enabled.
*
* @return The active icon.
- *
+ *
* @see #setIcon(Icon)
* @see #getDisabledIcon()
*/
@@ -642,11 +642,11 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
}
/**
- * Sets the icon for the label (this is a bound property with the name
+ * Sets the icon for the label (this is a bound property with the name
* 'icon'). This icon will be displayed when the label is enabled.
*
* @param newIcon The icon (<code>null</code> permitted).
- *
+ *
* @see #getIcon()
* @see #setDisabledIcon(Icon)
*/
@@ -662,13 +662,13 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
}
/**
- * Returns the disabled icon. The disabled icon is painted when the label is
+ * Returns the disabled icon. The disabled icon is painted when the label is
* disabled. If the disabled icon is <code>null</code> and the active icon
- * is an {@link ImageIcon}, this method returns a grayed version of the icon.
+ * is an {@link ImageIcon}, this method returns a grayed version of the icon.
* The grayed version of the icon becomes the <code>disabledIcon</code>.
*
* @return The disabled icon.
- *
+ *
* @see #setDisabledIcon(Icon)
*/
public Icon getDisabledIcon()
@@ -685,7 +685,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
* property with the name 'disabledIcon').
*
* @param newIcon The disabled icon (<code>null</code> permitted).
- *
+ *
* @see #getDisabledIcon()
*/
public void setDisabledIcon(Icon newIcon)
@@ -700,12 +700,12 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
/**
* Sets the keycode that will be the label's mnemonic (this is a bound
- * property with the name 'displayedMnemonic'). If the label is used as a
- * label for another component, the label will give focus to that component
+ * property with the name 'displayedMnemonic'). If the label is used as a
+ * label for another component, the label will give focus to that component
* when the mnemonic is activated.
*
* @param mnemonic The keycode to use for the mnemonic.
- *
+ *
* @see #getDisplayedMnemonic()
*/
public void setDisplayedMnemonic(int mnemonic)
@@ -727,7 +727,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
*
* @param mnemonic The character to use for the mnemonic (this will be
* converted to the equivalent upper case character).
- *
+ *
* @see #getDisplayedMnemonic()
*/
public void setDisplayedMnemonic(char mnemonic)
@@ -739,7 +739,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
* Returns the keycode that is used for the label's mnemonic.
*
* @return The keycode that is used for the label's mnemonic.
- *
+ *
* @see #setDisplayedMnemonic(int)
*/
public int getDisplayedMnemonic()
@@ -755,7 +755,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
* character 'n', you might wish to underline the second occurrence of 'n'
* rather than the first (which is the default).
* <br><br>
- * Note that this method does not validate the character at the specified
+ * Note that this method does not validate the character at the specified
* index to ensure that it matches the key code returned by
* {@link #getDisplayedMnemonic()}.
*
@@ -763,7 +763,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
*
* @throws IllegalArgumentException If index less than -1 or index is greater
* than or equal to the label length.
- *
+ *
* @see #getDisplayedMnemonicIndex()
* @since 1.4
*/
@@ -790,7 +790,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
* character is to be underlined.
*
* @return The index of the character that will be underlined.
- *
+ *
* @see #setDisplayedMnemonicIndex(int)
* @since 1.4
*/
@@ -800,9 +800,9 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
}
/**
- * Checks the specified key to ensure that it is valid as a horizontal
+ * Checks the specified key to ensure that it is valid as a horizontal
* alignment, throwing an {@link IllegalArgumentException} if the key is
- * invalid. Valid keys are {@link #LEFT}, {@link #CENTER}, {@link #RIGHT},
+ * invalid. Valid keys are {@link #LEFT}, {@link #CENTER}, {@link #RIGHT},
* {@link #LEADING} and {@link #TRAILING}.
*
* @param key The key to check.
@@ -823,7 +823,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
}
/**
- * Checks the specified key to ensure that it is valid as a vertical
+ * Checks the specified key to ensure that it is valid as a vertical
* alignment, throwing an {@link IllegalArgumentException} if the key is
* invalid. Valid keys are {@link #TOP}, {@link #CENTER} and {@link #BOTTOM}.
*
@@ -847,7 +847,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
* Returns the gap between the icon and the text.
*
* @return The gap between the icon and the text.
- *
+ *
* @see #setIconTextGap(int)
*/
public int getIconTextGap()
@@ -856,19 +856,19 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
}
/**
- * Sets the gap between the icon and the text, in the case that both are
- * visible (this is a bound property with the name 'iconTextGap').
+ * Sets the gap between the icon and the text, in the case that both are
+ * visible (this is a bound property with the name 'iconTextGap').
*
* @param newGap The gap (in pixels).
- *
+ *
* @see #getIconTextGap()
*/
public void setIconTextGap(int newGap)
{
if (iconTextGap != newGap)
{
- firePropertyChange("iconTextGap", iconTextGap, newGap);
- iconTextGap = newGap;
+ firePropertyChange("iconTextGap", iconTextGap, newGap);
+ iconTextGap = newGap;
}
}
@@ -878,7 +878,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
* depends on the installed look and feel, but is usually {@link #CENTER}.
*
* @return The vertical alignment.
- *
+ *
* @see #setVerticalAlignment(int)
*/
public int getVerticalAlignment()
@@ -888,16 +888,16 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
/**
* Sets the vertical alignment for the label (this is a bound property with
- * the name 'verticalAlignment'). The vertical alignment determines where
- * the label (icon and text) will be placed vertically within the component
- * bounds. Valid alignment codes are {@link #TOP}, {@link #CENTER} and
+ * the name 'verticalAlignment'). The vertical alignment determines where
+ * the label (icon and text) will be placed vertically within the component
+ * bounds. Valid alignment codes are {@link #TOP}, {@link #CENTER} and
* {@link #BOTTOM}.
*
* @param alignment The vertical alignment of the label.
- *
- * @throws IllegalArgumentException if <code>alignment</code> is not one of
+ *
+ * @throws IllegalArgumentException if <code>alignment</code> is not one of
* the specified values.
- *
+ *
* @see #getVerticalAlignment()
*/
public void setVerticalAlignment(int alignment)
@@ -911,13 +911,13 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
}
/**
- * Returns the horizontal alignment of the label (one of {@link #LEFT},
+ * Returns the horizontal alignment of the label (one of {@link #LEFT},
* {@link #CENTER}, {@link #RIGHT}, {@link #LEADING} and {@link #TRAILING}).
- * The default value depends on the installed look and feel, but is usually
+ * The default value depends on the installed look and feel, but is usually
* {@link #LEFT}.
*
* @return The horizontal alignment.
- *
+ *
* @see #setHorizontalAlignment(int)
*/
public int getHorizontalAlignment()
@@ -927,23 +927,23 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
/**
* Sets the horizontal alignment for the label (this is a bound property with
- * the name 'horizontalAlignment'). The horizontal alignment determines where
- * the label (icon and text) will be placed horizontally within the
- * component bounds. Valid alignment codes are {@link #LEFT},
+ * the name 'horizontalAlignment'). The horizontal alignment determines where
+ * the label (icon and text) will be placed horizontally within the
+ * component bounds. Valid alignment codes are {@link #LEFT},
* {@link #CENTER}, {@link #RIGHT}, {@link #LEADING} and {@link #TRAILING}.
*
* @param alignment The horizontal alignment of the label.
- *
- * @throws IllegalArgumentException if <code>alignment</code> is not one of
+ *
+ * @throws IllegalArgumentException if <code>alignment</code> is not one of
* the specified values.
- *
+ *
* @see #getHorizontalAlignment()
*/
public void setHorizontalAlignment(int alignment)
{
if (horizontalAlignment == alignment)
return;
-
+
int oldAlignment = horizontalAlignment;
horizontalAlignment = checkHorizontalKey(alignment, "horizontalAlignment");
firePropertyChange("horizontalAlignment", oldAlignment,
@@ -951,11 +951,11 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
}
/**
- * Returns the vertical position of the label's text relative to the icon.
+ * Returns the vertical position of the label's text relative to the icon.
* This will be one of {@link #TOP}, {@link #CENTER} and {@link #BOTTOM}.
- *
+ *
* @return The vertical position of the label's text relative to the icon.
- *
+ *
* @see #setVerticalTextPosition(int)
*/
public int getVerticalTextPosition()
@@ -965,11 +965,11 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
/**
* Sets the vertical position of the label's text relative to the icon (this
- * is a bound property with the name 'verticalTextPosition'). Valid
+ * is a bound property with the name 'verticalTextPosition'). Valid
* positions are {@link #TOP}, {@link #CENTER} and {@link #BOTTOM}.
*
* @param textPosition The vertical text position.
- *
+ *
* @throws IllegalArgumentException if <code>textPosition</code> is not one
* of the specified values.
*/
@@ -979,19 +979,19 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
{
int oldPos = verticalTextPosition;
verticalTextPosition = checkVerticalKey(textPosition,
- "verticalTextPosition");
- firePropertyChange("verticalTextPosition", oldPos,
+ "verticalTextPosition");
+ firePropertyChange("verticalTextPosition", oldPos,
verticalTextPosition);
}
}
/**
- * Returns the horizontal position of the label's text relative to the icon.
- * This will be one of {@link #LEFT}, {@link #CENTER}, {@link #RIGHT},
+ * Returns the horizontal position of the label's text relative to the icon.
+ * This will be one of {@link #LEFT}, {@link #CENTER}, {@link #RIGHT},
* {@link #LEADING} and {@link #TRAILING}.
- *
+ *
* @return The horizontal position of the label's text relative to the icon.
- *
+ *
* @see #setHorizontalTextPosition(int)
*/
public int getHorizontalTextPosition()
@@ -1001,12 +1001,12 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
/**
* Sets the horizontal position of the label's text relative to the icon (this
- * is a bound property with the name 'horizontalTextPosition'). Valid
- * positions are {@link #LEFT}, {@link #CENTER}, {@link #RIGHT},
+ * is a bound property with the name 'horizontalTextPosition'). Valid
+ * positions are {@link #LEFT}, {@link #CENTER}, {@link #RIGHT},
* {@link #LEADING} and {@link #TRAILING}.
*
* @param textPosition The horizontal text position.
- *
+ *
* @throws IllegalArgumentException if <code>textPosition</code> is not one
* of the specified values.
*/
@@ -1017,13 +1017,13 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
int oldPos = horizontalTextPosition;
horizontalTextPosition = checkHorizontalKey(textPosition,
"horizontalTextPosition");
- firePropertyChange("horizontalTextPosition", oldPos,
+ firePropertyChange("horizontalTextPosition", oldPos,
horizontalTextPosition);
}
}
/**
- * Returns false if the current icon image (current icon will depend on
+ * Returns false if the current icon image (current icon will depend on
* whether the label is enabled) is not equal to the passed in image.
*
* @param img The image to check.
@@ -1050,7 +1050,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
/**
* Returns the component that this <code>JLabel</code> is providing the label
- * for. This component will typically receive the focus when the label's
+ * for. This component will typically receive the focus when the label's
* mnemonic key is activated via the keyboard.
*
* @return The component (possibly <code>null</code>).
@@ -1063,11 +1063,11 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
/**
* Sets the component that this <code>JLabel</code> is providing the label
* for (this is a bound property with the name 'labelFor'). This component
- * will typically receive the focus when the label's mnemonic key is
+ * will typically receive the focus when the label's mnemonic key is
* activated via the keyboard.
*
* @param c the component (<code>null</code> permitted).
- *
+ *
* @see #getLabelFor()
*/
public void setLabelFor(Component c)
diff --git a/libjava/classpath/javax/swing/JLayeredPane.java b/libjava/classpath/javax/swing/JLayeredPane.java
index d981788..9a4e31e 100644
--- a/libjava/classpath/javax/swing/JLayeredPane.java
+++ b/libjava/classpath/javax/swing/JLayeredPane.java
@@ -1,4 +1,4 @@
-/* JLayeredPane.java --
+/* JLayeredPane.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -85,7 +85,7 @@ import javax.accessibility.AccessibleRole;
* </p>
*
* <p>To change the layer of a component that is already a child of
- * a <code>JLayeredPane</code>, use the {@link #setLayer(Component, int)}
+ * a <code>JLayeredPane</code>, use the {@link #setLayer(Component, int)}
* method.</p>
*
* <p>The purpose of this class is to translate this view of "layers" into a
@@ -94,9 +94,9 @@ import javax.accessibility.AccessibleRole;
*
* <p>There is a precise set of words we will use to refer to numbers within
* this class:</p>
- *
+ *
* <dl>
- * <dt>Component Index:</dt>
+ * <dt>Component Index:</dt>
* <dd>An offset into the <code>component</code> array held in our ancestor,
* {@link java.awt.Container}, from <code>[0 .. component.length)</code>. The drawing
* rule with indices is that 0 is drawn last.</dd>
@@ -106,7 +106,7 @@ import javax.accessibility.AccessibleRole;
* numbers are drawn first, then layer 0, then positive numbered layers, in
* ascending order.</dd>
*
- * <dt>Position:</dt>
+ * <dt>Position:</dt>
* <dd>An offset into a layer's "logical drawing order". Layer position 0
* is drawn last. Layer position -1 is a synonym for the first layer
* position (the logical "bottom").</dd>
@@ -120,7 +120,7 @@ import javax.accessibility.AccessibleRole;
*/
public class JLayeredPane extends JComponent implements Accessible
{
-
+
/**
* Provides accessibility support for <code>JLayeredPane</code>.
*/
@@ -136,7 +136,7 @@ public class JLayeredPane extends JComponent implements Accessible
/**
* Returns the accessble role of <code>JLayeredPane</code>,
- * {@link AccessibleRole#LAYERED_PANE}.
+ * {@link AccessibleRole#LAYERED_PANE}.
*/
public AccessibleRole getAccessibleRole()
{
@@ -145,7 +145,7 @@ public class JLayeredPane extends JComponent implements Accessible
}
private static final long serialVersionUID = 5534920399324590459L;
-
+
public static final String LAYER_PROPERTY = "layeredContainerLayer";
public static final Integer FRAME_CONTENT_LAYER = new Integer(-30000);
@@ -164,7 +164,7 @@ public class JLayeredPane extends JComponent implements Accessible
setLayout(null);
}
- /**
+ /**
* Looks up the layer a child component is currently assigned to.
*
* If <code>c</code> is an instance of {@link JComponent}, then the layer
@@ -199,7 +199,7 @@ public class JLayeredPane extends JComponent implements Accessible
* Looks up the layer in the client property with the key
* {@link #LAYER_PROPERTY} of <code>comp</code>. If no such property can be
* found, we return <code>0</code> ({@link #DEFAULT_LAYER}).
- *
+ *
* @param comp the component for which the layer is looked up
*
* @return the layer of <code>comp</code> as stored in the corresponding
@@ -313,7 +313,7 @@ public class JLayeredPane extends JComponent implements Accessible
/**
* Return the position of a component within its layer. Positions are assigned
- * from the "front" (position 0) to the "back" (position N-1), and drawn from
+ * from the "front" (position 0) to the "back" (position N-1), and drawn from
* the back towards the front.
*
* @param c the component to get the position of
@@ -344,7 +344,7 @@ public class JLayeredPane extends JComponent implements Accessible
/**
* Change the position of a component within its layer. Positions are assigned
- * from the "front" (position 0) to the "back" (position N-1), and drawn from
+ * from the "front" (position 0) to the "back" (position N-1), and drawn from
* the back towards the front.
*
* @param c the component to change the position of
@@ -356,7 +356,7 @@ public class JLayeredPane extends JComponent implements Accessible
{
setLayer(c, getLayer(c), position);
}
-
+
/**
* Return an array of all components within a layer of this
* container. Components are ordered front-to-back, with the "front"
@@ -420,9 +420,9 @@ public class JLayeredPane extends JComponent implements Accessible
* @param c the component to look up.
*
* @return the external index of the component or <code>-1</code> if
- * <code>c</code> is not a child of this layered pane
+ * <code>c</code> is not a child of this layered pane
*/
- public int getIndexOf(Component c)
+ public int getIndexOf(Component c)
{
return getComponentZOrder(c);
}
@@ -439,28 +439,28 @@ public class JLayeredPane extends JComponent implements Accessible
protected Integer getObjectForLayer(int layer)
{
switch (layer)
- {
- case -30000:
+ {
+ case -30000:
return FRAME_CONTENT_LAYER;
- case 0:
+ case 0:
return DEFAULT_LAYER;
- case 100:
+ case 100:
return PALETTE_LAYER;
- case 200:
+ case 200:
return MODAL_LAYER;
- case 300:
+ case 300:
return POPUP_LAYER;
- case 400:
+ case 400:
return DRAG_LAYER;
- default:
+ default:
break;
- }
+ }
return new Integer(layer);
}
@@ -579,8 +579,8 @@ public class JLayeredPane extends JComponent implements Accessible
*/
public void removeAll()
{
- componentToLayer.clear();
- super.removeAll();
+ componentToLayer.clear();
+ super.removeAll();
}
/**
@@ -650,7 +650,7 @@ public class JLayeredPane extends JComponent implements Accessible
* component to
* @param index the position within the layer
*/
- protected void addImpl(Component comp, Object layerConstraint, int index)
+ protected void addImpl(Component comp, Object layerConstraint, int index)
{
int layer;
if (layerConstraint != null && layerConstraint instanceof Integer)
@@ -726,14 +726,14 @@ public class JLayeredPane extends JComponent implements Accessible
boolean result = true;
for (int i = 0; i < numChildren; ++i)
{
- Component c1 = getComponent(i);
- if (! c1.isVisible())
+ Component c1 = getComponent(i);
+ if (! c1.isVisible())
continue;
- Rectangle r1 = c1.getBounds();
- if (r1.isEmpty())
+ Rectangle r1 = c1.getBounds();
+ if (r1.isEmpty())
continue;
- for (int j = i + 1; j < numChildren; ++j)
+ for (int j = i + 1; j < numChildren; ++j)
{
Component c2 = getComponent(j);
if (! c2.isVisible())
diff --git a/libjava/classpath/javax/swing/JList.java b/libjava/classpath/javax/swing/JList.java
index bd74406..b12fda3 100644
--- a/libjava/classpath/javax/swing/JList.java
+++ b/libjava/classpath/javax/swing/JList.java
@@ -115,7 +115,7 @@ import javax.swing.text.Position;
* <tr><td>UIClassID </td><td>list </td><td>no </td></tr>
* <tr><td>valueIsAdjusting </td><td>list </td><td>no </td></tr>
* <tr><td>visibleRowCount </td><td>list </td><td>no </td></tr>
- * </table>
+ * </table>
*
* @author Graydon Hoare (graydon@redhat.com)
*/
@@ -277,7 +277,7 @@ public class JList extends JComponent implements Accessible, Scrollable
/**
* Returns the font metrics for the specified font. This method forwards
- * to the parent <code>JList</code>.
+ * to the parent <code>JList</code>.
*
* @param font the font for which the font metrics is queried
*
@@ -539,7 +539,7 @@ public class JList extends JComponent implements Accessible, Scrollable
// selectable. Is there a way to disable single children?
if (parent.isEnabled())
states.add(AccessibleState.SELECTABLE);
-
+
if (parent.isSelectedIndex(listIndex))
states.add(AccessibleState.SELECTED);
@@ -613,10 +613,10 @@ public class JList extends JComponent implements Accessible, Scrollable
{
// Do nothing here.
}
-
+
// TODO: Implement the remaining methods of this class.
}
-
+
/**
* Create a new AccessibleJList.
*/
@@ -854,23 +854,23 @@ public class JList extends JComponent implements Accessible, Scrollable
private static final long serialVersionUID = 4406629526391098046L;
- /**
+ /**
* Constant value used in "layoutOrientation" property. This value means
- * that cells are laid out in a single vertical column. This is the default.
+ * that cells are laid out in a single vertical column. This is the default.
*/
public static final int VERTICAL = 0;
- /**
+ /**
* Constant value used in "layoutOrientation" property. This value means
* that cells are laid out in multiple columns "newspaper style", filling
- * vertically first, then horizontally.
+ * vertically first, then horizontally.
*/
public static final int VERTICAL_WRAP = 1;
-
- /**
+
+ /**
* Constant value used in "layoutOrientation" property. This value means
* that cells are laid out in multiple columns "newspaper style",
- * filling horizontally first, then vertically.
+ * filling horizontally first, then vertically.
*/
public static final int HORIZONTAL_WRAP = 2;
@@ -890,7 +890,7 @@ public class JList extends JComponent implements Accessible, Scrollable
* the {@link #prototypeCellValue} property.
*/
int fixedCellWidth;
-
+
/**
* This property indicates an fixed height to assign to all cells in the
* list. If its value is <code>-1</code>, no height has been
@@ -899,13 +899,13 @@ public class JList extends JComponent implements Accessible, Scrollable
*/
int fixedCellHeight;
- /**
+ /**
* This property holds the current layout orientation of the list, which
* is one of the integer constants {@link #VERTICAL}, {@link
- * #VERTICAL_WRAP}, or {@link #HORIZONTAL_WRAP}.
+ * #VERTICAL_WRAP}, or {@link #HORIZONTAL_WRAP}.
*/
int layoutOrientation;
-
+
/** This property holds the data elements displayed by the list. */
ListModel model;
@@ -923,7 +923,7 @@ public class JList extends JComponent implements Accessible, Scrollable
*/
Object prototypeCellValue;
- /**
+ /**
* This property specifies a foreground color for the selected cells in
* the list. When {@link ListCellRenderer#getListCellRendererComponent}
* is called with a selected cell object, the component returned will
@@ -931,7 +931,7 @@ public class JList extends JComponent implements Accessible, Scrollable
*/
Color selectionBackground;
- /**
+ /**
* This property specifies a background color for the selected cells in
* the list. When {@link ListCellRenderer#getListCellRendererComponent}
* is called with a selected cell object, the component returned will
@@ -939,14 +939,14 @@ public class JList extends JComponent implements Accessible, Scrollable
*/
Color selectionForeground;
- /**
+ /**
* This property holds a description of which data elements in the {@link
* #model} property should be considered "selected", when displaying and
* interacting with the list.
*/
ListSelectionModel selectionModel;
- /**
+ /**
* This property indicates a <em>preference</em> for the number of rows
* displayed in the list, and will scale the
* {@link #getPreferredScrollableViewportSize} property accordingly. The actual
@@ -956,18 +956,18 @@ public class JList extends JComponent implements Accessible, Scrollable
int visibleRowCount;
/**
- * Fire a {@link ListSelectionEvent} to all the registered
+ * Fire a {@link ListSelectionEvent} to all the registered
* ListSelectionListeners.
- *
+ *
* @param firstIndex the lowest index covering the selection change.
* @param lastIndex the highest index covering the selection change.
* @param isAdjusting a flag indicating if this event is one in a series
* of events updating the selection.
*/
- protected void fireSelectionValueChanged(int firstIndex, int lastIndex,
- boolean isAdjusting)
+ protected void fireSelectionValueChanged(int firstIndex, int lastIndex,
+ boolean isAdjusting)
{
- ListSelectionEvent evt = new ListSelectionEvent(this, firstIndex,
+ ListSelectionEvent evt = new ListSelectionEvent(this, firstIndex,
lastIndex, isAdjusting);
ListSelectionListener listeners[] = getListSelectionListeners();
for (int i = 0; i < listeners.length; ++i)
@@ -984,7 +984,7 @@ public class JList extends JComponent implements Accessible, Scrollable
* class receives either type of event, it triggers repainting of the
* list.
*/
- private class ListListener
+ private class ListListener
implements ListSelectionListener, ListDataListener
{
// ListDataListener events
@@ -1013,7 +1013,7 @@ public class JList extends JComponent implements Accessible, Scrollable
}
}
- /**
+ /**
* Shared ListListener instance, subscribed to both the current {@link
* #model} and {@link #selectionModel} properties of the list.
*/
@@ -1053,8 +1053,8 @@ public class JList extends JComponent implements Accessible, Scrollable
*
* @param model a model containing the list items (<code>null</code> not
* permitted).
- *
- * @throws IllegalArgumentException if <code>model</code> is
+ *
+ * @throws IllegalArgumentException if <code>model</code> is
* <code>null</code>.
*/
public JList(ListModel model)
@@ -1093,7 +1093,7 @@ public class JList extends JComponent implements Accessible, Scrollable
(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
}
setLayout(null);
-
+
updateUI();
}
@@ -1106,15 +1106,15 @@ public class JList extends JComponent implements Accessible, Scrollable
{
return new DefaultListSelectionModel();
}
-
+
/**
* Gets the value of the {@link #fixedCellHeight} property. This property
* may be <code>-1</code> to indicate that no cell height has been
* set. This property is also set implicitly when the
* {@link #prototypeCellValue} property is set.
*
- * @return The current value of the property
- *
+ * @return The current value of the property
+ *
* @see #fixedCellHeight
* @see #setFixedCellHeight
* @see #setPrototypeCellValue
@@ -1132,7 +1132,7 @@ public class JList extends JComponent implements Accessible, Scrollable
* overrides the height computed from {@link #prototypeCellValue}.
*
* @param h the height.
- *
+ *
* @see #getFixedCellHeight
* @see #getPrototypeCellValue
*/
@@ -1153,8 +1153,8 @@ public class JList extends JComponent implements Accessible, Scrollable
* set. This property is also set implicitly when the {@link
* #prototypeCellValue} property is set.
*
- * @return The current value of the property
- *
+ * @return The current value of the property
+ *
* @see #setFixedCellWidth
* @see #setPrototypeCellValue
*/
@@ -1171,7 +1171,7 @@ public class JList extends JComponent implements Accessible, Scrollable
* overrides the width computed from {@link #prototypeCellValue}.
*
* @param w the width.
- *
+ *
* @see #getFixedCellHeight
* @see #getPrototypeCellValue
*/
@@ -1179,18 +1179,18 @@ public class JList extends JComponent implements Accessible, Scrollable
{
if (fixedCellWidth == w)
return;
-
+
int old = fixedCellWidth;
fixedCellWidth = w;
firePropertyChange("fixedCellWidth", old, w);
}
- /**
- * Gets the value of the {@link #visibleRowCount} property. The default
+ /**
+ * Gets the value of the {@link #visibleRowCount} property. The default
* value is 8.
*
* @return the current value of the property.
- *
+ *
* @see #setVisibleRowCount(int)
*/
public int getVisibleRowCount()
@@ -1199,10 +1199,10 @@ public class JList extends JComponent implements Accessible, Scrollable
}
/**
- * Sets the value of the {@link #visibleRowCount} property.
+ * Sets the value of the {@link #visibleRowCount} property.
*
* @param vc The new property value
- *
+ *
* @see #getVisibleRowCount()
*/
public void setVisibleRowCount(int vc)
@@ -1245,7 +1245,7 @@ public class JList extends JComponent implements Accessible, Scrollable
/**
* Returns an array of all ListSelectionListeners subscribed to this
- * list.
+ * list.
*
* @return The current subscribed listeners
*
@@ -1257,20 +1257,20 @@ public class JList extends JComponent implements Accessible, Scrollable
}
/**
- * Returns the selection mode for the list (one of:
- * {@link ListSelectionModel#SINGLE_SELECTION},
- * {@link ListSelectionModel#SINGLE_INTERVAL_SELECTION} and
+ * Returns the selection mode for the list (one of:
+ * {@link ListSelectionModel#SINGLE_SELECTION},
+ * {@link ListSelectionModel#SINGLE_INTERVAL_SELECTION} and
* {@link ListSelectionModel#MULTIPLE_INTERVAL_SELECTION}).
- *
+ *
* @return The selection mode.
- *
+ *
* @see #setSelectionMode(int)
*/
public int getSelectionMode()
{
return selectionModel.getSelectionMode();
}
-
+
/**
* Sets the list's "selectionMode" property, which simply mirrors the
* same property on the list's {@link #selectionModel} property. This
@@ -1290,7 +1290,7 @@ public class JList extends JComponent implements Accessible, Scrollable
* Adds the interval <code>[a,a]</code> to the set of selections managed
* by this list's {@link #selectionModel} property. Depending on the
* selection mode, this may cause existing selections to become invalid,
- * or may simply expand the set of selections.
+ * or may simply expand the set of selections.
*
* @param a A number in the half-open range <code>[0, x)</code> where
* <code>x = getModel.getSize()</code>, indicating the index of an
@@ -1312,7 +1312,7 @@ public class JList extends JComponent implements Accessible, Scrollable
* <code>a</code>, calls {@link #setSelectedIndex} on <code>a[i]</code>.
*
* @param a an array of selected indices (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
* @see #setSelectionMode
* @see #selectionModel
@@ -1339,7 +1339,7 @@ public class JList extends JComponent implements Accessible, Scrollable
/**
* Returns <code>true</code> if the model's selection is empty, otherwise
- * <code>false</code>.
+ * <code>false</code>.
*
* @return The return value of {@link ListSelectionModel#isSelectionEmpty}
*/
@@ -1362,7 +1362,7 @@ public class JList extends JComponent implements Accessible, Scrollable
Rectangle r = getVisibleRect();
if (or == ComponentOrientation.RIGHT_TO_LEFT)
r.translate((int) r.getWidth() - 1, 0);
- return getUI().locationToIndex(this, r.getLocation());
+ return getUI().locationToIndex(this, r.getLocation());
}
@@ -1373,18 +1373,18 @@ public class JList extends JComponent implements Accessible, Scrollable
* <code>-1</code> is returned.
*
* @param location for which to look for in the list
- *
+ *
* @return index of the cell to which specified location is closest to.
*/
public int locationToIndex(Point location)
{
- return getUI().locationToIndex(this, location);
+ return getUI().locationToIndex(this, location);
}
/**
* Returns location of the cell located at the specified index in the list.
* @param index of the cell for which location will be determined
- *
+ *
* @return location of the cell located at the specified index in the list.
*/
public Point indexToLocation(int index)
@@ -1443,7 +1443,7 @@ public class JList extends JComponent implements Accessible, Scrollable
* Indicates whether the list element at a given index value is
* currently selected.
*
- * @param a The index to check
+ * @param a The index to check
* @return <code>true</code> if <code>a</code> is the index of a selected
* list element
*/
@@ -1476,7 +1476,7 @@ public class JList extends JComponent implements Accessible, Scrollable
/**
* Returns all the values in the list's {@link #model} property which are
* selected, according to the list's {@link #selectionModel} property.
- *
+ *
* @return An array containing all the selected values
* @see #setSelectedValue
*/
@@ -1524,7 +1524,7 @@ public class JList extends JComponent implements Accessible, Scrollable
{
return selectionForeground;
}
-
+
/**
* Sets the value of the {@link #selectionForeground} property.
*
@@ -1542,7 +1542,7 @@ public class JList extends JComponent implements Accessible, Scrollable
/**
* Sets the selection to cover only the specified value, if it
- * exists in the model.
+ * exists in the model.
*
* @param obj The object to select
* @param scroll Whether to scroll the list to make the newly selected
@@ -1595,9 +1595,9 @@ public class JList extends JComponent implements Accessible, Scrollable
/**
* Returns a {@link ListModel} backed by the specified array.
- *
+ *
* @param items the list items (don't use <code>null</code>).
- *
+ *
* @return A list model containing the specified items.
*/
private ListModel createListModel(final Object[] items)
@@ -1614,12 +1614,12 @@ public class JList extends JComponent implements Accessible, Scrollable
}
};
}
-
+
/**
* Returns a {@link ListModel} backed by the specified vector.
- *
+ *
* @param items the list items (don't use <code>null</code>).
- *
+ *
* @return A list model containing the specified items.
*/
private ListModel createListModel(final Vector items)
@@ -1649,20 +1649,20 @@ public class JList extends JComponent implements Accessible, Scrollable
{
setModel(new AbstractListModel()
{
- public int getSize()
- {
- return listData.size();
- }
-
- public Object getElementAt(int i)
- {
- return listData.elementAt(i);
- }
+ public int getSize()
+ {
+ return listData.size();
+ }
+
+ public Object getElementAt(int i)
+ {
+ return listData.elementAt(i);
+ }
});
}
/**
- * Gets the value of the {@link #cellRenderer} property.
+ * Gets the value of the {@link #cellRenderer} property.
*
* @return The current value of the property
*/
@@ -1680,7 +1680,7 @@ public class JList extends JComponent implements Accessible, Scrollable
{
if (cellRenderer == renderer)
return;
-
+
ListCellRenderer old = cellRenderer;
cellRenderer = renderer;
firePropertyChange("cellRenderer", old, renderer);
@@ -1689,7 +1689,7 @@ public class JList extends JComponent implements Accessible, Scrollable
}
/**
- * Gets the value of the {@link #model} property.
+ * Gets the value of the {@link #model} property.
*
* @return The current value of the property
*/
@@ -1704,26 +1704,26 @@ public class JList extends JComponent implements Accessible, Scrollable
* and re-subscribed to the new model.
*
* @param model the new model (<code>null</code> not permitted).
- *
- * @throws IllegalArgumentException if <code>model</code> is
+ *
+ * @throws IllegalArgumentException if <code>model</code> is
* <code>null</code>.
*/
public void setModel(ListModel model)
{
- if (model == null)
+ if (model == null)
throw new IllegalArgumentException("Null 'model' argument.");
if (this.model == model)
return;
-
+
if (this.model != null)
this.model.removeListDataListener(listListener);
-
+
ListModel old = this.model;
this.model = model;
-
+
if (this.model != null)
this.model.addListDataListener(listListener);
-
+
firePropertyChange("model", old, model);
revalidate();
repaint();
@@ -1741,7 +1741,7 @@ public class JList extends JComponent implements Accessible, Scrollable
* <li>{@link #setSelectedIndices(int[])};</li>
* <li>{@link #setSelectionInterval(int, int)}.</li>
* </ul>
- *
+ *
* @return The selection model.
*/
public ListSelectionModel getSelectionModel()
@@ -1760,16 +1760,16 @@ public class JList extends JComponent implements Accessible, Scrollable
{
if (selectionModel == model)
return;
-
+
if (selectionModel != null)
selectionModel.removeListSelectionListener(listListener);
-
+
ListSelectionModel old = selectionModel;
selectionModel = model;
-
+
if (selectionModel != null)
selectionModel.addListSelectionListener(listListener);
-
+
firePropertyChange("selectionModel", old, model);
revalidate();
repaint();
@@ -1855,7 +1855,7 @@ public class JList extends JComponent implements Accessible, Scrollable
Object old = prototypeCellValue;
Component comp = getCellRenderer()
- .getListCellRendererComponent(this, obj, 0, false, false);
+ .getListCellRendererComponent(this, obj, 0, false, false);
Dimension d = comp.getPreferredSize();
fixedCellWidth = d.width;
fixedCellHeight = d.height;
@@ -1878,19 +1878,19 @@ public class JList extends JComponent implements Accessible, Scrollable
*/
public Dimension getPreferredScrollableViewportSize()
{
- //If the layout orientation is not VERTICAL, then this will
- //return the value from getPreferredSize. The current ListUI is
+ //If the layout orientation is not VERTICAL, then this will
+ //return the value from getPreferredSize. The current ListUI is
//expected to override getPreferredSize to return an appropriate value.
if (getLayoutOrientation() != VERTICAL)
- return getPreferredSize();
+ return getPreferredSize();
int size = getModel().getSize();
-
- // Trivial case: if fixedCellWidth and fixedCellHeight were set
+
+ // Trivial case: if fixedCellWidth and fixedCellHeight were set
// just use them
if (fixedCellHeight != -1 && fixedCellWidth != -1)
return new Dimension(fixedCellWidth, size * fixedCellHeight);
-
+
// If the model is empty we use 16 * the number of visible rows
// for the height and either fixedCellWidth (if set) or 256
// for the width
@@ -1935,7 +1935,7 @@ public class JList extends JComponent implements Accessible, Scrollable
* <p>If the provided orientation is <code>HORIZONTAL</code>, the above
* comments refer to "rightwards" for positive direction, and "leftwards"
* for negative.</p>
- *
+ *
*
* @param visibleRect The rectangle to scroll an element into
* @param orientation One of the numeric consants <code>VERTICAL</code>
@@ -2031,7 +2031,7 @@ public class JList extends JComponent implements Accessible, Scrollable
* <p>If the provided orientation is <code>HORIZONTAL</code>, the above
* comments refer to "rightwards" for positive direction, and "leftwards"
* for negative.</p>
- *
+ *
*
* @param visibleRect The rectangle to scroll an element into
* @param orientation One of the numeric consants <code>VERTICAL</code>
@@ -2213,7 +2213,7 @@ public class JList extends JComponent implements Accessible, Scrollable
/**
* Returns the index of the anchor item in the current selection, or
* <code>-1</code> if there is no anchor item.
- *
+ *
* @return The item index.
*/
public int getAnchorSelectionIndex()
@@ -2224,7 +2224,7 @@ public class JList extends JComponent implements Accessible, Scrollable
/**
* Returns the index of the lead item in the current selection, or
* <code>-1</code> if there is no lead item.
- *
+ *
* @return The item index.
*/
public int getLeadSelectionIndex()
@@ -2235,9 +2235,9 @@ public class JList extends JComponent implements Accessible, Scrollable
/**
* Returns the lowest item index in the current selection, or <code>-1</code>
* if there is no selection.
- *
+ *
* @return The index.
- *
+ *
* @see #getMaxSelectionIndex()
*/
public int getMinSelectionIndex()
@@ -2246,11 +2246,11 @@ public class JList extends JComponent implements Accessible, Scrollable
}
/**
- * Returns the highest item index in the current selection, or
+ * Returns the highest item index in the current selection, or
* <code>-1</code> if there is no selection.
- *
+ *
* @return The index.
- *
+ *
* @see #getMinSelectionIndex()
*/
public int getMaxSelectionIndex()
@@ -2268,9 +2268,9 @@ public class JList extends JComponent implements Accessible, Scrollable
/**
* Sets the current selection to the items in the specified range (inclusive).
- * Note that <code>anchor</code> can be less than, equal to, or greater than
+ * Note that <code>anchor</code> can be less than, equal to, or greater than
* <code>lead</code>.
- *
+ *
* @param anchor the index of the anchor item.
* @param lead the index of the anchor item.
*/
@@ -2280,10 +2280,10 @@ public class JList extends JComponent implements Accessible, Scrollable
}
/**
- * Adds the specified interval to the current selection. Note that
- * <code>anchor</code> can be less than, equal to, or greater than
+ * Adds the specified interval to the current selection. Note that
+ * <code>anchor</code> can be less than, equal to, or greater than
* <code>lead</code>.
- *
+ *
* @param anchor the index of the anchor item.
* @param lead the index of the lead item.
*/
@@ -2293,10 +2293,10 @@ public class JList extends JComponent implements Accessible, Scrollable
}
/**
- * Removes the specified interval from the current selection. Note that
- * <code>index0</code> can be less than, equal to, or greater than
+ * Removes the specified interval from the current selection. Note that
+ * <code>index0</code> can be less than, equal to, or greater than
* <code>index1</code>.
- *
+ *
* @param index0 an index for one end of the range.
* @param index1 an index for the other end of the range.
*/
@@ -2317,7 +2317,7 @@ public class JList extends JComponent implements Accessible, Scrollable
}
/**
- * Sets the <code>valueIsAdjusting</code> flag in the list's selection
+ * Sets the <code>valueIsAdjusting</code> flag in the list's selection
* model.
*
* @param isAdjusting the new value
@@ -2331,7 +2331,7 @@ public class JList extends JComponent implements Accessible, Scrollable
* Return the value of the <code>dragEnabled</code> property.
*
* @return the value
- *
+ *
* @since 1.4
*/
public boolean getDragEnabled()
@@ -2343,7 +2343,7 @@ public class JList extends JComponent implements Accessible, Scrollable
* Set the <code>dragEnabled</code> property.
*
* @param enabled new value
- *
+ *
* @since 1.4
*/
public void setDragEnabled(boolean enabled)
@@ -2352,7 +2352,7 @@ public class JList extends JComponent implements Accessible, Scrollable
}
/**
- * Returns the layout orientation, which will be one of {@link #VERTICAL},
+ * Returns the layout orientation, which will be one of {@link #VERTICAL},
* {@link #VERTICAL_WRAP} and {@link #HORIZONTAL_WRAP}. The default value
* is {@link #VERTICAL}.
*
@@ -2368,7 +2368,7 @@ public class JList extends JComponent implements Accessible, Scrollable
/**
* Sets the layout orientation (this is a bound property with the name
- * 'layoutOrientation'). Valid orientations are {@link #VERTICAL},
+ * 'layoutOrientation'). Valid orientations are {@link #VERTICAL},
* {@link #VERTICAL_WRAP} and {@link #HORIZONTAL_WRAP}.
*
* @param orientation the orientation.
@@ -2414,7 +2414,7 @@ public class JList extends JComponent implements Accessible, Scrollable
}
/**
- * Returns the index of the next list element (beginning at
+ * Returns the index of the next list element (beginning at
* <code>startIndex</code> and moving in the specified direction through the
* list, looping around if necessary) that starts with <code>prefix</code>
* (ignoring case).
@@ -2433,7 +2433,7 @@ public class JList extends JComponent implements Accessible, Scrollable
*
* @since 1.4
*/
- public int getNextMatch(String prefix, int startIndex,
+ public int getNextMatch(String prefix, int startIndex,
Position.Bias direction)
{
if (prefix == null)
@@ -2455,7 +2455,7 @@ public class JList extends JComponent implements Accessible, Scrollable
int itemCount = model.getSize();
boolean finished = false;
prefix = prefix.toUpperCase();
-
+
if (direction == Position.Bias.Forward)
delta = 1;
while (!finished)
@@ -2467,15 +2467,15 @@ public class JList extends JComponent implements Accessible, Scrollable
if (current == -1)
current += itemCount;
else
- current = current % itemCount;
+ current = current % itemCount;
finished = current == startIndex;
}
return result;
}
-
+
/**
* Returns a string describing the attributes for the <code>JList</code>
- * component, for use in debugging. The return value is guaranteed to be
+ * component, for use in debugging. The return value is guaranteed to be
* non-<code>null</code>, but the format of the string may vary between
* implementations.
*
diff --git a/libjava/classpath/javax/swing/JMenu.java b/libjava/classpath/javax/swing/JMenu.java
index 7e627f11..e715ff9 100644
--- a/libjava/classpath/javax/swing/JMenu.java
+++ b/libjava/classpath/javax/swing/JMenu.java
@@ -74,7 +74,7 @@ import javax.swing.plaf.MenuItemUI;
* <p>
* JMenu's fires MenuEvents when this menu's selection changes. If this menu
* is selected, then fireMenuSelectedEvent() is invoked. In case when menu is
- * deselected or cancelled, then fireMenuDeselectedEvent() or
+ * deselected or cancelled, then fireMenuDeselectedEvent() or
* fireMenuCancelledEvent() is invoked, respectivelly.
* </p>
*/
@@ -156,7 +156,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
public JMenu(String text)
{
super(text);
- popupMenu = new JPopupMenu();
+ popupMenu = new JPopupMenu();
popupMenu.setInvoker(this);
setOpaque(false);
}
@@ -274,7 +274,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
{
if (index < 0 || (index > 0 && getMenuComponentCount() == 0))
throw new IllegalArgumentException();
-
+
if (getMenuComponentCount() > 0)
popupMenu.remove(index);
}
@@ -445,7 +445,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
/**
* Returns origin point of the popup menu. This takes the screen bounds
- * into account and places the popup where it fits best.
+ * into account and places the popup where it fits best.
*
* @return the origin of the popup menu
*/
@@ -459,7 +459,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
JPopupMenu popup = getPopupMenu();
Dimension popupSize = popup.getSize();
if (popupSize.width == 0 || popupSize.height == 0)
- popupSize = popup.getPreferredSize();
+ popupSize = popup.getPreferredSize();
// Determine screen bounds.
Toolkit tk = Toolkit.getDefaultToolkit();
@@ -652,7 +652,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
if (getItemCount() == 0)
return null;
-
+
Component c = popupMenu.getComponentAtIndex(index);
if (c instanceof JMenuItem)
@@ -680,7 +680,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
*/
public boolean isTearOff()
{
- // NOT YET IMPLEMENTED
+ // NOT YET IMPLEMENTED
throw new Error("The method isTearOff() has not yet been implemented.");
}
@@ -706,7 +706,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
{
if (getPopupMenu() == null || getMenuComponentCount() == 0)
return null;
-
+
return popupMenu.getComponentAtIndex(index);
}
@@ -784,7 +784,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
* Returns all registered <code>MenuListener</code> objects.
*
* @return an array of listeners
- *
+ *
* @since 1.4
*/
public MenuListener[] getMenuListeners()
@@ -853,7 +853,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
*/
public void menuSelectionChanged(boolean changed)
{
- // if this menu selection is true, then activate this menu and
+ // if this menu selection is true, then activate this menu and
// display popup associated with this menu
setSelected(changed);
}
@@ -910,11 +910,11 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
getModel().setPressed(true);
try
{
- java.lang.Thread.sleep(time);
+ java.lang.Thread.sleep(time);
}
catch (java.lang.InterruptedException e)
{
- // probably harmless
+ // probably harmless
}
getModel().setPressed(false);
@@ -1237,7 +1237,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
Action a = menuItem.getAction();
if (a != null)
- a.addPropertyChangeListener(this);
+ a.addPropertyChangeListener(this);
}
/**This method is invoked when some change occures in menuItem's action*/
diff --git a/libjava/classpath/javax/swing/JMenuBar.java b/libjava/classpath/javax/swing/JMenuBar.java
index 030fc4c..1c5a448 100644
--- a/libjava/classpath/javax/swing/JMenuBar.java
+++ b/libjava/classpath/javax/swing/JMenuBar.java
@@ -61,14 +61,14 @@ import javax.swing.border.Border;
* components to container, one can use add() to add menu's to the menu bar.
* Menu's will be displayed in the menu bar in the order they were added.
* The JMenuBar uses selectionModel to keep track of selected menu index.
- * JMenuBar's selectionModel will fire ChangeEvents to its registered
+ * JMenuBar's selectionModel will fire ChangeEvents to its registered
* listeners when the selected index changes.
*/
public class JMenuBar extends JComponent implements Accessible, MenuElement
{
/**
* Provides accessibility support for <code>JMenuBar</code>.
- *
+ *
* @author Roman Kennke (kennke@aicas.com)
*/
protected class AccessibleJMenuBar extends AccessibleJComponent
@@ -289,11 +289,11 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
for (int i = 0; i < comps.length; i++)
{
- if (comps[i].equals(c))
- {
- index = i;
- break;
- }
+ if (comps[i].equals(c))
+ {
+ index = i;
+ break;
+ }
}
return index;
@@ -306,18 +306,18 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
*/
public JMenu getHelpMenu()
{
- // the following error matches the behaviour of the reference
+ // the following error matches the behaviour of the reference
// implementation...
throw new Error("getHelpMenu() is not implemented");
}
/**
* Returns the margin between the menu bar's border and its menus. If the
- * margin is <code>null</code>, this method returns
+ * margin is <code>null</code>, this method returns
* <code>new Insets(0, 0, 0, 0)</code>.
*
* @return The margin (never <code>null</code>).
- *
+ *
* @see #setMargin(Insets)
*/
public Insets getMargin()
@@ -508,14 +508,14 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
}
/**
- * This method overrides JComponent.processKeyBinding to allow the
- * JMenuBar to check all the child components (recursiveley) to see
+ * This method overrides JComponent.processKeyBinding to allow the
+ * JMenuBar to check all the child components (recursiveley) to see
* if they'll consume the event.
- *
+ *
* @param ks the KeyStroke for the event
* @param e the KeyEvent for the event
* @param condition the focus condition for the binding
- * @param pressed true if the key is pressed
+ * @param pressed true if the key is pressed
*/
protected boolean processKeyBinding(KeyStroke ks, KeyEvent e, int condition,
boolean pressed)
@@ -523,19 +523,19 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
// See if the regular JComponent behavior consumes the event
if (super.processKeyBinding(ks, e, condition, pressed))
return true;
-
- // If not, have to recursively check all the child menu elements to see
- // if they want it
+
+ // If not, have to recursively check all the child menu elements to see
+ // if they want it
MenuElement[] children = getSubElements();
for (int i = 0; i < children.length; i++)
if (processKeyBindingHelper(children[i], ks, e, condition, pressed))
return true;
return false;
}
-
+
/**
* This is a helper method to recursively check the children of this
- * JMenuBar to see if they will consume a key event via key bindings.
+ * JMenuBar to see if they will consume a key event via key bindings.
* This is used for menu accelerators.
* @param menuElement the menuElement to check (and check all its children)
* @param ks the KeyStroke for the event
@@ -558,7 +558,7 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
&& ((JComponent) menuElement).processKeyBinding(ks, e, condition,
pressed))
return true;
-
+
// If that didn't consume it, check all the children recursively
MenuElement[] children = menuElement.getSubElements();
for (int i = 0; i < children.length; i++)
@@ -566,7 +566,7 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
return true;
return false;
}
-
+
/**
* Process mouse events forwarded from MenuSelectionManager. This method
* doesn't do anything. It is here to conform to the MenuElement interface.
@@ -602,11 +602,11 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
{
if (b != borderPainted)
{
- boolean old = borderPainted;
- borderPainted = b;
- firePropertyChange("borderPainted", old, b);
- revalidate();
- repaint();
+ boolean old = borderPainted;
+ borderPainted = b;
+ firePropertyChange("borderPainted", old, b);
+ revalidate();
+ repaint();
}
}
@@ -629,7 +629,7 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
* bound property with the name 'margin').
*
* @param m the margin (<code>null</code> permitted).
- *
+ *
* @see #getMargin()
*/
public void setMargin(Insets m)
@@ -664,9 +664,9 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
{
if (selectionModel != model)
{
- SingleSelectionModel oldModel = selectionModel;
- selectionModel = model;
- firePropertyChange("model", oldModel, selectionModel);
+ SingleSelectionModel oldModel = selectionModel;
+ selectionModel = model;
+ firePropertyChange("model", oldModel, selectionModel);
}
}
diff --git a/libjava/classpath/javax/swing/JMenuItem.java b/libjava/classpath/javax/swing/JMenuItem.java
index ffdccdc..fea3166 100644
--- a/libjava/classpath/javax/swing/JMenuItem.java
+++ b/libjava/classpath/javax/swing/JMenuItem.java
@@ -123,20 +123,20 @@ public class JMenuItem extends AbstractButton implements Accessible,
init(null, null);
if (action != null)
{
- String name = (String) action.getValue(Action.NAME);
- if (name != null)
+ String name = (String) action.getValue(Action.NAME);
+ if (name != null)
setName(name);
- KeyStroke accel = (KeyStroke) action.getValue(Action.ACCELERATOR_KEY);
- if (accel != null)
+ KeyStroke accel = (KeyStroke) action.getValue(Action.ACCELERATOR_KEY);
+ if (accel != null)
setAccelerator(accel);
- Integer mnemonic = (Integer) action.getValue(Action.MNEMONIC_KEY);
- if (mnemonic != null)
+ Integer mnemonic = (Integer) action.getValue(Action.MNEMONIC_KEY);
+ if (mnemonic != null)
setMnemonic(mnemonic.intValue());
- String command = (String) action.getValue(Action.ACTION_COMMAND_KEY);
- if (command != null)
+ String command = (String) action.getValue(Action.ACTION_COMMAND_KEY);
+ if (command != null)
setActionCommand(command);
}
}
@@ -180,7 +180,7 @@ public class JMenuItem extends AbstractButton implements Accessible,
super.init(text, icon);
// Initializes properties for this menu item, that are different
- // from Abstract button properties.
+ // from Abstract button properties.
/* NOTE: According to java specifications paint_border should be set to false,
since menu item should not have a border. However running few java programs
it seems that menu items and menues can have a border. Commenting
@@ -201,7 +201,7 @@ public class JMenuItem extends AbstractButton implements Accessible,
{
super.setUI(ui);
}
-
+
/**
* This method sets this menuItem's UI to the UIManager's default for the
* current look and feel.
@@ -265,11 +265,11 @@ public class JMenuItem extends AbstractButton implements Accessible,
}
/**
- * Sets the key combination which invokes the menu item's action
- * listeners without navigating the menu hierarchy. Note that when the
- * keyboard accelerator is typed, it will work whether or not the
+ * Sets the key combination which invokes the menu item's action
+ * listeners without navigating the menu hierarchy. Note that when the
+ * keyboard accelerator is typed, it will work whether or not the
* menu is currently displayed.
- *
+ *
* @param keystroke accelerator for this menu item.
*/
public void setAccelerator(KeyStroke keystroke)
@@ -294,7 +294,7 @@ public class JMenuItem extends AbstractButton implements Accessible,
{
setAccelerator((KeyStroke) (action.getValue(Action.ACCELERATOR_KEY)));
if (accelerator != null)
- super.registerKeyboardAction(action, accelerator,
+ super.registerKeyboardAction(action, accelerator,
JComponent.WHEN_IN_FOCUSED_WINDOW);
}
}
@@ -312,11 +312,11 @@ public class JMenuItem extends AbstractButton implements Accessible,
{
return new PropertyChangeListener()
{
- public void propertyChange(PropertyChangeEvent e)
- {
- Action act = (Action) (e.getSource());
- configurePropertiesFromAction(act);
- }
+ public void propertyChange(PropertyChangeEvent e)
+ {
+ Action act = (Action) (e.getSource());
+ configurePropertiesFromAction(act);
+ }
};
}
@@ -374,20 +374,20 @@ public class JMenuItem extends AbstractButton implements Accessible,
{
case MouseEvent.MOUSE_ENTERED:
isDragging = false;
- fireMenuDragMouseEntered(event);
- break;
+ fireMenuDragMouseEntered(event);
+ break;
case MouseEvent.MOUSE_EXITED:
isDragging = false;
- fireMenuDragMouseExited(event);
- break;
+ fireMenuDragMouseExited(event);
+ break;
case MouseEvent.MOUSE_DRAGGED:
isDragging = true;
- fireMenuDragMouseDragged(event);
- break;
+ fireMenuDragMouseDragged(event);
+ break;
case MouseEvent.MOUSE_RELEASED:
if (isDragging)
fireMenuDragMouseReleased(event);
- break;
+ break;
}
}
@@ -524,17 +524,17 @@ public class JMenuItem extends AbstractButton implements Accessible,
Component parent = this.getParent();
if (changed)
{
- model.setArmed(true);
+ model.setArmed(true);
- if (parent != null && parent instanceof JPopupMenu)
- ((JPopupMenu) parent).setSelected(this);
+ if (parent != null && parent instanceof JPopupMenu)
+ ((JPopupMenu) parent).setSelected(this);
}
else
{
- model.setArmed(false);
+ model.setArmed(false);
- if (parent != null && parent instanceof JPopupMenu)
- ((JPopupMenu) parent).getSelectionModel().clearSelection();
+ if (parent != null && parent instanceof JPopupMenu)
+ ((JPopupMenu) parent).getSelectionModel().clearSelection();
}
}
@@ -630,7 +630,7 @@ public class JMenuItem extends AbstractButton implements Accessible,
/**
* Returns a string describing the attributes for the <code>JMenuItem</code>
- * component, for use in debugging. The return value is guaranteed to be
+ * component, for use in debugging. The return value is guaranteed to be
* non-<code>null</code>, but the format of the string may vary between
* implementations.
*
@@ -646,14 +646,14 @@ public class JMenuItem extends AbstractButton implements Accessible,
* Returns the object that provides accessibility features for this
* <code>JMenuItem</code> component.
*
- * @return The accessible context (an instance of
+ * @return The accessible context (an instance of
* {@link AccessibleJMenuItem}).
*/
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
{
- AccessibleJMenuItem ctx = new AccessibleJMenuItem();
+ AccessibleJMenuItem ctx = new AccessibleJMenuItem();
addChangeListener(ctx);
accessibleContext = ctx;
}
@@ -662,9 +662,9 @@ public class JMenuItem extends AbstractButton implements Accessible,
}
/**
- * Provides the accessibility features for the <code>JMenuItem</code>
+ * Provides the accessibility features for the <code>JMenuItem</code>
* component.
- *
+ *
* @see JMenuItem#getAccessibleContext()
*/
protected class AccessibleJMenuItem extends AccessibleAbstractButton
diff --git a/libjava/classpath/javax/swing/JOptionPane.java b/libjava/classpath/javax/swing/JOptionPane.java
index 43caecd..8c765ed 100644
--- a/libjava/classpath/javax/swing/JOptionPane.java
+++ b/libjava/classpath/javax/swing/JOptionPane.java
@@ -71,7 +71,7 @@ public class JOptionPane extends JComponent implements Accessible
protected class AccessibleJOptionPane extends JComponent.AccessibleJComponent
{
private static final long serialVersionUID = 686071432213084821L;
-
+
/**
* Creates a new <code>AccessibleJOptionPane</code> instance.
*/
@@ -477,7 +477,7 @@ public class JOptionPane extends JComponent implements Accessible
* Returns the object that provides accessibility features for this
* <code>JOptionPane</code> component.
*
- * @return The accessible context (an instance of
+ * @return The accessible context (an instance of
* {@link AccessibleJOptionPane}).
*/
public AccessibleContext getAccessibleContext()
@@ -700,9 +700,9 @@ public class JOptionPane extends JComponent implements Accessible
{
if (icon != newIcon)
{
- Icon old = icon;
- icon = newIcon;
- firePropertyChange(ICON_PROPERTY, old, icon);
+ Icon old = icon;
+ icon = newIcon;
+ firePropertyChange(ICON_PROPERTY, old, icon);
}
}
@@ -715,10 +715,10 @@ public class JOptionPane extends JComponent implements Accessible
{
if (initialSelectionValue != newValue)
{
- Object old = initialSelectionValue;
- initialSelectionValue = newValue;
- firePropertyChange(INITIAL_SELECTION_VALUE_PROPERTY, old,
- initialSelectionValue);
+ Object old = initialSelectionValue;
+ initialSelectionValue = newValue;
+ firePropertyChange(INITIAL_SELECTION_VALUE_PROPERTY, old,
+ initialSelectionValue);
}
}
@@ -731,9 +731,9 @@ public class JOptionPane extends JComponent implements Accessible
{
if (initialValue != newValue)
{
- Object old = initialValue;
- initialValue = newValue;
- firePropertyChange(INITIAL_VALUE_PROPERTY, old, initialValue);
+ Object old = initialValue;
+ initialValue = newValue;
+ firePropertyChange(INITIAL_VALUE_PROPERTY, old, initialValue);
}
}
@@ -746,9 +746,9 @@ public class JOptionPane extends JComponent implements Accessible
{
if (inputValue != newValue)
{
- Object old = inputValue;
- inputValue = newValue;
- firePropertyChange(INPUT_VALUE_PROPERTY, old, inputValue);
+ Object old = inputValue;
+ inputValue = newValue;
+ firePropertyChange(INPUT_VALUE_PROPERTY, old, inputValue);
}
}
@@ -761,9 +761,9 @@ public class JOptionPane extends JComponent implements Accessible
{
if (message != newMessage)
{
- Object old = message;
- message = newMessage;
- firePropertyChange(MESSAGE_PROPERTY, old, message);
+ Object old = message;
+ message = newMessage;
+ firePropertyChange(MESSAGE_PROPERTY, old, message);
}
}
@@ -780,9 +780,9 @@ public class JOptionPane extends JComponent implements Accessible
throw new IllegalArgumentException("Message Type not legal value.");
if (newType != messageType)
{
- int old = messageType;
- messageType = newType;
- firePropertyChange(MESSAGE_TYPE_PROPERTY, old, messageType);
+ int old = messageType;
+ messageType = newType;
+ firePropertyChange(MESSAGE_TYPE_PROPERTY, old, messageType);
}
}
@@ -795,9 +795,9 @@ public class JOptionPane extends JComponent implements Accessible
{
if (options != newOptions)
{
- Object[] old = options;
- options = newOptions;
- firePropertyChange(OPTIONS_PROPERTY, old, options);
+ Object[] old = options;
+ options = newOptions;
+ firePropertyChange(OPTIONS_PROPERTY, old, options);
}
}
@@ -814,9 +814,9 @@ public class JOptionPane extends JComponent implements Accessible
throw new IllegalArgumentException("Option Type not legal value.");
if (newType != optionType)
{
- int old = optionType;
- optionType = newType;
- firePropertyChange(OPTION_TYPE_PROPERTY, old, optionType);
+ int old = optionType;
+ optionType = newType;
+ firePropertyChange(OPTION_TYPE_PROPERTY, old, optionType);
}
}
@@ -840,11 +840,11 @@ public class JOptionPane extends JComponent implements Accessible
{
if (newValues != selectionValues)
{
- if (newValues != null)
- wantsInput = true;
- Object[] old = selectionValues;
- selectionValues = newValues;
- firePropertyChange(SELECTION_VALUES_PROPERTY, old, selectionValues);
+ if (newValues != null)
+ wantsInput = true;
+ Object[] old = selectionValues;
+ selectionValues = newValues;
+ firePropertyChange(SELECTION_VALUES_PROPERTY, old, selectionValues);
}
}
@@ -867,9 +867,9 @@ public class JOptionPane extends JComponent implements Accessible
{
if (value != newValue)
{
- Object old = value;
- value = newValue;
- firePropertyChange(VALUE_PROPERTY, old, value);
+ Object old = value;
+ value = newValue;
+ firePropertyChange(VALUE_PROPERTY, old, value);
}
}
@@ -882,9 +882,9 @@ public class JOptionPane extends JComponent implements Accessible
{
if (wantsInput != newValue)
{
- boolean old = wantsInput;
- wantsInput = newValue;
- firePropertyChange(WANTS_INPUT_PROPERTY, old, wantsInput);
+ boolean old = wantsInput;
+ wantsInput = newValue;
+ firePropertyChange(WANTS_INPUT_PROPERTY, old, wantsInput);
}
}
@@ -904,7 +904,7 @@ public class JOptionPane extends JComponent implements Accessible
JOptionPane pane = new JOptionPane(message, QUESTION_MESSAGE);
JDialog dialog = pane.createDialog(parentComponent, "Select an Option");
dialog.show();
-
+
if (pane.getValue() instanceof Integer)
return ((Integer) pane.getValue()).intValue();
return -1;
@@ -1011,7 +1011,7 @@ public class JOptionPane extends JComponent implements Accessible
pane.setWantsInput(true);
JDialog dialog = pane.createDialog(parentComponent, null);
dialog.show();
-
+
return (String) pane.getInputValue();
}
@@ -1037,7 +1037,7 @@ public class JOptionPane extends JComponent implements Accessible
pane.setWantsInput(true);
JDialog dialog = pane.createDialog(parentComponent, null);
dialog.show();
-
+
return (String) pane.getInputValue();
}
@@ -1062,7 +1062,7 @@ public class JOptionPane extends JComponent implements Accessible
pane.setWantsInput(true);
JDialog dialog = pane.createDialog(parentComponent, title);
dialog.show();
-
+
return (String) pane.getInputValue();
}
@@ -1094,7 +1094,7 @@ public class JOptionPane extends JComponent implements Accessible
pane.setInitialSelectionValue(initialSelectionValue);
JDialog dialog = pane.createDialog(parentComponent, title);
dialog.show();
-
+
return pane.getInputValue();
}
@@ -1114,7 +1114,7 @@ public class JOptionPane extends JComponent implements Accessible
pane.setWantsInput(true);
JDialog dialog = pane.createDialog(null, null);
dialog.show();
-
+
return (String) pane.getInputValue();
}
@@ -1138,7 +1138,7 @@ public class JOptionPane extends JComponent implements Accessible
pane.setInitialSelectionValue(initialSelectionValue);
JDialog dialog = pane.createDialog(null, null);
dialog.show();
-
+
return (String) pane.getInputValue();
}
@@ -1160,7 +1160,7 @@ public class JOptionPane extends JComponent implements Accessible
JInternalFrame frame = pane.createInternalFrame(parentComponent, null);
startModal(frame);
-
+
if (pane.getValue() instanceof Integer)
return ((Integer) pane.getValue()).intValue();
return -1;
@@ -1270,7 +1270,7 @@ public class JOptionPane extends JComponent implements Accessible
JInternalFrame frame = pane.createInternalFrame(parentComponent, null);
startModal(frame);
-
+
return (String) pane.getInputValue();
}
@@ -1296,7 +1296,7 @@ public class JOptionPane extends JComponent implements Accessible
JInternalFrame frame = pane.createInternalFrame(parentComponent, title);
startModal(frame);
-
+
return (String) pane.getInputValue();
}
@@ -1331,7 +1331,7 @@ public class JOptionPane extends JComponent implements Accessible
JInternalFrame frame = pane.createInternalFrame(parentComponent, title);
startModal(frame);
-
+
return pane.getInputValue();
}
@@ -1424,7 +1424,7 @@ public class JOptionPane extends JComponent implements Accessible
JInternalFrame frame = pane.createInternalFrame(parentComponent, title);
startModal(frame);
-
+
if (pane.getValue() instanceof Integer)
return ((Integer) pane.getValue()).intValue();
return -1;
@@ -1441,7 +1441,7 @@ public class JOptionPane extends JComponent implements Accessible
{
JOptionPane pane = new JOptionPane(message, INFORMATION_MESSAGE);
JDialog dialog = pane.createDialog(parentComponent, null);
- dialog.show();
+ dialog.show();
}
/**
@@ -1539,7 +1539,7 @@ public class JOptionPane extends JComponent implements Accessible
case PLAIN_MESSAGE:
case QUESTION_MESSAGE:
case WARNING_MESSAGE:
- return true;
+ return true;
}
return false;
}
@@ -1559,7 +1559,7 @@ public class JOptionPane extends JComponent implements Accessible
case OK_CANCEL_OPTION:
case YES_NO_CANCEL_OPTION:
case YES_NO_OPTION:
- return true;
+ return true;
}
return false;
}
diff --git a/libjava/classpath/javax/swing/JPanel.java b/libjava/classpath/javax/swing/JPanel.java
index 3bd71d1..f2ff956 100644
--- a/libjava/classpath/javax/swing/JPanel.java
+++ b/libjava/classpath/javax/swing/JPanel.java
@@ -91,10 +91,10 @@ public class JPanel extends JComponent implements Accessible
/**
* Creates a new panel with double-buffering enabled or disabled as
- * specified. The default layout manager is an instance of
+ * specified. The default layout manager is an instance of
* {@link FlowLayout}.
- *
- * @param isDoubleBuffered a flag that controls whether or not
+ *
+ * @param isDoubleBuffered a flag that controls whether or not
* double-buffering is enabled.
*/
public JPanel(boolean isDoubleBuffered)
@@ -105,7 +105,7 @@ public class JPanel extends JComponent implements Accessible
/**
* Creates a new panel with the specified layout manager. Double-buffering
* is enabled by default.
- *
+ *
* @param layout the layout manager (<code>null</code> permitted).
*/
public JPanel(LayoutManager layout)
@@ -114,24 +114,24 @@ public class JPanel extends JComponent implements Accessible
}
/**
- * Creates a new panel with the specified layout manager and
+ * Creates a new panel with the specified layout manager and
* double-buffering.
- *
+ *
* @param layout the layout manager (<code>null</code> permitted).
- * @param isDoubleBuffered a flag that controls whether or not
+ * @param isDoubleBuffered a flag that controls whether or not
* double-buffering is enabled.
*/
public JPanel(LayoutManager layout, boolean isDoubleBuffered)
{
- setLayout(layout);
+ setLayout(layout);
setOpaque(true);
setDoubleBuffered(isDoubleBuffered);
- updateUI();
- }
+ updateUI();
+ }
/**
- * Returns the suffix (<code>"PanelUI"</code> in this case) used to
- * determine the class name for a UI delegate that can provide the look and
+ * Returns the suffix (<code>"PanelUI"</code> in this case) used to
+ * determine the class name for a UI delegate that can provide the look and
* feel for a <code>JPanel</code>.
*
* @return <code>"PanelUI"</code>.
@@ -143,9 +143,9 @@ public class JPanel extends JComponent implements Accessible
/**
* Sets the UI delegate for the <code>JPanel</code> component.
- *
+ *
* @param ui the UI delegate.
- *
+ *
* @since 1.4
* @see #getUI()
*/
@@ -156,9 +156,9 @@ public class JPanel extends JComponent implements Accessible
/**
* Returns the UI delegate for the <code>JPanel</code> component.
- *
+ *
* @return The UI delegate.
- *
+ *
* @since 1.4
* @see #setUI(PanelUI)
*/
@@ -188,7 +188,7 @@ public class JPanel extends JComponent implements Accessible
accessibleContext = new AccessibleJPanel();
return accessibleContext;
}
-
+
/**
* Returns an implementation-dependent string describing the attributes of
* this <code>JPanel</code>.
@@ -198,6 +198,6 @@ public class JPanel extends JComponent implements Accessible
*/
protected String paramString()
{
- return super.paramString();
+ return super.paramString();
}
}
diff --git a/libjava/classpath/javax/swing/JPasswordField.java b/libjava/classpath/javax/swing/JPasswordField.java
index 11e45e8..e73993f 100644
--- a/libjava/classpath/javax/swing/JPasswordField.java
+++ b/libjava/classpath/javax/swing/JPasswordField.java
@@ -48,7 +48,7 @@ import javax.swing.text.Document;
/**
* class JPasswordField
- *
+ *
* @author Andrew Selkirk
* @author Lillian Angel
* @version 1.0
@@ -72,7 +72,7 @@ public class JPasswordField extends JTextField
/**
* getAccessibleRole
- *
+ *
* @return AccessibleRole
*/
public AccessibleRole getAccessibleRole()
@@ -96,7 +96,7 @@ public class JPasswordField extends JTextField
/**
* Creates a <code>JPasswordField</code> object.
- *
+ *
* @param text the initial text
*/
public JPasswordField(String text)
@@ -106,7 +106,7 @@ public class JPasswordField extends JTextField
/**
* Creates a <code>JPasswordField</code> object.
- *
+ *
* @param columns the number of columns
*/
public JPasswordField(int columns)
@@ -116,7 +116,7 @@ public class JPasswordField extends JTextField
/**
* Creates a <code>JPasswordField</code> object.
- *
+ *
* @param text the initial text
* @param columns the number of columns
*/
@@ -127,7 +127,7 @@ public class JPasswordField extends JTextField
/**
* Creates a <code>JPasswordField</code> object.
- *
+ *
* @param document the document to use
* @param text the initial text
* @param columns the number of columns
@@ -139,9 +139,9 @@ public class JPasswordField extends JTextField
/**
* writeObject
- *
+ *
* @param stream the stream to write to
- *
+ *
* @exception IOException if an error occurs
*/
private void writeObject(ObjectOutputStream stream) throws IOException
@@ -151,7 +151,7 @@ public class JPasswordField extends JTextField
/**
* Returns the <code>UIClassID</code>
- *
+ *
* @return the string "PasswordFieldUI"
*/
public String getUIClassID()
@@ -161,7 +161,7 @@ public class JPasswordField extends JTextField
/**
* getEchoChar
- *
+ *
* @return the echo char
*/
public char getEchoChar()
@@ -171,7 +171,7 @@ public class JPasswordField extends JTextField
/**
* setEchoChar
- *
+ *
* @param echo the echo char
*/
public void setEchoChar(char echo)
@@ -180,9 +180,9 @@ public class JPasswordField extends JTextField
}
/**
- * Returns true if this JPasswordField has a character set for echoing.
+ * Returns true if this JPasswordField has a character set for echoing.
* A character is considered to be set if the echo character is not 0.
- *
+ *
* @return <code>true</code> if the echo char is set,
* <code>false</code> otherwise.
*/
@@ -210,11 +210,11 @@ public class JPasswordField extends JTextField
}
/**
- * Returns the text contained in this TextComponent. If the
+ * Returns the text contained in this TextComponent. If the
* underlying document is null, will give a NullPointerException.
- *
+ *
* @return String
- *
+ *
* @deprecated
*/
public String getText()
@@ -231,15 +231,15 @@ public class JPasswordField extends JTextField
}
/**
- * Fetches a portion of the text represented by the component.
- * Returns an empty string if length is 0. If the
+ * Fetches a portion of the text represented by the component.
+ * Returns an empty string if length is 0. If the
* underlying document is null, will give a NullPointerException.
- *
+ *
* @param offset TODO
* @param length TODO
- *
+ *
* @return String
- *
+ *
* @exception BadLocationException TODO
*
* @deprecated
@@ -250,11 +250,11 @@ public class JPasswordField extends JTextField
}
/**
- * Returns the text contained in this TextComponent. If the underlying
- * document is null, will give a NullPointerException.
- * For stronger security, it is recommended that the returned character
+ * Returns the text contained in this TextComponent. If the underlying
+ * document is null, will give a NullPointerException.
+ * For stronger security, it is recommended that the returned character
* array be cleared after use by setting each character to zero.
- *
+ *
* @return char[]
*/
public char[] getPassword()
@@ -263,11 +263,11 @@ public class JPasswordField extends JTextField
}
/**
- * Returns a string representation of this JPasswordField. This method is
- * intended to be used only for debugging purposes,
- * and the content and format of the returned string may vary between
+ * Returns a string representation of this JPasswordField. This method is
+ * intended to be used only for debugging purposes,
+ * and the content and format of the returned string may vary between
* implementations. The returned string may be empty but may not be null.
- *
+ *
* @return String
*/
protected String paramString()
@@ -284,7 +284,7 @@ public class JPasswordField extends JTextField
/**
* getAccessibleContext
- *
+ *
* @return the <code>AccessibleContext</code> object
*/
public AccessibleContext getAccessibleContext()
diff --git a/libjava/classpath/javax/swing/JPopupMenu.java b/libjava/classpath/javax/swing/JPopupMenu.java
index ac1a9eb..8f16aa2 100644
--- a/libjava/classpath/javax/swing/JPopupMenu.java
+++ b/libjava/classpath/javax/swing/JPopupMenu.java
@@ -79,10 +79,10 @@ import javax.swing.plaf.PopupMenuUI;
* popupMenuBecomeInvisible() or popupMenuCancelled() methods of
* PopupMenuListeners will be invoked.
*
- * JPopupMenu also fires PropertyChangeEvents when its bound properties
- * change.In addittion to inheritted bound properties, JPopupMenu has
+ * JPopupMenu also fires PropertyChangeEvents when its bound properties
+ * change.In addittion to inheritted bound properties, JPopupMenu has
* 'visible' bound property. When JPopupMenu becomes visible/invisible on
- * the screen it fires PropertyChangeEvents to its registered
+ * the screen it fires PropertyChangeEvents to its registered
* PropertyChangeListeners.
*/
public class JPopupMenu extends JComponent implements Accessible, MenuElement
@@ -139,7 +139,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
/* Field indicating if popup menu is visible or not */
private boolean visible = false;
-
+
/**
* Creates a new JPopupMenu object.
*/
@@ -326,7 +326,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
*/
public void setSelectionModel(SingleSelectionModel model)
{
- selectionModel = model;
+ selectionModel = model;
}
/**
@@ -397,9 +397,9 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
{
if (label != this.label)
{
- String oldLabel = this.label;
- this.label = label;
- firePropertyChange("label", oldLabel, label);
+ String oldLabel = this.label;
+ this.label = label;
+ firePropertyChange("label", oldLabel, label);
}
}
@@ -408,40 +408,40 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
*/
public void addSeparator()
{
- // insert separator at the end of the list of menu items
+ // insert separator at the end of the list of menu items
this.insert(new Separator(), -1);
}
/**
* Adds a MenuKeyListener to the popup.
- *
+ *
* @param l - the listener to add.
*/
public void addMenuKeyListener(MenuKeyListener l)
{
listenerList.add(MenuKeyListener.class, l);
}
-
+
/**
* Removes a MenuKeyListener from the popup.
- *
+ *
* @param l - the listener to remove.
*/
public void removeMenuKeyListener(MenuKeyListener l)
{
listenerList.remove(MenuKeyListener.class, l);
}
-
+
/**
* Returns array of getMenuKeyListeners that are listening to JPopupMenu.
- *
+ *
* @return array of getMenuKeyListeners that are listening to JPopupMenu
*/
public MenuKeyListener[] getMenuKeyListeners()
{
return ((MenuKeyListener[]) listenerList.getListeners(MenuKeyListener.class));
}
-
+
/**
* Adds popupMenuListener to listen for PopupMenuEvents fired
* by the JPopupMenu
@@ -691,8 +691,8 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
for (int i = 0; i < items.length; i++)
{
- if (items[i].equals(component))
- return i;
+ if (items[i].equals(component))
+ return i;
}
return -1;
@@ -783,7 +783,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
}
/**
- * Process mouse events forwarded from MenuSelectionManager. This method
+ * Process mouse events forwarded from MenuSelectionManager. This method
* doesn't do anything. It is here to conform to the MenuElement interface.
*
* @param event event forwarded from MenuSelectionManager
@@ -846,7 +846,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
for (int i = 0; i < items.length; i++)
if (items[i] instanceof MenuElement)
- subElements.add(items[i]);
+ subElements.add(items[i]);
return (MenuElement[])
subElements.toArray(new MenuElement[subElements.size()]);
diff --git a/libjava/classpath/javax/swing/JProgressBar.java b/libjava/classpath/javax/swing/JProgressBar.java
index b20b02a..d24a380 100644
--- a/libjava/classpath/javax/swing/JProgressBar.java
+++ b/libjava/classpath/javax/swing/JProgressBar.java
@@ -57,8 +57,8 @@ import javax.swing.plaf.ProgressBarUI;
/**
* A component that displays a visual indicator of the progress of a task. The
* component has two modes: determinate and indeterminate. In determinate mode,
- * the <code>JProgressBar</code> fills a percentage of its bar based on its
- * current value. In indeterminate mode, it creates box and bounces it between
+ * the <code>JProgressBar</code> fills a percentage of its bar based on its
+ * current value. In indeterminate mode, it creates box and bounces it between
* its bounds.
* <p>
* This component has the following properties:
@@ -67,10 +67,10 @@ import javax.swing.plaf.ProgressBarUI;
* <tr><th> Property </th><th> Stored in </th><th> Bound? </th></tr>
* <tr><td> borderPainted </td><td> progressBar </td><td> yes </td></tr>
* <tr><td> changeListeners </td><td> progressBar </td><td> no </td></tr>
- * <tr><td> indeterminate </td><td> progressBar </td><td> yes </td></tr>
+ * <tr><td> indeterminate </td><td> progressBar </td><td> yes </td></tr>
* <tr><td> maximum </td><td> model </td><td> no </td></tr>
* <tr><td> minimum </td><td> model </td><td> no </td></tr>
- * <tr><td> model </td><td> progressBar </td><td> no </td></tr>
+ * <tr><td> model </td><td> progressBar </td><td> no </td></tr>
* <tr><td> orientation </td><td> progressBar </td><td> yes </td></tr>
* <tr><td> percentComplete </td><td> progressBar </td><td> no </td></tr>
* <tr><td> string </td><td> progressBar </td><td> yes </td></tr>
@@ -89,17 +89,17 @@ public class JProgressBar extends JComponent implements SwingConstants,
implements AccessibleValue
{
private static final long serialVersionUID = -2938130009392721813L;
-
+
/**
* Creates a new <code>AccessibleJProgressBar</code> instance.
*/
protected AccessibleJProgressBar()
{
// Nothing to do here.
- }
+ }
/**
- * Returns a set containing the current state of the {@link JProgressBar}
+ * Returns a set containing the current state of the {@link JProgressBar}
* component.
*
* @return The accessible state set.
@@ -112,7 +112,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
else if (orientation == JProgressBar.VERTICAL)
result.add(AccessibleState.VERTICAL);
return result;
- }
+ }
/**
* Returns the accessible role for the <code>JProgressBar</code> component.
@@ -122,10 +122,10 @@ public class JProgressBar extends JComponent implements SwingConstants,
public AccessibleRole getAccessibleRole()
{
return AccessibleRole.PROGRESS_BAR;
- }
+ }
/**
- * Returns an object that provides access to the current, minimum and
+ * Returns an object that provides access to the current, minimum and
* maximum values.
*
* @return The accessible value.
@@ -133,7 +133,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
public AccessibleValue getAccessibleValue()
{
return this;
- }
+ }
/**
* Returns the current value of the {@link JProgressBar} component, as an
@@ -148,14 +148,14 @@ public class JProgressBar extends JComponent implements SwingConstants,
/**
* Sets the current value of the {@link JProgressBar} component and sends a
- * {@link PropertyChangeEvent} (with the property name
+ * {@link PropertyChangeEvent} (with the property name
* {@link AccessibleContext#ACCESSIBLE_VALUE_PROPERTY}) to all registered
- * listeners. If the supplied value is <code>null</code>, this method
+ * listeners. If the supplied value is <code>null</code>, this method
* does nothing and returns <code>false</code>.
*
* @param value the new progress bar value (<code>null</code> permitted).
*
- * @return <code>true</code> if the slider value is updated, and
+ * @return <code>true</code> if the slider value is updated, and
* <code>false</code> otherwise.
*/
public boolean setCurrentAccessibleValue(Number value)
@@ -164,7 +164,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
return false;
Number oldValue = getCurrentAccessibleValue();
setValue(value.intValue());
- firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue,
+ firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue,
new Integer(getValue()));
return true;
}
@@ -190,63 +190,63 @@ public class JProgressBar extends JComponent implements SwingConstants,
{
return new Integer(getMaximum());
}
- }
+ }
private static final long serialVersionUID = 1980046021813598781L;
-
- /**
- * A flag that determines the mode (<code>true</code> for indeterminate,
+
+ /**
+ * A flag that determines the mode (<code>true</code> for indeterminate,
* <code>false</code> for determinate).
*/
private transient boolean indeterminate = false;
- /**
- * The orientation of the <code>JProgressBar</code>
- * ({@link SwingConstants#HORIZONTAL} or {@link SwingConstants#VERTICAL}).
+ /**
+ * The orientation of the <code>JProgressBar</code>
+ * ({@link SwingConstants#HORIZONTAL} or {@link SwingConstants#VERTICAL}).
* Defaults to {@link SwingConstants#HORIZONTAL}.
* @see #setOrientation(int)
*/
protected int orientation;
- /**
+ /**
* A flag the controls whether or not the component's border is painted.
- * The default is <code>true</code>.
+ * The default is <code>true</code>.
* @see #setBorderPainted(boolean)
*/
protected boolean paintBorder = true;
- /**
+ /**
* The model defining the bounds and current value for the progress bar.
- * @see #setModel(BoundedRangeModel)
+ * @see #setModel(BoundedRangeModel)
*/
protected BoundedRangeModel model;
- /**
- * A custom string for display in the progress bar. If this is
- * <code>null</code>, a default string will be generated.
+ /**
+ * A custom string for display in the progress bar. If this is
+ * <code>null</code>, a default string will be generated.
* @see #setString(String)
*/
protected String progressString;
- /**
- * A flag that controls whether a string is displayed within the progress
- * bar.
+ /**
+ * A flag that controls whether a string is displayed within the progress
+ * bar.
* @see #setStringPainted(boolean)
*/
protected boolean paintString = false;
- /**
+ /**
* A single change event reused for all events.
- * @see #fireStateChanged()
+ * @see #fireStateChanged()
*/
protected transient ChangeEvent changeEvent;
- /**
+ /**
* The listener that is registered with the model. */
protected ChangeListener changeListener;
/**
- * Creates a new <code>JProgressBar</code> with default attributes. The
+ * Creates a new <code>JProgressBar</code> with default attributes. The
* following defaults are used:
* <p>
* <ul>
@@ -254,7 +254,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
* <li><code>minimum</code>: 0;</li>
* <li><code>maximum</code>: 100;</li>
* <li><code>orientation</code>: {@link SwingConstants#HORIZONTAL}.</li>
- * </ul>
+ * </ul>
*/
public JProgressBar()
{
@@ -262,18 +262,18 @@ public class JProgressBar extends JComponent implements SwingConstants,
}
/**
- * Creates a new <code>JProgressBar</code> with the specified
+ * Creates a new <code>JProgressBar</code> with the specified
* <code>orientation</code>. The following defaults are used:
* <p>
* <ul>
* <li><code>value</code>: 0;</li>
* <li><code>minimum</code>: 0;</li>
* <li><code>maximum</code>: 100;</li>
- * </ul>
- *
- * @param orientation the orientation ({@link #HORIZONTAL} or
+ * </ul>
+ *
+ * @param orientation the orientation ({@link #HORIZONTAL} or
* {@link #VERTICAL}).
- *
+ *
* @throws IllegalArgumentException if <code>orientation</code> is not one of
* the specified values.
*/
@@ -289,8 +289,8 @@ public class JProgressBar extends JComponent implements SwingConstants,
* <ul>
* <li><code>value</code>: <code>minimum</code>;</li>
* <li><code>orientation</code>: {@link SwingConstants#HORIZONTAL}.</li>
- * </ul>
- *
+ * </ul>
+ *
* @param minimum the lower bound of the value range.
* @param maximum the upper bound of the value range.
*/
@@ -305,13 +305,13 @@ public class JProgressBar extends JComponent implements SwingConstants,
* <p>
* <ul>
* <li><code>value</code>: <code>minimum</code>;</li>
- * </ul>
- *
+ * </ul>
+ *
* @param minimum the lower bound of the value range.
* @param maximum the upper bound of the value range.
- * @param orientation the orientation ({@link #HORIZONTAL} or
+ * @param orientation the orientation ({@link #HORIZONTAL} or
* {@link #VERTICAL}).
- *
+ *
* @throws IllegalArgumentException if <code>orientation</code> is not one of
* the specified values.
*/
@@ -320,7 +320,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
model = new DefaultBoundedRangeModel(minimum, 0, minimum, maximum);
if (orientation != HORIZONTAL && orientation != VERTICAL)
throw new IllegalArgumentException(orientation
- + " is not a legal orientation");
+ + " is not a legal orientation");
this.orientation = orientation;
changeListener = createChangeListener();
model.addChangeListener(changeListener);
@@ -333,8 +333,8 @@ public class JProgressBar extends JComponent implements SwingConstants,
* <p>
* <ul>
* <li><code>orientation</code>: {@link SwingConstants#HORIZONTAL}.</li>
- * </ul>
- *
+ * </ul>
+ *
* @param model the model (<code>null</code> not permitted).
*/
public JProgressBar(BoundedRangeModel model)
@@ -343,15 +343,15 @@ public class JProgressBar extends JComponent implements SwingConstants,
changeListener = createChangeListener();
if (model != null)
model.addChangeListener(changeListener);
- updateUI();
+ updateUI();
}
/**
- * Returns the current value for the <code>JProgressBar</code>. This value
+ * Returns the current value for the <code>JProgressBar</code>. This value
* is fetched from the model.
*
* @return The current value.
- *
+ *
* @see #setValue(int)
*/
public int getValue()
@@ -361,18 +361,18 @@ public class JProgressBar extends JComponent implements SwingConstants,
/**
* Sets the current value for the <code>JProgressBar</code>. The value is
- * stored in the component's <code>model</code> (see {@link #getModel()}).
- * If the new value is different to the old value, a {@link ChangeEvent} is
- * sent to the model's registered listeners. In turn, this triggers a call
- * to {@link #fireStateChanged()} which will send a <code>ChangeEvent</code>
+ * stored in the component's <code>model</code> (see {@link #getModel()}).
+ * If the new value is different to the old value, a {@link ChangeEvent} is
+ * sent to the model's registered listeners. In turn, this triggers a call
+ * to {@link #fireStateChanged()} which will send a <code>ChangeEvent</code>
* to this component's registered listeners.
* <p>
- * If <code>value</code> is outside the range <code>minimum</code> to
- * <code>maximum</code>, it will be set to the nearest of those boundary
+ * If <code>value</code> is outside the range <code>minimum</code> to
+ * <code>maximum</code>, it will be set to the nearest of those boundary
* values.
*
* @param value the new value.
- *
+ *
* @see #getValue()
*/
public void setValue(int value)
@@ -385,7 +385,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
* returns <code>true</code>.
*
* @param graphics the graphics object to paint with.
- *
+ *
* @see #setBorderPainted(boolean)
*/
protected void paintBorder(Graphics graphics)
@@ -397,12 +397,12 @@ public class JProgressBar extends JComponent implements SwingConstants,
/**
* Returns the orientation of the <code>JProgressBar</code> component, which
- * is either {@link SwingConstants#HORIZONTAL} or
- * {@link SwingConstants#VERTICAL}. The default orientation is
+ * is either {@link SwingConstants#HORIZONTAL} or
+ * {@link SwingConstants#VERTICAL}. The default orientation is
* <code>HORIZONTAL</code>.
*
* @return The orientation.
- *
+ *
* @see #setOrientation(int)
*/
public int getOrientation()
@@ -412,22 +412,22 @@ public class JProgressBar extends JComponent implements SwingConstants,
/**
* Sets the orientation for this <code>JProgressBar</code> component and,
- * if the value changes, sends a {@link PropertyChangeEvent} (with the
+ * if the value changes, sends a {@link PropertyChangeEvent} (with the
* property name <code>"orientation"</code>) to all registered listeners.
*
- * @param orientation the orientation ({@link #HORIZONTAL} or
+ * @param orientation the orientation ({@link #HORIZONTAL} or
* {@link #VERTICAL}).
- *
+ *
* @throws IllegalArgumentException if <code>orientation</code> is not
* one of the listed values.
- *
+ *
* @see #getOrientation()
*/
public void setOrientation(int orientation)
{
if (orientation != VERTICAL && orientation != HORIZONTAL)
throw new IllegalArgumentException(orientation
- + " is not a legal orientation");
+ + " is not a legal orientation");
if (this.orientation != orientation)
{
int oldOrientation = this.orientation;
@@ -438,12 +438,12 @@ public class JProgressBar extends JComponent implements SwingConstants,
/**
* Returns the flag that controls whether or not the string returned by
- * {@link #getString()} is displayed by the <code>JProgressBar</code>
+ * {@link #getString()} is displayed by the <code>JProgressBar</code>
* component.
*
- * @return <code>true</code> if the string should be displayed, and
+ * @return <code>true</code> if the string should be displayed, and
* <code>false</code> otherwise.
- *
+ *
* @see #setStringPainted(boolean)
*/
public boolean isStringPainted()
@@ -453,13 +453,13 @@ public class JProgressBar extends JComponent implements SwingConstants,
/**
* Sets the flag that controls whether or not the string returned by
- * {@link #getString()} is displayed by the <code>JProgressBar</code>
- * component. If the flag value changes, a {@link PropertyChangeEvent} (with
- * the property name <code>"stringPainted"</code>) is sent to all registered
+ * {@link #getString()} is displayed by the <code>JProgressBar</code>
+ * component. If the flag value changes, a {@link PropertyChangeEvent} (with
+ * the property name <code>"stringPainted"</code>) is sent to all registered
* listeners.
*
* @param painted the new flag value.
- *
+ *
* @see #isStringPainted()
* @see #setString(String)
*/
@@ -474,13 +474,13 @@ public class JProgressBar extends JComponent implements SwingConstants,
}
/**
- * Returns the string that is painted on the <code>JProgressBar</code> if
- * {@link #isStringPainted()} returns <code>true</code>. If no string has
- * been explicitly set, this method will return a string displaying the
+ * Returns the string that is painted on the <code>JProgressBar</code> if
+ * {@link #isStringPainted()} returns <code>true</code>. If no string has
+ * been explicitly set, this method will return a string displaying the
* value of {@link #getPercentComplete()}.
*
* @return The string.
- *
+ *
* @see #setString(String)
* @see #setStringPainted(boolean)
*/
@@ -494,13 +494,13 @@ public class JProgressBar extends JComponent implements SwingConstants,
/**
* Sets the string to display within the progress bar and, if the new value
- * is different to the old value, sends a {@link PropertyChangeEvent} (with
- * the property name <code>"string"</code>) to all registered listeners. If
+ * is different to the old value, sends a {@link PropertyChangeEvent} (with
+ * the property name <code>"string"</code>) to all registered listeners. If
* the string is set to <code>null</code>, {@link #getString()} will return
* a default string.
*
* @param string the string (<code>null</code> permitted).
- *
+ *
* @see #getString()
* @see #setStringPainted(boolean)
*/
@@ -508,7 +508,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
{
if (((string == null || progressString == null) &&
string != progressString) || (string != null &&
- ! string.equals(progressString)))
+ ! string.equals(progressString)))
{
String oldString = progressString;
progressString = string;
@@ -517,7 +517,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
}
/**
- * Returns the current value expressed as a percentage. This is calculated
+ * Returns the current value expressed as a percentage. This is calculated
* as <code>(value - min) / (max - min)</code>.
*
* @return The percentage (a value in the range 0.0 to 1.0).
@@ -527,7 +527,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
if (getMaximum() == getMinimum())
return 1.0;
else
- return (double) (model.getValue() - model.getMinimum())
+ return (double) (model.getValue() - model.getMinimum())
/ (model.getMaximum() - model.getMinimum());
}
@@ -537,7 +537,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
*
* @return <code>true</code> if the component's border should be painted,
* and <code>false</code> otherwise.
- *
+ *
* @see #setBorderPainted(boolean)
*/
public boolean isBorderPainted()
@@ -547,12 +547,12 @@ public class JProgressBar extends JComponent implements SwingConstants,
/**
* Sets the flag that controls whether or not the component's border is
- * painted. If the flag value is changed, this method sends a
- * {@link PropertyChangeEvent} (with the property name "borderPainted") to
+ * painted. If the flag value is changed, this method sends a
+ * {@link PropertyChangeEvent} (with the property name "borderPainted") to
* all registered listeners.
*
* @param painted the new flag value.
- *
+ *
* @see #isBorderPainted()
* @see #paintBorder
*/
@@ -587,7 +587,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
}
/**
- * Sets this <code>JProgressBar</code>'s UI delegate to the default
+ * Sets this <code>JProgressBar</code>'s UI delegate to the default
* (obtained from the {@link UIManager}) for the current look and feel.
*/
public void updateUI()
@@ -596,8 +596,8 @@ public class JProgressBar extends JComponent implements SwingConstants,
}
/**
- * Returns the suffix (<code>"ProgressBarUI"</code> in this case) used to
- * determine the class name for a UI delegate that can provide the look and
+ * Returns the suffix (<code>"ProgressBarUI"</code> in this case) used to
+ * determine the class name for a UI delegate that can provide the look and
* feel for a <code>JProgressBar</code>.
*
* @return <code>"ProgressBarUI"</code>.
@@ -608,11 +608,11 @@ public class JProgressBar extends JComponent implements SwingConstants,
}
/**
- * Creates a new {@link ChangeListener} that calls
+ * Creates a new {@link ChangeListener} that calls
* {@link #fireStateChanged()} whenever it receives a {@link ChangeEvent}
- * (typically from the component's <code>model</code>). This listener is
- * registered with the progress bar's model, so that changes made to the
- * model directly will automatically result in the progress bar's listeners
+ * (typically from the component's <code>model</code>). This listener is
+ * registered with the progress bar's model, so that changes made to the
+ * model directly will automatically result in the progress bar's listeners
* being notified also.
*
* @return A new listener.
@@ -624,16 +624,16 @@ public class JProgressBar extends JComponent implements SwingConstants,
public void stateChanged(ChangeEvent ce)
{
fireStateChanged();
- }
+ }
};
}
/**
- * Registers a listener with this component so that it will receive
+ * Registers a listener with this component so that it will receive
* notification of component state changes.
*
* @param listener the listener.
- *
+ *
* @see #removeChangeListener(ChangeListener)
*/
public void addChangeListener(ChangeListener listener)
@@ -646,31 +646,31 @@ public class JProgressBar extends JComponent implements SwingConstants,
* component state changes.
*
* @param listener the listener.
- *
+ *
* @see #addChangeListener(ChangeListener)
*/
public void removeChangeListener(ChangeListener listener)
{
listenerList.remove(ChangeListener.class, listener);
}
-
+
/**
* Returns an array of the listeners that are registered with this component.
* The array may be empty, but is never <code>null</code>.
*
* @return An array of listeners.
- *
+ *
* @since 1.4
*/
public ChangeListener[] getChangeListeners()
{
return (ChangeListener[]) listenerList.getListeners(ChangeListener.class);
- }
+ }
/**
* Sends a {@link ChangeEvent} to all registered listeners to indicate that
- * the state of the <code>JProgressBar</code> has changed.
- *
+ * the state of the <code>JProgressBar</code> has changed.
+ *
* @see #createChangeListener()
*/
protected void fireStateChanged()
@@ -689,7 +689,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
* Returns the model for the <code>JProgressBar</code>.
*
* @return The model (never <code>null</code>).
- *
+ *
* @see #setModel(BoundedRangeModel)
*/
public BoundedRangeModel getModel()
@@ -698,11 +698,11 @@ public class JProgressBar extends JComponent implements SwingConstants,
}
/**
- * Sets the model for the <code>JProgressBar</code> and sends a
+ * Sets the model for the <code>JProgressBar</code> and sends a
* {@link ChangeEvent} to all registered listeners.
*
* @param model the model (<code>null</code> not permitted).
- *
+ *
* @see #getModel()
*/
public void setModel(BoundedRangeModel model)
@@ -717,12 +717,12 @@ public class JProgressBar extends JComponent implements SwingConstants,
}
/**
- * Returns the minimum value for the <code>JProgressBar</code>. This defines
- * the lower bound for the current value, and is stored in the component's
+ * Returns the minimum value for the <code>JProgressBar</code>. This defines
+ * the lower bound for the current value, and is stored in the component's
* <code>model</code>.
*
* @return The minimum value.
- *
+ *
* @see #setMinimum(int)
*/
public int getMinimum()
@@ -732,14 +732,14 @@ public class JProgressBar extends JComponent implements SwingConstants,
/**
* Sets the minimum value for the <code>JProgressBar</code>. The value is
- * stored in the component's <code>model</code> (see {@link #getModel()}).
- * If the new value is different to the old value, a {@link ChangeEvent} is
- * sent to the model's registered listeners. In turn, this triggers a call
- * to {@link #fireStateChanged()} which will send a <code>ChangeEvent</code>
+ * stored in the component's <code>model</code> (see {@link #getModel()}).
+ * If the new value is different to the old value, a {@link ChangeEvent} is
+ * sent to the model's registered listeners. In turn, this triggers a call
+ * to {@link #fireStateChanged()} which will send a <code>ChangeEvent</code>
* to this component's registered listeners.
- *
+ *
* @param minimum the minimum value.
- *
+ *
* @see #getMinimum()
*/
public void setMinimum(int minimum)
@@ -748,12 +748,12 @@ public class JProgressBar extends JComponent implements SwingConstants,
}
/**
- * Returns the maximum value for the <code>JProgressBar</code>. This defines
- * the upper bound for the current value, and is stored in the component's
+ * Returns the maximum value for the <code>JProgressBar</code>. This defines
+ * the upper bound for the current value, and is stored in the component's
* <code>model</code>.
*
* @return The maximum value.
- *
+ *
* @see #setMaximum(int)
*/
public int getMaximum()
@@ -763,14 +763,14 @@ public class JProgressBar extends JComponent implements SwingConstants,
/**
* Sets the maximum value for the <code>JProgressBar</code>. The value is
- * stored in the component's <code>model</code> (see {@link #getModel()}).
- * If the new value is different to the old value, a {@link ChangeEvent} is
- * sent to the model's registered listeners. In turn, this triggers a call
- * to {@link #fireStateChanged()} which will send a <code>ChangeEvent</code>
+ * stored in the component's <code>model</code> (see {@link #getModel()}).
+ * If the new value is different to the old value, a {@link ChangeEvent} is
+ * sent to the model's registered listeners. In turn, this triggers a call
+ * to {@link #fireStateChanged()} which will send a <code>ChangeEvent</code>
* to this component's registered listeners.
*
* @param maximum the maximum value.
- *
+ *
* @see #getMaximum()
*/
public void setMaximum(int maximum)
@@ -782,7 +782,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
* Returns an implementation-dependent string describing the attributes of
* this <code>JProgressBar</code>.
*
- * @return A string describing the attributes of this
+ * @return A string describing the attributes of this
* <code>JProgressBar</code> (never <code>null</code>).
*/
protected String paramString()
@@ -806,17 +806,17 @@ public class JProgressBar extends JComponent implements SwingConstants,
/**
* Sets the flag that controls the mode for this <code>JProgressBar</code>
* (<code>true</code> for indeterminate mode, and <code>false</code> for
- * determinate mode). If the flag value changes, this method sends a
- * {@link PropertyChangeEvent} (with the property name
+ * determinate mode). If the flag value changes, this method sends a
+ * {@link PropertyChangeEvent} (with the property name
* <code>"indeterminate"</code>) to all registered listeners.
* <p>
* If the <code>JProgressBar</code> is determinate, it paints a percentage
- * of the bar described by its value. If it is indeterminate, it simply
- * bounces a box between the ends of the bar; the value of the
+ * of the bar described by its value. If it is indeterminate, it simply
+ * bounces a box between the ends of the bar; the value of the
* <code>JProgressBar</code> is ignored.
*
* @param flag the new flag value.
- *
+ *
* @see #isIndeterminate()
* @since 1.4
*/
@@ -831,11 +831,11 @@ public class JProgressBar extends JComponent implements SwingConstants,
/**
* Returns a flag that indicates the mode for this <code>JProgressBar</code>
- * (<code>true</code> for indeterminate mode, and <code>false</code> for
- * determinate mode).
+ * (<code>true</code> for indeterminate mode, and <code>false</code> for
+ * determinate mode).
*
* @return A flag indicating the mode for the <code>JProgressBar</code>.
- *
+ *
* @see #setIndeterminate(boolean)
* @since 1.4
*/
@@ -848,14 +848,14 @@ public class JProgressBar extends JComponent implements SwingConstants,
* Returns the object that provides accessibility features for this
* <code>JProgressBar</code> component.
*
- * @return The accessible context (an instance of
+ * @return The accessible context (an instance of
* {@link AccessibleJProgressBar}).
*/
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
accessibleContext = new AccessibleJProgressBar();
-
+
return accessibleContext;
- }
+ }
}
diff --git a/libjava/classpath/javax/swing/JRadioButton.java b/libjava/classpath/javax/swing/JRadioButton.java
index e0593f3..ae42f2c 100644
--- a/libjava/classpath/javax/swing/JRadioButton.java
+++ b/libjava/classpath/javax/swing/JRadioButton.java
@@ -1,4 +1,4 @@
-/* JRadioButton.java --
+/* JRadioButton.java --
Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -105,12 +105,12 @@ public class JRadioButton extends JToggleButton
/**
* Constructs an unselected radio button with no text or icon.
- */
+ */
public JRadioButton()
{
this(null, null, false);
}
-
+
/**
* Constructs a radio button using the labelling, state
* and icon specified by the supplied action.
@@ -130,10 +130,10 @@ public class JRadioButton extends JToggleButton
* @param icon the icon to use.
*/
public JRadioButton(Icon icon)
- {
+ {
this(null, icon, false);
- }
-
+ }
+
/**
* Constructs a radio button with the supplied icon and state.
*
@@ -142,10 +142,10 @@ public class JRadioButton extends JToggleButton
* selected state. Otherwise, the button is unselected.
*/
public JRadioButton(Icon icon, boolean selected)
- {
+ {
this(null, icon, selected);
- }
-
+ }
+
/**
* Constructs an unselected radio button using the supplied text
* and no icon.
@@ -168,7 +168,7 @@ public class JRadioButton extends JToggleButton
{
this(text, null, selected);
}
-
+
/**
* Constructs an unselected radio button with the supplied text
* and icon.
@@ -180,7 +180,7 @@ public class JRadioButton extends JToggleButton
{
this(text, icon, false);
}
-
+
/**
* Constructs a radio button with the supplied text, icon and state.
*
@@ -195,7 +195,7 @@ public class JRadioButton extends JToggleButton
setBorderPainted(false);
setHorizontalAlignment(LEADING);
}
-
+
/**
* Returns the accessible context for this <code>JRadioButton</code>,
* in the form of an instance of <code>AccessibleJRadioButton</code>.
@@ -209,23 +209,23 @@ public class JRadioButton extends JToggleButton
if (accessibleContext == null)
{
/* Create the context */
- accessibleContext = new AccessibleJRadioButton();
+ accessibleContext = new AccessibleJRadioButton();
}
return accessibleContext;
}
-
+
/**
* Returns a string specifying the name of the Look and Feel UI class
* that renders this component.
*
* @return the Look and Feel UI class for <code>JRadioButton</code>s
* as a <code>String</code>.
- */
+ */
public String getUIClassID()
{
return "RadioButtonUI";
}
-
+
/**
* Returns a string representation of this component for debugging use.
* Users should not depend on anything as regards the content or formatting
@@ -233,19 +233,19 @@ public class JRadioButton extends JToggleButton
* null (only empty).
*
* @return the component in <code>String</code> form for debugging.
- */
+ */
protected String paramString()
{
return super.paramString();
}
-
+
/**
* This method resets the radio button's UI delegate to the default UI for
* the current look and feel.
*/
public void updateUI()
{
- /*
+ /*
I can't see any difference between this and the superclass one,
but Sun reimplements it... there is no RadioButtonUI class for it
to be cast to.
@@ -254,6 +254,3 @@ public class JRadioButton extends JToggleButton
}
}
-
-
-
diff --git a/libjava/classpath/javax/swing/JRadioButtonMenuItem.java b/libjava/classpath/javax/swing/JRadioButtonMenuItem.java
index 13ef189..48fc9ae 100644
--- a/libjava/classpath/javax/swing/JRadioButtonMenuItem.java
+++ b/libjava/classpath/javax/swing/JRadioButtonMenuItem.java
@@ -169,12 +169,12 @@ public class JRadioButtonMenuItem extends JMenuItem implements Accessible
}
/**
- * Returns a string describing the attributes for the
- * <code>JRadioButtonMenuItem</code> component, for use in debugging. The
- * return value is guaranteed to be non-<code>null</code>, but the format of
+ * Returns a string describing the attributes for the
+ * <code>JRadioButtonMenuItem</code> component, for use in debugging. The
+ * return value is guaranteed to be non-<code>null</code>, but the format of
* the string may vary between implementations.
*
- * @return A string describing the attributes of the
+ * @return A string describing the attributes of the
* <code>JRadioButtonMenuItem</code>.
*/
protected String paramString()
@@ -187,7 +187,7 @@ public class JRadioButtonMenuItem extends JMenuItem implements Accessible
* Returns the object that provides accessibility features for this
* <code>JRadioButtonMenuItem</code> component.
*
- * @return The accessible context (an instance of
+ * @return The accessible context (an instance of
* {@link AccessibleJRadioButtonMenuItem}).
*/
public AccessibleContext getAccessibleContext()
@@ -199,9 +199,9 @@ public class JRadioButtonMenuItem extends JMenuItem implements Accessible
}
/**
- * Provides the accessibility features for the
+ * Provides the accessibility features for the
* <code>JRadioButtonMenuItem</code> component.
- *
+ *
* @see JRadioButtonMenuItem#getAccessibleContext()
*/
protected class AccessibleJRadioButtonMenuItem extends AccessibleJMenuItem
@@ -217,7 +217,7 @@ public class JRadioButtonMenuItem extends JMenuItem implements Accessible
}
/**
- * Returns the accessible role for the <code>JRadioButtonMenuItem</code>
+ * Returns the accessible role for the <code>JRadioButtonMenuItem</code>
* component.
*
* @return {@link AccessibleRole#RADIO_BUTTON}.
diff --git a/libjava/classpath/javax/swing/JRootPane.java b/libjava/classpath/javax/swing/JRootPane.java
index 10fdf10..c74f4f5 100644
--- a/libjava/classpath/javax/swing/JRootPane.java
+++ b/libjava/classpath/javax/swing/JRootPane.java
@@ -93,7 +93,7 @@ public class JRootPane extends JComponent implements Accessible
}
}
- // Custom Layout Manager for JRootPane. It positions contentPane and
+ // Custom Layout Manager for JRootPane. It positions contentPane and
// menuBar withing its layeredPane.
protected class RootLayout implements LayoutManager2, Serializable
{
@@ -125,7 +125,7 @@ public class JRootPane extends JComponent implements Accessible
*/
protected RootLayout()
{
- // Nothing to do here.
+ // Nothing to do here.
}
/**
@@ -208,7 +208,7 @@ public class JRootPane extends JComponent implements Accessible
// 2. the layeredPane filles entire viewable region.
// 3. the menuBar is positioned at the upper edge of layeredPane.
// 4. the contentPane fills viewable region minus menuBar, if present.
-
+
// +-------------------------------+
// | JLayeredPane |
@@ -237,7 +237,7 @@ public class JRootPane extends JComponent implements Accessible
else
contentPaneBounds = new Rectangle(0, 0, containerWidth,
containerHeight);
-
+
glassPaneBounds = new Rectangle(i.left, i.top, containerWidth, containerHeight);
layeredPaneBounds = new Rectangle(i.left, i.top, containerWidth, containerHeight);
}
@@ -321,7 +321,7 @@ public class JRootPane extends JComponent implements Accessible
public static final int FILE_CHOOSER_DIALOG = 6;
public static final int QUESTION_DIALOG = 7;
public static final int WARNING_DIALOG = 8;
-
+
/** DOCUMENT ME! */
protected Component glassPane;
@@ -366,7 +366,7 @@ public class JRootPane extends JComponent implements Accessible
* @since 1.4
*/
private int windowDecorationStyle = NONE;
-
+
/**
* DOCUMENT ME!
*
@@ -432,7 +432,7 @@ public class JRootPane extends JComponent implements Accessible
/**
* Sets the JRootPane's content pane. The content pane should typically be
- * opaque for painting to work properly. This method also
+ * opaque for painting to work properly. This method also
* removes the old content pane from the layered pane.
*
* @param p the Container that will be the content pane
@@ -505,10 +505,10 @@ public class JRootPane extends JComponent implements Accessible
}
/**
- * Set the layered pane for the root pane.
+ * Set the layered pane for the root pane.
*
* @param f The JLayeredPane to be used.
- *
+ *
* @throws IllegalComponentStateException if JLayeredPane
* parameter is null.
*/
@@ -516,10 +516,10 @@ public class JRootPane extends JComponent implements Accessible
{
if (f == null)
throw new IllegalComponentStateException();
-
+
if (layeredPane != null)
remove(layeredPane);
-
+
layeredPane = f;
add(f, -1);
}
@@ -628,7 +628,7 @@ public class JRootPane extends JComponent implements Accessible
{
return defaultButton;
}
-
+
public void setDefaultButton(JButton newButton)
{
// We only change the default button if the new button is defaultCapable
@@ -665,7 +665,7 @@ public class JRootPane extends JComponent implements Accessible
&& style != WARNING_DIALOG
&& style != PLAIN_DIALOG)
throw new IllegalArgumentException("invalid style");
-
+
int oldStyle = windowDecorationStyle;
windowDecorationStyle = style;
firePropertyChange("windowDecorationStyle", oldStyle, style);
diff --git a/libjava/classpath/javax/swing/JScrollBar.java b/libjava/classpath/javax/swing/JScrollBar.java
index 371bb60..a600316 100644
--- a/libjava/classpath/javax/swing/JScrollBar.java
+++ b/libjava/classpath/javax/swing/JScrollBar.java
@@ -57,7 +57,7 @@ import javax.swing.event.ChangeListener;
import javax.swing.plaf.ScrollBarUI;
/**
- * The JScrollBar. Two buttons control how the values that the
+ * The JScrollBar. Two buttons control how the values that the
* scroll bar can take. You can also drag the thumb or click the track
* to move the scroll bar. Typically, the JScrollBar is used with
* other components to translate the value of the bar to the viewable
@@ -73,7 +73,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
implements AccessibleValue
{
private static final long serialVersionUID = -7758162392045586663L;
-
+
/**
* Creates a new <code>AccessibleJScrollBar</code> instance.
*/
@@ -83,7 +83,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
}
/**
- * Returns a set containing the current state of the {@link JScrollBar}
+ * Returns a set containing the current state of the {@link JScrollBar}
* component.
*
* @return The accessible state set.
@@ -109,7 +109,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
}
/**
- * Returns an object that provides access to the current, minimum and
+ * Returns an object that provides access to the current, minimum and
* maximum values.
*
* @return The accessible value.
@@ -132,14 +132,14 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
/**
* Sets the current value of the {@link JScrollBar} component and sends a
- * {@link PropertyChangeEvent} (with the property name
+ * {@link PropertyChangeEvent} (with the property name
* {@link AccessibleContext#ACCESSIBLE_VALUE_PROPERTY}) to all registered
- * listeners. If the supplied value is <code>null</code>, this method
+ * listeners. If the supplied value is <code>null</code>, this method
* does nothing and returns <code>false</code>.
*
* @param value the new slider value (<code>null</code> permitted).
*
- * @return <code>true</code> if the slider value is updated, and
+ * @return <code>true</code> if the slider value is updated, and
* <code>false</code> otherwise.
*/
public boolean setCurrentAccessibleValue(Number value)
@@ -148,7 +148,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
return false;
Number oldValue = getCurrentAccessibleValue();
setValue(value.intValue());
- firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue,
+ firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue,
new Integer(getValue()));
return true;
}
@@ -195,11 +195,11 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
m.getValueIsAdjusting());
}
}
-
+
}
private static final long serialVersionUID = -8195169869225066566L;
-
+
/** How much the thumb moves when moving in a block. */
protected int blockIncrement = 10;
@@ -218,7 +218,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
*/
private ChangeListener sbChangeListener;
- /**
+ /**
* Creates a new horizontal JScrollBar object with a minimum
* of 0, a maxmium of 100, a value of 0 and an extent of 10.
*/
@@ -228,7 +228,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
}
/**
- * Creates a new JScrollBar object with a minimum of 0, a
+ * Creates a new JScrollBar object with a minimum of 0, a
* maximum of 100, a value of 0, an extent of 10 and the given
* orientation.
*
@@ -240,7 +240,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
}
/**
- * Creates a new JScrollBar object with the given orientation,
+ * Creates a new JScrollBar object with the given orientation,
* value, min, max, and extent.
*
* @param orientation The orientation to use.
@@ -294,7 +294,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
}
/**
- * This method returns an identifier to
+ * This method returns an identifier to
* choose the correct UI delegate for the
* scrollbar.
*
@@ -327,15 +327,15 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
throw new IllegalArgumentException("orientation must be one of HORIZONTAL or VERTICAL");
if (orientation != this.orientation)
{
- int oldOrientation = this.orientation;
- this.orientation = orientation;
- firePropertyChange("orientation", oldOrientation,
- this.orientation);
+ int oldOrientation = this.orientation;
+ this.orientation = orientation;
+ firePropertyChange("orientation", oldOrientation,
+ this.orientation);
}
}
/**
- * This method returns the model being used with
+ * This method returns the model being used with
* the scrollbar.
*
* @return The scrollbar's model.
@@ -364,7 +364,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
/**
* This method returns how much the scrollbar's value
- * should change for a unit increment depending on the
+ * should change for a unit increment depending on the
* given direction.
*
* @param direction The direction to scroll in.
@@ -385,10 +385,10 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
{
if (unitIncrement != this.unitIncrement)
{
- int oldInc = this.unitIncrement;
- this.unitIncrement = unitIncrement;
- firePropertyChange("unitIncrement", oldInc,
- this.unitIncrement);
+ int oldInc = this.unitIncrement;
+ this.unitIncrement = unitIncrement;
+ firePropertyChange("unitIncrement", oldInc,
+ this.unitIncrement);
}
}
@@ -415,10 +415,10 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
{
if (blockIncrement != this.blockIncrement)
{
- int oldInc = this.blockIncrement;
- this.blockIncrement = blockIncrement;
- firePropertyChange("blockIncrement", oldInc,
- this.blockIncrement);
+ int oldInc = this.blockIncrement;
+ this.blockIncrement = blockIncrement;
+ firePropertyChange("blockIncrement", oldInc,
+ this.blockIncrement);
}
}
@@ -463,8 +463,8 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
}
/**
- * This method returns the visible amount (AKA extent).
- * The visible amount can be used by UI delegates to
+ * This method returns the visible amount (AKA extent).
+ * The visible amount can be used by UI delegates to
* determine the size of the thumb.
*
* @return The visible amount (AKA extent).
@@ -545,7 +545,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
}
/**
- * This method sets the value, extent, minimum and
+ * This method sets the value, extent, minimum and
* maximum.
*
* @param newValue The new value.
@@ -570,7 +570,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
}
/**
- * This method removes an AdjustmentListener from the scroll bar.
+ * This method removes an AdjustmentListener from the scroll bar.
*
* @param listener The listener to remove.
*/
@@ -580,7 +580,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
}
/**
- * This method returns an arry of all AdjustmentListeners listening to
+ * This method returns an arry of all AdjustmentListeners listening to
* this scroll bar.
*
* @return An array of AdjustmentListeners listening to this scroll bar.
@@ -594,7 +594,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
* This method is called to fired AdjustmentEvents to the listeners
* of this scroll bar. All AdjustmentEvents that are fired
* will have an ID of ADJUSTMENT_VALUE_CHANGED and a type of
- * TRACK.
+ * TRACK.
*
* @param id The ID of the adjustment event.
* @param type The Type of change.
@@ -658,14 +658,14 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
*/
public void setEnabled(boolean x)
{
- // nothing special needs to be done here since we
+ // nothing special needs to be done here since we
// just check the enabled setting before changing the value.
super.setEnabled(x);
}
/**
* Returns a string describing the attributes for the <code>JScrollBar</code>
- * component, for use in debugging. The return value is guaranteed to be
+ * component, for use in debugging. The return value is guaranteed to be
* non-<code>null</code>, but the format of the string may vary between
* implementations.
*
@@ -678,7 +678,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
sb.append(",orientation=");
if (this.orientation == JScrollBar.HORIZONTAL)
sb.append("HORIZONTAL");
- else
+ else
sb.append("VERTICAL");
sb.append(",unitIncrement=").append(unitIncrement);
return sb.toString();
@@ -688,7 +688,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
* Returns the object that provides accessibility features for this
* <code>JScrollBar</code> component.
*
- * @return The accessible context (an instance of
+ * @return The accessible context (an instance of
* {@link AccessibleJScrollBar}).
*/
public AccessibleContext getAccessibleContext()
diff --git a/libjava/classpath/javax/swing/JScrollPane.java b/libjava/classpath/javax/swing/JScrollPane.java
index f6d37c7..6d17857 100644
--- a/libjava/classpath/javax/swing/JScrollPane.java
+++ b/libjava/classpath/javax/swing/JScrollPane.java
@@ -1,4 +1,4 @@
-/* JScrollPane.java --
+/* JScrollPane.java --
Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -146,7 +146,7 @@ public class JScrollPane extends JComponent
}
private static final long serialVersionUID = 5203525440012340014L;
-
+
protected JViewport columnHeader;
protected JViewport rowHeader;
@@ -171,9 +171,9 @@ public class JScrollPane extends JComponent
return columnHeader;
}
- public Component getCorner(String key)
+ public Component getCorner(String key)
{
- if (getComponentOrientation()
+ if (getComponentOrientation()
== ComponentOrientation.LEFT_TO_RIGHT)
{
if (key == LOWER_LEADING_CORNER)
@@ -185,7 +185,7 @@ public class JScrollPane extends JComponent
else if (key == UPPER_TRAILING_CORNER)
key = UPPER_RIGHT_CORNER;
}
- else if (getComponentOrientation()
+ else if (getComponentOrientation()
== ComponentOrientation.RIGHT_TO_LEFT)
{
if (key == LOWER_LEADING_CORNER)
@@ -261,14 +261,14 @@ public class JScrollPane extends JComponent
else
{
Rectangle b = getViewport().getBounds();
- return new Rectangle(b.x - i.left,
+ return new Rectangle(b.x - i.left,
b.y - i.top,
- b.width + i.left + i.right,
+ b.width + i.left + i.right,
b.height + i.top + i.bottom);
}
}
}
-
+
public boolean isWheelScrollingEnabled()
{
return wheelScrollingEnabled;
@@ -310,7 +310,7 @@ public class JScrollPane extends JComponent
{
if (columnHeader == h)
return;
-
+
JViewport old = columnHeader;
removeNonNull(old);
columnHeader = h;
@@ -329,7 +329,7 @@ public class JScrollPane extends JComponent
public void setCorner(String key, Component c)
{
- if (getComponentOrientation()
+ if (getComponentOrientation()
== ComponentOrientation.LEFT_TO_RIGHT)
{
if (key == LOWER_LEADING_CORNER)
@@ -341,7 +341,7 @@ public class JScrollPane extends JComponent
else if (key == UPPER_TRAILING_CORNER)
key = UPPER_RIGHT_CORNER;
}
- else if (getComponentOrientation()
+ else if (getComponentOrientation()
== ComponentOrientation.RIGHT_TO_LEFT)
{
if (key == LOWER_LEADING_CORNER)
@@ -401,11 +401,11 @@ public class JScrollPane extends JComponent
{
if (horizontalScrollBarPolicy == h)
return;
-
+
if (h != HORIZONTAL_SCROLLBAR_AS_NEEDED
&& h != HORIZONTAL_SCROLLBAR_NEVER
&& h != HORIZONTAL_SCROLLBAR_ALWAYS)
- throw new IllegalArgumentException("unknown horizontal scrollbar policy");
+ throw new IllegalArgumentException("unknown horizontal scrollbar policy");
int old = horizontalScrollBarPolicy;
horizontalScrollBarPolicy = h;
@@ -428,7 +428,7 @@ public class JScrollPane extends JComponent
{
if (rowHeader == v)
return;
-
+
JViewport old = rowHeader;
removeNonNull(old);
rowHeader = v;
@@ -449,7 +449,7 @@ public class JScrollPane extends JComponent
{
if (verticalScrollBar == v)
return;
-
+
JScrollBar old = verticalScrollBar;
removeNonNull(old);
verticalScrollBar = v;
@@ -462,12 +462,12 @@ public class JScrollPane extends JComponent
{
if (verticalScrollBarPolicy == v)
return;
-
+
if (v != VERTICAL_SCROLLBAR_AS_NEEDED
&& v != VERTICAL_SCROLLBAR_NEVER
&& v != VERTICAL_SCROLLBAR_ALWAYS)
- throw new IllegalArgumentException("unknown vertical scrollbar policy");
-
+ throw new IllegalArgumentException("unknown vertical scrollbar policy");
+
int old = verticalScrollBarPolicy;
verticalScrollBarPolicy = v;
firePropertyChange("verticalScrollBarPolicy", old, v);
@@ -479,7 +479,7 @@ public class JScrollPane extends JComponent
{
if (wheelScrollingEnabled == b)
return;
-
+
boolean old = wheelScrollingEnabled;
wheelScrollingEnabled = b;
firePropertyChange("wheelScrollingEnabled", old, b);
@@ -490,7 +490,7 @@ public class JScrollPane extends JComponent
{
if (viewport == v)
return;
-
+
JViewport old = viewport;
removeNonNull(old);
viewport = v;
@@ -510,20 +510,20 @@ public class JScrollPane extends JComponent
{
if (viewportBorder == b)
return;
-
+
Border old = viewportBorder;
viewportBorder = b;
firePropertyChange("viewportBorder", old, b);
sync();
}
-
+
public void setViewportView(Component view)
{
if (getViewport() == null)
{
setViewport(createViewport());
}
-
+
if (view != null)
{
getViewport().setView(view);
@@ -541,7 +541,7 @@ public class JScrollPane extends JComponent
* policy is set to {@link #VERTICAL_SCROLLBAR_AS_NEEDED} and
* {@link #HORIZONTAL_SCROLLBAR_AS_NEEDED}.
*/
- public JScrollPane()
+ public JScrollPane()
{
this(null);
}
@@ -553,10 +553,10 @@ public class JScrollPane extends JComponent
*
* @param view the component that is embedded inside the JScrollPane
*/
- public JScrollPane(Component view)
+ public JScrollPane(Component view)
{
- this(view,
- VERTICAL_SCROLLBAR_AS_NEEDED,
+ this(view,
+ VERTICAL_SCROLLBAR_AS_NEEDED,
HORIZONTAL_SCROLLBAR_AS_NEEDED);
}
@@ -574,7 +574,7 @@ public class JScrollPane extends JComponent
* @see ScrollPaneConstants#VERTICAL_SCROLLBAR_AS_NEEDED
* @see ScrollPaneConstants#VERTICAL_SCROLLBAR_NEVER
*/
- public JScrollPane(int vsbPolicy, int hsbPolicy)
+ public JScrollPane(int vsbPolicy, int hsbPolicy)
{
this(null, vsbPolicy, hsbPolicy);
}
@@ -594,7 +594,7 @@ public class JScrollPane extends JComponent
* @see ScrollPaneConstants#VERTICAL_SCROLLBAR_AS_NEEDED
* @see ScrollPaneConstants#VERTICAL_SCROLLBAR_NEVER
*/
- public JScrollPane(Component view, int vsbPolicy, int hsbPolicy)
+ public JScrollPane(Component view, int vsbPolicy, int hsbPolicy)
{
wheelScrollingEnabled = true;
setVerticalScrollBarPolicy(vsbPolicy);
@@ -610,7 +610,7 @@ public class JScrollPane extends JComponent
updateUI();
}
-
+
public JScrollBar createHorizontalScrollBar()
{
return new ScrollBar(SwingConstants.HORIZONTAL);
@@ -620,7 +620,7 @@ public class JScrollPane extends JComponent
{
return new ScrollBar(SwingConstants.VERTICAL);
}
-
+
protected JViewport createViewport()
{
return new JViewport();
@@ -630,11 +630,11 @@ public class JScrollPane extends JComponent
{
return "ScrollPaneUI";
}
-
+
public void updateUI()
{
setUI((ScrollPaneUI) UIManager.getUI(this));
- }
+ }
/**
* This method returns the scrollpane's UI delegate.
@@ -656,7 +656,7 @@ public class JScrollPane extends JComponent
super.setUI(ui);
}
- protected class ScrollBar
+ protected class ScrollBar
extends JScrollBar
implements UIResource
{
@@ -675,7 +675,7 @@ public class JScrollPane extends JComponent
else
{
Scrollable s = (Scrollable) view;
- return s.getScrollableBlockIncrement(JScrollPane.this.getViewport().getViewRect(),
+ return s.getScrollableBlockIncrement(JScrollPane.this.getViewport().getViewRect(),
this.getOrientation(),
direction);
}
@@ -689,7 +689,7 @@ public class JScrollPane extends JComponent
else
{
Scrollable s = (Scrollable) view;
- return s.getScrollableUnitIncrement(JScrollPane.this.getViewport().getViewRect(),
+ return s.getScrollableUnitIncrement(JScrollPane.this.getViewport().getViewRect(),
this.getOrientation(),
direction);
}
diff --git a/libjava/classpath/javax/swing/JSeparator.java b/libjava/classpath/javax/swing/JSeparator.java
index c87783b..15d15fd 100644
--- a/libjava/classpath/javax/swing/JSeparator.java
+++ b/libjava/classpath/javax/swing/JSeparator.java
@@ -58,7 +58,7 @@ public class JSeparator extends JComponent implements SwingConstants,
protected class AccessibleJSeparator extends AccessibleJComponent
{
private static final long serialVersionUID = 916332890553201095L;
-
+
/**
* Creates a new <code>AccessibleJSeparator</code> instance.
*/
@@ -79,7 +79,7 @@ public class JSeparator extends JComponent implements SwingConstants,
}
private static final long serialVersionUID = 125301223445282357L;
-
+
/** The orientation of the JSeparator. */
private transient int orientation = HORIZONTAL;
@@ -94,9 +94,9 @@ public class JSeparator extends JComponent implements SwingConstants,
/**
* Creates a new <code>JSeparator</code> object with the given orientation.
*
- * @param orientation the orientation (either {@link #HORIZONTAL} or
+ * @param orientation the orientation (either {@link #HORIZONTAL} or
* {@link #VERTICAL}).
- *
+ *
* @throws IllegalArgumentException if <code>orientation</code> is not
* one of the specified values.
*/
@@ -139,8 +139,8 @@ public class JSeparator extends JComponent implements SwingConstants,
}
/**
- * Returns the suffix (<code>"SeparatorUI"</code> in this case) used to
- * determine the class name for a UI delegate that can provide the look and
+ * Returns the suffix (<code>"SeparatorUI"</code> in this case) used to
+ * determine the class name for a UI delegate that can provide the look and
* feel for a <code>JSeparator</code>.
*
* @return <code>"SeparatorUI"</code>.
@@ -154,7 +154,7 @@ public class JSeparator extends JComponent implements SwingConstants,
* Returns the orientation of the <code>JSeparator</code>.
*
* @return The orientation (one of {@link #HORIZONTAL} and {@link #VERTICAL}).
- *
+ *
* @see #setOrientation(int)
*/
public int getOrientation()
@@ -163,16 +163,16 @@ public class JSeparator extends JComponent implements SwingConstants,
}
/**
- * Sets the orientation for the <code>JSeparator</code> and sends a
- * {@link PropertyChangeEvent} (with the property name
+ * Sets the orientation for the <code>JSeparator</code> and sends a
+ * {@link PropertyChangeEvent} (with the property name
* <code>orientation</code>) to all registered listeners.
*
- * @param orientation the orientation (either {@link #HORIZONTAL} or
+ * @param orientation the orientation (either {@link #HORIZONTAL} or
* {@link #VERTICAL}).
- *
+ *
* @throws IllegalArgumentException if <code>orientation</code> is not
* one of the specified values.
- *
+ *
* @see #getOrientation()
*/
public void setOrientation(int orientation)
@@ -205,14 +205,14 @@ public class JSeparator extends JComponent implements SwingConstants,
* Returns the object that provides accessibility features for this
* <code>JSeparator</code> component.
*
- * @return The accessible context (an instance of
+ * @return The accessible context (an instance of
* {@link AccessibleJSeparator}).
*/
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
accessibleContext = new AccessibleJSeparator();
-
+
return accessibleContext;
}
}
diff --git a/libjava/classpath/javax/swing/JSlider.java b/libjava/classpath/javax/swing/JSlider.java
index 979707a..a6f5113 100644
--- a/libjava/classpath/javax/swing/JSlider.java
+++ b/libjava/classpath/javax/swing/JSlider.java
@@ -67,17 +67,17 @@ import javax.swing.plaf.UIResource;
* <p>
* A <code>JSlider</code> component has the following properties:
* </p>
- *
+ *
* <table>
* <tr><th> Property </th><th> Stored in </th><th> Bound? </th></tr>
* <tr><td> extent </td><td> model </td><td> no </td></tr>
* <tr><td> inverted </td><td> slider </td><td> yes </td></tr>
* <tr><td> labelTable </td><td> slider </td><td> yes </td></tr>
- * <tr><td> majorTickSpacing </td><td> slider </td><td> yes </td></tr>
+ * <tr><td> majorTickSpacing </td><td> slider </td><td> yes </td></tr>
* <tr><td> maximum </td><td> model </td><td> yes </td></tr>
* <tr><td> minimum </td><td> model </td><td> yes </td></tr>
* <tr><td> minorTickSpacing </td><td> slider </td><td> yes </td></tr>
- * <tr><td> model </td><td> slider </td><td> yes </td></tr>
+ * <tr><td> model </td><td> slider </td><td> yes </td></tr>
* <tr><td> orientation </td><td> slider </td><td> yes </td></tr>
* <tr><td> paintLabels </td><td> slider </td><td> yes </td></tr>
* <tr><td> paintTicks </td><td> slider </td><td> yes </td></tr>
@@ -85,11 +85,11 @@ import javax.swing.plaf.UIResource;
* <tr><td> value </td><td> model </td><td> no </td></tr>
* <tr><td> valueIsAdjusting </td><td> model </td><td> no </td></tr>
* </table>
- *
+ *
* <p>
* The various behavioural aspects of these properties follows:
* </p>
- *
+ *
* <ul>
* <li>
* When a non-bound property stored in the slider changes, the slider fires
@@ -100,11 +100,11 @@ import javax.swing.plaf.UIResource;
* {@link PropertyChangeEvent} to its property change listeners.
* </li>
* <li>
- * If any of the model's properties change, it fires a {@link ChangeEvent} to
+ * If any of the model's properties change, it fires a {@link ChangeEvent} to
* its listeners, which include the slider.
* </li>
* <li>
- * If the slider receives a {@link ChangeEvent} from its model, it will
+ * If the slider receives a {@link ChangeEvent} from its model, it will
* propagate the event to its own change listeners, with the event's "source"
* property set to refer to the slider, rather than the model.
* </li>
@@ -140,7 +140,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
implements AccessibleValue
{
private static final long serialVersionUID = -6301740148041106789L;
-
+
/**
* Creates a new <code>AccessibleJSlider</code> instance.
*/
@@ -150,7 +150,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Returns a set containing the current state of the {@link JSlider}
+ * Returns a set containing the current state of the {@link JSlider}
* component.
*
* @return The accessible state set.
@@ -176,8 +176,8 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Returns an object that provides access to the current, minimum and
- * maximum values for the {@link JSlider}. Since this class implements
+ * Returns an object that provides access to the current, minimum and
+ * maximum values for the {@link JSlider}. Since this class implements
* {@link AccessibleValue}, it returns itself.
*
* @return The accessible value.
@@ -200,14 +200,14 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
/**
* Sets the current value of the {@link JSlider} component and sends a
- * {@link PropertyChangeEvent} (with the property name
+ * {@link PropertyChangeEvent} (with the property name
* {@link AccessibleContext#ACCESSIBLE_VALUE_PROPERTY}) to all registered
- * listeners. If the supplied value is <code>null</code>, this method
+ * listeners. If the supplied value is <code>null</code>, this method
* does nothing and returns <code>false</code>.
*
* @param value the new slider value (<code>null</code> permitted).
*
- * @return <code>true</code> if the slider value is updated, and
+ * @return <code>true</code> if the slider value is updated, and
* <code>false</code> otherwise.
*/
public boolean setCurrentAccessibleValue(Number value)
@@ -216,7 +216,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
return false;
Number oldValue = getCurrentAccessibleValue();
setValue(value.intValue());
- firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue,
+ firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue,
new Integer(getValue()));
return true;
}
@@ -277,9 +277,9 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
/** Whether the slider is inverted. */
private transient boolean isInverted;
- /**
+ /**
* The listener that monitors the slider's model and forwards events to the
- * slider's listeners (see <code>createChangeListener()</code>).
+ * slider's listeners (see <code>createChangeListener()</code>).
*/
protected ChangeListener changeListener;
@@ -287,7 +287,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
protected transient ChangeEvent changeEvent;
/**
- * Creates a new horizontal <code>JSlider</code> instance with a minimum of
+ * Creates a new horizontal <code>JSlider</code> instance with a minimum of
* 0, a maximum of 100, and a value of 50.
*/
public JSlider()
@@ -296,12 +296,12 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Creates a new <code>JSlider</code> instance with the given orientation
+ * Creates a new <code>JSlider</code> instance with the given orientation
* and a minimum of 0, a maximum of 100, and a value of 50.
*
* @param orientation The orientation of the slider ({@link #HORIZONTAL} or
* {@link #VERTICAL}).
- *
+ *
* @throws IllegalArgumentException if <code>orientation</code> is not one of
* the specified values.
*/
@@ -311,13 +311,13 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Creates a new horizontal <code>JSlider</code> instance with the given
+ * Creates a new horizontal <code>JSlider</code> instance with the given
* maximum and minimum and a value that is halfway between the minimum and the
* maximum.
*
* @param minimum The minimum value.
* @param maximum The maximum value.
- *
+ *
* @throws IllegalArgumentException if <code>minimum</code> is greater than
* <code>maximum</code>.
*/
@@ -327,14 +327,14 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Creates a new horizontal <code>JSlider</code> instance with the given
+ * Creates a new horizontal <code>JSlider</code> instance with the given
* minimum, maximum, and value.
*
* @param minimum The minimum value.
* @param maximum The maximum value.
* @param value The initial value.
- *
- * @throws IllegalArgumentException if <code>value</code> is not in the
+ *
+ * @throws IllegalArgumentException if <code>value</code> is not in the
* specified range.
* @throws IllegalArgumentException if <code>minimum</code> is greater than
* <code>maximum</code>.
@@ -345,7 +345,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Creates a new <code>JSlider</code> instance with the given orientation,
+ * Creates a new <code>JSlider</code> instance with the given orientation,
* minimum, maximum, and value.
*
* @param orientation The orientation of the slider ({@link #HORIZONTAL} or
@@ -353,10 +353,10 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* @param minimum The minimum value of the JSlider.
* @param maximum The maximum value of the JSlider.
* @param value The initial value of the JSlider.
- *
+ *
* @throws IllegalArgumentException if <code>orientation</code> is not one of
* the specified values.
- * @throws IllegalArgumentException if <code>value</code> is not in the
+ * @throws IllegalArgumentException if <code>value</code> is not in the
* specified range.
* @throws IllegalArgumentException if <code>minimum</code> is greater than
* <code>maximum</code>.
@@ -365,7 +365,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
{
sliderModel = new DefaultBoundedRangeModel(value, 0, minimum, maximum);
if (orientation != HORIZONTAL && orientation != VERTICAL)
- throw new IllegalArgumentException(orientation
+ throw new IllegalArgumentException(orientation
+ " is not a legal orientation");
this.orientation = orientation;
changeListener = createChangeListener();
@@ -374,11 +374,11 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Creates a new horizontal <code>JSlider</code> instance with the given
+ * Creates a new horizontal <code>JSlider</code> instance with the given
* model.
*
* @param model The model (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if <code>model</code> is <code>null</code>.
*/
public JSlider(BoundedRangeModel model)
@@ -393,7 +393,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* Returns the slider's value (from the slider's model).
*
* @return The value of the slider.
- *
+ *
* @see #setValue(int)
*/
public int getValue()
@@ -402,14 +402,14 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Sets the slider's value and sends a {@link ChangeEvent} to all
+ * Sets the slider's value and sends a {@link ChangeEvent} to all
* registered listeners. Note that the model will fire a change event to all
* of its registered listeners first (with the model as the event source) and
* then the slider will fire another change event to all of its registered
* listeners (this time with the slider as the event source).
*
* @param value the new value.
- *
+ *
* @see #getValue()
*/
public void setValue(int value)
@@ -448,8 +448,8 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Returns the suffix (<code>"SliderUI"</code> in this case) used to
- * determine the class name for a UI delegate that can provide the look and
+ * Returns the suffix (<code>"SliderUI"</code> in this case) used to
+ * determine the class name for a UI delegate that can provide the look and
* feel for a <code>JSlider</code>.
*
* @return <code>"SliderUI"</code>.
@@ -462,7 +462,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
/**
* Creates a {@link ChangeListener} that is added to the slider's model and
* forwards change events generated by the model to the listeners that are
- * registered with the <code>JSlider</code> (by calling the
+ * registered with the <code>JSlider</code> (by calling the
* {@link #fireStateChanged} method).
*
* @return A new listener.
@@ -474,7 +474,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
public void stateChanged(ChangeEvent ce)
{
// No need to trigger a repaint since the UI listens to the model
- // as well. All we need to do is pass on the stateChanged event
+ // as well. All we need to do is pass on the stateChanged event
// to our listeners.
fireStateChanged();
}
@@ -482,13 +482,13 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Registers a listener with the slider so that it will receive
+ * Registers a listener with the slider so that it will receive
* {@link ChangeEvent} notifications. Note that change events generated
* by the slider's model will be forwarded automatically to the slider's
* listeners.
*
* @param listener the listener to register.
- *
+ *
* @see #removeChangeListener(ChangeListener)
*/
public void addChangeListener(ChangeListener listener)
@@ -501,7 +501,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* {@link ChangeEvent} notifications from the slider.
*
* @param listener The listener to remove.
- *
+ *
* @see #addChangeListener(ChangeListener)
*/
public void removeChangeListener(ChangeListener listener)
@@ -510,7 +510,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Sends a {@link ChangeEvent} to all registered listeners, with this slider
+ * Sends a {@link ChangeEvent} to all registered listeners, with this slider
* as the source.
*/
protected void fireStateChanged()
@@ -526,12 +526,12 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Returns an array containing all the {@link ChangeListener} instances
+ * Returns an array containing all the {@link ChangeListener} instances
* registered with this slider. If no listeners are registered, this method
* returns an empty array.
*
- * @return An array array containing all the {@link ChangeListener} instances
- * registered with this slider (possibly empty, but never
+ * @return An array array containing all the {@link ChangeListener} instances
+ * registered with this slider (possibly empty, but never
* <code>null</code>).
*/
public ChangeListener[] getChangeListeners()
@@ -540,11 +540,11 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Returns the slider's model, which stores the minimum, maximum and current
+ * Returns the slider's model, which stores the minimum, maximum and current
* values.
*
* @return The slider's model.
- *
+ *
* @see #setModel(BoundedRangeModel)
*/
public BoundedRangeModel getModel()
@@ -556,12 +556,12 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* Sets the slider's model and sends a {@link PropertyChangeEvent} (with the
* property name "model") to all registered listeners. The change listener
* that the slider registered with the original model is removed and added
- * to the new model (this ensures that {@link ChangeEvent} notifications
+ * to the new model (this ensures that {@link ChangeEvent} notifications
* generated by the model are automatically forwarded to listeners that are
* registered with the slider).
*
* @param model The model to use with the slider.
- *
+ *
* @see #getModel()
*/
public void setModel(BoundedRangeModel model)
@@ -583,7 +583,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* Returns the minimum value of the slider (from the slider's model).
*
* @return The minimum value of the slider.
- *
+ *
* @see #setMinimum(int)
*/
public int getMinimum()
@@ -592,19 +592,19 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Sets the minimum value of the slider and fires a
+ * Sets the minimum value of the slider and fires a
* {@link PropertyChangeEvent} (with the property name "minimum") to all
* registered listeners. Note that:
* <p>
* <ul>
- * <li>the minimum value is stored in the slider's model (see
+ * <li>the minimum value is stored in the slider's model (see
* {@link #getModel()});</li>
- * <li>in addition to the property change event, the slider also fires a
+ * <li>in addition to the property change event, the slider also fires a
* {@link ChangeEvent}.</li>
* </ul>
- *
+ *
* @param minimum The minimum value of the slider.
- *
+ *
* @see #getMinimum()
*/
public void setMinimum(int minimum)
@@ -619,7 +619,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* Returns the slider's maximum value (obtained from the slider's model).
*
* @return The maximum value of the slider.
- *
+ *
* @see #setMaximum(int)
*/
public int getMaximum()
@@ -628,19 +628,19 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Sets the maximum value of the slider and fires a
+ * Sets the maximum value of the slider and fires a
* {@link PropertyChangeEvent} (with the property name "maximum") to all
* registered listeners. Note that:
* <p>
* <ul>
- * <li>the maximum value is stored in the slider's model (see
+ * <li>the maximum value is stored in the slider's model (see
* {@link #getModel()});</li>
- * <li>in addition to the property change event, the slider also fires a
+ * <li>in addition to the property change event, the slider also fires a
* {@link ChangeEvent}.</li>
* </ul>
*
* @param maximum The maximum value of the slider.
- *
+ *
* @see #getMaximum()
*/
public void setMaximum(int maximum)
@@ -655,7 +655,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* Returns the <code>valueIsAdjusting</code> flag from the slider's model.
*
* @return The <code>valueIsAdjusting</code> flag from the slider's model.
- *
+ *
* @see #setValueIsAdjusting(boolean)
*/
public boolean getValueIsAdjusting()
@@ -664,11 +664,11 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Sets the <code>valueIsAdjusting</code> flag in the slider's model, and
+ * Sets the <code>valueIsAdjusting</code> flag in the slider's model, and
* sends a {@link ChangeEvent} to all registered listeners.
*
* @param adjusting the new flag value.
- *
+ *
* @see #getValueIsAdjusting()
*/
public void setValueIsAdjusting(boolean adjusting)
@@ -680,7 +680,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* Returns the slider's extent value, obtained from the slider's model.
*
* @return The extent value.
- *
+ *
* @see #setExtent(int)
*/
public int getExtent()
@@ -689,14 +689,14 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Sets the slider's extent value and sends a {@link ChangeEvent} to all
+ * Sets the slider's extent value and sends a {@link ChangeEvent} to all
* registered listeners. Note that the model will fire a change event to all
* of its registered listeners first (with the model as the event source) and
* then the slider will fire another change event to all of its registered
* listeners (this time with the slider as the event source).
*
* @param extent The extent value for this slider.
- *
+ *
* @see #getExtent()
*/
public void setExtent(int extent)
@@ -709,7 +709,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* or {@link JSlider#VERTICAL}.
*
* @return The orientation of the slider.
- *
+ *
* @see #setOrientation(int)
*/
public int getOrientation()
@@ -718,16 +718,16 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Sets the orientation for the slider and sends a
+ * Sets the orientation for the slider and sends a
* {@link PropertyChangeEvent} (with the property name "orientation") to all
* registered listeners.
*
* @param orientation the orientation (one of {@link JSlider#HORIZONTAL} or
* {@link JSlider#VERTICAL}).
- *
+ *
* @throws IllegalArgumentException if <code>orientation</code> is not one of
* the permitted values.
- *
+ *
* @see #getOrientation()
*/
public void setOrientation(int orientation)
@@ -748,7 +748,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* Returns the label table for the slider.
*
* @return The label table for the slider (possibly <code>null</code>).
- *
+ *
* @see #setLabelTable(Dictionary)
*/
public Dictionary getLabelTable()
@@ -757,12 +757,12 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Sets the table of labels for the slider and sends a
- * {@link PropertyChangeEvent} (with the property name "labelTable") to all
+ * Sets the table of labels for the slider and sends a
+ * {@link PropertyChangeEvent} (with the property name "labelTable") to all
* registered listeners.
*
* @param table the table of labels (<code>null</code> permitted).
- *
+ *
* @see #getLabelTable()
*/
public void setLabelTable(Dictionary table)
@@ -779,7 +779,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Resets the UI delegates for the labels in the <code>labelTable</code> to
+ * Resets the UI delegates for the labels in the <code>labelTable</code> to
* the default for the current look and feel.
*/
protected void updateLabelUIs()
@@ -800,8 +800,8 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Creates a hashtable of <code>(Integer, JLabel)</code> pairs that can be
- * used as a label table for this slider. The labels will start from the
+ * Creates a hashtable of <code>(Integer, JLabel)</code> pairs that can be
+ * used as a label table for this slider. The labels will start from the
* slider's minimum and increase by the increment. Each label will have a text
* string indicating its integer value.
*
@@ -818,9 +818,9 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Creates a hashtable of <code>(Integer, JLabel)</code> pairs that can be
- * used as a label table for this slider. The labels will start from the
- * given start value and increase by the increment. Each label will have a
+ * Creates a hashtable of <code>(Integer, JLabel)</code> pairs that can be
+ * used as a label table for this slider. The labels will start from the
+ * given start value and increase by the increment. Each label will have a
* text string indicating its integer value.
*
* @param increment The increment between labels (must be > 0).
@@ -834,7 +834,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
*/
public Hashtable createStandardLabels(int increment, int start)
{
- if (increment <= 0)
+ if (increment <= 0)
throw new IllegalArgumentException("Requires 'increment' > 0.");
if (start < getMinimum() || start > getMaximum())
throw new IllegalArgumentException("The 'start' value is out of range.");
@@ -855,7 +855,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
*
* @return The flag that controls whether or not the value scale for the
* slider is inverted.
- *
+ *
* @see #setInverted(boolean)
*/
public boolean getInverted()
@@ -867,14 +867,14 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* Sets the flag that controls whether or not the value scale for the
* slider is inverted and, if the new flag value is different to the old flag
* value, sends a {@link PropertyChangeEvent} to all registered listeners.
- * Typically, a horizontal slider will display a scale that increases from
- * left to right, but this is reversed if the 'inverted' flag is set to
+ * Typically, a horizontal slider will display a scale that increases from
+ * left to right, but this is reversed if the 'inverted' flag is set to
* <code>true</code>. Similarly, a vertical slider will display a scale that
* increases from bottom to top, and this is reversed if the 'inverted' flag
* is set to <code>true</code>.
*
* @param inverted the new flag value.
- *
+ *
* @see #getInverted()
*/
public void setInverted(boolean inverted)
@@ -889,11 +889,11 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Returns the distance between major tick marks along the slider's value
+ * Returns the distance between major tick marks along the slider's value
* scale.
*
* @return The amount of units between each major tick mark.
- *
+ *
* @see #setMajorTickSpacing(int)
*/
public int getMajorTickSpacing()
@@ -902,12 +902,12 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Sets the distance between major tick marks along the slider's value scale,
- * and sends a {@link PropertyChangeEvent} (with the property name
+ * Sets the distance between major tick marks along the slider's value scale,
+ * and sends a {@link PropertyChangeEvent} (with the property name
* "majorTickSpacing") to all registered listeners.
*
* @param spacing the distance between major tick marks.
- *
+ *
* @see #getMajorTickSpacing()
*/
public void setMajorTickSpacing(int spacing)
@@ -925,12 +925,12 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Returns the distance between minor tick marks along the slider's value
+ * Returns the distance between minor tick marks along the slider's value
* scale.
*
- * @return The distance between minor tick marks along the slider's value
+ * @return The distance between minor tick marks along the slider's value
* scale.
- *
+ *
* @see #setMinorTickSpacing(int)
*/
public int getMinorTickSpacing()
@@ -939,12 +939,12 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Sets the distance between minor tick marks along the slider's value scale,
- * and sends a {@link PropertyChangeEvent} (with the property name
+ * Sets the distance between minor tick marks along the slider's value scale,
+ * and sends a {@link PropertyChangeEvent} (with the property name
* "minorTickSpacing") to all registered listeners.
*
* @param spacing the distance between minor tick marks.
- *
+ *
* @see #getMinorTickSpacing()
*/
public void setMinorTickSpacing(int spacing)
@@ -961,11 +961,11 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
/**
* Returns the flag that controls whether the slider thumb will snap to ticks.
- * Sliders that snap to ticks will automatically move the thumb to the
+ * Sliders that snap to ticks will automatically move the thumb to the
* nearest tick mark.
*
* @return <code>true</code> if the slider thumb automatically.
- *
+ *
* @see #setSnapToTicks(boolean)
*/
public boolean getSnapToTicks()
@@ -974,13 +974,13 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
}
/**
- * Sets the flag that controls whether the slider thumb will snap to ticks
- * and sends a {@link PropertyChangeEvent} (with the property name
- * 'snapToTicks') to all registered listeners. Sliders that snap to ticks
+ * Sets the flag that controls whether the slider thumb will snap to ticks
+ * and sends a {@link PropertyChangeEvent} (with the property name
+ * 'snapToTicks') to all registered listeners. Sliders that snap to ticks
* will automatically move the thumb to the nearest tick mark.
*
* @param snap the new flag value.
- *
+ *
* @see #getSnapToTicks()
*/
public void setSnapToTicks(boolean snap)
@@ -996,9 +996,9 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* Returns the flag that controls whether or not tick marks are painted along
* the slider's value scale.
*
- * @return <code>true</code> if tick marks should be painted, and
+ * @return <code>true</code> if tick marks should be painted, and
* <code>false</code> if tick marks should not be painted.
- *
+ *
* @see #setPaintTicks(boolean)
*/
public boolean getPaintTicks()
@@ -1008,14 +1008,14 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
/**
* Sets the flag that controls whether or not tick marks are painted along
- * the slider's value scale, and sends a {@link PropertyChangeEvent} (with
+ * the slider's value scale, and sends a {@link PropertyChangeEvent} (with
* the property name "paintTicks") to all registered listeners. In
* addition to setting this property to <code>true</code>, one or both of the
- * minor tick spacing and major tick spacing attributes must be set to a
+ * minor tick spacing and major tick spacing attributes must be set to a
* value greater than 0 in order for ticks to be painted.
*
* @param paint Whether ticks will be painted.
- *
+ *
* @see #getPaintTicks()
*/
public void setPaintTicks(boolean paint)
@@ -1034,7 +1034,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* Returns the flag that controls whether or not the track is painted.
*
* @return Whether the track will be painted.
- *
+ *
* @see #setPaintTrack(boolean)
*/
public boolean getPaintTrack()
@@ -1048,7 +1048,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* registered listeners.
*
* @param paint Whether the track will be painted.
- *
+ *
* @see #getPaintTrack()
*/
public void setPaintTrack(boolean paint)
@@ -1066,7 +1066,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
* tick marks along the slider.
*
* @return Whether labels will be painted.
- *
+ *
* @see #setPaintLabels(boolean)
*/
public boolean getPaintLabels()
@@ -1076,11 +1076,11 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
/**
* Sets the flag that controls whether or not labels are painted for the
- * tick marks along the slider and sends a {@link PropertyChangeEvent} (with
+ * tick marks along the slider and sends a {@link PropertyChangeEvent} (with
* the property name "paintLabels") to all registered listeners.
*
* @param paint Whether labels will be painted.
- *
+ *
* @see #getPaintLabels()
*/
public void setPaintLabels(boolean paint)
@@ -1119,7 +1119,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
sb.append(",paintTicks=").append(getPaintTicks());
sb.append(",paintTrack=").append(getPaintTrack());
sb.append(",snapToTicks=").append(getSnapToTicks());
-
+
// the following is output by the reference implementation. We don't
// strictly need to replicate this. Perhaps it has some meaning, but
// I couldn't determine it yet...
@@ -1138,7 +1138,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
{
if (accessibleContext == null)
accessibleContext = new AccessibleJSlider();
-
+
return accessibleContext;
}
}
diff --git a/libjava/classpath/javax/swing/JSpinner.java b/libjava/classpath/javax/swing/JSpinner.java
index 16a2106..e942cae 100644
--- a/libjava/classpath/javax/swing/JSpinner.java
+++ b/libjava/classpath/javax/swing/JSpinner.java
@@ -66,18 +66,18 @@ import javax.swing.text.NumberFormatter;
* from a list.
*
* @author Ka-Hing Cheung
- *
+ *
* @since 1.4
*/
public class JSpinner extends JComponent
{
/**
- * The base class for the editor used by the {@link JSpinner} component.
+ * The base class for the editor used by the {@link JSpinner} component.
* The editor is in fact a panel containing a {@link JFormattedTextField}
* component.
*/
- public static class DefaultEditor
- extends JPanel
+ public static class DefaultEditor
+ extends JPanel
implements ChangeListener, PropertyChangeListener, LayoutManager
{
/** The spinner that the editor is allocated to. */
@@ -92,7 +92,7 @@ public class JSpinner extends JComponent
private static final long serialVersionUID = -5317788736173368172L;
/**
- * Creates a new <code>DefaultEditor</code> object. The editor is
+ * Creates a new <code>DefaultEditor</code> object. The editor is
* registered with the spinner as a {@link ChangeListener} here.
*
* @param spinner the <code>JSpinner</code> associated with this editor
@@ -107,23 +107,23 @@ public class JSpinner extends JComponent
ftf.setValue(spinner.getValue());
ftf.addPropertyChangeListener(this);
if (getComponentOrientation().isLeftToRight())
- ftf.setHorizontalAlignment(JTextField.RIGHT);
+ ftf.setHorizontalAlignment(JTextField.RIGHT);
else
- ftf.setHorizontalAlignment(JTextField.LEFT);
+ ftf.setHorizontalAlignment(JTextField.LEFT);
spinner.addChangeListener(this);
}
/**
* Returns the <code>JSpinner</code> component that the editor is assigned
* to.
- *
+ *
* @return The spinner that the editor is assigned to.
*/
public JSpinner getSpinner()
{
return spinner;
}
-
+
/**
* DOCUMENT ME!
*/
@@ -144,7 +144,7 @@ public class JSpinner extends JComponent
}
/**
- * Returns the text field used to display and edit the current value in
+ * Returns the text field used to display and edit the current value in
* the spinner.
*
* @return The text field.
@@ -153,7 +153,7 @@ public class JSpinner extends JComponent
{
return ftf;
}
-
+
/**
* Sets the bounds for the child components in this container. In this
* case, the text field is the only component to be laid out.
@@ -168,7 +168,7 @@ public class JSpinner extends JComponent
size.width - insets.left - insets.right,
size.height - insets.top - insets.bottom);
}
-
+
/**
* Calculates the minimum size for this component. In this case, the
* text field is the only subcomponent, so the return value is the minimum
@@ -185,10 +185,10 @@ public class JSpinner extends JComponent
return new Dimension(minSize.width + insets.left + insets.right,
minSize.height + insets.top + insets.bottom);
}
-
+
/**
* Calculates the preferred size for this component. In this case, the
- * text field is the only subcomponent, so the return value is the
+ * text field is the only subcomponent, so the return value is the
* preferred size of the text field plus the insets of this component.
*
* @param parent the parent container.
@@ -202,26 +202,26 @@ public class JSpinner extends JComponent
return new Dimension(prefSize.width + insets.left + insets.right,
prefSize.height + insets.top + insets.bottom);
}
-
+
/**
- * Receives notification of property changes. If the text field's 'value'
+ * Receives notification of property changes. If the text field's 'value'
* property changes, the spinner's model is updated accordingly.
*
* @param event the event.
*/
public void propertyChange(PropertyChangeEvent event)
{
- if (event.getSource() == ftf)
+ if (event.getSource() == ftf)
{
if (event.getPropertyName().equals("value"))
spinner.getModel().setValue(event.getNewValue());
}
}
-
+
/**
* Receives notification of changes in the state of the {@link JSpinner}
* that the editor belongs to - the content of the text field is updated
- * accordingly.
+ * accordingly.
*
* @param event the change event.
*/
@@ -229,12 +229,12 @@ public class JSpinner extends JComponent
{
ftf.setValue(spinner.getValue());
}
-
+
/**
* This method does nothing. It is required by the {@link LayoutManager}
* interface, but since this component has a single child, there is no
* need to use this method.
- *
+ *
* @param child the child component to remove.
*/
public void removeLayoutComponent(Component child)
@@ -246,7 +246,7 @@ public class JSpinner extends JComponent
* This method does nothing. It is required by the {@link LayoutManager}
* interface, but since this component has a single child, there is no
* need to use this method.
- *
+ *
* @param name the name.
* @param child the child component to add.
*/
@@ -260,7 +260,7 @@ public class JSpinner extends JComponent
* A panel containing a {@link JFormattedTextField} that is configured for
* displaying and editing numbers. The panel is used as a subcomponent of
* a {@link JSpinner}.
- *
+ *
* @see JSpinner#createEditor(SpinnerModel)
*/
public static class NumberEditor extends DefaultEditor
@@ -271,8 +271,8 @@ public class JSpinner extends JComponent
private static final long serialVersionUID = 3791956183098282942L;
/**
- * Creates a new <code>NumberEditor</code> object for the specified
- * <code>spinner</code>. The editor is registered with the spinner as a
+ * Creates a new <code>NumberEditor</code> object for the specified
+ * <code>spinner</code>. The editor is registered with the spinner as a
* {@link ChangeListener}.
*
* @param spinner the component the editor will be used with.
@@ -295,7 +295,7 @@ public class JSpinner extends JComponent
public NumberEditor(JSpinner spinner, String decimalFormatPattern)
{
super(spinner);
- NumberEditorFormatter nef
+ NumberEditorFormatter nef
= new NumberEditorFormatter(decimalFormatPattern);
nef.setMinimum(getModel().getMinimum());
nef.setMaximum(getModel().getMaximum());
@@ -316,7 +316,7 @@ public class JSpinner extends JComponent
/**
* Returns the model used by the editor's {@link JSpinner} component,
* cast to a {@link SpinnerNumberModel}.
- *
+ *
* @return The model.
*/
public SpinnerNumberModel getModel()
@@ -324,11 +324,11 @@ public class JSpinner extends JComponent
return (SpinnerNumberModel) getSpinner().getModel();
}
}
-
- static class NumberEditorFormatter
+
+ static class NumberEditorFormatter
extends NumberFormatter
{
- public NumberEditorFormatter()
+ public NumberEditorFormatter()
{
super(NumberFormat.getInstance());
}
@@ -359,7 +359,7 @@ public class JSpinner extends JComponent
/**
* Returns the spinner's model cast as a {@link SpinnerListModel}.
- *
+ *
* @return The spinner's model.
*/
public SpinnerListModel getModel()
@@ -442,10 +442,10 @@ public class JSpinner extends JComponent
}
}
- static class DateEditorFormatter
+ static class DateEditorFormatter
extends DateFormatter
{
- public DateEditorFormatter()
+ public DateEditorFormatter()
{
super(DateFormat.getInstance());
}
@@ -455,9 +455,9 @@ public class JSpinner extends JComponent
}
}
- /**
+ /**
* A listener that forwards {@link ChangeEvent} notifications from the model
- * to the {@link JSpinner}'s listeners.
+ * to the {@link JSpinner}'s listeners.
*/
class ModelListener implements ChangeListener
{
@@ -468,10 +468,10 @@ public class JSpinner extends JComponent
{
// nothing to do here
}
-
+
/**
* Receives notification from the model that its state has changed.
- *
+ *
* @param event the event (ignored).
*/
public void stateChanged(ChangeEvent event)
@@ -480,9 +480,9 @@ public class JSpinner extends JComponent
}
}
- /**
- * The model that defines the current value and permitted values for the
- * spinner.
+ /**
+ * The model that defines the current value and permitted values for the
+ * spinner.
*/
private SpinnerModel model;
@@ -492,8 +492,8 @@ public class JSpinner extends JComponent
private static final long serialVersionUID = 3412663575706551720L;
/**
- * Creates a new <code>JSpinner</code> with default instance of
- * {@link SpinnerNumberModel} (that is, a model with value 0, step size 1,
+ * Creates a new <code>JSpinner</code> with default instance of
+ * {@link SpinnerNumberModel} (that is, a model with value 0, step size 1,
* and no upper or lower limit).
*
* @see javax.swing.SpinnerNumberModel
@@ -504,12 +504,12 @@ public class JSpinner extends JComponent
}
/**
- * Creates a new <code>JSpinner with the specified model. The
+ * Creates a new <code>JSpinner with the specified model. The
* {@link #createEditor(SpinnerModel)} method is used to create an editor
* that is suitable for the model.
*
* @param model the model (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if <code>model</code> is <code>null</code>.
*/
public JSpinner(SpinnerModel model)
@@ -550,7 +550,7 @@ public class JSpinner extends JComponent
*
* @param editor the new editor (<code>null</code> not permitted.
*
- * @throws IllegalArgumentException if <code>editor</code> is
+ * @throws IllegalArgumentException if <code>editor</code> is
* <code>null</code>.
*
* @see #getEditor
@@ -565,7 +565,7 @@ public class JSpinner extends JComponent
((DefaultEditor) oldEditor).dismiss(this);
else if (oldEditor instanceof ChangeListener)
removeChangeListener((ChangeListener) oldEditor);
-
+
this.editor = editor;
firePropertyChange("editor", oldEditor, editor);
}
@@ -574,7 +574,7 @@ public class JSpinner extends JComponent
* Returns the model used by the {@link JSpinner} component.
*
* @return The model.
- *
+ *
* @see #setModel(SpinnerModel)
*/
public SpinnerModel getModel()
@@ -593,7 +593,7 @@ public class JSpinner extends JComponent
{
if (newModel == null)
throw new IllegalArgumentException();
-
+
if (model == newModel)
return;
diff --git a/libjava/classpath/javax/swing/JSplitPane.java b/libjava/classpath/javax/swing/JSplitPane.java
index 5b6ec15..856b2e5 100644
--- a/libjava/classpath/javax/swing/JSplitPane.java
+++ b/libjava/classpath/javax/swing/JSplitPane.java
@@ -1,4 +1,4 @@
-/* JSplitPane.java --
+/* JSplitPane.java --
Copyright (C) 2004, 2006, Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -69,7 +69,7 @@ public class JSplitPane extends JComponent implements Accessible
implements AccessibleValue
{
private static final long serialVersionUID = -1788116871416305366L;
-
+
/**
* Creates a new <code>AccessibleJSplitPane</code> instance.
*/
@@ -79,7 +79,7 @@ public class JSplitPane extends JComponent implements Accessible
}
/**
- * Returns a set containing the current state of the {@link JSplitPane}
+ * Returns a set containing the current state of the {@link JSplitPane}
* component.
*
* @return The accessible state set.
@@ -109,8 +109,8 @@ public class JSplitPane extends JComponent implements Accessible
}
/**
- * Returns an object that provides access to the current, minimum and
- * maximum values for the {@link JSplitPane}. Since this class implements
+ * Returns an object that provides access to the current, minimum and
+ * maximum values for the {@link JSplitPane}. Since this class implements
* {@link AccessibleValue}, it returns itself.
*
* @return The accessible value.
@@ -121,7 +121,7 @@ public class JSplitPane extends JComponent implements Accessible
}
/**
- * Returns the current divider location for the {@link JSplitPane}
+ * Returns the current divider location for the {@link JSplitPane}
* component, as an {@link Integer}.
*
* @return The current divider location.
@@ -132,15 +132,15 @@ public class JSplitPane extends JComponent implements Accessible
}
/**
- * Sets the divider location for the {@link JSplitPane} component and sends
- * a {@link PropertyChangeEvent} (with the property name
+ * Sets the divider location for the {@link JSplitPane} component and sends
+ * a {@link PropertyChangeEvent} (with the property name
* {@link AccessibleContext#ACCESSIBLE_VALUE_PROPERTY}) to all registered
- * listeners. If the supplied value is <code>null</code>, this method
+ * listeners. If the supplied value is <code>null</code>, this method
* does nothing and returns <code>false</code>.
*
* @param value the new divider location (<code>null</code> permitted).
*
- * @return <code>true</code> if the divider location value is updated, and
+ * @return <code>true</code> if the divider location value is updated, and
* <code>false</code> otherwise.
*/
public boolean setCurrentAccessibleValue(Number value)
@@ -149,13 +149,13 @@ public class JSplitPane extends JComponent implements Accessible
return false;
Number oldValue = getCurrentAccessibleValue();
setDividerLocation(value.intValue());
- firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue,
+ firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue,
new Integer(value.intValue()));
return true;
}
/**
- * Returns the minimum divider location for the {@link JSplitPane}
+ * Returns the minimum divider location for the {@link JSplitPane}
* component, as an {@link Integer}.
*
* @return The minimum divider location.
@@ -166,7 +166,7 @@ public class JSplitPane extends JComponent implements Accessible
}
/**
- * Returns the maximum divider location for the {@link JSplitPane}
+ * Returns the maximum divider location for the {@link JSplitPane}
* component, as an {@link Integer}.
*
* @return The maximum divider location.
@@ -178,7 +178,7 @@ public class JSplitPane extends JComponent implements Accessible
}
private static final long serialVersionUID = -5634142046175988380L;
-
+
/** The constraints string used to add components to the bottom. */
public static final String BOTTOM = "bottom";
@@ -200,14 +200,14 @@ public class JSplitPane extends JComponent implements Accessible
public static final int HORIZONTAL_SPLIT = 1;
/** The property fired when the last divider location property changes. */
- public static final String LAST_DIVIDER_LOCATION_PROPERTY =
+ public static final String LAST_DIVIDER_LOCATION_PROPERTY =
"lastDividerLocation";
/** The constraints string used to add components to the left. */
public static final String LEFT = "left";
/** The property fired when the one touch expandable property changes. */
- public static final String ONE_TOUCH_EXPANDABLE_PROPERTY =
+ public static final String ONE_TOUCH_EXPANDABLE_PROPERTY =
"oneTouchExpandable";
/** The property fired when the orientation property changes. */
@@ -231,7 +231,7 @@ public class JSplitPane extends JComponent implements Accessible
/** Whether the JSplitPane uses one touch expandable buttons. */
protected boolean oneTouchExpandable = false;
- // This is the master dividerSize variable and sets the
+ // This is the master dividerSize variable and sets the
// BasicSplitPaneDivider one accordingly
/** The size of the divider. */
@@ -357,7 +357,7 @@ public class JSplitPane extends JComponent implements Accessible
* @param constraints The constraints string to use.
* @param index Where to place to component in the list of components.
*
- * @throws IllegalArgumentException When the constraints is not a known
+ * @throws IllegalArgumentException When the constraints is not a known
* identifier.
*/
protected void addImpl(Component comp, Object constraints, int index)
@@ -389,7 +389,7 @@ public class JSplitPane extends JComponent implements Accessible
else if (placement.equals(DIVIDER))
constraints = null;
else
- throw new
+ throw new
IllegalArgumentException("Constraints is not a known identifier.");
// If no dividerLocation has been set, then we need to trigger an
@@ -405,14 +405,14 @@ public class JSplitPane extends JComponent implements Accessible
* Returns the object that provides accessibility features for this
* <code>JSplitPane</code> component.
*
- * @return The accessible context (an instance of
+ * @return The accessible context (an instance of
* {@link AccessibleJSplitPane}).
*/
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
accessibleContext = new AccessibleJSplitPane();
-
+
return accessibleContext;
}
@@ -715,7 +715,7 @@ public class JSplitPane extends JComponent implements Accessible
/**
* This method sets the location of the divider.
- *
+ *
* @param location The location of the divider. The negative value forces to
* compute the new location from the preferred sizes of the split
* pane components.
@@ -727,7 +727,7 @@ public class JSplitPane extends JComponent implements Accessible
SplitPaneUI ui = getUI();
if (ui != null)
ui.setDividerLocation(this, location);
- firePropertyChange(DIVIDER_LOCATION_PROPERTY, oldLocation,
+ firePropertyChange(DIVIDER_LOCATION_PROPERTY, oldLocation,
location);
}
@@ -773,7 +773,7 @@ public class JSplitPane extends JComponent implements Accessible
* @param comp The left component.
*/
public void setLeftComponent(Component comp)
- {
+ {
if (comp != null)
add(comp, LEFT);
else
@@ -801,8 +801,8 @@ public class JSplitPane extends JComponent implements Accessible
}
/**
- * Sets the orientation for the <code>JSplitPane</code> and sends a
- * {@link PropertyChangeEvent} (with the property name
+ * Sets the orientation for the <code>JSplitPane</code> and sends a
+ * {@link PropertyChangeEvent} (with the property name
* {@link #ORIENTATION_PROPERTY}) to all registered listeners.
*
* @param orientation the orientation (either {@link #HORIZONTAL_SPLIT}
@@ -839,7 +839,7 @@ public class JSplitPane extends JComponent implements Accessible
if (value < 0.0 || value > 1.0)
throw new IllegalArgumentException("Value outside permitted range.");
if (this.resizeWeight != value)
- {
+ {
double old = resizeWeight;
resizeWeight = value;
firePropertyChange(RESIZE_WEIGHT_PROPERTY, old, value);
@@ -905,7 +905,7 @@ public class JSplitPane extends JComponent implements Accessible
/**
* Helper method for
* {@link LookAndFeel#installProperty(JComponent, String, Object)}.
- *
+ *
* @param propertyName the name of the property
* @param value the value of the property
*
diff --git a/libjava/classpath/javax/swing/JTabbedPane.java b/libjava/classpath/javax/swing/JTabbedPane.java
index 79521be3..18055e8 100644
--- a/libjava/classpath/javax/swing/JTabbedPane.java
+++ b/libjava/classpath/javax/swing/JTabbedPane.java
@@ -64,7 +64,7 @@ import javax.swing.plaf.UIResource;
* This is a container for components where only one component is displayed at
* a given time and the displayed component can be switched by clicking on
* tabs.
- *
+ *
* <p>
* Tabs can be oriented in several ways. They can be above, below, left and
* right of the component. Tabs can either wrap around (by creating multiple
@@ -185,7 +185,7 @@ public class JTabbedPane extends JComponent implements Serializable,
/**
* Returns the number of selected child components of the
* <code>JTabbedPane</code>. The reference implementation appears
- * to return <code>1</code> always and we do the same.
+ * to return <code>1</code> always and we do the same.
*
* @return <code>1</code>
*/
@@ -195,7 +195,7 @@ public class JTabbedPane extends JComponent implements Serializable,
}
/**
- * Returns the selected tab, or <code>null</code> if there is no
+ * Returns the selected tab, or <code>null</code> if there is no
* selection.
*
* @param i the selection index (ignored here).
@@ -239,7 +239,7 @@ public class JTabbedPane extends JComponent implements Serializable,
* tabbed pane, since one tab must always be selected.
*
* @param i the item index.
- *
+ *
* @see #addAccessibleSelection(int)
*/
public void removeAccessibleSelection(int i)
@@ -250,7 +250,7 @@ public class JTabbedPane extends JComponent implements Serializable,
/**
* Does nothing - it makes no sense to clear the selection for
* a tabbed pane, since one tab must always be selected.
- *
+ *
* @see #addAccessibleSelection(int)
*/
public void clearAccessibleSelection()
@@ -261,7 +261,7 @@ public class JTabbedPane extends JComponent implements Serializable,
/**
* Does nothing - it makes no sense to select all for a tabbed
* pane, since only one tab can be selected at a time.
- *
+ *
* @see #addAccessibleSelection(int)
*/
public void selectAllAccessibleSelection()
@@ -464,7 +464,7 @@ public class JTabbedPane extends JComponent implements Serializable,
{
title = text;
if (title != null && title.length() <= underlinedChar)
- setDisplayedMnemonicIndex(title.length() - 1);
+ setDisplayedMnemonicIndex(title.length() - 1);
}
/**
@@ -495,7 +495,7 @@ public class JTabbedPane extends JComponent implements Serializable,
public Icon getDisabledIcon()
{
if (disabledIcon == null && icon instanceof ImageIcon)
- setDisabledIcon(icon);
+ setDisabledIcon(icon);
return disabledIcon;
}
@@ -560,7 +560,7 @@ public class JTabbedPane extends JComponent implements Serializable,
{
mnemonicKey = aChar;
if (title != null)
- setDisplayedMnemonicIndex(title.indexOf(mnemonicKey));
+ setDisplayedMnemonicIndex(title.indexOf(mnemonicKey));
}
/**
@@ -585,10 +585,10 @@ public class JTabbedPane extends JComponent implements Serializable,
throws IllegalArgumentException
{
if (index < -1 || title != null && index >= title.length())
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException();
if (title == null || mnemonicKey == 0 || (index > -1 && title.charAt(index) != mnemonicKey))
- index = -1;
+ index = -1;
underlinedChar = index;
}
@@ -605,7 +605,7 @@ public class JTabbedPane extends JComponent implements Serializable,
/**
* Returns the accessible name for this tab.
- *
+ *
* @return The accessible name.
*/
public String getAccessibleName()
@@ -615,7 +615,7 @@ public class JTabbedPane extends JComponent implements Serializable,
else
return title;
}
-
+
/**
* Returns the accessible role of this tab, which is always
* {@link AccessibleRole#PAGE_TAB}.
@@ -634,7 +634,7 @@ public class JTabbedPane extends JComponent implements Serializable,
*/
public AccessibleStateSet getAccessibleStateSet()
{
- AccessibleContext parentCtx = JTabbedPane.this.getAccessibleContext();
+ AccessibleContext parentCtx = JTabbedPane.this.getAccessibleContext();
AccessibleStateSet state = parentCtx.getAccessibleStateSet();
state.add(AccessibleState.SELECTABLE);
if (component == getSelectedComponent())
@@ -761,7 +761,7 @@ public class JTabbedPane extends JComponent implements Serializable,
throw new IllegalArgumentException("tabLayoutPolicy is not valid.");
this.tabPlacement = tabPlacement;
layoutPolicy = tabLayoutPolicy;
-
+
setModel(new DefaultSingleSelectionModel());
updateUI();
@@ -847,8 +847,8 @@ public class JTabbedPane extends JComponent implements Serializable,
changeEvent = new ChangeEvent(this);
for (int i = changeListeners.length - 2; i >= 0; i -= 2)
{
- if (changeListeners[i] == ChangeListener.class)
- ((ChangeListener) changeListeners[i + 1]).stateChanged(changeEvent);
+ if (changeListeners[i] == ChangeListener.class)
+ ((ChangeListener) changeListeners[i + 1]).stateChanged(changeEvent);
}
}
@@ -881,11 +881,11 @@ public class JTabbedPane extends JComponent implements Serializable,
{
if (m != model)
{
- SingleSelectionModel oldModel = this.model;
+ SingleSelectionModel oldModel = this.model;
if (oldModel != null && changeListener != null)
oldModel.removeChangeListener(changeListener);
- model = m;
+ model = m;
if (model != null)
{
@@ -893,7 +893,7 @@ public class JTabbedPane extends JComponent implements Serializable,
changeListener = createChangeListener();
model.addChangeListener(changeListener);
}
- firePropertyChange("model", oldModel, this.model);
+ firePropertyChange("model", oldModel, this.model);
}
}
@@ -922,9 +922,9 @@ public class JTabbedPane extends JComponent implements Serializable,
throw new IllegalArgumentException("tabPlacement is not valid.");
if (tabPlacement != this.tabPlacement)
{
- int oldPlacement = this.tabPlacement;
- this.tabPlacement = tabPlacement;
- firePropertyChange("tabPlacement", oldPlacement, this.tabPlacement);
+ int oldPlacement = this.tabPlacement;
+ this.tabPlacement = tabPlacement;
+ firePropertyChange("tabPlacement", oldPlacement, this.tabPlacement);
}
}
@@ -953,9 +953,9 @@ public class JTabbedPane extends JComponent implements Serializable,
throw new IllegalArgumentException("tabLayoutPolicy is not valid.");
if (tabLayoutPolicy != layoutPolicy)
{
- int oldPolicy = layoutPolicy;
- layoutPolicy = tabLayoutPolicy;
- firePropertyChange("tabLayoutPolicy", oldPolicy, layoutPolicy);
+ int oldPolicy = layoutPolicy;
+ layoutPolicy = tabLayoutPolicy;
+ firePropertyChange("tabLayoutPolicy", oldPolicy, layoutPolicy);
}
}
@@ -998,7 +998,7 @@ public class JTabbedPane extends JComponent implements Serializable,
{
// Hiding and showing the involved components
// is done by the JTabbedPane's UI.
- model.setSelectedIndex(index);
+ model.setSelectedIndex(index);
}
}
@@ -1051,8 +1051,8 @@ public class JTabbedPane extends JComponent implements Serializable,
// so we don't trigger a repaint.
if (component != null)
{
- component.hide();
- super.add(component);
+ component.hide();
+ super.add(component);
}
if (getSelectedIndex() == -1)
@@ -1117,7 +1117,7 @@ public class JTabbedPane extends JComponent implements Serializable,
super.add(component);
else
insertTab(component.getName(), null, component, null, tabs.size());
-
+
return component;
}
@@ -1191,18 +1191,18 @@ public class JTabbedPane extends JComponent implements Serializable,
super.add(component);
else
{
- if (constraints instanceof String)
- insertTab((String) constraints, null, component, null, index);
- else
- insertTab(component.getName(),
- (constraints instanceof Icon) ? (Icon) constraints : null,
- component, null, index);
+ if (constraints instanceof String)
+ insertTab((String) constraints, null, component, null, index);
+ else
+ insertTab(component.getName(),
+ (constraints instanceof Icon) ? (Icon) constraints : null,
+ component, null, index);
}
}
/**
- * Removes the tab at index. After the component associated with
- * index is removed, its visibility is reset to true to ensure it
+ * Removes the tab at index. After the component associated with
+ * index is removed, its visibility is reset to true to ensure it
* will be visible if added to other containers.
*
* @param index The index of the tab to remove.
@@ -1261,7 +1261,7 @@ public class JTabbedPane extends JComponent implements Serializable,
// Since components implementing UIResource
// are not added as regular tabs by the add()
// methods we have to take special care when
- // removing these object. Especially
+ // removing these object. Especially
// Container.remove(Component) cannot be used
// because it will call JTabbedPane.remove(int)
// later which is overridden and can only
@@ -1270,7 +1270,7 @@ public class JTabbedPane extends JComponent implements Serializable,
// situation that someone called insertTab()
// with a component that implements UIResource.
int index = indexOfComponent(component);
-
+
// If the component is not a tab component
// find out its Container-given index
// and call that class' implementation
@@ -1603,11 +1603,11 @@ public class JTabbedPane extends JComponent implements Serializable,
int index = -1;
for (int i = 0; i < tabs.size(); i++)
{
- if (((Page) tabs.elementAt(i)).getTitle().equals(title))
- {
- index = i;
- break;
- }
+ if (((Page) tabs.elementAt(i)).getTitle().equals(title))
+ {
+ index = i;
+ break;
+ }
}
return index;
}
@@ -1624,11 +1624,11 @@ public class JTabbedPane extends JComponent implements Serializable,
int index = -1;
for (int i = 0; i < tabs.size(); i++)
{
- if (((Page) tabs.elementAt(i)).getIcon() == icon)
- {
- index = i;
- break;
- }
+ if (((Page) tabs.elementAt(i)).getIcon() == icon)
+ {
+ index = i;
+ break;
+ }
}
return index;
}
@@ -1645,11 +1645,11 @@ public class JTabbedPane extends JComponent implements Serializable,
int index = -1;
for (int i = 0; i < tabs.size(); i++)
{
- if (((Page) tabs.elementAt(i)).getComponent() == component)
- {
- index = i;
- break;
- }
+ if (((Page) tabs.elementAt(i)).getComponent() == component)
+ {
+ index = i;
+ break;
+ }
}
return index;
}
@@ -1684,12 +1684,12 @@ public class JTabbedPane extends JComponent implements Serializable,
}
/**
- * Returns a string describing the attributes for the
- * <code>JTabbedPane</code> component, for use in debugging. The return
- * value is guaranteed to be non-<code>null</code>, but the format of the
+ * Returns a string describing the attributes for the
+ * <code>JTabbedPane</code> component, for use in debugging. The return
+ * value is guaranteed to be non-<code>null</code>, but the format of the
* string may vary between implementations.
*
- * @return A string describing the attributes of the
+ * @return A string describing the attributes of the
* <code>JTabbedPane</code>.
*/
protected String paramString()
@@ -1711,7 +1711,7 @@ public class JTabbedPane extends JComponent implements Serializable,
* Returns the object that provides accessibility features for this
* <code>JTabbedPane</code> component.
*
- * @return The accessible context (an instance of
+ * @return The accessible context (an instance of
* {@link AccessibleJTabbedPane}).
*/
public AccessibleContext getAccessibleContext()
diff --git a/libjava/classpath/javax/swing/JTable.java b/libjava/classpath/javax/swing/JTable.java
index 42563e6..b60c67a 100644
--- a/libjava/classpath/javax/swing/JTable.java
+++ b/libjava/classpath/javax/swing/JTable.java
@@ -1,4 +1,4 @@
-/* JTable.java --
+/* JTable.java --
Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -90,9 +90,9 @@ import javax.swing.table.TableModel;
* The table component, displaying information, organized in rows and columns.
* The table can be placed in the scroll bar and have the optional header
* that is always visible. Cell values may be editable after double clicking
- * on the cell. Cell columns may have various data types, that are
+ * on the cell. Cell columns may have various data types, that are
* displayed and edited by the different renderers and editors. It is possible
- * to set different column width. The columns are also resizeable by
+ * to set different column width. The columns are also resizeable by
* dragging the column boundary in the header.
*/
public class JTable
@@ -271,7 +271,7 @@ public class JTable
* Sets the background of the cell. Since table cells cannot have
* individual background colors, this method does nothing. Set the
* background directly on the table instead.
- *
+ *
* @param color not used
*/
public void setBackground(Color color)
@@ -293,7 +293,7 @@ public class JTable
* Sets the foreground of the cell. Since table cells cannot have
* individual foreground colors, this method does nothing. Set the
* foreground directly on the table instead.
- *
+ *
* @param color not used
*/
public void setForeground(Color color)
@@ -315,7 +315,7 @@ public class JTable
* Sets the cursor of the cell. Since table cells cannot have
* individual cursors, this method does nothing. Set the
* cursor directly on the table instead.
- *
+ *
* @param cursor not used
*/
public void setCursor(Cursor cursor)
@@ -337,7 +337,7 @@ public class JTable
* Sets the font of the cell. Since table cells cannot have
* individual fonts, this method does nothing. Set the
* font directly on the table instead.
- *
+ *
* @param font not used
*/
public void setFont(Font font)
@@ -568,7 +568,7 @@ public class JTable
{
table.removeFocusListener(listener);
}
-
+
}
protected class AccessibleJTableModelChange
@@ -748,7 +748,7 @@ public class JTable
public void setAccessibleRowHeader(AccessibleTable header)
{
// TODO Auto-generated method stub
-
+
}
public AccessibleTable getAccessibleColumnHeader()
@@ -760,7 +760,7 @@ public class JTable
public void setAccessibleColumnHeader(AccessibleTable header)
{
// TODO Auto-generated method stub
-
+
}
public Accessible getAccessibleRowDescription(int r)
@@ -772,7 +772,7 @@ public class JTable
public void setAccessibleRowDescription(int r, Accessible description)
{
// TODO Auto-generated method stub
-
+
}
public Accessible getAccessibleColumnDescription(int c)
@@ -784,7 +784,7 @@ public class JTable
public void setAccessibleColumnDescription(int c, Accessible description)
{
// TODO Auto-generated method stub
-
+
}
public boolean isAccessibleSelected(int r, int c)
@@ -816,7 +816,7 @@ public class JTable
// TODO Auto-generated method stub
return null;
}
-
+
}
/**
@@ -830,11 +830,11 @@ public class JTable
{
JTableHeader header;
-
+
int columnIndex;
-
+
/**
- *
+ *
* @param h the table header.
* @param comp
* @param r
@@ -849,7 +849,7 @@ public class JTable
/**
* Returns the header renderer.
- *
+ *
* @return The header renderer.
*/
Component getColumnHeaderRenderer()
@@ -858,13 +858,13 @@ public class JTable
TableCellRenderer r = tc.getHeaderRenderer();
if (r == null)
r = header.getDefaultRenderer();
- return r.getTableCellRendererComponent(header.getTable(),
+ return r.getTableCellRendererComponent(header.getTable(),
tc.getHeaderValue(), false, false, -1, columnIndex);
}
-
+
/**
* Returns the accessible role for the table header cell.
- *
+ *
* @return The accessible role.
*/
public AccessibleRole getAccessibleRole()
@@ -910,7 +910,7 @@ public class JTable
/**
* Returns the accessible context.
- *
+ *
* @return <code>this</code>.
*/
public AccessibleContext getAccessibleContext()
@@ -927,7 +927,7 @@ public class JTable
public void setBackground(Color color)
{
// TODO Auto-generated method stub
-
+
}
public Color getForeground()
@@ -939,7 +939,7 @@ public class JTable
public void setForeground(Color color)
{
// TODO Auto-generated method stub
-
+
}
public Cursor getCursor()
@@ -951,7 +951,7 @@ public class JTable
public void setCursor(Cursor cursor)
{
// TODO Auto-generated method stub
-
+
}
public Font getFont()
@@ -963,7 +963,7 @@ public class JTable
public void setFont(Font font)
{
// TODO Auto-generated method stub
-
+
}
public FontMetrics getFontMetrics(Font font)
@@ -981,7 +981,7 @@ public class JTable
public void setEnabled(boolean b)
{
// TODO Auto-generated method stub
-
+
}
public boolean isVisible()
@@ -993,7 +993,7 @@ public class JTable
public void setVisible(boolean b)
{
// TODO Auto-generated method stub
-
+
}
public boolean isShowing()
@@ -1023,7 +1023,7 @@ public class JTable
public void setLocation(Point point)
{
// TODO Auto-generated method stub
-
+
}
public Rectangle getBounds()
@@ -1035,7 +1035,7 @@ public class JTable
public void setBounds(Rectangle rectangle)
{
// TODO Auto-generated method stub
-
+
}
public Dimension getSize()
@@ -1047,7 +1047,7 @@ public class JTable
public void setSize(Dimension dimension)
{
// TODO Auto-generated method stub
-
+
}
public Accessible getAccessibleAt(Point point)
@@ -1065,21 +1065,21 @@ public class JTable
public void requestFocus()
{
// TODO Auto-generated method stub
-
+
}
public void addFocusListener(FocusListener listener)
{
// TODO Auto-generated method stub
-
+
}
public void removeFocusListener(FocusListener listener)
{
// TODO Auto-generated method stub
-
+
}
-
+
}
/**
@@ -1140,17 +1140,17 @@ public class JTable
{
return AccessibleRole.TABLE;
}
-
+
/**
* Returns the accessible table.
- *
+ *
* @return <code>this</code>.
*/
public AccessibleTable getAccessibleTable()
{
return this;
}
-
+
/**
* Returns the number of selected items in this table.
*/
@@ -1489,7 +1489,7 @@ public class JTable
*/
public void propertyChange(PropertyChangeEvent e)
{
- String propName = e.getPropertyName();
+ String propName = e.getPropertyName();
if (propName.equals("tableModel"))
{
TableModel oldModel = (TableModel) e.getOldValue();
@@ -1525,9 +1525,9 @@ public class JTable
* index.
*
* @param index the index of the cell of which the row number is queried
- *
+ *
* @return the row number of an accessible child (cell) with the specified
- * index
+ * index
*/
public int getAccessibleRow(int index)
{
@@ -1539,9 +1539,9 @@ public class JTable
* specified index.
*
* @param index the index of the cell of which the column number is queried
- *
+ *
* @return the column number of an accessible child (cell) with the
- * specified index
+ * specified index
*/
public int getAccessibleColumn(int index)
{
@@ -1629,16 +1629,16 @@ public class JTable
* Returns the accessible child at the given index.
*
* @param index the child index.
- *
+ *
* @return The accessible child.
*/
public Accessible getAccessibleChild(int index)
{
int r = getAccessibleRow(index);
int c = getAccessibleColumn(index);
- return getAccessibleAt(r, c);
+ return getAccessibleAt(r, c);
}
-
+
/**
* Returns the accessible child (table cell) at the specified row and
* column.
@@ -1707,7 +1707,7 @@ public class JTable
*/
public void setAccessibleRowHeader(AccessibleTable header)
{
- // In the RI this seems to be a no-op.
+ // In the RI this seems to be a no-op.
}
/**
@@ -1912,7 +1912,7 @@ public class JTable
/**
* Receives notification that a property of the observed TableColumns has
* changed.
- *
+ *
* @param ev the property change event
*/
public void propertyChange(PropertyChangeEvent ev)
@@ -1943,7 +1943,7 @@ public class JTable
* The CheckBox that is used for rendering.
*/
private final JCheckBox checkBox;
-
+
/**
* Creates a new checkbox based boolean cell renderer. The checkbox is
* centered by default.
@@ -1953,7 +1953,7 @@ public class JTable
checkBox = new JCheckBox();
checkBox.setHorizontalAlignment(SwingConstants.CENTER);
}
-
+
/**
* Get the check box.
*/
@@ -1964,7 +1964,7 @@ public class JTable
/**
* Returns the component that is used for rendering the value.
- *
+ *
* @param table the JTable
* @param value the value of the object
* @param isSelected is the cell selected?
@@ -2031,7 +2031,7 @@ public class JTable
* @param hasFocus has the cell the focus?
* @param row the row to render
* @param column the cell to render
- *
+ *
* @return this component (the default table cell renderer)
*/
public Component getTableCellRendererComponent(JTable table, Object value,
@@ -2074,7 +2074,7 @@ public class JTable
* @param hasFocus has the cell the focus?
* @param row the row to render
* @param column the cell to render
- *
+ *
* @return this component (the default table cell renderer)
*/
public Component getTableCellRendererComponent(JTable table, Object value,
@@ -2117,7 +2117,7 @@ public class JTable
* @param hasFocus has the cell the focus?
* @param row the row to render
* @param column the cell to render
- *
+ *
* @return this component (the default table cell renderer)
*/
public Component getTableCellRendererComponent(JTable table, Object value,
@@ -2162,8 +2162,8 @@ public class JTable
{
setHorizontalAlignment(SwingConstants.CENTER);
}
-
-
+
+
/**
* Returns the component that is used for rendering the value.
*
@@ -2173,7 +2173,7 @@ public class JTable
* @param hasFocus has the cell the focus?
* @param row the row to render
* @param column the cell to render
- *
+ *
* @return this component (the default table cell renderer)
*/
public Component getTableCellRendererComponent(JTable table, Object value,
@@ -2196,7 +2196,7 @@ public class JTable
return this;
}
}
-
+
/**
* The JTable text component (used in editing) always has the table
* as its parent. The scrollRectToVisible must be adjusted taking the
@@ -2213,11 +2213,11 @@ public class JTable
{
setBorder(BorderFactory.createLineBorder(getGridColor(), 2));
}
- }
-
+ }
+
private static final long serialVersionUID = 3876025080382781659L;
-
+
/**
* This table, for referring identically name methods from inner classes.
*/
@@ -2244,7 +2244,7 @@ public class JTable
* n)</code>, uniformly, to provide or absorb excess space requirements.
*/
public static final int AUTO_RESIZE_SUBSEQUENT_COLUMNS = 2;
-
+
/**
* When resizing column <code>i</code> in a table of <code>n</code>
* columns, automatically change all columns in the range <code>[0,
@@ -2261,15 +2261,15 @@ public class JTable
public static final int AUTO_RESIZE_LAST_COLUMN = 3;
/**
- * A table mapping {@link java.lang.Class} objects to
- * {@link TableCellEditor} objects. This table is consulted by the
+ * A table mapping {@link java.lang.Class} objects to
+ * {@link TableCellEditor} objects. This table is consulted by the
* FIXME
*/
protected Hashtable defaultEditorsByColumnClass = new Hashtable();
/**
- * A table mapping {@link java.lang.Class} objects to
- * {@link TableCellEditor} objects. This table is consulted by the
+ * A table mapping {@link java.lang.Class} objects to
+ * {@link TableCellEditor} objects. This table is consulted by the
* FIXME
*/
protected Hashtable defaultRenderersByColumnClass = new Hashtable();
@@ -2295,7 +2295,7 @@ public class JTable
/**
* Whether or not the table should automatically compute a matching
* {@link TableColumnModel} and assign it to the {@link #columnModel}
- * property when the {@link #dataModel} property is changed.
+ * property when the {@link #dataModel} property is changed.
*
* @see #setModel(TableModel)
* @see #createDefaultColumnsFromModel()
@@ -2310,7 +2310,7 @@ public class JTable
* one of {@link #AUTO_RESIZE_ALL_COLUMNS} (the default), {@link
* #AUTO_RESIZE_LAST_COLUMN}, {@link #AUTO_RESIZE_NEXT_COLUMN}, {@link
* #AUTO_RESIZE_SUBSEQUENT_COLUMNS}, or {@link #AUTO_RESIZE_OFF}.
- *
+ *
* @see #doLayout()
* @see #setAutoResizeMode(int)
* @see #getAutoResizeMode()
@@ -2322,7 +2322,7 @@ public class JTable
* of uniform height. This differs from column width, which varies on a
* per-column basis, and is stored in the individual columns of the
* {@link #columnModel}.
- *
+ *
* @see #getRowHeight()
* @see #setRowHeight(int)
* @see TableColumn#getWidth()
@@ -2331,8 +2331,8 @@ public class JTable
protected int rowHeight;
/**
- * The height in pixels of the gap left between any two rows of the table.
- *
+ * The height in pixels of the gap left between any two rows of the table.
+ *
* @see #setRowMargin(int)
* @see #getRowHeight()
* @see #getIntercellSpacing()
@@ -2358,12 +2358,12 @@ public class JTable
protected boolean rowSelectionAllowed;
/**
- * Obsolete. Use {@link #rowSelectionAllowed}, {@link
+ * Obsolete. Use {@link #rowSelectionAllowed}, {@link
* #getColumnSelectionAllowed}, or the combined methods {@link
* #getCellSelectionEnabled} and {@link #setCellSelectionEnabled(boolean)}.
*/
protected boolean cellSelectionEnabled;
-
+
/**
* The model for data stored in the table. Confusingly, the published API
* requires that this field be called <code>dataModel</code>, despite its
@@ -2393,7 +2393,7 @@ public class JTable
* at all: setting {@link #autoCreateColumnsFromModel} will construct the
* columnModel automatically, and the table acts as a facade for most of
* the interesting properties of the columnModel anyways.</p>
- *
+ *
* @see #setColumnModel(TableColumnModel)
* @see #getColumnModel()
*/
@@ -2409,12 +2409,12 @@ public class JTable
* @see #setSelectionModel(ListSelectionModel)
* @see #getSelectionModel()
* @see TableColumnModel#getSelectionModel()
- * @see ListSelectionModel#addListSelectionListener(ListSelectionListener)
+ * @see ListSelectionModel#addListSelectionListener(ListSelectionListener)
*/
protected ListSelectionModel selectionModel;
/**
- * The current cell editor.
+ * The current cell editor.
*/
protected TableCellEditor cellEditor;
@@ -2504,7 +2504,7 @@ public class JTable
private boolean surrendersFocusOnKeystroke = false;
/**
- * A Rectangle object to be reused in {@link #getCellRect}.
+ * A Rectangle object to be reused in {@link #getCellRect}.
*/
private Rectangle rectCache = new Rectangle();
@@ -2531,13 +2531,13 @@ public class JTable
* @see #setRowHeight(int, int)
*/
private SizeSequence rowHeights;
-
+
/**
* This editor serves just a marker that the value must be simply changed to
* the opposite one instead of starting the editing session.
*/
- private transient TableCellEditor booleanInvertingEditor;
-
+ private transient TableCellEditor booleanInvertingEditor;
+
/**
* Creates a new <code>JTable</code> instance.
*/
@@ -2559,7 +2559,7 @@ public class JTable
}
/**
- * Creates a new <code>JTable</code> instance, storing the given data
+ * Creates a new <code>JTable</code> instance, storing the given data
* array and heaving the given column names. To see the column names,
* you must place the JTable into the {@link JScrollPane}.
*
@@ -2576,7 +2576,7 @@ public class JTable
* object that provides information about the table content. The table model
* object is asked for the table size, other features and also receives
* notifications in the case when the table has been edited by the user.
- *
+ *
* @param model
* the table model.
*/
@@ -2592,7 +2592,7 @@ public class JTable
* notifications in the case when the table has been edited by the user. The
* table column model provides more detailed control on the table column
* related features.
- *
+ *
* @param dm
* the table data mode
* @param cm
@@ -2618,24 +2618,24 @@ public class JTable
TableColumnModel columnModel;
if (cm != null)
columnModel = cm;
- else
+ else
{
columnModel = createDefaultColumnModel();
autoCreate = true;
}
-
+
// Initialise the intercelar spacing before setting the column model to
// avoid firing unnecessary events.
- // The initial incellar spacing is new Dimenstion(1,1).
+ // The initial incellar spacing is new Dimenstion(1,1).
rowMargin = 1;
columnModel.setColumnMargin(1);
setColumnModel(columnModel);
-
+
setSelectionModel(sm == null ? createDefaultSelectionModel() : sm);
setModel(dm == null ? createDefaultDataModel() : dm);
setAutoCreateColumnsFromModel(autoCreate);
initializeLocalVars();
-
+
// The following four lines properly set the lead selection indices.
// After this, the UI will handle the lead selection indices.
// FIXME: this should probably not be necessary, if the UI is installed
@@ -2649,9 +2649,9 @@ public class JTable
// selectionModel.setLeadSelectionIndex(-1);
// columnModel.getSelectionModel().setAnchorSelectionIndex(-1);
// columnModel.getSelectionModel().setLeadSelectionIndex(-1);
- updateUI();
+ updateUI();
}
-
+
/**
* Creates a new <code>JTable</code> instance that uses data and column
* names, stored in {@link Vector}s.
@@ -2662,8 +2662,8 @@ public class JTable
public JTable(Vector data, Vector columnNames)
{
this(new DefaultTableModel(data, columnNames));
- }
-
+ }
+
/**
* Initialize local variables to default values.
*/
@@ -2678,10 +2678,10 @@ public class JTable
setRowHeight(16);
this.rowMargin = 1;
this.rowSelectionAllowed = true;
-
+
// this.accessibleContext = new AccessibleJTable();
this.cellEditor = null;
-
+
// COMPAT: Both Sun and IBM have drag enabled
this.dragEnabled = false;
this.preferredViewportSize = new Dimension(450,400);
@@ -2690,15 +2690,15 @@ public class JTable
this.editingColumn = -1;
this.editingRow = -1;
}
-
+
/**
* Add the new table column. The table column class allows to specify column
* features more precisely, setting the preferred width, column data type
* (column class) and table headers.
- *
- * There is no need the add columns to the table if the default column
+ *
+ * There is no need the add columns to the table if the default column
* handling is sufficient.
- *
+ *
* @param column
* the new column to add.
*/
@@ -2709,15 +2709,15 @@ public class JTable
String name = dataModel.getColumnName(column.getModelIndex());
column.setHeaderValue(name);
}
-
+
columnModel.addColumn(column);
column.addPropertyChangeListener(tableColumnPropertyChangeHandler);
}
-
+
/**
* Create the default editors for this table. The default method creates
* the editor for Booleans.
- *
+ *
* Other fields are edited as strings at the moment.
*/
protected void createDefaultEditors()
@@ -2725,10 +2725,10 @@ public class JTable
JCheckBox box = new BooleanCellRenderer().getCheckBox();
box.setBorder(BorderFactory.createLineBorder(getGridColor(), 2));
box.setBorderPainted(true);
- booleanInvertingEditor = new DefaultCellEditor(box);
+ booleanInvertingEditor = new DefaultCellEditor(box);
setDefaultEditor(Boolean.class, booleanInvertingEditor);
}
-
+
/**
* Create the default renderers for this table. The default method creates
* renderers for Boolean, Number, Double, Date, Icon and ImageIcon.
@@ -2742,9 +2742,9 @@ public class JTable
setDefaultRenderer(Double.class, new FloatCellRenderer());
setDefaultRenderer(Date.class, new DateCellRenderer());
setDefaultRenderer(Icon.class, new IconCellRenderer());
- setDefaultRenderer(ImageIcon.class, new IconCellRenderer());
+ setDefaultRenderer(ImageIcon.class, new IconCellRenderer());
}
-
+
/**
* @deprecated 1.0.2, replaced by <code>new JScrollPane(JTable)</code>
*/
@@ -2752,12 +2752,12 @@ public class JTable
{
return new JScrollPane(table);
}
-
+
/**
* Create the default table column model that is used if the user-defined
* column model is not provided. The default method creates
* {@link DefaultTableColumnModel}.
- *
+ *
* @return the created table column model.
*/
protected TableColumnModel createDefaultColumnModel()
@@ -2769,7 +2769,7 @@ public class JTable
* Create the default table data model that is used if the user-defined
* data model is not provided. The default method creates
* {@link DefaultTableModel}.
- *
+ *
* @return the created table data model.
*/
protected TableModel createDefaultDataModel()
@@ -2781,25 +2781,25 @@ public class JTable
* Create the default table selection model that is used if the user-defined
* selection model is not provided. The default method creates
* {@link DefaultListSelectionModel}.
- *
+ *
* @return the created table data model.
*/
protected ListSelectionModel createDefaultSelectionModel()
{
return new DefaultListSelectionModel();
}
-
+
/**
* Create the default table header, if the user - defined table header is not
* provided.
- *
+ *
* @return the default table header.
*/
protected JTableHeader createDefaultTableHeader()
{
return new JTableHeader(columnModel);
}
-
+
/**
* Invoked when the column is added. Revalidates and repains the table.
*/
@@ -2810,7 +2810,7 @@ public class JTable
}
/**
- * Invoked when the column margin is changed.
+ * Invoked when the column margin is changed.
* Revalidates and repains the table.
*/
public void columnMarginChanged (ChangeEvent event)
@@ -2838,7 +2838,7 @@ public class JTable
revalidate();
repaint();
}
-
+
/**
* Invoked when the the column selection changes, repaints the changed
* columns. It is not recommended to override this method, register the
@@ -2887,7 +2887,7 @@ public class JTable
repaint(dirty);
}
}
-
+
/**
* Invoked when the editing is cancelled.
*/
@@ -2896,23 +2896,23 @@ public class JTable
if (editorComp!=null)
{
remove(editorComp);
- repaint(editorComp.getBounds());
+ repaint(editorComp.getBounds());
editorComp = null;
}
}
-
+
/**
* Finish the current editing session and update the table with the
* new value by calling {@link #setValueAt}.
- *
+ *
* @param event the change event
*/
public void editingStopped (ChangeEvent event)
{
if (editorComp!=null)
{
- remove(editorComp);
- setValueAt(cellEditor.getCellEditorValue(), editingRow, editingColumn);
+ remove(editorComp);
+ setValueAt(cellEditor.getCellEditorValue(), editingRow, editingColumn);
repaint(editorComp.getBounds());
editorComp = null;
}
@@ -3051,7 +3051,7 @@ public class JTable
Rectangle dirty;
if (col == TableModelEvent.ALL_COLUMNS)
{
- // All columns changed.
+ // All columns changed.
dirty = new Rectangle(0, firstRow * getRowHeight(),
getColumnModel().getTotalColumnWidth(), 0);
}
@@ -3121,7 +3121,7 @@ public class JTable
// If we are in the editing process, end the editing session.
if (isEditing())
editingStopped(null);
-
+
// Repaint the changed region.
int first = Math.max(0, Math.min(getRowCount() - 1, event.getFirstIndex()));
int last = Math.max(0, Math.min(getRowCount() - 1, event.getLastIndex()));
@@ -3134,11 +3134,11 @@ public class JTable
}
/**
- * Returns index of the column that contains specified point
+ * Returns index of the column that contains specified point
* or -1 if this table doesn't contain this point.
*
* @param point point to identify the column
- * @return index of the column that contains specified point or
+ * @return index of the column that contains specified point or
* -1 if this table doesn't contain this point.
*/
public int columnAtPoint(Point point)
@@ -3162,7 +3162,7 @@ public class JTable
/**
* Returns index of the row that contains specified point or -1 if this table
* doesn't contain this point.
- *
+ *
* @param point point to identify the row
* @return index of the row that contains specified point or -1 if this table
* doesn't contain this point.
@@ -3191,7 +3191,7 @@ public class JTable
return -1;
}
- /**
+ /**
* Calculate the visible rectangle for a particular row and column. The
* row and column are specified in visual terms; the column may not match
* the {@link #dataModel} column.
@@ -3272,7 +3272,7 @@ public class JTable
cellRect.x += cMargin / 2;
cellRect.width -= cMargin;
}
- }
+ }
return cellRect;
}
@@ -3291,10 +3291,10 @@ public class JTable
* @return The current value of the selectedRow property
*/
public int getSelectedRow ()
- {
+ {
return selectionModel.getMinSelectionIndex();
}
-
+
/**
* Get the value of the {@link #selectionModel} property.
*
@@ -3305,7 +3305,7 @@ public class JTable
//Neither Sun nor IBM returns null if rowSelection not allowed
return selectionModel;
}
-
+
public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction)
{
int block;
@@ -3334,7 +3334,7 @@ public class JTable
{
return false;
}
-
+
/**
* Get the value of the <code>scrollableTracksViewportWidth</code> property.
*
@@ -3348,20 +3348,20 @@ public class JTable
else
return true;
}
-
+
/**
* Return the preferred scrolling amount (in pixels) for the given scrolling
* direction and orientation. This method handles a partially exposed row by
* returning the distance required to completely expose the item. When
* scrolling the top item is completely exposed.
- *
+ *
* @param visibleRect the currently visible part of the component.
* @param orientation the scrolling orientation
* @param direction the scrolling direction (negative - up, positive -down).
* The values greater than one means that more mouse wheel or similar
* events were generated, and hence it is better to scroll the longer
* distance.
- *
+ *
* @author Roman Kennke (kennke@aicas.com)
*/
public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation,
@@ -3403,7 +3403,7 @@ public class JTable
* not provide the editor, the call is forwarded to the
* {@link #getDefaultEditor(Class)} with the parameter, obtained from
* {@link TableModel#getColumnClass(int)}.
- *
+ *
* @param row the cell row
* @param column the cell column
* @return the editor to edit that cell
@@ -3420,13 +3420,13 @@ public class JTable
return editor;
}
-
+
/**
* Get the default editor for editing values of the given type
* (String, Boolean and so on).
- *
+ *
* @param columnClass the class of the value that will be edited.
- *
+ *
* @return the editor, suitable for editing this data type
*/
public TableCellEditor getDefaultEditor(Class<?> columnClass)
@@ -3435,7 +3435,7 @@ public class JTable
return (TableCellEditor) defaultEditorsByColumnClass.get(columnClass);
else
{
- JTextField t = new TableTextField();
+ JTextField t = new TableTextField();
TableCellEditor r = new DefaultCellEditor(t);
defaultEditorsByColumnClass.put(columnClass, r);
return r;
@@ -3444,7 +3444,7 @@ public class JTable
/**
* Get the cell renderer for rendering the given cell.
- *
+ *
* @param row the cell row
* @param column the cell column
* @return the cell renderer to render that cell.
@@ -3464,7 +3464,7 @@ public class JTable
/**
* Set default renderer for rendering the given data type.
- *
+ *
* @param columnClass the data type (String, Boolean and so on) that must be
* rendered.
* @param rend the renderer that will rend this data type
@@ -3476,9 +3476,9 @@ public class JTable
/**
* Get the default renderer for rendering the given data type.
- *
+ *
* @param columnClass the data that must be rendered
- *
+ *
* @return the appropriate defauld renderer for rendering that data type.
*/
public TableCellRenderer getDefaultRenderer(Class<?> columnClass)
@@ -3492,7 +3492,7 @@ public class JTable
return r;
}
}
-
+
/**
* Convert the table model index into the table column number.
* The model number need not match the real column position. The columns
@@ -3500,9 +3500,9 @@ public class JTable
* column headers.
*
* @param vc the column number (0=first).
- *
+ *
* @return the table column model index of this column.
- *
+ *
* @see TableColumn#getModelIndex()
*/
public int convertColumnIndexToModel(int vc)
@@ -3512,18 +3512,18 @@ public class JTable
else
return columnModel.getColumn(vc).getModelIndex();
}
-
+
/**
* Convert the table column number to the table column model index.
* The model number need not match the real column position. The columns
* may be rearranged by the user with mouse at any time by dragging the
* column headers.
- *
+ *
* @param mc the table column index (0=first).
- *
+ *
* @return the table column number in the model
- *
- * @see TableColumn#getModelIndex()
+ *
+ * @see TableColumn#getModelIndex()
*/
public int convertColumnIndexToView(int mc)
{
@@ -3537,14 +3537,14 @@ public class JTable
}
return -1;
}
-
+
/**
* Prepare the renderer for rendering the given cell.
- *
+ *
* @param renderer the renderer being prepared
* @param row the row of the cell being rendered
* @param column the column of the cell being rendered
- *
+ *
* @return the component which .paint() method will paint the cell.
*/
public Component prepareRenderer(TableCellRenderer renderer,
@@ -3569,7 +3569,7 @@ public class JTable
&& colSel.getLeadSelectionIndex() == column;
return renderer.getTableCellRendererComponent(this,
- dataModel.getValueAt(row,
+ dataModel.getValueAt(row,
convertColumnIndexToModel(column)),
isSel,
hasFocus,
@@ -3635,7 +3635,7 @@ public class JTable
* Get the value of the {@link #rowSelectionAllowed} property.
*
* @return The current value of the property
- *
+ *
* @see #setRowSelectionAllowed(boolean)
*/
public boolean getRowSelectionAllowed()
@@ -3671,7 +3671,7 @@ public class JTable
*/
public int getColumnCount()
{
- return columnModel.getColumnCount();
+ return columnModel.getColumnCount();
}
/**
@@ -3718,14 +3718,14 @@ public class JTable
case ListSelectionModel.SINGLE_SELECTION:
sum = 1;
break;
-
+
case ListSelectionModel.SINGLE_INTERVAL_SELECTION:
sum = hi - lo + 1;
break;
-
- case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:
+
+ case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:
for (int i = lo; i <= hi; ++i)
- if (lsm.isSelectedIndex(i))
+ if (lsm.isSelectedIndex(i))
++sum;
break;
}
@@ -3747,16 +3747,16 @@ public class JTable
{
case ListSelectionModel.SINGLE_SELECTION:
ret[0] = lo;
- break;
-
- case ListSelectionModel.SINGLE_INTERVAL_SELECTION:
+ break;
+
+ case ListSelectionModel.SINGLE_INTERVAL_SELECTION:
for (int i = lo; i <= hi; ++i)
ret[j++] = i;
break;
-
- case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:
+
+ case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:
for (int i = lo; i <= hi; ++i)
- if (lsm.isSelectedIndex(i))
+ if (lsm.isSelectedIndex(i))
ret[j++] = i;
break;
}
@@ -3769,7 +3769,7 @@ public class JTable
* delegation to the {@link #columnModel} field.
*
* @return The current value of the selectedColumnCount property
- */
+ */
public int getSelectedColumnCount()
{
return countSelections(columnModel.getSelectionModel());
@@ -3790,7 +3790,7 @@ public class JTable
* Get the value of the <code>columnSelectionAllowed</code> property.
*
* @return The current value of the columnSelectionAllowed property
- *
+ *
* @see #setColumnSelectionAllowed(boolean)
*/
public boolean getColumnSelectionAllowed()
@@ -3835,7 +3835,7 @@ public class JTable
tcm.addColumnModelListener(ctx);
tcm.getSelectionModel().addListSelectionListener(ctx);
getSelectionModel().addListSelectionListener(ctx);
-
+
accessibleContext = ctx;
}
return accessibleContext;
@@ -3947,7 +3947,7 @@ public class JTable
* @param column column to removed
*/
public void removeColumn(TableColumn column)
- {
+ {
columnModel.removeColumn(column);
}
@@ -3956,8 +3956,8 @@ public class JTable
*
* @param column index of the column to move
* @param targetColumn index specifying new location of the column
- */
- public void moveColumn(int column,int targetColumn)
+ */
+ public void moveColumn(int column,int targetColumn)
{
columnModel.moveColumn(column, targetColumn);
}
@@ -3968,7 +3968,7 @@ public class JTable
* {@link #createDefaultColumnsFromModel()} method is called.
*
* @param autoCreate the new value of the flag.
- */
+ */
public void setAutoCreateColumnsFromModel(boolean autoCreate)
{
if (autoCreateColumnsFromModel != autoCreate)
@@ -3983,7 +3983,7 @@ public class JTable
* Set the value of the {@link #autoResizeMode} property.
*
* @param a The new value of the autoResizeMode property
- */
+ */
public void setAutoResizeMode(int a)
{
autoResizeMode = a;
@@ -4000,7 +4000,7 @@ public class JTable
* @see #getRowHeight()
* @see #setRowHeight(int, int)
* @see #getRowHeight(int)
- */
+ */
public void setRowHeight(int r)
{
if (r < 1)
@@ -4013,10 +4013,10 @@ public class JTable
revalidate();
repaint();
}
-
+
/**
* Sets the height of a single row in the table.
- *
+ *
* @param rh the new row height
* @param row the row to change the height of
*/
@@ -4028,12 +4028,12 @@ public class JTable
}
rowHeights.setSize(row, rh);
}
-
+
/**
* Set the value of the {@link #rowMargin} property.
*
* @param r The new value of the rowMargin property
- */
+ */
public void setRowMargin(int r)
{
rowMargin = r;
@@ -4045,12 +4045,12 @@ public class JTable
* Set the value of the {@link #rowSelectionAllowed} property.
*
* @param r The new value of the rowSelectionAllowed property
- *
+ *
* @see #getRowSelectionAllowed()
- */
+ */
public void setRowSelectionAllowed(boolean r)
{
- if (rowSelectionAllowed != r)
+ if (rowSelectionAllowed != r)
{
rowSelectionAllowed = r;
firePropertyChange("rowSelectionAllowed", !r, r);
@@ -4062,7 +4062,7 @@ public class JTable
* Set the value of the {@link #cellSelectionEnabled} property.
*
* @param c The new value of the cellSelectionEnabled property
- */
+ */
public void setCellSelectionEnabled(boolean c)
{
setColumnSelectionAllowed(c);
@@ -4079,13 +4079,13 @@ public class JTable
* <code>m</code>.</p>
*
* @param m The new value of the model property
- */
+ */
public void setModel(TableModel m)
{
// Throw exception is m is null.
if (m == null)
throw new IllegalArgumentException();
-
+
// Don't do anything if setting the current model again.
if (dataModel == m)
return;
@@ -4095,7 +4095,7 @@ public class JTable
// Remove table as TableModelListener from old model.
if (dataModel != null)
dataModel.removeTableModelListener(this);
-
+
if (m != null)
{
// Set property.
@@ -4129,7 +4129,7 @@ public class JTable
* <code>c</code>.</p>
*
* @param c The new value of the columnModel property
- */
+ */
public void setColumnModel(TableColumnModel c)
{
if (c == null)
@@ -4146,7 +4146,7 @@ public class JTable
TableColumn column;
for (int i = 0; i < ncols; ++i)
{
- column = columnModel.getColumn(i);
+ column = columnModel.getColumn(i);
if (column.getHeaderValue()==null)
column.setHeaderValue(dataModel.getColumnName(i));
}
@@ -4165,9 +4165,9 @@ public class JTable
* Set the value of the <code>columnSelectionAllowed</code> property.
*
* @param c The new value of the property
- *
+ *
* @see #getColumnSelectionAllowed()
- */
+ */
public void setColumnSelectionAllowed(boolean c)
{
if (columnModel.getColumnSelectionAllowed() != c)
@@ -4186,7 +4186,7 @@ public class JTable
* parameter <code>s</code>.</p>
*
* @param s The new value of the selectionModel property
- */
+ */
public void setSelectionModel(ListSelectionModel s)
{
if (s == null)
@@ -4206,12 +4206,12 @@ public class JTable
* mode is set for row and column selection models.
*
* @param s The new value of the property
- */
+ */
public void setSelectionMode(int s)
- {
- selectionModel.setSelectionMode(s);
+ {
+ selectionModel.setSelectionMode(s);
columnModel.getSelectionModel().setSelectionMode(s);
-
+
repaint();
}
@@ -4223,7 +4223,7 @@ public class JTable
* <code>c</code>.</p>
*
* @param c The new value of the cellEditor property
- */
+ */
public void setCellEditor(TableCellEditor c)
{
TableCellEditor tmp = cellEditor;
@@ -4238,7 +4238,7 @@ public class JTable
* Set the value of the {@link #dragEnabled} property.
*
* @param d The new value of the dragEnabled property
- */
+ */
public void setDragEnabled(boolean d)
{
dragEnabled = d;
@@ -4248,7 +4248,7 @@ public class JTable
* Set the value of the {@link #gridColor} property.
*
* @param g The new value of the gridColor property
- */
+ */
public void setGridColor(Color g)
{
gridColor = g;
@@ -4259,7 +4259,7 @@ public class JTable
* Set the value of the <code>intercellSpacing</code> property.
*
* @param i The new value of the intercellSpacing property
- */
+ */
public void setIntercellSpacing(Dimension i)
{
rowMargin = i.height;
@@ -4271,7 +4271,7 @@ public class JTable
* Set the value of the {@link #preferredViewportSize} property.
*
* @param p The new value of the preferredViewportSize property
- */
+ */
public void setPreferredScrollableViewportSize(Dimension p)
{
preferredViewportSize = p;
@@ -4287,7 +4287,7 @@ public class JTable
* selectionBackground changed.</p>
*
* @param s The new value of the selectionBackground property
- */
+ */
public void setSelectionBackground(Color s)
{
Color tmp = selectionBackground;
@@ -4307,7 +4307,7 @@ public class JTable
* selectionForeground changed.</p>
*
* @param s The new value of the selectionForeground property
- */
+ */
public void setSelectionForeground(Color s)
{
Color tmp = selectionForeground;
@@ -4323,7 +4323,7 @@ public class JTable
* Set the value of the <code>showGrid</code> property.
*
* @param s The new value of the showGrid property
- */
+ */
public void setShowGrid(boolean s)
{
setShowVerticalLines(s);
@@ -4334,7 +4334,7 @@ public class JTable
* Set the value of the {@link #showHorizontalLines} property.
*
* @param s The new value of the showHorizontalLines property
- */
+ */
public void setShowHorizontalLines(boolean s)
{
showHorizontalLines = s;
@@ -4345,7 +4345,7 @@ public class JTable
* Set the value of the {@link #showVerticalLines} property.
*
* @param s The new value of the showVerticalLines property
- */
+ */
public void setShowVerticalLines(boolean s)
{
showVerticalLines = s;
@@ -4356,7 +4356,7 @@ public class JTable
* Set the value of the {@link #tableHeader} property.
*
* @param t The new value of the tableHeader property
- */
+ */
public void setTableHeader(JTableHeader t)
{
if (tableHeader != null)
@@ -4383,7 +4383,7 @@ public class JTable
if (jsp != null)
{
jsp.setColumnHeaderView(null);
- }
+ }
}
@@ -4417,7 +4417,7 @@ public class JTable
cols[i].setWidth(cols[i].getPreferredWidth() + average);
}
}
-
+
/**
* This distributes the superfluous width in a table, setting the width of the
* column being resized strictly to its preferred width.
@@ -4434,20 +4434,20 @@ public class JTable
cols[i].setWidth(cols[i].getPreferredWidth() + average);
}
resizeIt.setWidth(resizeIt.getPreferredWidth());
- }
-
+ }
+
/**
* Set the widths of all columns, taking they preferred widths into
* consideration. The excess space, if any, will be distrubuted between
* all columns. This method also handles special cases when one of the
* collumns is currently being resized.
- *
+ *
* @see TableColumn#setPreferredWidth(int)
*/
public void doLayout()
{
TableColumn resizingColumn = null;
-
+
int ncols = columnModel.getColumnCount();
if (ncols < 1)
return;
@@ -4457,7 +4457,7 @@ public class JTable
if (tableHeader != null)
resizingColumn = tableHeader.getResizingColumn();
-
+
for (int i = 0; i < ncols; ++i)
{
TableColumn col = columnModel.getColumn(i);
@@ -4466,21 +4466,21 @@ public class JTable
if (resizingColumn == col)
rCol = i;
}
-
+
int spill = getWidth() - prefSum;
if (resizingColumn != null)
{
TableColumn col;
TableColumn [] cols;
-
+
switch (getAutoResizeMode())
{
case AUTO_RESIZE_LAST_COLUMN:
col = columnModel.getColumn(ncols-1);
col.setWidth(col.getPreferredWidth() + spill);
break;
-
+
case AUTO_RESIZE_NEXT_COLUMN:
col = columnModel.getColumn(ncols-1);
col.setWidth(col.getPreferredWidth() + spill);
@@ -4494,7 +4494,7 @@ public class JTable
break;
case AUTO_RESIZE_SUBSEQUENT_COLUMNS:
-
+
// Subtract the width of the non-resized columns from the spill.
int w = 0;
int wp = 0;
@@ -4513,7 +4513,7 @@ public class JTable
// If there are any columns on the right sied to resize.
spill = (getWidth()-w) - (prefSum-wp);
int average = spill / n;
-
+
// For all columns right from the column being resized:
for (int i = rCol+1; i < ncols; i++)
{
@@ -4539,17 +4539,17 @@ public class JTable
distributeSpill(cols, spill);
}
-
+
if (editorComp!=null)
moveToCellBeingEdited(editorComp);
-
+
int leftBoundary = getLeftResizingBoundary();
int width = getWidth() - leftBoundary;
repaint(leftBoundary, 0, width, getHeight());
if (tableHeader != null)
tableHeader.repaint(leftBoundary, 0, width, tableHeader.getHeight());
}
-
+
/**
* Get the left boundary of the rectangle which changes during the column
* resizing.
@@ -4569,12 +4569,12 @@ public class JTable
for (int i = 0; i < rc; i++)
p += columnModel.getColumn(i).getWidth();
-
+
return p;
}
}
-
-
+
+
/**
* @deprecated Replaced by <code>doLayout()</code>
*/
@@ -4582,7 +4582,7 @@ public class JTable
{
doLayout();
}
-
+
/**
* Obsolete since JDK 1.4. Please use <code>doLayout()</code>.
*/
@@ -4628,9 +4628,9 @@ public class JTable
/**
* Get the class (datatype) of the column. The cells are rendered and edited
* differently, depending from they data type.
- *
+ *
* @param column the column (not the model index).
- *
+ *
* @return the class, defining data type of that column (String.class for
* String, Boolean.class for boolean and so on).
*/
@@ -4638,16 +4638,16 @@ public class JTable
{
return getModel().getColumnClass(convertColumnIndexToModel(column));
}
-
+
/**
* Get the name of the column. If the column has the column identifier set,
* the return value is the result of the .toString() method call on that
* identifier. If the identifier is not explicitly set, the returned value
- * is calculated by
+ * is calculated by
* {@link javax.swing.table.AbstractTableModel#getColumnName(int)}.
- *
+ *
* @param column the column
- *
+ *
* @return the name of that column.
*/
public String getColumnName(int column)
@@ -4658,7 +4658,7 @@ public class JTable
/**
* Get the column, currently being edited
- *
+ *
* @return the column, currently being edited.
*/
public int getEditingColumn()
@@ -4668,17 +4668,17 @@ public class JTable
/**
* Set the column, currently being edited
- *
+ *
* @param column the column, currently being edited.
*/
public void setEditingColumn(int column)
{
editingColumn = column;
}
-
+
/**
* Get the row currently being edited.
- *
+ *
* @return the row, currently being edited.
*/
public int getEditingRow()
@@ -4688,17 +4688,17 @@ public class JTable
/**
* Set the row currently being edited.
- *
+ *
* @param row the row, that will be edited
*/
public void setEditingRow(int row)
{
editingRow = row;
}
-
+
/**
* Get the editor component that is currently editing one of the cells
- *
+ *
* @return the editor component or null, if none of the cells is being
* edited.
*/
@@ -4706,10 +4706,10 @@ public class JTable
{
return editorComp;
}
-
+
/**
* Check if one of the table cells is currently being edited.
- *
+ *
* @return true if there is a cell being edited.
*/
public boolean isEditing()
@@ -4721,10 +4721,10 @@ public class JTable
* Set the default editor for the given column class (column data type).
* By default, String is handled by text field and Boolean is handled by
* the check box.
- *
+ *
* @param columnClass the column data type
* @param editor the editor that will edit this data type
- *
+ *
* @see TableModel#getColumnClass(int)
*/
public void setDefaultEditor(Class<?> columnClass, TableCellEditor editor)
@@ -4734,25 +4734,25 @@ public class JTable
else
defaultEditorsByColumnClass.remove(columnClass);
}
-
+
public void addColumnSelectionInterval(int index0, int index1)
{
if ((index0 < 0 || index0 > (getColumnCount()-1)
|| index1 < 0 || index1 > (getColumnCount()-1)))
throw new IllegalArgumentException("Column index out of range.");
-
+
getColumnModel().getSelectionModel().addSelectionInterval(index0, index1);
}
-
+
public void addRowSelectionInterval(int index0, int index1)
- {
+ {
if ((index0 < 0 || index0 > (getRowCount()-1)
|| index1 < 0 || index1 > (getRowCount()-1)))
throw new IllegalArgumentException("Row index out of range.");
-
+
getSelectionModel().addSelectionInterval(index0, index1);
}
-
+
public void setColumnSelectionInterval(int index0, int index1)
{
if ((index0 < 0 || index0 > (getColumnCount()-1)
@@ -4761,17 +4761,17 @@ public class JTable
getColumnModel().getSelectionModel().setSelectionInterval(index0, index1);
}
-
+
public void setRowSelectionInterval(int index0, int index1)
- {
+ {
if ((index0 < 0 || index0 > (getRowCount()-1)
|| index1 < 0 || index1 > (getRowCount()-1)))
throw new IllegalArgumentException("Row index out of range.");
getSelectionModel().setSelectionInterval(index0, index1);
}
-
- public void removeColumnSelectionInterval(int index0, int index1)
+
+ public void removeColumnSelectionInterval(int index0, int index1)
{
if ((index0 < 0 || index0 > (getColumnCount()-1)
|| index1 < 0 || index1 > (getColumnCount()-1)))
@@ -4779,7 +4779,7 @@ public class JTable
getColumnModel().getSelectionModel().removeSelectionInterval(index0, index1);
}
-
+
public void removeRowSelectionInterval(int index0, int index1)
{
if ((index0 < 0 || index0 > (getRowCount()-1)
@@ -4788,12 +4788,12 @@ public class JTable
getSelectionModel().removeSelectionInterval(index0, index1);
}
-
+
/**
* Checks if the given column is selected.
- *
+ *
* @param column the column
- *
+ *
* @return true if the column is selected (as reported by the selection
* model, associated with the column model), false otherwise.
*/
@@ -4801,12 +4801,12 @@ public class JTable
{
return getColumnModel().getSelectionModel().isSelectedIndex(column);
}
-
+
/**
* Checks if the given row is selected.
- *
+ *
* @param row the row
- *
+ *
* @return true if the row is selected (as reported by the selection model),
* false otherwise.
*/
@@ -4814,21 +4814,21 @@ public class JTable
{
return getSelectionModel().isSelectedIndex(row);
}
-
+
/**
* Checks if the given cell is selected. The cell is selected if both
* the cell row and the cell column are selected.
- *
+ *
* @param row the cell row
* @param column the cell column
- *
+ *
* @return true if the cell is selected, false otherwise
*/
public boolean isCellSelected(int row, int column)
{
return isRowSelected(row) && isColumnSelected(column);
}
-
+
/**
* Select all table.
*/
@@ -4837,7 +4837,7 @@ public class JTable
// The table is empty - nothing to do!
if (getRowCount() == 0 || getColumnCount() == 0)
return;
-
+
// rowLead and colLead store the current lead selection indices
int rowLead = selectionModel.getLeadSelectionIndex();
int colLead = getColumnModel().getSelectionModel().getLeadSelectionIndex();
@@ -4850,25 +4850,25 @@ public class JTable
addColumnSelectionInterval(colLead,colLead);
addRowSelectionInterval(rowLead, rowLead);
}
-
+
/**
* Get the cell value at the given position.
- *
+ *
* @param row the row to get the value
- * @param column the actual column number (not the model index)
+ * @param column the actual column number (not the model index)
* to get the value.
- *
+ *
* @return the cell value, as returned by model.
*/
public Object getValueAt(int row, int column)
{
return dataModel.getValueAt(row, convertColumnIndexToModel(column));
}
-
+
/**
* Set value for the cell at the given position. The modified cell is
* repainted.
- *
+ *
* @param value the value to set
* @param row the row of the cell being modified
* @param column the column of the cell being modified
@@ -4876,20 +4876,20 @@ public class JTable
public void setValueAt(Object value, int row, int column)
{
dataModel.setValueAt(value, row, convertColumnIndexToModel(column));
-
+
repaint(getCellRect(row, column, true));
}
-
+
/**
* Get table column with the given identified.
- *
+ *
* @param identifier the column identifier
- *
+ *
* @return the table column with this identifier
- *
- * @throws IllegalArgumentException if <code>identifier</code> is
+ *
+ * @throws IllegalArgumentException if <code>identifier</code> is
* <code>null</code> or there is no column with that identifier.
- *
+ *
* @see TableColumn#setIdentifier(Object)
*/
public TableColumn getColumn(Object identifier)
@@ -4929,7 +4929,7 @@ public class JTable
columnModel.removeColumn(columnModel.getColumn(columnIndex));
columnIndex--;
}
-
+
// add new columns to match the TableModel
int columnCount = dataModel.getColumnCount();
for (int c = 0; c < columnCount; c++)
@@ -4967,7 +4967,7 @@ public class JTable
}
else if (extend)
{
- // Extend the previous selection from the anchor to the
+ // Extend the previous selection from the anchor to the
// specified cell, clearing all other selections
selectionModel.setLeadSelectionIndex(rowIndex);
getColumnModel().getSelectionModel().setLeadSelectionIndex(columnIndex);
@@ -4980,14 +4980,14 @@ public class JTable
selectionModel.setSelectionInterval(rowIndex,rowIndex);
getColumnModel().getSelectionModel().clearSelection();
getColumnModel().getSelectionModel().setSelectionInterval(columnIndex, columnIndex);
-
-
+
+
}
}
/**
* Programmatically starts editing the specified cell.
- *
+ *
* @param row the row of the cell to edit.
* @param column the column of the cell to edit.
*/
@@ -4998,7 +4998,7 @@ public class JTable
editingStopped(new ChangeEvent("editingStopped"));
TableCellEditor editor = getCellEditor(row, column);
-
+
// The boolean values are inverted by the single click without the
// real editing session.
if (editor == booleanInvertingEditor && isCellEditable(row, column))
@@ -5024,16 +5024,16 @@ public class JTable
moveToCellBeingEdited(editorComp);
scrollRectToVisible(editorComp.getBounds());
editorComp.requestFocusInWindow();
-
+
// Deliver the should select event.
- return editor.shouldSelectCell(null);
+ return editor.shouldSelectCell(null);
}
}
/**
- * Move the given component under the cell being edited.
+ * Move the given component under the cell being edited.
* The table must be in the editing mode.
- *
+ *
* @param component the component to move.
*/
private void moveToCellBeingEdited(Component component)
@@ -5107,7 +5107,7 @@ public class JTable
// TODO: Implement functionality of this property (in UI impl).
surrendersFocusOnKeystroke = value;
}
-
+
/**
* Returns whether cell editors of this table should receive keyboard focus
* when the editor is activated by a keystroke. The default setting is
@@ -5128,7 +5128,7 @@ public class JTable
/**
* Helper method for
* {@link LookAndFeel#installProperty(JComponent, String, Object)}.
- *
+ *
* @param propertyName the name of the property
* @param value the value of the property
*
diff --git a/libjava/classpath/javax/swing/JTextArea.java b/libjava/classpath/javax/swing/JTextArea.java
index 9b50feb..51921cc 100644
--- a/libjava/classpath/javax/swing/JTextArea.java
+++ b/libjava/classpath/javax/swing/JTextArea.java
@@ -1,4 +1,4 @@
-/* JTextArea.java --
+/* JTextArea.java --
Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -126,7 +126,7 @@ public class JTextArea extends JTextComponent
* Compatible with Sun's JDK
*/
private static final long serialVersionUID = -6141680179310439825L;
-
+
/**
* The number of rows used by the component.
*/
@@ -235,14 +235,14 @@ public class JTextArea extends JTextComponent
public void append(String toAppend)
{
try
- {
- getDocument().insertString(getText().length(), toAppend, null);
- }
+ {
+ getDocument().insertString(getText().length(), toAppend, null);
+ }
catch (BadLocationException exception)
- {
- /* This shouldn't happen in theory -- but, if it does... */
- throw new RuntimeException("Unexpected exception occurred.", exception);
- }
+ {
+ /* This shouldn't happen in theory -- but, if it does... */
+ throw new RuntimeException("Unexpected exception occurred.", exception);
+ }
if (toAppend != null && toAppend.length() > 0)
revalidate();
}
@@ -337,7 +337,7 @@ public class JTextArea extends JTextComponent
{
return columns;
}
-
+
/**
* Sets the number of rows.
*
@@ -349,7 +349,7 @@ public class JTextArea extends JTextComponent
{
if (columns < 0)
throw new IllegalArgumentException();
-
+
if (columns != this.columns)
{
this.columns = columns;
@@ -378,7 +378,7 @@ public class JTextArea extends JTextComponent
{
if (rows < 0)
throw new IllegalArgumentException();
-
+
if (rows != this.rows)
{
this.rows = rows;
@@ -423,7 +423,7 @@ public class JTextArea extends JTextComponent
{
return wrapStyleWord;
}
-
+
/**
* Enables/Disables word style wrapping.
*
@@ -434,12 +434,12 @@ public class JTextArea extends JTextComponent
{
if (wrapStyleWord == flag)
return;
-
+
boolean oldValue = wrapStyleWord;
wrapStyleWord = flag;
firePropertyChange("wrapStyleWord", oldValue, wrapStyleWord);
}
-
+
/**
* Returns the number of characters used for a tab.
* This defaults to 8.
@@ -456,14 +456,14 @@ public class JTextArea extends JTextComponent
* supplied value. If a change to the tab size property
* occurs (i.e. newSize != tabSize), a property change event
* is fired.
- *
+ *
* @param newSize The new number of characters to use for a tab.
*/
public void setTabSize(int newSize)
{
if (tabSize == newSize)
return;
-
+
int oldValue = tabSize;
tabSize = newSize;
firePropertyChange("tabSize", oldValue, tabSize);
@@ -484,7 +484,7 @@ public class JTextArea extends JTextComponent
throws BadLocationException
{
int lineCount = getLineCount();
-
+
if (line < 0 || line > lineCount)
throw new BadLocationException("Non-existing line number", line);
@@ -496,7 +496,7 @@ public class JTextArea extends JTextComponent
throws BadLocationException
{
int lineCount = getLineCount();
-
+
if (line < 0 || line > lineCount)
throw new BadLocationException("Non-existing line number", line);
@@ -510,7 +510,7 @@ public class JTextArea extends JTextComponent
Document doc = getDocument();
if (offset < doc.getStartPosition().getOffset()
- || offset >= doc.getEndPosition().getOffset())
+ || offset >= doc.getEndPosition().getOffset())
throw new BadLocationException("offset outside of document", offset);
return doc.getDefaultRootElement().getElementIndex(offset);
@@ -536,32 +536,32 @@ public class JTextArea extends JTextComponent
{
// Retrieve the document model.
Document doc = getDocument();
-
+
// Check the model and string for validity.
if (doc == null
- || string == null
- || string.length() == 0)
+ || string == null
+ || string.length() == 0)
return;
// Insert the text into the model.
try
{
- doc.insertString(position, string, null);
+ doc.insertString(position, string, null);
}
catch (BadLocationException e)
{
- throw new IllegalArgumentException("The supplied position, "
- + position + ", was invalid.");
+ throw new IllegalArgumentException("The supplied position, "
+ + position + ", was invalid.");
}
}
public void replaceRange(String text, int start, int end)
{
Document doc = getDocument();
-
+
if (start > end
- || start < doc.getStartPosition().getOffset()
- || end >= doc.getEndPosition().getOffset())
+ || start < doc.getStartPosition().getOffset()
+ || end >= doc.getEndPosition().getOffset())
throw new IllegalArgumentException();
try
@@ -571,7 +571,7 @@ public class JTextArea extends JTextComponent
}
catch (BadLocationException e)
{
- // This cannot happen as we check offset above.
+ // This cannot happen as we check offset above.
}
}
diff --git a/libjava/classpath/javax/swing/JTextField.java b/libjava/classpath/javax/swing/JTextField.java
index ace358f..69b70b0 100644
--- a/libjava/classpath/javax/swing/JTextField.java
+++ b/libjava/classpath/javax/swing/JTextField.java
@@ -95,7 +95,7 @@ public class JTextField extends JTextComponent
* gets accepted.
*/
public static final String notifyAction = "notify-field-accept";
-
+
static
{
actions = new Action[1];
@@ -108,16 +108,16 @@ public class JTextField extends JTextComponent
}
};
}
-
+
private int columns;
private int align;
-
+
/** @since 1.3 */
private Action action;
/** @since 1.3 */
private String actionCommand;
-
+
private PropertyChangeListener actionPropertyChangeListener;
/**
@@ -142,7 +142,7 @@ public class JTextField extends JTextComponent
{
this(null, text, 0);
}
-
+
/**
* Creates a new instance of <code>JTextField</code>.
*
@@ -270,7 +270,7 @@ public class JTextField extends JTextComponent
*/
protected void fireActionPerformed()
{
- ActionEvent event = new ActionEvent(this, 0,
+ ActionEvent event = new ActionEvent(this, 0,
actionCommand == null ? getText() : actionCommand);
ActionListener[] listeners = getActionListeners();
@@ -305,8 +305,8 @@ public class JTextField extends JTextComponent
}
/**
- * Returns the horizontal alignment, which is one of: JTextField.LEFT,
- * JTextField.CENTER, JTextField.RIGHT, JTextField.LEADING,
+ * Returns the horizontal alignment, which is one of: JTextField.LEFT,
+ * JTextField.CENTER, JTextField.RIGHT, JTextField.LEADING,
* JTextField.TRAILING.
* @return the horizontal alignment
*/
@@ -345,7 +345,7 @@ public class JTextField extends JTextComponent
}
/**
- * Returns the preferred size. If there is a non-zero number of columns,
+ * Returns the preferred size. If there is a non-zero number of columns,
* this is the number of columns multiplied by the column width, otherwise
* it returns super.getPreferredSize().
*/
@@ -374,7 +374,7 @@ public class JTextField extends JTextComponent
/**
* Sets the scroll offset in pixels.
- *
+ *
* @param offset the scroll offset
*/
public void setScrollOffset(int offset)
@@ -385,7 +385,7 @@ public class JTextField extends JTextComponent
Math.min(horizontalVisibility.getMaximum()
- horizontalVisibility.getExtent(),
offset));
-
+
}
/**
@@ -407,7 +407,7 @@ public class JTextField extends JTextComponent
for (int index = 0; index < listeners.length; ++index)
listeners[index].actionPerformed(event);
}
-
+
/**
* @since 1.3
*/
@@ -480,7 +480,7 @@ public class JTextField extends JTextComponent
}
/**
- *
+ *
* @since 1.3
*/
protected void configurePropertiesFromAction(Action action)
@@ -546,15 +546,15 @@ public class JTextField extends JTextComponent
{
return ! (getParent() instanceof JViewport);
}
-
+
public void scrollRectToVisible(Rectangle r)
{
int v = horizontalVisibility.getValue();
-
+
// The extent value is the inner width of the text field.
int e = horizontalVisibility.getExtent();
Insets i = getInsets();
-
+
// The x value in the rectangle (usually) denotes the new location
// of the caret. We check whether the location lies inside the left or
// right border and scroll into the appropriate direction.
@@ -566,5 +566,5 @@ public class JTextField extends JTextComponent
else if (r.x > e + i.left)
setScrollOffset(r.x + v - e - i.left);
}
-
+
}
diff --git a/libjava/classpath/javax/swing/JTextPane.java b/libjava/classpath/javax/swing/JTextPane.java
index 05968fc..4fef002 100644
--- a/libjava/classpath/javax/swing/JTextPane.java
+++ b/libjava/classpath/javax/swing/JTextPane.java
@@ -179,7 +179,7 @@ public class JTextPane
catch (BadLocationException e)
{
throw new AssertionError
- ("No BadLocationException should be thrown here");
+ ("No BadLocationException should be thrown here");
}
}
@@ -326,7 +326,7 @@ public class JTextPane
}
else
getStyledDocument().setCharacterAttributes(start, end - start, attribute,
- replace);
+ replace);
}
/**
diff --git a/libjava/classpath/javax/swing/JToggleButton.java b/libjava/classpath/javax/swing/JToggleButton.java
index 60c4489..2ee4187 100644
--- a/libjava/classpath/javax/swing/JToggleButton.java
+++ b/libjava/classpath/javax/swing/JToggleButton.java
@@ -1,4 +1,4 @@
-/* JToggleButton.java --
+/* JToggleButton.java --
Copyright (C) 2002, 2004, 2005, 2006, Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -92,7 +92,7 @@ public class JToggleButton extends AbstractButton implements Accessible
{
return AccessibleRole.TOGGLE_BUTTON;
}
-
+
/**
* Monitors the toggle button for state changes and fires accessible
* property change events when they occur.
@@ -106,14 +106,14 @@ public class JToggleButton extends AbstractButton implements Accessible
{
/* State has changed from unselected (null) to selected */
firePropertyChange(ACCESSIBLE_STATE_PROPERTY, null, AccessibleState.SELECTED);
- }
+ }
else
{
/* State has changed from selected to unselected (null) */
firePropertyChange(ACCESSIBLE_STATE_PROPERTY, AccessibleState.ENABLED, null);
}
}
-
+
}
/**
@@ -129,19 +129,19 @@ public class JToggleButton extends AbstractButton implements Accessible
* Compatible with Sun's JDK.
*/
private static final long serialVersionUID = -1589950750899943974L;
-
+
/**
* Sets the pressed state of the button. The selected state
* of the button also changes follwing the button being pressed.
*
* @param p true if the button is pressed down.
*/
- public void setPressed(boolean p)
+ public void setPressed(boolean p)
{
// cannot change PRESSED state unless button is enabled
if (! isEnabled())
return;
-
+
// if this call does not represent a CHANGE in state, then return
if ((p && isPressed()) || (!p && !isPressed()))
return;
@@ -164,7 +164,7 @@ public class JToggleButton extends AbstractButton implements Accessible
stateMask = stateMask | PRESSED;
else
stateMask = stateMask & (~PRESSED);
-
+
// notify interested ChangeListeners
fireStateChanged();
@@ -175,36 +175,36 @@ public class JToggleButton extends AbstractButton implements Accessible
actionCommand));
}
}
-
+
/**
* Checks if the button is selected.
- *
+ *
* @return <code>true</code> if the button is selected.
*/
public boolean isSelected()
{
return super.isSelected();
}
-
+
/**
* Sets the selected state of the button.
- *
+ *
* @param b true if button is selected
*/
public void setSelected(boolean b)
{
super.setSelected(b);
- }
+ }
}
/**
* Compatible with Sun's JDK.
*/
private static final long serialVersionUID = -3128248873429850443L;
-
+
/**
* Constructs an unselected toggle button with no text or icon.
- */
+ */
public JToggleButton()
{
this(null, null, false);
@@ -229,10 +229,10 @@ public class JToggleButton extends AbstractButton implements Accessible
* @param icon the icon to use.
*/
public JToggleButton(Icon icon)
- {
+ {
this(null, icon, false);
- }
-
+ }
+
/**
* Constructs a toggle button with the supplied icon and state.
*
@@ -240,22 +240,22 @@ public class JToggleButton extends AbstractButton implements Accessible
* @param selected if true, the toggle button is initially in the
* selected state. Otherwise, the button is unselected.
*/
- public JToggleButton(Icon icon, boolean selected)
+ public JToggleButton(Icon icon, boolean selected)
{
this(null, icon, selected);
}
-
+
/**
* Constructs an unselected toggle button using the supplied text
* and no icon.
*
* @param text the text to use.
- */
+ */
public JToggleButton(String text)
{
this(text, null, false);
}
-
+
/**
* Constructs a toggle button with the supplied text and state.
*
@@ -288,10 +288,10 @@ public class JToggleButton extends AbstractButton implements Accessible
* @param selected if true, the toggle button is initially in the
* selected state. Otherwise, the button is unselected.
*/
- public JToggleButton (String text, Icon icon, boolean selected)
+ public JToggleButton (String text, Icon icon, boolean selected)
{
super();
- setModel(new ToggleButtonModel());
+ setModel(new ToggleButtonModel());
init(text, icon);
model.setSelected(selected);
setAlignmentX(LEFT_ALIGNMENT);
@@ -309,11 +309,11 @@ public class JToggleButton extends AbstractButton implements Accessible
if (accessibleContext == null)
{
/* Create the context */
- accessibleContext = new AccessibleJToggleButton();
+ accessibleContext = new AccessibleJToggleButton();
}
return accessibleContext;
}
-
+
/**
* Returns a string that specifies the name of the Look and Feel
* class that renders this component.
@@ -324,7 +324,7 @@ public class JToggleButton extends AbstractButton implements Accessible
{
return "ToggleButtonUI";
}
-
+
/**
* Returns a textual representation of this component for debugging.
* Users should not depend on anything as regards the content or formatting
@@ -337,17 +337,14 @@ public class JToggleButton extends AbstractButton implements Accessible
{
return super.paramString();
}
-
+
/**
* This method resets the toggle button's UI delegate to the default UI for
* the current look and feel.
*/
public void updateUI()
- {
+ {
setUI((ButtonUI)UIManager.getUI(this));
}
}
-
-
-
diff --git a/libjava/classpath/javax/swing/JToolBar.java b/libjava/classpath/javax/swing/JToolBar.java
index 33ebcfc..5f4816f 100644
--- a/libjava/classpath/javax/swing/JToolBar.java
+++ b/libjava/classpath/javax/swing/JToolBar.java
@@ -83,7 +83,7 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
}
/**
- * Returns a set containing the current state of the {@link JToolBar}
+ * Returns a set containing the current state of the {@link JToolBar}
* component. The current implementation simply calls the superclass.
*
* @return The accessible state set.
@@ -134,16 +134,16 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
public void layoutContainer(Container c)
{
if (! (c instanceof JToolBar))
- throw new Error("DefaultToolBarLayout can only be used on JToolBars.");
+ throw new Error("DefaultToolBarLayout can only be used on JToolBars.");
Insets insets = getInsets();
Insets margin = getMargin();
int middle;
if (margin != null)
{
- insets.left += margin.left;
- insets.top += margin.top;
- insets.bottom += margin.bottom;
- insets.right += margin.right;
+ insets.left += margin.left;
+ insets.top += margin.top;
+ insets.bottom += margin.bottom;
+ insets.right += margin.right;
}
Component[] components = c.getComponents();
Dimension tdims = c.getSize();
@@ -152,39 +152,39 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
if (getOrientation() == SwingUtilities.HORIZONTAL)
{
- start += insets.left;
- for (int i = 0; i < components.length; i++)
- {
- if (components[i] != null && components[i].isVisible())
- {
- pref = components[i].getPreferredSize();
- if (pref != null)
- {
- middle = (tdims.height - pref.height) / 2;
- components[i].setBounds(start, middle, pref.width,
- pref.height);
- start += pref.width;
- }
- }
- }
+ start += insets.left;
+ for (int i = 0; i < components.length; i++)
+ {
+ if (components[i] != null && components[i].isVisible())
+ {
+ pref = components[i].getPreferredSize();
+ if (pref != null)
+ {
+ middle = (tdims.height - pref.height) / 2;
+ components[i].setBounds(start, middle, pref.width,
+ pref.height);
+ start += pref.width;
+ }
+ }
+ }
}
else
{
- start += insets.top;
- for (int i = 0; i < components.length; i++)
- {
- if (components[i] != null && components[i].isVisible())
- {
- pref = components[i].getPreferredSize();
- if (pref != null)
- {
- middle = (tdims.width - pref.width) / 2;
- components[i].setBounds(middle, start, pref.width,
- pref.height);
- start += pref.height;
- }
- }
- }
+ start += insets.top;
+ for (int i = 0; i < components.length; i++)
+ {
+ if (components[i] != null && components[i].isVisible())
+ {
+ pref = components[i].getPreferredSize();
+ if (pref != null)
+ {
+ middle = (tdims.width - pref.width) / 2;
+ components[i].setBounds(middle, start, pref.width,
+ pref.height);
+ start += pref.height;
+ }
+ }
+ }
}
}
@@ -223,33 +223,33 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
if (orientation == SwingConstants.HORIZONTAL)
{
- for (int i = 0; i < components.length; i++)
- {
- dims = components[i].getPreferredSize();
- if (dims != null)
- {
- if (dims.height > limit)
- limit = dims.height;
- total += dims.width;
- }
- }
- w = total;
- h = limit;
+ for (int i = 0; i < components.length; i++)
+ {
+ dims = components[i].getPreferredSize();
+ if (dims != null)
+ {
+ if (dims.height > limit)
+ limit = dims.height;
+ total += dims.width;
+ }
+ }
+ w = total;
+ h = limit;
}
else
{
- for (int i = 0; i < components.length; i++)
- {
- dims = components[i].getPreferredSize();
- if (dims != null)
- {
- if (dims.width > limit)
- limit = dims.width;
- total += dims.height;
- }
- }
- w = limit;
- h = total;
+ for (int i = 0; i < components.length; i++)
+ {
+ dims = components[i].getPreferredSize();
+ if (dims != null)
+ {
+ if (dims.width > limit)
+ limit = dims.width;
+ total += dims.height;
+ }
+ }
+ w = limit;
+ h = total;
}
Insets insets = getInsets();
@@ -259,8 +259,8 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
Insets margin = getMargin();
if (margin != null)
{
- w += margin.left + margin.right;
- h += margin.top + margin.bottom;
+ w += margin.left + margin.right;
+ h += margin.top + margin.bottom;
}
return new Dimension(w, h);
@@ -509,10 +509,10 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
{
if (b != rollover)
{
- rollover = b;
- firePropertyChange("rollover", ! rollover, rollover);
- revalidate();
- repaint();
+ rollover = b;
+ firePropertyChange("rollover", ! rollover, rollover);
+ revalidate();
+ repaint();
}
}
@@ -541,7 +541,7 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
for (int i = 0; i < components.length; i++)
if (components[i] == component)
- return i;
+ return i;
return -1;
} // getComponentIndex()
@@ -584,11 +584,11 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
|| margin.right != this.margin.right || margin.top != this.margin.top
|| margin.bottom != this.margin.bottom)))
{
- Insets oldMargin = this.margin;
- this.margin = margin;
- firePropertyChange("margin", oldMargin, this.margin);
- revalidate();
- repaint();
+ Insets oldMargin = this.margin;
+ this.margin = margin;
+ firePropertyChange("margin", oldMargin, this.margin);
+ revalidate();
+ repaint();
}
} // setMargin()
@@ -612,10 +612,10 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
{
if (painted != paintBorder)
{
- paintBorder = painted;
- firePropertyChange("borderPainted", ! paintBorder,
- paintBorder);
- repaint();
+ paintBorder = painted;
+ firePropertyChange("borderPainted", ! paintBorder,
+ paintBorder);
+ repaint();
}
} // setBorderPainted()
@@ -639,8 +639,8 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
{
if (floatable != this.floatable)
{
- this.floatable = floatable;
- firePropertyChange("floatable", ! floatable, floatable);
+ this.floatable = floatable;
+ firePropertyChange("floatable", ! floatable, floatable);
}
} // setFloatable()
@@ -681,11 +681,11 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
+ " is not a legal orientation");
if (orientation != this.orientation)
{
- int oldOrientation = this.orientation;
- this.orientation = orientation;
- firePropertyChange("orientation", oldOrientation, this.orientation);
- revalidate();
- repaint();
+ int oldOrientation = this.orientation;
+ this.orientation = orientation;
+ firePropertyChange("orientation", oldOrientation, this.orientation);
+ revalidate();
+ repaint();
}
} // setOrientation()
@@ -760,7 +760,7 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
/**
* Returns a string describing the attributes for the <code>JToolBar</code>
- * component, for use in debugging. The return value is guaranteed to be
+ * component, for use in debugging. The return value is guaranteed to be
* non-<code>null</code>, but the format of the string may vary between
* implementations.
*
diff --git a/libjava/classpath/javax/swing/JToolTip.java b/libjava/classpath/javax/swing/JToolTip.java
index f59ec95..6f226e7 100644
--- a/libjava/classpath/javax/swing/JToolTip.java
+++ b/libjava/classpath/javax/swing/JToolTip.java
@@ -117,7 +117,7 @@ public class JToolTip extends JComponent implements Accessible
* Returns the text displayed by the tool tip.
*
* @return The text (possibly <code>null</code>).
- *
+ *
* @see #setTipText(String)
*/
public String getTipText()
@@ -142,7 +142,7 @@ public class JToolTip extends JComponent implements Accessible
* Returns the component that the tool tip is associated with.
*
* @return The component (possibly <code>null</code>).
- *
+ *
* @see #setComponent(JComponent)
*/
public JComponent getComponent()
@@ -173,7 +173,7 @@ public class JToolTip extends JComponent implements Accessible
/**
* Returns a string describing the attributes for the <code>JToolTip</code>
- * component, for use in debugging. The return value is guaranteed to be
+ * component, for use in debugging. The return value is guaranteed to be
* non-<code>null</code>, but the format of the string may vary between
* implementations.
*
@@ -189,12 +189,12 @@ public class JToolTip extends JComponent implements Accessible
}
/**
- * Sets the component that the tool tip is associated with and sends a
- * {@link PropertyChangeEvent} (with the property name 'component') to all
+ * Sets the component that the tool tip is associated with and sends a
+ * {@link PropertyChangeEvent} (with the property name 'component') to all
* registered listeners.
*
* @param c the component (<code>null</code> permitted).
- *
+ *
* @see #getComponent()
*/
public void setComponent(JComponent c)
@@ -205,12 +205,12 @@ public class JToolTip extends JComponent implements Accessible
}
/**
- * Sets the text to be displayed by the tool tip and sends a
- * {@link PropertyChangeEvent} (with the property name 'tiptext') to all
+ * Sets the text to be displayed by the tool tip and sends a
+ * {@link PropertyChangeEvent} (with the property name 'tiptext') to all
* registered listeners.
*
* @param tipText the text (<code>null</code> permitted).
- *
+ *
* @see #getTipText()
*/
public void setTipText(String tipText)
diff --git a/libjava/classpath/javax/swing/JTree.java b/libjava/classpath/javax/swing/JTree.java
index c0365bc..d89adad 100644
--- a/libjava/classpath/javax/swing/JTree.java
+++ b/libjava/classpath/javax/swing/JTree.java
@@ -1,6 +1,6 @@
-/* JTree.java
+/* JTree.java
Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
-
+
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
@@ -87,24 +87,24 @@ public class JTree extends JComponent implements Scrollable, Accessible
{
/**
- * This class implements accessibility support for the JTree class. It
- * provides an implementation of the Java Accessibility API appropriate
+ * This class implements accessibility support for the JTree class. It
+ * provides an implementation of the Java Accessibility API appropriate
* to tree user-interface elements.
*/
protected class AccessibleJTree extends JComponent.AccessibleJComponent
implements AccessibleSelection, TreeSelectionListener, TreeModelListener,
TreeExpansionListener
{
-
+
/**
- * This class implements accessibility support for the JTree child. It provides
+ * This class implements accessibility support for the JTree child. It provides
* an implementation of the Java Accessibility API appropriate to tree nodes.
*/
- protected class AccessibleJTreeNode extends AccessibleContext
- implements Accessible, AccessibleComponent, AccessibleSelection,
+ protected class AccessibleJTreeNode extends AccessibleContext
+ implements Accessible, AccessibleComponent, AccessibleSelection,
AccessibleAction
{
-
+
private JTree tree;
private TreePath tp;
private Accessible acc;
@@ -113,10 +113,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
private Vector actionList;
private TreeModel mod;
private Cursor cursor;
-
+
/**
* Constructs an AccessibleJTreeNode
- *
+ *
* @param t - the current tree
* @param p - the current path to be dealt with
* @param ap - the accessible object to use
@@ -128,11 +128,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
actionList = new Vector();
mod = tree.getModel();
cursor = JTree.this.getCursor();
-
+
tree = t;
tp = p;
acc = ap;
-
+
// Add all the children of this path that may already be
// selected to the selection list.
TreePath[] selected = tree.getSelectionPaths();
@@ -142,20 +142,20 @@ public class JTree extends JComponent implements Scrollable, Accessible
if ((sel.getParentPath()).equals(tp))
selectionList.add(sel);
}
-
- // Add all the actions available for a node to
+
+ // Add all the actions available for a node to
// the action list.
actionList.add("EXPAND");
actionList.add("COLLAPSE");
actionList.add("EDIT");
actionList.add("SELECT");
actionList.add("DESELECT");
- }
-
+ }
+
/**
* Adds the specified selected item in the object to the object's
* selection.
- *
+ *
* @param i - the i-th child of this node.
*/
public void addAccessibleSelection(int i)
@@ -167,47 +167,47 @@ public class JTree extends JComponent implements Scrollable, Accessible
{
if (!states.contains(AccessibleState.MULTISELECTABLE))
clearAccessibleSelection();
- selectionList.add(child);
+ selectionList.add(child);
tree.addSelectionPath(tp.pathByAddingChild(child));
}
}
}
-
+
/**
- * Adds the specified focus listener to receive focus events
+ * Adds the specified focus listener to receive focus events
* from this component.
- *
+ *
* @param l - the new focus listener
*/
public void addFocusListener(FocusListener l)
{
tree.addFocusListener(l);
}
-
+
/**
* Add a PropertyChangeListener to the listener list.
- *
+ *
* @param l - the new property change listener
*/
public void addPropertyChangeListener(PropertyChangeListener l)
{
// Nothing to do here.
}
-
+
/**
- * Clears the selection in the object, so that nothing in the
+ * Clears the selection in the object, so that nothing in the
* object is selected.
*/
public void clearAccessibleSelection()
{
selectionList.clear();
}
-
+
/**
- * Checks whether the specified point is within this object's
- * bounds, where the point's x and y coordinates are defined to be
- * relative to the coordinate system of the object.
- *
+ * Checks whether the specified point is within this object's
+ * bounds, where the point's x and y coordinates are defined to be
+ * relative to the coordinate system of the object.
+ *
* @param p - the point to check
* @return true if p is in the bounds
*/
@@ -215,10 +215,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
{
return getBounds().contains(p);
}
-
+
/**
* Perform the specified Action on the tree node.
- *
+ *
* @param i - the i-th action to perform
* @return true if the the action was performed; else false.
*/
@@ -226,7 +226,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
{
if (i >= actionList.size() || i < 0)
return false;
-
+
if (actionList.get(i).equals("EXPAND"))
tree.expandPath(tp);
else if (actionList.get(i).equals("COLLAPSE"))
@@ -241,30 +241,30 @@ public class JTree extends JComponent implements Scrollable, Accessible
return false;
return true;
}
-
+
/**
* Get the AccessibleAction associated with this object.
- *
+ *
* @return the action
*/
public AccessibleAction getAccessibleAction()
{
return this;
}
-
+
/**
* Returns the number of accessible actions available in this tree node.
- *
+ *
* @return the number of actions
*/
public int getAccessibleActionCount()
{
return actionList.size();
}
-
+
/**
* Return a description of the specified action of the tree node.
- *
+ *
* @param i - the i-th action's description
* @return a description of the action
*/
@@ -274,11 +274,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
return (actionList.get(i)).toString();
return super.getAccessibleDescription();
}
-
+
/**
- * Returns the Accessible child, if one exists, contained at the
+ * Returns the Accessible child, if one exists, contained at the
* local coordinate Point.
- *
+ *
* @param p - the point of the accessible
* @return the accessible at point p if it exists
*/
@@ -289,10 +289,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
return new AccessibleJTreeNode(tree, acc, this);
return null;
}
-
+
/**
* Return the specified Accessible child of the object.
- *
+ *
* @param i - the i-th child of the current path
* @return the child if it exists
*/
@@ -307,10 +307,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
}
return null;
}
-
+
/**
* Returns the number of accessible children in the object.
- *
+ *
* @return the number of children the current node has
*/
public int getAccessibleChildrenCount()
@@ -320,40 +320,40 @@ public class JTree extends JComponent implements Scrollable, Accessible
return mod.getChildCount(tp.getLastPathComponent());
return 0;
}
-
+
/**
* Get the AccessibleComponent associated with this object.
- *
+ *
* @return the accessible component if it is supported.
*/
public AccessibleComponent getAccessibleComponent()
{
return this;
}
-
+
/**
* Get the AccessibleContext associated with this tree node.
- *
+ *
* @return an instance of this class
*/
public AccessibleContext getAccessibleContext()
{
return this;
}
-
+
/**
* Get the accessible description of this object.
- *
+ *
* @return the accessible description
*/
public String getAccessibleDescription()
{
return super.getAccessibleDescription();
}
-
+
/**
* Get the index of this object in its accessible parent.
- *
+ *
* @return the index of this in the parent.
*/
public int getAccessibleIndexInParent()
@@ -367,74 +367,74 @@ public class JTree extends JComponent implements Scrollable, Accessible
}
return -1;
}
-
+
/**
* Get the accessible name of this object.
- *
+ *
* @return the accessible name
*/
public String getAccessibleName()
{
return super.getAccessibleName();
}
-
+
/**
* Get the Accessible parent of this object.
- *
+ *
* @return the accessible parent if it exists.
*/
public Accessible getAccessibleParent()
{
return super.getAccessibleParent();
}
-
+
/**
* Get the role of this object.
- *
+ *
* @return the accessible role
*/
public AccessibleRole getAccessibleRole()
{
return AccessibleJTree.this.getAccessibleRole();
}
-
+
/**
* Get the AccessibleSelection associated with this object if one exists.
- *
+ *
* @return the accessible selection for this.
*/
public AccessibleSelection getAccessibleSelection()
{
return this;
}
-
+
/**
- * Returns an Accessible representing the specified selected item
+ * Returns an Accessible representing the specified selected item
* in the object.
- *
+ *
* @return the accessible representing a certain selected item.
*/
public Accessible getAccessibleSelection(int i)
{
if (i > 0 && i < getAccessibleSelectionCount())
- return new AccessibleJTreeNode(tree,
+ return new AccessibleJTreeNode(tree,
tp.pathByAddingChild(selectionList.get(i)), acc);
return null;
}
-
+
/**
* Returns the number of items currently selected.
- *
+ *
* @return the number of items selected.
*/
public int getAccessibleSelectionCount()
{
return selectionList.size();
}
-
+
/**
* Get the state set of this object.
- *
+ *
* @return the state set for this object
*/
public AccessibleStateSet getAccessibleStateSet()
@@ -445,7 +445,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
states.add(AccessibleState.COLLAPSED);
if (tree.isEditable())
states.add(AccessibleState.EDITABLE);
- if (mod != null &&
+ if (mod != null &&
!mod.isLeaf(tp.getLastPathComponent()))
states.add(AccessibleState.EXPANDABLE);
if (tree.isExpanded(tp))
@@ -454,7 +454,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
states.add(AccessibleState.FOCUSABLE);
if (hasFocus())
states.add(AccessibleState.FOCUSED);
- if (tree.getSelectionModel().getSelectionMode() !=
+ if (tree.getSelectionModel().getSelectionMode() !=
TreeSelectionModel.SINGLE_TREE_SELECTION)
states.add(AccessibleState.MULTISELECTABLE);
if (tree.isOpaque())
@@ -467,70 +467,70 @@ public class JTree extends JComponent implements Scrollable, Accessible
states.add(AccessibleState.SELECTABLE);
return states;
}
-
+
/**
* Get the AccessibleText associated with this object if one exists.
- *
+ *
* @return the accessible text
*/
public AccessibleText getAccessibleText()
{
return super.getAccessibleText();
}
-
+
/**
* Get the AccessibleValue associated with this object if one exists.
- *
+ *
* @return the accessible value if it exists
*/
public AccessibleValue getAccessibleValue()
{
return super.getAccessibleValue();
}
-
+
/**
* Get the background color of this object.
- *
+ *
* @return the color of the background.
*/
public Color getBackground()
{
return tree.getBackground();
}
-
+
/**
* Gets the bounds of this object in the form of a Rectangle object.
- *
+ *
* @return the bounds of the current node.
*/
public Rectangle getBounds()
{
return tree.getPathBounds(tp);
}
-
+
/**
* Gets the Cursor of this object.
- *
+ *
* @return the cursor for the current node
*/
public Cursor getCursor()
{
return cursor;
}
-
+
/**
* Gets the Font of this object.
- *
+ *
* @return the font for the current node
*/
public Font getFont()
{
return tree.getFont();
}
-
+
/**
* Gets the FontMetrics of this object.
- *
+ *
* @param f - the current font.
* @return the font metrics for the given font.
*/
@@ -538,42 +538,42 @@ public class JTree extends JComponent implements Scrollable, Accessible
{
return tree.getFontMetrics(f);
}
-
+
/**
* Get the foreground color of this object.
- *
+ *
* @return the foreground for this object.
*/
public Color getForeground()
{
return tree.getForeground();
}
-
+
/**
* Gets the locale of the component.
- *
+ *
* @return the locale of the component.
*/
public Locale getLocale()
{
return tree.getLocale();
}
-
+
/**
- * Gets the location of the object relative to the
- * parent in the form of a point specifying the object's
- * top-left corner in the screen's coordinate space.
- *
+ * Gets the location of the object relative to the
+ * parent in the form of a point specifying the object's
+ * top-left corner in the screen's coordinate space.
+ *
* @return the location of the current node.
*/
public Point getLocation()
{
return getLocationInJTree();
}
-
+
/**
* Returns the location in the tree.
- *
+ *
* @return the location in the JTree.
*/
protected Point getLocationInJTree()
@@ -581,10 +581,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
Rectangle bounds = tree.getPathBounds(tp);
return new Point(bounds.x, bounds.y);
}
-
+
/**
* Returns the location of the object on the screen.
- *
+ *
* @return the location of the object on the screen.
*/
public Point getLocationOnScreen()
@@ -593,10 +593,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
SwingUtilities.convertPointToScreen(loc, tree);
return loc;
}
-
+
/**
* Returns the size of this object in the form of a Dimension object.
- *
+ *
* @return the size of the object
*/
public Dimension getSize()
@@ -604,10 +604,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
Rectangle b = getBounds();
return b.getSize();
}
-
+
/**
* Returns true if the current child of this object is selected.
- *
+ *
* @param i - the child of the current node
* @return true if the child is selected.
*/
@@ -618,30 +618,30 @@ public class JTree extends JComponent implements Scrollable, Accessible
return tree.isPathSelected(tp.pathByAddingChild(child));
return false;
}
-
+
/**
* Determines if the object is enabled.
- *
+ *
* @return true if the tree is enabled
*/
public boolean isEnabled()
{
return tree.isEnabled();
}
-
+
/**
* Returns whether this object can accept focus or not.
- *
+ *
* @return true, it is always focus traversable
*/
public boolean isFocusTraversable()
{
return true;
}
-
+
/**
* Determines if the object is showing.
- *
+ *
* @return true if the object is visible and the
* parent is visible.
*/
@@ -649,21 +649,21 @@ public class JTree extends JComponent implements Scrollable, Accessible
{
return isVisible() && tree.isShowing();
}
-
+
/**
* Determines if the object is visible.
- *
+ *
* @return true if the object is visible.
*/
public boolean isVisible()
{
return tree.isVisible(tp);
}
-
+
/**
* Removes the specified selected item in the object from the
* object's selection.
- *
+ *
* @param i - the specified item to remove
*/
public void removeAccessibleSelection(int i)
@@ -677,34 +677,34 @@ public class JTree extends JComponent implements Scrollable, Accessible
clearAccessibleSelection();
if (selectionList.contains(child))
{
- selectionList.remove(child);
+ selectionList.remove(child);
tree.removeSelectionPath(tp.pathByAddingChild(child));
}
}
}
}
-
+
/**
- * Removes the specified focus listener so it no longer receives focus
+ * Removes the specified focus listener so it no longer receives focus
* events from this component.
- *
+ *
* @param l - the focus listener to remove
*/
public void removeFocusListener(FocusListener l)
{
tree.removeFocusListener(l);
}
-
+
/**
* Remove a PropertyChangeListener from the listener list.
- *
+ *
* @param l - the property change listener to remove.
*/
public void removePropertyChangeListener(PropertyChangeListener l)
{
// Nothing to do here.
}
-
+
/**
* Requests focus for this object.
*/
@@ -712,9 +712,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
{
tree.requestFocus();
}
-
+
/**
- * Causes every selected item in the object to be selected if the object
+ * Causes every selected item in the object to be selected if the object
* supports multiple selections.
*/
public void selectAllAccessibleSelection()
@@ -738,110 +738,110 @@ public class JTree extends JComponent implements Scrollable, Accessible
}
}
}
-
+
/**
* Set the accessible description of this object.
- *
+ *
* @param s - the string to set the accessible description to.
*/
public void setAccessibleDescription(String s)
{
super.setAccessibleDescription(s);
}
-
+
/**
* Set the localized accessible name of this object.
- *
+ *
* @param s - the string to set the accessible name to.
*/
public void setAccessibleName(String s)
{
super.setAccessibleName(s);
}
-
+
/**
* Set the background color of this object.
- *
+ *
* @param c - the color to set the background to.
*/
public void setBackground(Color c)
{
// Nothing to do here.
}
-
+
/**
* Sets the bounds of this object in the form of a Rectangle object.
- *
+ *
* @param r - the bounds to set the object o
*/
public void setBounds(Rectangle r)
{
// Nothing to do here.
}
-
+
/**
* Sets the Cursor of this object.
- *
+ *
* @param c - the new cursor
*/
public void setCursor(Cursor c)
{
cursor = c;
}
-
+
/**
* Sets the enabled state of the object.
- *
+ *
* @param b - boolean to enable or disable object
*/
public void setEnabled(boolean b)
{
// Nothing to do here.
}
-
+
/**
* Sets the Font of this object.
- *
+ *
* @param f - the new font.
*/
public void setFont(Font f)
{
// Nothing to do here.
}
-
+
/**
* Sets the foreground color of this object.
- *
+ *
* @param c - the new foreground color.
*/
public void setForeground(Color c)
{
// Nothing to do here.
}
-
+
/**
* Sets the location of the object relative to the parent.
- *
+ *
* @param p - the new location for the object.
*/
public void setLocation(Point p)
{
// Nothing to do here.
}
-
+
/**
* Resizes this object so that it has width and height.
- *
+ *
* @param d - the new size for the object.
*/
public void setSize(Dimension d)
{
// Nothing to do here.
}
-
+
/**
* Sets the visible state of the object.
- *
+ *
* @param b - sets the objects visibility.
*/
public void setVisible(boolean b)
@@ -849,7 +849,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
// Nothing to do here.
}
}
-
+
/**
* Constructor
*/
@@ -857,17 +857,17 @@ public class JTree extends JComponent implements Scrollable, Accessible
{
// Nothing to do here.
}
-
+
/**
* Adds the specified selected item in the object to the object's selection.
- *
+ *
* @param i - the row to add to the tree's selection
*/
public void addAccessibleSelection(int i)
{
addSelectionInterval(i, i);
}
-
+
/**
* Clears the selection in the object, so that nothing in the object is selected.
*/
@@ -875,7 +875,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
{
clearSelection();
}
-
+
/**
* Fire a visible data property change notification.
*/
@@ -883,11 +883,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
{
treeDidChange();
}
-
+
/**
- * Returns the Accessible child, if one exists, contained at the local
+ * Returns the Accessible child, if one exists, contained at the local
* coordinate Point.
- *
+ *
* @param p - the point of the accessible to get.
* @return the accessible at point p.
*/
@@ -898,10 +898,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
return new AccessibleJTreeNode(JTree.this, tp, null);
return null;
}
-
+
/**
* Return the nth Accessible child of the object.
- *
+ *
* @param i - the accessible child to get
* @return the i-th child
*/
@@ -909,10 +909,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
{
return null;
}
-
+
/**
* Returns the number of top-level children nodes of this JTree.
- *
+ *
* @return the number of top-level children
*/
public int getAccessibleChildrenCount()
@@ -922,68 +922,68 @@ public class JTree extends JComponent implements Scrollable, Accessible
return model.getChildCount(model.getRoot());
return 0;
}
-
+
/**
* Get the index of this object in its accessible parent.
- *
+ *
* @return the index of this object.
*/
public int getAccessibleIndexInParent()
{
return 0;
}
-
+
/**
* Get the role of this object.
- *
+ *
* @return the role of this object
*/
public AccessibleRole getAccessibleRole()
{
return AccessibleRole.TREE;
}
-
+
/**
* Get the AccessibleSelection associated with this object.
- *
+ *
* @return the accessible selection of the tree
*/
public AccessibleSelection getAccessibleSelection()
{
TreeModel mod = getModel();
if (mod != null)
- return (new AccessibleJTreeNode(JTree.this,
+ return (new AccessibleJTreeNode(JTree.this,
new TreePath(mod.getRoot()), null)).getAccessibleSelection();
return null;
}
-
+
/**
* Returns an Accessible representing the specified selected item in the object.
- *
+ *
* @return the i-th accessible in the selection
*/
public Accessible getAccessibleSelection(int i)
{
TreeModel mod = getModel();
if (mod != null)
- return (new AccessibleJTreeNode(JTree.this,
+ return (new AccessibleJTreeNode(JTree.this,
new TreePath(mod.getRoot()), null)).getAccessibleSelection(i);
return null;
}
-
+
/**
* Returns the number of items currently selected.
- *
+ *
* @return the number of selected accessibles.
*/
public int getAccessibleSelectionCount()
{
return getSelectionCount();
}
-
+
/**
* Returns true if the current child of this object is selected.
- *
+ *
* @param i - the child of this object
* @return true if the i-th child is selected.
*/
@@ -992,92 +992,92 @@ public class JTree extends JComponent implements Scrollable, Accessible
// Nothing to do here.
return false;
}
-
+
/**
* Removes the specified selected item in the object from the object's
* selection.
- *
+ *
* @param i - the i-th selected item to remove
*/
public void removeAccessibleSelection(int i)
{
removeSelectionInterval(i, i);
}
-
+
/**
* Causes every selected item in the object to be selected if the object
* supports multiple selections.
*/
public void selectAllAccessibleSelection()
{
- if (getSelectionModel().getSelectionMode() !=
+ if (getSelectionModel().getSelectionMode() !=
TreeSelectionModel.SINGLE_TREE_SELECTION)
addSelectionInterval(0, getVisibleRowCount());
}
-
+
/**
* Tree Collapsed notification
- *
+ *
* @param e - the event
*/
public void treeCollapsed(TreeExpansionEvent e)
{
fireTreeCollapsed(e.getPath());
}
-
+
/**
* Tree Model Expansion notification.
- *
+ *
* @param e - the event
*/
public void treeExpanded(TreeExpansionEvent e)
{
fireTreeExpanded(e.getPath());
}
-
+
/**
* Tree Model Node change notification.
- *
+ *
* @param e - the event
*/
public void treeNodesChanged(TreeModelEvent e)
{
// Nothing to do here.
}
-
+
/**
* Tree Model Node change notification.
- *
+ *
* @param e - the event
*/
public void treeNodesInserted(TreeModelEvent e)
{
// Nothing to do here.
}
-
+
/**
* Tree Model Node change notification.
- *
+ *
* @param e - the event
*/
public void treeNodesRemoved(TreeModelEvent e)
{
// Nothing to do here.
}
-
+
/**
* Tree Model structure change change notification.
- *
+ *
* @param e - the event
*/
public void treeStructureChanged(TreeModelEvent e)
{
// Nothing to do here.
}
-
+
/**
* Tree Selection Listener value change method.
- *
+ *
* @param e - the event
*/
public void valueChanged(TreeSelectionEvent e)
@@ -1085,7 +1085,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
fireValueChanged(e);
}
}
-
+
public static class DynamicUtilTreeNode extends DefaultMutableTreeNode
{
protected Object childValue;
@@ -1129,9 +1129,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Returns the child node at position <code>pos</code>. Subclassed
* here to load the children if necessary.
- *
+ *
* @param pos the position of the child node to fetch
- *
+ *
* @return the childnode at the specified position
*/
public TreeNode getChildAt(int pos)
@@ -1143,7 +1143,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
public boolean isLeaf()
{
return childValue == null || !(childValue instanceof Hashtable
- || childValue instanceof Vector
+ || childValue instanceof Vector
|| childValue.getClass().isArray());
}
@@ -1180,7 +1180,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
}
/**
- * Listens to the model of the JTree and updates the property
+ * Listens to the model of the JTree and updates the property
* <code>expandedState</code> if nodes are removed or changed.
*/
protected class TreeModelHandler implements TreeModelListener
@@ -1199,9 +1199,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
* that a node has changed its location or changed it's children. It
* only means that some attributes of the node have changed that might
* affect its presentation.
- *
+ *
* This method is called after the actual change occured.
- *
+ *
* @param ev the TreeModelEvent describing the change
*/
public void treeNodesChanged(TreeModelEvent ev)
@@ -1211,9 +1211,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Notifies when a node is inserted into the tree.
- *
+ *
* This method is called after the actual change occured.
- *
+ *
* @param ev the TreeModelEvent describing the change
*/
public void treeNodesInserted(TreeModelEvent ev)
@@ -1223,11 +1223,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Notifies when a node is removed from the tree.
- *
+ *
* This method is called after the actual change occured.
*
* @param ev the TreeModelEvent describing the change
- */
+ */
public void treeNodesRemoved(TreeModelEvent ev)
{
if (ev != null)
@@ -1260,9 +1260,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Notifies when the structure of the tree is changed.
- *
+ *
* This method is called after the actual change occured.
- *
+ *
* @param ev the TreeModelEvent describing the change
*/
public void treeStructureChanged(TreeModelEvent ev)
@@ -1324,12 +1324,12 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Notifies when the tree selection changes.
- *
+ *
* @param ev the TreeSelectionEvent that describes the change
*/
public void valueChanged(TreeSelectionEvent ev)
{
- TreeSelectionEvent rewritten =
+ TreeSelectionEvent rewritten =
(TreeSelectionEvent) ev.cloneWithSource(JTree.this);
fireValueChanged(rewritten);
}
@@ -1359,7 +1359,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Returns the shared instance of EmptySelectionModel.
- *
+ *
* @return the shared instance of EmptySelectionModel
*/
public static EmptySelectionModel sharedInstance()
@@ -1369,7 +1369,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* This catches attempts to set a selection and sets nothing instead.
- *
+ *
* @param paths not used here
*/
public void setSelectionPaths(TreePath[] paths)
@@ -1379,7 +1379,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* This catches attempts to add something to the selection.
- *
+ *
* @param paths not used here
*/
public void addSelectionPaths(TreePath[] paths)
@@ -1389,7 +1389,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* This catches attempts to remove something from the selection.
- *
+ *
* @param paths not used here
*/
public void removeSelectionPaths(TreePath[] paths)
@@ -1431,7 +1431,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
public static final String ANCHOR_SELECTION_PATH_PROPERTY =
"anchorSelectionPath";
- /** @since 1.3 */
+ /** @since 1.3 */
public static final String LEAD_SELECTION_PATH_PROPERTY = "leadSelectionPath";
/** @since 1.3 */
@@ -1531,7 +1531,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Creates a new <code>JTree</code> object.
- *
+ *
* @param value the initial nodes in the tree
*/
public JTree(Hashtable<?, ?> value)
@@ -1541,7 +1541,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Creates a new <code>JTree</code> object.
- *
+ *
* @param value the initial nodes in the tree
*/
public JTree(Object[] value)
@@ -1551,14 +1551,14 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Creates a new <code>JTree</code> object.
- *
+ *
* @param model the model to use
*/
public JTree(TreeModel model)
{
setRootVisible(true);
setSelectionModel( new DefaultTreeSelectionModel() );
-
+
// The root node appears expanded by default.
nodeStates = new Hashtable();
@@ -1575,7 +1575,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Creates a new <code>JTree</code> object.
- *
+ *
* @param root the root node
*/
public JTree(TreeNode root)
@@ -1585,7 +1585,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Creates a new <code>JTree</code> object.
- *
+ *
* @param root the root node
* @param asksAllowChildren if false, all nodes without children are leaf
* nodes. If true, only nodes that do not allow children are leaf
@@ -1598,7 +1598,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Creates a new <code>JTree</code> object.
- *
+ *
* @param value the initial nodes in the tree
*/
public JTree(Vector<?> value)
@@ -1621,13 +1621,13 @@ public class JTree extends JComponent implements Scrollable, Accessible
TreeUI ui = getUI();
return ui != null ? ui.getPathForRow(this, row) : null;
}
-
+
/**
* Get the pathes that are displayes between the two given rows.
- *
+ *
* @param index0 the starting row, inclusive
* @param index1 the ending row, inclusive
- *
+ *
* @return the array of the tree pathes
*/
protected TreePath[] getPathBetweenRows(int index0, int index1)
@@ -1649,7 +1649,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Creates a new <code>TreeModel</code> object.
- *
+ *
* @param value the values stored in the model
*/
protected static TreeModel createTreeModel(Object value)
@@ -1659,7 +1659,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Return the UI associated with this <code>JTree</code> object.
- *
+ *
* @return the associated <code>TreeUI</code> object
*/
public TreeUI getUI()
@@ -1669,7 +1669,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Sets the UI associated with this <code>JTree</code> object.
- *
+ *
* @param ui the <code>TreeUI</code> to associate
*/
public void setUI(TreeUI ui)
@@ -1687,7 +1687,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* This method returns the String ID of the UI class of Separator.
- *
+ *
* @return The UI class' String ID.
*/
public String getUIClassID()
@@ -1698,7 +1698,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Gets the AccessibleContext associated with this
* <code>JTree</code>.
- *
+ *
* @return the associated context
*/
public AccessibleContext getAccessibleContext()
@@ -1708,19 +1708,19 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Returns the preferred viewport size.
- *
+ *
* @return the preferred size
*/
public Dimension getPreferredScrollableViewportSize()
{
return getPreferredSize();
}
-
+
/**
* Return the preferred scrolling amount (in pixels) for the given scrolling
* direction and orientation. This method handles a partially exposed row by
* returning the distance required to completely expose the item.
- *
+ *
* @param visibleRect the currently visible part of the component.
* @param orientation the scrolling orientation
* @param direction the scrolling direction (negative - up, positive -down).
@@ -1796,7 +1796,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Adds a <code>TreeExpansionListener</code> object to the tree.
- *
+ *
* @param listener the listener to add
*/
public void addTreeExpansionListener(TreeExpansionListener listener)
@@ -1806,7 +1806,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Removes a <code>TreeExpansionListener</code> object from the tree.
- *
+ *
* @param listener the listener to remove
*/
public void removeTreeExpansionListener(TreeExpansionListener listener)
@@ -1816,7 +1816,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Returns all added <code>TreeExpansionListener</code> objects.
- *
+ *
* @return an array of listeners
*/
public TreeExpansionListener[] getTreeExpansionListeners()
@@ -1826,7 +1826,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Notifies all listeners that the tree was collapsed.
- *
+ *
* @param path the path to the node that was collapsed
*/
public void fireTreeCollapsed(TreePath path)
@@ -1840,7 +1840,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Notifies all listeners that the tree was expanded.
- *
+ *
* @param path the path to the node that was expanded
*/
public void fireTreeExpanded(TreePath path)
@@ -1854,7 +1854,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Adds a <code>TreeSelctionListener</code> object to the tree.
- *
+ *
* @param listener the listener to add
*/
public void addTreeSelectionListener(TreeSelectionListener listener)
@@ -1864,7 +1864,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Removes a <code>TreeSelectionListener</code> object from the tree.
- *
+ *
* @param listener the listener to remove
*/
public void removeTreeSelectionListener(TreeSelectionListener listener)
@@ -1874,18 +1874,18 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Returns all added <code>TreeSelectionListener</code> objects.
- *
+ *
* @return an array of listeners
*/
public TreeSelectionListener[] getTreeSelectionListeners()
{
- return (TreeSelectionListener[])
+ return (TreeSelectionListener[])
getListeners(TreeSelectionListener.class);
}
/**
* Notifies all listeners when the selection of the tree changed.
- *
+ *
* @param event the event to send
*/
protected void fireValueChanged(TreeSelectionEvent event)
@@ -1898,7 +1898,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Adds a <code>TreeWillExpandListener</code> object to the tree.
- *
+ *
* @param listener the listener to add
*/
public void addTreeWillExpandListener(TreeWillExpandListener listener)
@@ -1908,7 +1908,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Removes a <code>TreeWillExpandListener</code> object from the tree.
- *
+ *
* @param listener the listener to remove
*/
public void removeTreeWillExpandListener(TreeWillExpandListener listener)
@@ -1918,18 +1918,18 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Returns all added <code>TreeWillExpandListener</code> objects.
- *
+ *
* @return an array of listeners
*/
public TreeWillExpandListener[] getTreeWillExpandListeners()
{
- return (TreeWillExpandListener[])
+ return (TreeWillExpandListener[])
getListeners(TreeWillExpandListener.class);
}
/**
* Notifies all listeners that the tree will collapse.
- *
+ *
* @param path the path to the node that will collapse
*/
public void fireTreeWillCollapse(TreePath path) throws ExpandVetoException
@@ -1943,7 +1943,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Notifies all listeners that the tree will expand.
- *
+ *
* @param path the path to the node that will expand
*/
public void fireTreeWillExpand(TreePath path) throws ExpandVetoException
@@ -1957,7 +1957,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Returns the model of this <code>JTree</code> object.
- *
+ *
* @return the associated <code>TreeModel</code>
*/
public TreeModel getModel()
@@ -1967,7 +1967,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Sets the model to use in <code>JTree</code>.
- *
+ *
* @param model the <code>TreeModel</code> to use
*/
public void setModel(TreeModel model)
@@ -2007,7 +2007,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Checks if this <code>JTree</code> object is editable.
- *
+ *
* @return <code>true</code> if this tree object is editable,
* <code>false</code> otherwise
*/
@@ -2018,7 +2018,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Sets the <code>editable</code> property.
- *
+ *
* @param flag <code>true</code> to make this tree object editable,
* <code>false</code> otherwise
*/
@@ -2034,7 +2034,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Checks if the root element is visible.
- *
+ *
* @return <code>true</code> if the root element is visible,
* <code>false</code> otherwise
*/
@@ -2056,11 +2056,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
TreePath rootPath = getPathForRow(0);
model.removeSelectionPath(rootPath);
}
-
+
boolean oldValue = rootVisible;
rootVisible = flag;
firePropertyChange(ROOT_VISIBLE_PROPERTY, oldValue, flag);
-
+
}
public boolean getShowsRootHandles()
@@ -2074,7 +2074,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
if (showsRootHandles == flag)
return;
-
+
boolean oldValue = showsRootHandles;
showsRootHandles = flag;
firePropertyChange(SHOWS_ROOT_HANDLES_PROPERTY, oldValue, flag);
@@ -2200,7 +2200,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
boolean oldValue = invokesStopCellEditing;
invokesStopCellEditing = invoke;
- firePropertyChange(INVOKES_STOP_CELL_EDITING_PROPERTY,
+ firePropertyChange(INVOKES_STOP_CELL_EDITING_PROPERTY,
oldValue, invoke);
}
@@ -2265,11 +2265,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
clearSelectionPathStates();
selectionModel.setSelectionPaths(paths);
}
-
+
/**
* This method, and all calls to it, should be removed once the
* DefaultTreeModel fires events properly. Maintenance of the nodeStates
- * table should really be done in the TreeModelHandler.
+ * table should really be done in the TreeModelHandler.
*/
private void clearSelectionPathStates()
{
@@ -2340,12 +2340,12 @@ public class JTree extends JComponent implements Scrollable, Accessible
addSelectionPaths(paths);
}
-
+
/**
* Select all rows between the two given indexes, inclusive. The method
* will not select the inner leaves and braches of the currently collapsed
* nodes in this interval.
- *
+ *
* @param index0 the starting row, inclusive
* @param index1 the ending row, inclusive
*/
@@ -2422,17 +2422,17 @@ public class JTree extends JComponent implements Scrollable, Accessible
TreePath oldValue = selectionModel.getLeadSelectionPath();
if (path == oldValue || path != null && path.equals(oldValue))
return;
-
+
// Repaint the previous and current rows with the lead selection path.
if (path != null)
{
repaint(getPathBounds(path));
selectionModel.addSelectionPath(path);
}
-
+
if (oldValue != null)
repaint(getPathBounds(oldValue));
-
+
firePropertyChange(LEAD_SELECTION_PATH_PROPERTY, oldValue, path);
}
}
@@ -2520,9 +2520,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Return the value of the <code>dragEnabled</code> property.
- *
+ *
* @return the value
- *
+ *
* @since 1.4
*/
public boolean getDragEnabled()
@@ -2532,9 +2532,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Set the <code>dragEnabled</code> property.
- *
+ *
* @param enabled new value
- *
+ *
* @since 1.4
*/
public void setDragEnabled(boolean enabled)
@@ -2722,7 +2722,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
public void cancelEditing()
{
TreeUI ui = getUI();
-
+
if (isEditing())
if (ui != null)
ui.cancelEditing(this);
@@ -2803,11 +2803,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
private void doExpandParents(TreePath path, boolean state)
{
- TreePath parent = path.getParentPath();
+ TreePath parent = path.getParentPath();
if (!isExpanded(parent) && parent != null)
doExpandParents(parent, false);
-
+
nodeStates.put(path, state ? EXPANDED : COLLAPSED);
}
@@ -2868,7 +2868,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
{
if (path == null)
return;
-
+
expandPath(path.getParentPath());
}
@@ -2879,7 +2879,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Creates and returns an instance of {@link TreeModelHandler}.
- *
+ *
* @return an instance of {@link TreeModelHandler}
*/
protected TreeModelListener createTreeModelListener()
@@ -2890,7 +2890,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Returns a sample TreeModel that can be used in a JTree. This can be used
* in Bean- or GUI-Builders to show something interesting.
- *
+ *
* @return a sample TreeModel that can be used in a JTree
*/
protected static TreeModel getDefaultTreeModel()
@@ -2930,11 +2930,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Converts the specified value to a String. This is used by the renderers
* of this JTree and its nodes.
- *
+ *
* This implementation simply returns <code>value.toString()</code> and
* ignores all other parameters. Subclass this method to control the
* conversion.
- *
+ *
* @param value the value that is converted to a String
* @param selected indicates if that value is selected or not
* @param expanded indicates if that value is expanded or not
@@ -2952,7 +2952,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
* A String representation of this JTree. This is intended to be used for
* debugging. The returned string may be empty but may not be
* <code>null</code>.
- *
+ *
* @return a String representation of this JTree
*/
protected String paramString()
@@ -2968,7 +2968,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
* and are exapanded at the moment of the execution of this method. If the
* state of any node is beeing toggled while this method is executing this
* change may be left unaccounted.
- *
+ *
* @param path The parent of this request
*
* @return An Enumeration containing TreePath objects
@@ -2993,18 +2993,18 @@ public class JTree extends JComponent implements Scrollable, Accessible
* Returns the next table element (beginning from the row
* <code>startingRow</code> that starts with <code>prefix</code>.
* Searching is done in the direction specified by <code>bias</code>.
- *
+ *
* @param prefix the prefix to search for in the cell values
* @param startingRow the index of the row where to start searching from
* @param bias the search direction, either {@link Position.Bias#Forward} or
* {@link Position.Bias#Backward}
- *
+ *
* @return the path to the found element or -1 if no such element has been
* found
- *
+ *
* @throws IllegalArgumentException if prefix is <code>null</code> or
* startingRow is not valid
- *
+ *
* @since 1.4
*/
public TreePath getNextMatch(String prefix, int startingRow,
@@ -3067,14 +3067,14 @@ public class JTree extends JComponent implements Scrollable, Accessible
* descendants of <code>path</code>. If <code>includePath</code> is set
* to <code>true</code> and <code>path</code> itself is selected, then
* it will be removed too.
- *
+ *
* @param path the path from which selected descendants are to be removed
* @param includeSelected if <code>true</code> then <code>path</code> itself
* will also be remove if it's selected
- *
+ *
* @return <code>true</code> if something has been removed,
* <code>false</code> otherwise
- *
+ *
* @since 1.3
*/
protected boolean removeDescendantSelectedPaths(TreePath path,
@@ -3093,11 +3093,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
}
return removedSomething;
}
-
+
/**
- * Removes any descendants of the TreePaths in toRemove that have been
+ * Removes any descendants of the TreePaths in toRemove that have been
* expanded.
- *
+ *
* @param toRemove - Enumeration of TreePaths that need to be removed from
* cache of toggled tree paths.
*/
@@ -3107,7 +3107,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
{
TreePath current = toRemove.nextElement();
Enumeration descendants = getDescendantToggledPaths(current);
-
+
while (descendants.hasMoreElements())
{
TreePath currentDes = (TreePath) descendants.nextElement();
@@ -3130,7 +3130,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
* {@link DefaultTreeModel#reload()} after adding or removing nodes. Following
* the official Java 1.5 API standard, just calling treeDidChange, repaint()
* or revalidate() does <i>not</i> update the tree appearance properly.
- *
+ *
* @see DefaultTreeModel#reload()
*/
public void treeDidChange()
@@ -3141,7 +3141,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
/**
* Helper method for
* {@link LookAndFeel#installProperty(JComponent, String, Object)}.
- *
+ *
* @param propertyName the name of the property
* @param value the value of the property
*
diff --git a/libjava/classpath/javax/swing/JViewport.java b/libjava/classpath/javax/swing/JViewport.java
index 0239480..729fac6 100644
--- a/libjava/classpath/javax/swing/JViewport.java
+++ b/libjava/classpath/javax/swing/JViewport.java
@@ -1,4 +1,4 @@
-/* JViewport.java --
+/* JViewport.java --
Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -62,7 +62,7 @@ import javax.swing.event.ChangeListener;
import javax.swing.plaf.ViewportUI;
/**
- *
+ *
* <pre>
* _
* +-------------------------------+ ...........Y1 \
@@ -89,7 +89,7 @@ import javax.swing.plaf.ViewportUI;
* \/
* VX = X2-X1
*</pre>
- *
+ *
* <p>A viewport is, like all swing components, located at some position in
* the swing component tree; that location is exactly the same as any other
* components: the viewport's "bounds".</p>
@@ -226,7 +226,7 @@ public class JViewport extends JComponent implements Accessible
/**
* Stores the bounds of the area that needs to be repainted. This is a cached
- * Rectangle object used in blitting calculations.
+ * Rectangle object used in blitting calculations.
*/
Rectangle cachedBlitPaint;
@@ -308,14 +308,14 @@ public class JViewport extends JComponent implements Accessible
*/
public Dimension getViewSize()
{
- Dimension size;
+ Dimension size;
Component view = getView();
if (view != null)
{
if (isViewSizeSet)
size = view.getSize();
else
- size = view.getPreferredSize();
+ size = view.getPreferredSize();
}
else
size = new Dimension(0, 0);
@@ -409,7 +409,7 @@ public class JViewport extends JComponent implements Accessible
{
if (getComponentCount() == 0)
return null;
-
+
return getComponents()[0];
}
@@ -458,7 +458,7 @@ public class JViewport extends JComponent implements Accessible
insets.right = 0;
return insets;
}
-
+
/**
* Overridden to return <code>false</code>, so the JViewport's paint method
@@ -482,7 +482,7 @@ public class JViewport extends JComponent implements Accessible
Rectangle viewBounds = view.getBounds();
Rectangle portBounds = getBounds();
- if (viewBounds.width == 0
+ if (viewBounds.width == 0
|| viewBounds.height == 0
|| portBounds.width == 0
|| portBounds.height == 0)
@@ -515,7 +515,7 @@ public class JViewport extends JComponent implements Accessible
listenerList.remove(ChangeListener.class, listener);
}
- public ChangeListener[] getChangeListeners()
+ public ChangeListener[] getChangeListeners()
{
return (ChangeListener[]) getListeners(ChangeListener.class);
}
@@ -536,7 +536,7 @@ public class JViewport extends JComponent implements Accessible
public void updateUI()
{
setUI((ViewportUI) UIManager.getUI(this));
- }
+ }
/**
* This method returns the viewport's UI delegate.
@@ -573,7 +573,7 @@ public class JViewport extends JComponent implements Accessible
{
Component view = getView();
if (view == null)
- return;
+ return;
Point pos = getViewPosition();
// We get the contentRect in the viewport coordinates. But we want to
@@ -582,7 +582,7 @@ public class JViewport extends JComponent implements Accessible
int contentY = contentRect.y + pos.y;
Rectangle viewBounds = getView().getBounds();
Rectangle portBounds = getBounds();
-
+
if (isShowing())
getView().validate();
@@ -641,7 +641,7 @@ public class JViewport extends JComponent implements Accessible
{
if (getComponentCount() > 0)
remove(getComponents()[0]);
-
+
super.addImpl(comp, constraints, index);
}
@@ -796,7 +796,7 @@ public class JViewport extends JComponent implements Accessible
g.translate(-pos.x, -pos.y);
translated = true;
view.paint(g);
- }
+ }
finally
{
if (translated)
@@ -861,7 +861,7 @@ public class JViewport extends JComponent implements Accessible
// clip must be updated in the buffer.
if (dx == 0 && dy == 0)
g2.setClip(g.getClip());
-
+
paintSimple(g2);
}
g2.dispose();
diff --git a/libjava/classpath/javax/swing/JWindow.java b/libjava/classpath/javax/swing/JWindow.java
index b36b8cf..91e0b50 100644
--- a/libjava/classpath/javax/swing/JWindow.java
+++ b/libjava/classpath/javax/swing/JWindow.java
@@ -77,7 +77,7 @@ public class JWindow extends Window implements Accessible, RootPaneContainer
}
private static final long serialVersionUID = 5420698392125238833L;
-
+
protected JRootPane rootPane;
/**
diff --git a/libjava/classpath/javax/swing/KeyStroke.java b/libjava/classpath/javax/swing/KeyStroke.java
index b57a711..94bc334 100644
--- a/libjava/classpath/javax/swing/KeyStroke.java
+++ b/libjava/classpath/javax/swing/KeyStroke.java
@@ -42,18 +42,18 @@ import java.awt.AWTKeyStroke;
import java.awt.event.KeyEvent;
import java.io.Serializable;
-public class KeyStroke
+public class KeyStroke
extends AWTKeyStroke
implements Serializable
{
private static final long serialVersionUID = -9060180771037902530L;
-
+
// Called by java.awt.AWTKeyStroke.registerSubclass via reflection.
private KeyStroke()
{
// Nothing to do here.
}
-
+
private KeyStroke(char keyChar, int keyCode, int modifiers,
boolean onKeyRelease)
{
@@ -65,34 +65,34 @@ public class KeyStroke
AWTKeyStroke.registerSubclass(KeyStroke.class);
}
- public static KeyStroke getKeyStroke(char keyChar)
+ public static KeyStroke getKeyStroke(char keyChar)
{
return (KeyStroke) getAWTKeyStroke(keyChar);
}
- /**
+ /**
* @deprecated Use {@link #getKeyStroke(char)}
*
* This method, unlike all the other factory methods on this object,
* returns a non-cached, non-shared object. New code should not use it.
*/
- public static KeyStroke getKeyStroke(char keyChar, boolean onKeyRelease)
+ public static KeyStroke getKeyStroke(char keyChar, boolean onKeyRelease)
{
return new KeyStroke(keyChar, KeyEvent.VK_UNDEFINED, 0, onKeyRelease);
}
- public static KeyStroke getKeyStroke(Character keyChar, int modifiers)
+ public static KeyStroke getKeyStroke(Character keyChar, int modifiers)
{
return (KeyStroke) getAWTKeyStroke(keyChar, modifiers);
}
- public static KeyStroke getKeyStroke(int keyCode, int modifiers,
- boolean onKeyRelease)
+ public static KeyStroke getKeyStroke(int keyCode, int modifiers,
+ boolean onKeyRelease)
{
return (KeyStroke) getAWTKeyStroke(keyCode, modifiers, onKeyRelease);
}
- public static KeyStroke getKeyStroke(int keyCode, int modifiers)
+ public static KeyStroke getKeyStroke(int keyCode, int modifiers)
{
return (KeyStroke) getAWTKeyStroke(keyCode, modifiers);
}
@@ -103,19 +103,19 @@ public class KeyStroke
* <code>IllegalArugmentException</code> when
* the keystoke sequence cannot be parsed from the given string.
*/
- public static KeyStroke getKeyStroke(String str)
+ public static KeyStroke getKeyStroke(String str)
{
try
{
- return (KeyStroke) getAWTKeyStroke(str);
+ return (KeyStroke) getAWTKeyStroke(str);
}
catch (IllegalArgumentException iae)
{
- return null;
+ return null;
}
}
- public static KeyStroke getKeyStrokeForEvent(KeyEvent event)
+ public static KeyStroke getKeyStrokeForEvent(KeyEvent event)
{
return (KeyStroke) getAWTKeyStrokeForEvent(event);
}
diff --git a/libjava/classpath/javax/swing/KeyboardManager.java b/libjava/classpath/javax/swing/KeyboardManager.java
index f7ac949..5c1c09e 100644
--- a/libjava/classpath/javax/swing/KeyboardManager.java
+++ b/libjava/classpath/javax/swing/KeyboardManager.java
@@ -1,4 +1,4 @@
-/* KeyboardManager.java --
+/* KeyboardManager.java --
Copyright (C) 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -49,11 +49,11 @@ import java.util.Vector;
import java.util.WeakHashMap;
/**
- * This class maintains a mapping from top-level containers to a
- * Hashtable. The Hashtable maps KeyStrokes to Components to be used when
+ * This class maintains a mapping from top-level containers to a
+ * Hashtable. The Hashtable maps KeyStrokes to Components to be used when
* Components register keyboard actions with the condition
* JComponent.WHEN_IN_FOCUSED_WINDOW.
- *
+ *
* @author Anthony Balkissoon abalkiss at redhat dot com
*
*/
@@ -61,13 +61,13 @@ class KeyboardManager
{
/** Shared instance of KeyboardManager **/
static KeyboardManager manager = new KeyboardManager();
-
- /**
- * A mapping between top level containers and Hashtables that
+
+ /**
+ * A mapping between top level containers and Hashtables that
* map KeyStrokes to Components.
*/
- WeakHashMap topLevelLookup = new WeakHashMap();
-
+ WeakHashMap topLevelLookup = new WeakHashMap();
+
/**
* A mapping between top level containers and Vectors of JMenuBars
* used to allow all the JMenuBars within a top level container
@@ -91,22 +91,22 @@ class KeyboardManager
{
Container topLevel = (c instanceof Container) ? (Container) c
: c.getParent();
- while (topLevel != null &&
- !(topLevel instanceof Window) &&
- !(topLevel instanceof Applet) &&
+ while (topLevel != null &&
+ !(topLevel instanceof Window) &&
+ !(topLevel instanceof Applet) &&
!(topLevel instanceof JInternalFrame))
topLevel = topLevel.getParent();
return topLevel;
}
-
+
/**
- * Returns the Hashtable that maps KeyStrokes to Components, for
+ * Returns the Hashtable that maps KeyStrokes to Components, for
* the specified top-level container c. If no Hashtable exists
* we create and register it here and return the newly created
* Hashtable.
- *
+ *
* @param c the top-level container whose Hashtable we want
- * @return the Hashtable mapping KeyStrokes to Components for the
+ * @return the Hashtable mapping KeyStrokes to Components for the
* specified top-level container
*/
Hashtable getHashtableForTopLevel (Container c)
@@ -119,13 +119,13 @@ class KeyboardManager
}
return keyToComponent;
}
-
+
/**
* Registers a KeyStroke with a Component. This does not register
- * the KeyStroke to a specific Action. When searching for a
+ * the KeyStroke to a specific Action. When searching for a
* WHEN_IN_FOCUSED_WINDOW binding we will first go up to the focused
- * top-level Container, then get the Hashtable that maps KeyStrokes
- * to components for that particular top-level Container, then
+ * top-level Container, then get the Hashtable that maps KeyStrokes
+ * to components for that particular top-level Container, then
* call processKeyBindings on that component with the condition
* JComponent.WHEN_IN_FOCUSED_WINDOW.
* @param comp the JComponent associated with the KeyStroke
@@ -135,7 +135,7 @@ class KeyboardManager
{
// This method associates a KeyStroke with a particular JComponent
// When the KeyStroke occurs, if this component's top-level ancestor
- // has focus (one of its children is the focused Component) then
+ // has focus (one of its children is the focused Component) then
// comp.processKeyBindings will be called with condition
// JComponent.WHEN_IN_FOCUSED_WINDOW.
@@ -143,16 +143,16 @@ class KeyboardManager
Container topLevel = findTopLevel(comp);
if (topLevel == null)
return;
-
+
// Now get the Hashtable for this top-level container
- Hashtable keyToComponent = getHashtableForTopLevel(topLevel);
-
+ Hashtable keyToComponent = getHashtableForTopLevel(topLevel);
+
// And add the new binding to this Hashtable
// FIXME: should allow more than one JComponent to be associated
// with a KeyStroke, in case one of them is disabled
keyToComponent.put(key, comp);
}
-
+
public void clearBindingsForComp(JComponent comp)
{
// This method clears all the WHEN_IN_FOCUSED_WINDOW bindings associated
@@ -162,9 +162,9 @@ class KeyboardManager
// bindings from the updated ComponentInputMap. This is only a preliminary
// strategy and should be improved upon once the WHEN_IN_FOCUSED_WINDOW
// bindings work.
-
+
// Find the top-level ancestor
-
+
Container topLevel = findTopLevel(comp);
if (topLevel == null)
return;
@@ -179,22 +179,22 @@ class KeyboardManager
{
temp = keys.nextElement();
if (comp == (JComponent)keyToComponent.get(temp))
- keyToComponent.remove(temp);
+ keyToComponent.remove(temp);
}
}
-
+
/**
* This method registers all the bindings in the given ComponentInputMap.
* Rather than call registerBinding on all the keys, we do the work here
- * so that we don't duplicate finding the top-level container and
+ * so that we don't duplicate finding the top-level container and
* getting its Hashtable.
- *
+ *
* @param map the ComponentInputMap whose bindings we want to register
*/
public void registerEntireMap (ComponentInputMap map)
{
if (map == null)
- return;
+ return;
JComponent comp = map.getComponent();
KeyStroke[] keys = map.allKeys();
if (keys == null)
@@ -203,13 +203,13 @@ class KeyboardManager
Container topLevel = findTopLevel(comp);
if (topLevel == null)
return;
-
+
// Register the KeyStrokes in the top-level container's Hashtable
Hashtable keyToComponent = getHashtableForTopLevel(topLevel);
for (int i = 0; i < keys.length; i++)
keyToComponent.put(keys[i], comp);
}
-
+
public boolean processKeyStroke (Component comp, KeyStroke key, KeyEvent e)
{
boolean pressed = e.getID() == KeyEvent.KEY_PRESSED;
@@ -217,15 +217,15 @@ class KeyboardManager
// Look for the top-level ancestor
Container topLevel = findTopLevel(comp);
if (topLevel == null)
- return false;
+ return false;
// Now get the Hashtable for that top-level container
Hashtable keyToComponent = getHashtableForTopLevel(topLevel);
Enumeration keys = keyToComponent.keys();
- JComponent target = (JComponent)keyToComponent.get(key);
+ JComponent target = (JComponent)keyToComponent.get(key);
if (target != null && target.processKeyBinding
(key, e, JComponent.WHEN_IN_FOCUSED_WINDOW, pressed))
return true;
-
+
// Have to give all the JMenuBars a chance to consume the event
Vector menuBars = getVectorForTopLevel(topLevel);
for (int i = 0; i < menuBars.size(); i++)
@@ -233,7 +233,7 @@ class KeyboardManager
return true;
return false;
}
-
+
/**
* Returns the Vector of JMenuBars associated with the top-level
* @param c the top-level container whose JMenuBar Vector we want
@@ -249,11 +249,11 @@ class KeyboardManager
}
return result;
}
-
+
/**
- * In processKeyStroke, KeyManager must give all JMenuBars in the
- * focused top-level container a chance to process the event. So,
- * JMenuBars must be registered in KeyManager and associated with a
+ * In processKeyStroke, KeyManager must give all JMenuBars in the
+ * focused top-level container a chance to process the event. So,
+ * JMenuBars must be registered in KeyManager and associated with a
* top-level container. That's what this method is for.
* @param menuBar the JMenuBar to register
*/
@@ -264,9 +264,9 @@ class KeyboardManager
if (!menuBars.contains(menuBar))
menuBars.add(menuBar);
}
-
+
/**
- * Unregisters a JMenuBar from its top-level container. This is
+ * Unregisters a JMenuBar from its top-level container. This is
* called before the JMenuBar is actually removed from the container
* so findTopLevel will still find us the correct top-level container.
* @param menuBar the JMenuBar to unregister.
diff --git a/libjava/classpath/javax/swing/LayoutFocusTraversalPolicy.java b/libjava/classpath/javax/swing/LayoutFocusTraversalPolicy.java
index 2d13515..335bc26 100644
--- a/libjava/classpath/javax/swing/LayoutFocusTraversalPolicy.java
+++ b/libjava/classpath/javax/swing/LayoutFocusTraversalPolicy.java
@@ -45,10 +45,10 @@ import java.util.Comparator;
/**
* @author Graydon Hoare
* @author Michael Koch
- *
+ *
* @since 1.4
*/
-public class LayoutFocusTraversalPolicy
+public class LayoutFocusTraversalPolicy
extends SortingFocusTraversalPolicy
implements Serializable
{
@@ -59,7 +59,7 @@ public class LayoutFocusTraversalPolicy
{
// Do nothing here.
}
-
+
public int compare(Object o1, Object o2)
{
Component comp1 = (Component) o1;
@@ -69,19 +69,19 @@ public class LayoutFocusTraversalPolicy
int y1 = comp1.getY();
int x2 = comp2.getX();
int y2 = comp2.getY();
-
+
if (x1 == x2 && y1 == y2)
- return 0;
-
+ return 0;
+
if ((y1 < y2) || ((y1 == y2) && (x1 < x2)))
- return -1;
+ return -1;
return 1;
}
}
private static final long serialVersionUID = 4312146927238881442L;
-
+
public LayoutFocusTraversalPolicy()
{
super(new LayoutComparator());
diff --git a/libjava/classpath/javax/swing/ListCellRenderer.java b/libjava/classpath/javax/swing/ListCellRenderer.java
index e234d18..0e56d501 100644
--- a/libjava/classpath/javax/swing/ListCellRenderer.java
+++ b/libjava/classpath/javax/swing/ListCellRenderer.java
@@ -1,4 +1,4 @@
-/* ListCellRenderer.java --
+/* ListCellRenderer.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/ListSelectionModel.java b/libjava/classpath/javax/swing/ListSelectionModel.java
index 499362d..1cd67e9 100644
--- a/libjava/classpath/javax/swing/ListSelectionModel.java
+++ b/libjava/classpath/javax/swing/ListSelectionModel.java
@@ -1,4 +1,4 @@
-/* ListSelectionModel.java --
+/* ListSelectionModel.java --
Copyright (C) 2002, 2006, Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -42,19 +42,19 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
/**
- * A model that tracks the selection status of a list of items. Each item in
+ * A model that tracks the selection status of a list of items. Each item in
* the list is identified by a zero-based index only, so the model can be used
- * to track the selection status of any type of list. The model
+ * to track the selection status of any type of list. The model
* supports three modes:
* <ul>
- * <li><code>SINGLE_SELECTION</code> - only one item in the list may be
+ * <li><code>SINGLE_SELECTION</code> - only one item in the list may be
* selected;</li>
- * <li><code>SINGLE_INTERVAL_SELECTION</code> - only one interval in the list
+ * <li><code>SINGLE_INTERVAL_SELECTION</code> - only one interval in the list
* may be selected;</li>
- * <li><code>MULTIPLE_INTERVAL_SELECTION</code> - any combination of items in
+ * <li><code>MULTIPLE_INTERVAL_SELECTION</code> - any combination of items in
* the list may be selected.</li>
* </ul>
- * The model uses an event notification mechanism to notify listeners (see
+ * The model uses an event notification mechanism to notify listeners (see
* {@link ListSelectionListener}) about updates to the selection model.
* <p>
* This model is used to track row selections in the {@link JList} component,
@@ -62,10 +62,10 @@ import javax.swing.event.ListSelectionListener;
*/
public interface ListSelectionModel
{
-
+
/**
* A selection mode in which only one item can be selected.
- *
+ *
* @see #setSelectionMode(int)
*/
int SINGLE_SELECTION = 0;
@@ -73,14 +73,14 @@ public interface ListSelectionModel
/**
* A selection mode in which a single interval can be selected (an interval
* is a range containing one or more contiguous items).
- *
+ *
* @see #setSelectionMode(int)
*/
int SINGLE_INTERVAL_SELECTION = 1;
/**
* A selection mode in which any combination of items can be selected.
- *
+ *
* @see #setSelectionMode(int)
*/
int MULTIPLE_INTERVAL_SELECTION = 2;
@@ -90,32 +90,32 @@ public interface ListSelectionModel
* <p>
* FIXME: The spec is silent about what happens to existing selections, for
* example when changing from an interval selection to single selection.
- *
- * @param mode one of {@link #SINGLE_SELECTION},
- * {@link #SINGLE_INTERVAL_SELECTION} and
+ *
+ * @param mode one of {@link #SINGLE_SELECTION},
+ * {@link #SINGLE_INTERVAL_SELECTION} and
* {@link #MULTIPLE_INTERVAL_SELECTION}.
- *
+ *
* @see #getSelectionMode()
- *
+ *
* @throws IllegalArgumentException if <code>mode</code> is not one of the
* specified values.
*/
void setSelectionMode(int mode);
/**
- * Returns the selection mode, which is one of {@link #SINGLE_SELECTION},
- * {@link #SINGLE_INTERVAL_SELECTION} and
+ * Returns the selection mode, which is one of {@link #SINGLE_SELECTION},
+ * {@link #SINGLE_INTERVAL_SELECTION} and
* {@link #MULTIPLE_INTERVAL_SELECTION}.
- *
+ *
* @return The selection mode.
- *
+ *
* @see #setSelectionMode(int)
*/
int getSelectionMode();
/**
- * Clears the current selection from the model. If the selection state
- * changes (that is, the existing selection is non-empty) a
+ * Clears the current selection from the model. If the selection state
+ * changes (that is, the existing selection is non-empty) a
* {@link ListSelectionEvent} should be sent to all registered listeners.
* <p>
* FIXME: what happens to the anchor and lead selection indices (the spec
@@ -126,11 +126,11 @@ public interface ListSelectionModel
void clearSelection();
/**
- * Returns the lowest selected index, or <code>-1</code> if there is no
+ * Returns the lowest selected index, or <code>-1</code> if there is no
* selection.
- *
+ *
* @return The lowest selected index.
- *
+ *
* @see #getMaxSelectionIndex()
*/
int getMinSelectionIndex();
@@ -138,22 +138,22 @@ public interface ListSelectionModel
/**
* Returns the highest selected index, or <code>-1</code> if there is no
* selection.
- *
+ *
* @return The highest selected index.
- *
+ *
* @see #getMinSelectionIndex()
*/
int getMaxSelectionIndex();
/**
- * Returns <code>true</code> if the specified item is selected, and
- * <code>false</code> otherwise. Special note: if <code>index</code> is
- * negative, this method should return <code>false</code> (no exception
+ * Returns <code>true</code> if the specified item is selected, and
+ * <code>false</code> otherwise. Special note: if <code>index</code> is
+ * negative, this method should return <code>false</code> (no exception
* should be thrown).
- *
+ *
* @param index the item index (zero-based).
- *
- * @return <code>true</code> if the specified item is selected, and
+ *
+ * @return <code>true</code> if the specified item is selected, and
* <code>false</code> otherwise.
*/
boolean isSelectedIndex(int index);
@@ -161,56 +161,56 @@ public interface ListSelectionModel
/**
* Returns <code>true</code> if there is no selection, and <code>false</code>
* otherwise.
- *
- * @return <code>true</code> if there is no selection, and
+ *
+ * @return <code>true</code> if there is no selection, and
* <code>false</code> otherwise.
*/
boolean isSelectionEmpty();
/**
- * Sets the selection interval to the specified range (note that
- * <code>anchor</code> can be less than, equal to, or greater than
- * <code>lead</code>). If this results in the selection being changed,
+ * Sets the selection interval to the specified range (note that
+ * <code>anchor</code> can be less than, equal to, or greater than
+ * <code>lead</code>). If this results in the selection being changed,
* a {@link ListSelectionEvent} is sent to all registered listeners.
* <p>
- * If the selection mode is {@link #SINGLE_SELECTION}, only the
+ * If the selection mode is {@link #SINGLE_SELECTION}, only the
* <code>lead</code> item is selected.
- *
+ *
* @param anchor the anchor index.
* @param lead the lead index.
*/
void setSelectionInterval(int anchor, int lead);
/**
- * Marks the items in the specified interval as selected. The behaviour of
+ * Marks the items in the specified interval as selected. The behaviour of
* this method depends on the selection mode:
* <ul>
- * <li><code>SINGLE_SELECTION</code> - only the <code>lead</code> item is
+ * <li><code>SINGLE_SELECTION</code> - only the <code>lead</code> item is
* selected;</li>
- * <li><code>SINGLE_INTERVAL_SELECTION</code> - the existing selection
+ * <li><code>SINGLE_INTERVAL_SELECTION</code> - the existing selection
* interval is replaced by the specified interval;</li>
- * <li><code>MULTIPLE_INTERVAL_SELECTION</code> - the specified interval is
+ * <li><code>MULTIPLE_INTERVAL_SELECTION</code> - the specified interval is
* merged into the currently selected intervals.</li>
* </ul>
- * Note that <code>anchor</code> can be less than, equal to, or greater than
+ * Note that <code>anchor</code> can be less than, equal to, or greater than
* <code>lead</code>.
- *
+ *
* @param anchor the index of the anchor item
* @param lead the index of the lead item.
*/
void addSelectionInterval(int anchor, int lead);
/**
- * Marks the items in the specified interval as not selected. The behaviour
+ * Marks the items in the specified interval as not selected. The behaviour
* of this method depends on the selection mode:
* <ul>
* <li><code>SINGLE_SELECTION</code> - XXX;</li>
* <li><code>SINGLE_INTERVAL_SELECTION</code> - XXX;</li>
* <li><code>MULTIPLE_INTERVAL_SELECTION</code> - XXX.</li>
* </ul>
- * Note that <code>anchor</code> can be less than, equal to, or greater than
+ * Note that <code>anchor</code> can be less than, equal to, or greater than
* <code>lead</code>.
- *
+ *
* @param anchor the index of the anchor item
* @param lead the index of the lead item.
*/
@@ -221,67 +221,67 @@ public interface ListSelectionModel
* specified <code>index</code> (the <code>before</code> flag indicates
* whether the range is inserted before or after the existing item at
* <code>index</code>).
- *
+ *
* FIXME: What is the selection status of the new items? Bug 4870694.
* FIXME: What event is generated?
- *
- * @param index the index of the item.
+ *
+ * @param index the index of the item.
* @param length the number of items in the interval to be inserted.
- * @param before if <code>true</code>, the interval should be inserted
+ * @param before if <code>true</code>, the interval should be inserted
* before <code>index</code>, otherwise it is inserted after.
- *
+ *
* @see #removeIndexInterval(int, int)
*/
void insertIndexInterval(int index, int length, boolean before);
/**
* Removes the items in the specified range (inclusive) from the selection
- * model. This method should be called when an interval is deleted from
+ * model. This method should be called when an interval is deleted from
* the underlying list.
- *
- * FIXME: what happens to the lead and anchor indices if they are part of
- * the range that is removed?
+ *
+ * FIXME: what happens to the lead and anchor indices if they are part of
+ * the range that is removed?
* FIXME: what event is generated
- *
+ *
* @param index0 XXX
* @param index1 XXX
- *
+ *
* @see #insertIndexInterval(int, int, boolean)
*/
void removeIndexInterval(int index0, int index1);
/**
- * Returns the index of the anchor item.
- *
+ * Returns the index of the anchor item.
+ *
* @return The index of the anchor item.
- *
+ *
* @see #setAnchorSelectionIndex(int)
*/
int getAnchorSelectionIndex();
/**
* Sets the index of the anchor item.
- *
+ *
* @param index the item index.
- *
+ *
* @see #getAnchorSelectionIndex()
*/
void setAnchorSelectionIndex(int index);
/**
* Returns the index of the lead item.
- *
+ *
* @return The index of the lead item.
- *
+ *
* @see #setLeadSelectionIndex(int)
*/
int getLeadSelectionIndex();
/**
* Sets the index of the lead item.
- *
+ *
* @param index the item index.
- *
+ *
* @see #getLeadSelectionIndex()
*/
void setLeadSelectionIndex(int index);
@@ -289,21 +289,21 @@ public interface ListSelectionModel
/**
* Sets the flag that is passed to listeners for each change notification.
* If a sequence of changes is made to the selection model, this flag should
- * be set to <code>true</code> at the start of the sequence, and
+ * be set to <code>true</code> at the start of the sequence, and
* <code>false</code> for the last change - this gives listeners the option
* to ignore interim changes if that is more efficient.
- *
+ *
* @param valueIsAdjusting the flag value.
- *
+ *
* @see #getValueIsAdjusting()
*/
void setValueIsAdjusting(boolean valueIsAdjusting);
/**
* Returns a flag that is passed to registered listeners when changes are
- * made to the model. See the description for
+ * made to the model. See the description for
* {@link #setValueIsAdjusting(boolean)} for more information.
- *
+ *
* @return The flag.
*/
boolean getValueIsAdjusting();
@@ -311,9 +311,9 @@ public interface ListSelectionModel
/**
* Registers a listener with the model so that it receives notification
* of changes to the model.
- *
+ *
* @param listener the listener (<code>null</code> ignored).
- *
+ *
* @see #removeListSelectionListener(ListSelectionListener)
*/
void addListSelectionListener(ListSelectionListener listener);
@@ -322,9 +322,9 @@ public interface ListSelectionModel
* Deregisters a listener so that it no longer receives notification of
* changes to the model. If the specified listener is not registered with
* the model, or is <code>null</code>, this method does nothing.
- *
+ *
* @param listener the listener (<code>null</code> ignored).
- *
+ *
* @see #addListSelectionListener(ListSelectionListener)
*/
void removeListSelectionListener(ListSelectionListener listener);
diff --git a/libjava/classpath/javax/swing/LookAndFeel.java b/libjava/classpath/javax/swing/LookAndFeel.java
index d995bc9..aec6ebb 100644
--- a/libjava/classpath/javax/swing/LookAndFeel.java
+++ b/libjava/classpath/javax/swing/LookAndFeel.java
@@ -53,18 +53,18 @@ import javax.swing.plaf.metal.MetalLookAndFeel;
import javax.swing.text.JTextComponent;
/**
- * A <i>look-and-feel</i> controls most aspects of the appearance and
- * operation of user interface components in <code>javax.swing</code>. A
+ * A <i>look-and-feel</i> controls most aspects of the appearance and
+ * operation of user interface components in <code>javax.swing</code>. A
* cross-platform look-and-feel (the {@link MetalLookAndFeel}) is provided.
- *
+ *
* @see UIManager#getInstalledLookAndFeels()
* @see UIManager#setLookAndFeel(LookAndFeel)
*/
public abstract class LookAndFeel
{
/**
- * Creates and returns a look-and-feel specific defaults table. This method
- * is called once by {@link UIManager#setLookAndFeel(LookAndFeel)} and
+ * Creates and returns a look-and-feel specific defaults table. This method
+ * is called once by {@link UIManager#setLookAndFeel(LookAndFeel)} and
* shouldn't be called again (as it creates a large table of defaults).
*
* @return The UI defaults.
@@ -76,47 +76,47 @@ public abstract class LookAndFeel
/**
* Returns a description of the look and feel.
- *
+ *
* @return A description of the look and feel.
*/
public abstract String getDescription();
/**
* Returns the value of <code>Toolkit.getDefaultToolkit()
- * .getDesktopProperty(systemPropertyName)</code>, or
+ * .getDesktopProperty(systemPropertyName)</code>, or
* <code>fallbackValue</code> if no such property is defined.
- *
+ *
* @param systemPropertyName the system property name.
* @param fallbackValue the fallback value.
- *
+ *
* @return The property value or <code>fallbackValue</code>.
*/
- public static Object getDesktopPropertyValue(String systemPropertyName,
+ public static Object getDesktopPropertyValue(String systemPropertyName,
Object fallbackValue)
{
Object value = Toolkit.getDefaultToolkit().getDesktopProperty(
systemPropertyName);
return value != null ? value : fallbackValue;
}
-
+
/**
* Returns an identifier for the look and feel.
- *
+ *
* @return An identifier for the look and feel.
*/
public abstract String getID();
/**
* Returns the name for the look and feel.
- *
+ *
* @return The name for the look and feel.
*/
public abstract String getName();
/**
- * Returns <code>true</code> when the look-and-feel supports window
+ * Returns <code>true</code> when the look-and-feel supports window
* decorations, and <code>false</code> otherwise. This default implementation
- * always returns <code>false</code> and needs to be overridden when the
+ * always returns <code>false</code> and needs to be overridden when the
* derived look-and-feel supports this.
*
* @return <code>false</code>.
@@ -127,13 +127,13 @@ public abstract class LookAndFeel
{
return false;
}
-
+
/**
- * Initializes the look-and-feel. The
- * {@link UIManager#setLookAndFeel(LookAndFeel)} method calls this method
- * before the first call (and typically the only call) to
+ * Initializes the look-and-feel. The
+ * {@link UIManager#setLookAndFeel(LookAndFeel)} method calls this method
+ * before the first call (and typically the only call) to
* {@link #getDefaults()}. This default implementation does nothing, but
- * subclasses can override this behaviour.
+ * subclasses can override this behaviour.
*/
public void initialize()
{
@@ -142,12 +142,12 @@ public abstract class LookAndFeel
}
/**
- * Convenience method for installing a component's default {@link Border}
- * object on the specified component if either the border is currently
- * <code>null</code> or already an instance of {@link UIResource}.
- *
+ * Convenience method for installing a component's default {@link Border}
+ * object on the specified component if either the border is currently
+ * <code>null</code> or already an instance of {@link UIResource}.
+ *
* @param c the component (<code>null</code> not permitted).
- * @param defaultBorderName the border name (for lookup in the UIDefaults
+ * @param defaultBorderName the border name (for lookup in the UIDefaults
* table).
*/
public static void installBorder(JComponent c, String defaultBorderName)
@@ -160,9 +160,9 @@ public abstract class LookAndFeel
/**
* Convenience method for initializing a component's foreground and
* background color properties with values from the current defaults table.
- *
+ *
* @param c the component (<code>null</code> not permitted).
- * @param defaultBgName the key for the background color in the UIDefaults
+ * @param defaultBgName the key for the background color in the UIDefaults
* table.
* @param defaultFgName the key for the foreground color in the UIDefaults
* table.
@@ -184,9 +184,9 @@ public abstract class LookAndFeel
/**
* Convenience method for initializing a component's foreground, background
* and font properties with values from the current defaults table.
- *
+ *
* @param component the component (<code>null</code> not permitted).
- * @param defaultBgName the key for the background color in the UIDefaults
+ * @param defaultBgName the key for the background color in the UIDefaults
* table.
* @param defaultFgName the key for the foreground color in the UIDefaults
* table.
@@ -206,23 +206,23 @@ public abstract class LookAndFeel
}
/**
- * Returns <code>true</code> if the look-and-feel is the "native"
+ * Returns <code>true</code> if the look-and-feel is the "native"
* look-and-feel for the current platform, and <code>false</code> otherwise.
- * A native look-and-feel emulates the appearance and behaviour of the
+ * A native look-and-feel emulates the appearance and behaviour of the
* default windowing system on the host operating system.
- *
+ *
* @return A flag indicating whether or not this is the native look and feel
* for the current platform.
*/
public abstract boolean isNativeLookAndFeel();
/**
- * Returns <code>true</code> if the look-and-feel is supported on the
- * current operating system, and <code>false</code> otherwise. This
+ * Returns <code>true</code> if the look-and-feel is supported on the
+ * current operating system, and <code>false</code> otherwise. This
* mechanism is provided so that it is possible to prevent a look-and-feel
* from being used on some operating systems (usually for legal, not
* technical, reasons).
- *
+ *
* @return A flag indicating whether or not the look-and-feel is supported
* on the current platform.
*/
@@ -232,9 +232,9 @@ public abstract class LookAndFeel
* Loads the bindings in keys into retMap. Does not remove existing entries
* from retMap. <code>keys</code> describes the InputMap, every even indexed
* item is either a KeyStroke or a String representing a KeyStroke and every
- * odd indexed item is the Object associated with that KeyStroke in an
+ * odd indexed item is the Object associated with that KeyStroke in an
* ActionMap.
- *
+ *
* @param retMap the InputMap into which we load bindings
* @param keys the Object array describing the InputMap as above
*/
@@ -255,19 +255,19 @@ public abstract class LookAndFeel
}
/**
- * Creates a ComponentInputMap from keys.
+ * Creates a ComponentInputMap from keys.
* <code>keys</code> describes the InputMap, every even indexed
* item is either a KeyStroke or a String representing a KeyStroke and every
- * odd indexed item is the Object associated with that KeyStroke in an
+ * odd indexed item is the Object associated with that KeyStroke in an
* ActionMap.
- *
+ *
* @param c the JComponent associated with the ComponentInputMap
* @param keys the Object array describing the InputMap as above
- *
+ *
* @return A new input map.
*/
public static ComponentInputMap makeComponentInputMap(JComponent c,
- Object[] keys)
+ Object[] keys)
{
ComponentInputMap retMap = new ComponentInputMapUIResource(c);
loadKeyBindings(retMap, keys);
@@ -277,17 +277,17 @@ public abstract class LookAndFeel
/**
* Utility method that creates a UIDefaults.LazyValue that creates an
* ImageIcon UIResource for the specified gifFile filename.
- *
+ *
* @param baseClass the base class for accessing the icon resource.
* @param gifFile the file name.
- *
- * @return A {@link UIDefaults.LazyValue} that serves up an
+ *
+ * @return A {@link UIDefaults.LazyValue} that serves up an
* {@link IconUIResource}.
*/
public static Object makeIcon(Class<?> baseClass, String gifFile)
{
final URL file = baseClass.getResource(gifFile);
- return new UIDefaults.LazyValue()
+ return new UIDefaults.LazyValue()
{
public Object createValue(UIDefaults table)
{
@@ -297,14 +297,14 @@ public abstract class LookAndFeel
}
/**
- * Creates a InputMap from keys.
+ * Creates a InputMap from keys.
* <code>keys</code> describes the InputMap, every even indexed
* item is either a KeyStroke or a String representing a KeyStroke and every
- * odd indexed item is the Object associated with that KeyStroke in an
+ * odd indexed item is the Object associated with that KeyStroke in an
* ActionMap.
- *
+ *
* @param keys the Object array describing the InputMap as above
- *
+ *
* @return A new input map.
*/
public static InputMap makeInputMap(Object[] keys)
@@ -319,14 +319,14 @@ public abstract class LookAndFeel
* <code>keyBindingList</code> is an array of KeyStroke-Action pairs where
* even indexed elements are KeyStrokes or Strings representing KeyStrokes
* and odd indexed elements are the associated Actions.
- *
+ *
* @param keyBindingList the array of KeyStroke-Action pairs
* @return a JTextComponent.KeyBinding array
*/
public static JTextComponent.KeyBinding[] makeKeyBindings(
Object[] keyBindingList)
{
- JTextComponent.KeyBinding[] retBindings =
+ JTextComponent.KeyBinding[] retBindings =
new JTextComponent.KeyBinding[keyBindingList.length / 2];
for (int i = 0; i < keyBindingList.length - 1; i += 2)
{
@@ -335,15 +335,15 @@ public abstract class LookAndFeel
stroke = (KeyStroke) keyBindingList[i];
else
stroke = KeyStroke.getKeyStroke((String) keyBindingList[i]);
- retBindings[i / 2] = new JTextComponent.KeyBinding(stroke,
+ retBindings[i / 2] = new JTextComponent.KeyBinding(stroke,
(String) keyBindingList[i + 1]);
}
return retBindings;
}
/**
- * Invoked when the user attempts an invalid operation. The default
- * implementation just beeps. Subclasses that wish to change this need to
+ * Invoked when the user attempts an invalid operation. The default
+ * implementation just beeps. Subclasses that wish to change this need to
* override this method.
*
* @param component the component the error occured in
@@ -365,7 +365,7 @@ public abstract class LookAndFeel
/**
* UIManager.setLookAndFeel calls this method just before we're replaced by
- * a new default look and feel.
+ * a new default look and feel.
*/
public void uninitialize()
{
@@ -376,7 +376,7 @@ public abstract class LookAndFeel
/**
* Convenience method for un-installing a component's default border on the
* specified component if the border is currently an instance of UIResource.
- *
+ *
* @param c the component (<code>null</code> not permitted).
*/
public static void uninstallBorder(JComponent c)
diff --git a/libjava/classpath/javax/swing/MenuSelectionManager.java b/libjava/classpath/javax/swing/MenuSelectionManager.java
index beafbf4..0b65449 100644
--- a/libjava/classpath/javax/swing/MenuSelectionManager.java
+++ b/libjava/classpath/javax/swing/MenuSelectionManager.java
@@ -127,7 +127,7 @@ public class MenuSelectionManager
// clear selected path
selectedPath.clear();
- // notify all listeners that the selected path was changed
+ // notify all listeners that the selected path was changed
fireStateChanged();
}
@@ -146,37 +146,37 @@ public class MenuSelectionManager
{
// Convert sourcePoint to screen coordinates.
Point sourcePointOnScreen = sourcePoint;
-
+
if (source.isShowing())
SwingUtilities.convertPointToScreen(sourcePointOnScreen, source);
Point compPointOnScreen;
Component resultComp = null;
- // For each menu element on the selected path, express its location
- // in terms of screen coordinates and check if there is any
+ // For each menu element on the selected path, express its location
+ // in terms of screen coordinates and check if there is any
// menu element on the selected path that contains given source point.
for (int i = 0; i < selectedPath.size(); i++)
{
- Component comp = ((Component) selectedPath.get(i));
- Dimension size = comp.getSize();
-
- // convert location of this menu item to screen coordinates
- compPointOnScreen = comp.getLocationOnScreen();
-
- if (compPointOnScreen.x <= sourcePointOnScreen.x
- && sourcePointOnScreen.x < compPointOnScreen.x + size.width
- && compPointOnScreen.y <= sourcePointOnScreen.y
- && sourcePointOnScreen.y < compPointOnScreen.y + size.height)
- {
- Point p = sourcePointOnScreen;
-
+ Component comp = ((Component) selectedPath.get(i));
+ Dimension size = comp.getSize();
+
+ // convert location of this menu item to screen coordinates
+ compPointOnScreen = comp.getLocationOnScreen();
+
+ if (compPointOnScreen.x <= sourcePointOnScreen.x
+ && sourcePointOnScreen.x < compPointOnScreen.x + size.width
+ && compPointOnScreen.y <= sourcePointOnScreen.y
+ && sourcePointOnScreen.y < compPointOnScreen.y + size.height)
+ {
+ Point p = sourcePointOnScreen;
+
if (comp.isShowing())
SwingUtilities.convertPointFromScreen(p, comp);
-
- resultComp = SwingUtilities.getDeepestComponentAt(comp, p.x, p.y);
- break;
- }
+
+ resultComp = SwingUtilities.getDeepestComponentAt(comp, p.x, p.y);
+ break;
+ }
}
return resultComp;
}
@@ -232,7 +232,7 @@ public class MenuSelectionManager
subElements = first.getSubElements();
for (int j = 0; j < subElements.length; j++)
{
- MenuElement me = subElements[j];
+ MenuElement me = subElements[j];
if (me != null
&& (SwingUtilities.isDescendingFrom(c, me.getComponent())))
{
@@ -315,9 +315,9 @@ public class MenuSelectionManager
Component source = ((Component) event.getSource());
// In the case of drag event, event.getSource() returns component
- // where drag event originated. However menu element processing this
- // event should be the one over which mouse is currently located,
- // which is not necessary the source of the drag event.
+ // where drag event originated. However menu element processing this
+ // event should be the one over which mouse is currently located,
+ // which is not necessary the source of the drag event.
Component mouseOverMenuComp;
// find over which menu element the mouse is currently located
@@ -330,28 +330,28 @@ public class MenuSelectionManager
// Process this event only if mouse is located over some menu element
if (mouseOverMenuComp != null && (mouseOverMenuComp instanceof MenuElement))
{
- MenuElement[] path = getPath(mouseOverMenuComp);
- ((MenuElement) mouseOverMenuComp).processMouseEvent(event, path,
- manager);
-
- // FIXME: Java specification says that mouse events should be
- // forwarded to subcomponents. The code below does it, but
- // menu's work fine without it. This code is commented for now.
-
- /*
- MenuElement[] subComponents = ((MenuElement) mouseOverMenuComp)
- .getSubElements();
-
- for (int i = 0; i < subComponents.length; i++)
- {
- subComponents[i].processMouseEvent(event, path, manager);
- }
- */
+ MenuElement[] path = getPath(mouseOverMenuComp);
+ ((MenuElement) mouseOverMenuComp).processMouseEvent(event, path,
+ manager);
+
+ // FIXME: Java specification says that mouse events should be
+ // forwarded to subcomponents. The code below does it, but
+ // menu's work fine without it. This code is commented for now.
+
+ /*
+ MenuElement[] subComponents = ((MenuElement) mouseOverMenuComp)
+ .getSubElements();
+
+ for (int i = 0; i < subComponents.length; i++)
+ {
+ subComponents[i].processMouseEvent(event, path, manager);
+ }
+ */
}
else
{
- if (event.getID() == MouseEvent.MOUSE_RELEASED)
- clearSelectedPath();
+ if (event.getID() == MouseEvent.MOUSE_RELEASED)
+ clearSelectedPath();
}
}
@@ -364,8 +364,8 @@ public class MenuSelectionManager
{
if (path == null)
{
- clearSelectedPath();
- return;
+ clearSelectedPath();
+ return;
}
int minSize = path.length; // size of the smaller path.
@@ -412,25 +412,25 @@ public class MenuSelectionManager
private MenuElement[] getPath(Component c)
{
// FIXME: There is the same method in BasicMenuItemUI. However I
- // cannot use it here instead of this method, since I cannot assume that
+ // cannot use it here instead of this method, since I cannot assume that
// all the menu elements on the selected path are JMenuItem or JMenu.
- // For now I've just duplicated it here. Please
- // fix me or delete me if another better approach will be found, and
+ // For now I've just duplicated it here. Please
+ // fix me or delete me if another better approach will be found, and
// this method will not be necessary.
ArrayList path = new ArrayList();
- // if given component is JMenu, we also need to include
- // it's popup menu in the path
+ // if given component is JMenu, we also need to include
+ // it's popup menu in the path
if (c instanceof JMenu)
path.add(((JMenu) c).getPopupMenu());
while (c instanceof MenuElement)
{
- path.add(0, (MenuElement) c);
+ path.add(0, (MenuElement) c);
- if (c instanceof JPopupMenu)
- c = ((JPopupMenu) c).getInvoker();
- else
- c = c.getParent();
+ if (c instanceof JPopupMenu)
+ c = ((JPopupMenu) c).getInvoker();
+ else
+ c = c.getParent();
}
MenuElement[] pathArray = new MenuElement[path.size()];
diff --git a/libjava/classpath/javax/swing/OverlayLayout.java b/libjava/classpath/javax/swing/OverlayLayout.java
index a2cccb9..b037a09 100644
--- a/libjava/classpath/javax/swing/OverlayLayout.java
+++ b/libjava/classpath/javax/swing/OverlayLayout.java
@@ -62,7 +62,7 @@ import java.io.Serializable;
* point is in the middle, an X alignment of 1.0 means, the aligment point is
* at the right edge. So if you have three components, the first with 0.0, the
* second with 0.5 and the third with 1.0, then they are laid out like this:
- *
+ *
* <pre>
* +-------+
* | 1 |
@@ -300,7 +300,7 @@ public class OverlayLayout implements LayoutManager2, Serializable
* at the right edge. So if you have three components, the first with 0.0,
* the second with 0.5 and the third with 1.0, then they are laid out like
* this:
- *
+ *
* <pre>
* +-------+
* | 1 |
diff --git a/libjava/classpath/javax/swing/Popup.java b/libjava/classpath/javax/swing/Popup.java
index 5074d64..65be7cf 100644
--- a/libjava/classpath/javax/swing/Popup.java
+++ b/libjava/classpath/javax/swing/Popup.java
@@ -85,8 +85,8 @@ public class Popup
// The real stuff happens in the implementation of subclasses,
// for instance JWindowPopup.
}
-
-
+
+
/**
* Constructs a new <code>Popup</code>.
*/
@@ -177,8 +177,8 @@ public class Popup
window.setSize(contents.getSize());
window.show();
}
-
-
+
+
/**
* Removes the popup's <code>JWindow</code> from the
* screen. Nothing happens if it is currently not visible.
@@ -226,12 +226,12 @@ public class Popup
* The panel that holds the content.
*/
private JPanel panel;
-
+
/**
* The layered pane of the owner.
*/
private JLayeredPane layeredPane;
-
+
/**
* Constructs a new <code>LightweightPopup</code> given its owner,
* contents and the screen position where the popup
@@ -259,7 +259,7 @@ public class Popup
this.contents = contents;
this.x = x;
this.y = y;
-
+
JRootPane rootPane = SwingUtilities.getRootPane(owner);
JLayeredPane layeredPane = rootPane.getLayeredPane();
this.layeredPane = layeredPane;
@@ -279,7 +279,7 @@ public class Popup
panel = new JPanel();
panel.setLayout(new FlowLayout(0, 0, 0));
}
-
+
panel.add(contents);
panel.setSize(contents.getSize());
Point layeredPaneLoc = layeredPane.getLocationOnScreen();
diff --git a/libjava/classpath/javax/swing/PopupFactory.java b/libjava/classpath/javax/swing/PopupFactory.java
index b326205..9468c88 100644
--- a/libjava/classpath/javax/swing/PopupFactory.java
+++ b/libjava/classpath/javax/swing/PopupFactory.java
@@ -159,7 +159,7 @@ public class PopupFactory
Dimension rootSize = root.getSize();
if (x >= rootLoc.x && y > rootLoc.y
&& (x - rootLoc.x) + contentsSize.width < rootSize.width
- && (y - rootLoc.y) + contentsSize.height < rootSize.height)
+ && (y - rootLoc.y) + contentsSize.height < rootSize.height)
popup = new Popup.LightweightPopup(owner, contents, x, y);
else
popup = new Popup.JWindowPopup(owner, contents, x, y);
diff --git a/libjava/classpath/javax/swing/ProgressMonitor.java b/libjava/classpath/javax/swing/ProgressMonitor.java
index b4c3d22..0d7ab3e 100644
--- a/libjava/classpath/javax/swing/ProgressMonitor.java
+++ b/libjava/classpath/javax/swing/ProgressMonitor.java
@@ -64,12 +64,12 @@ import javax.accessibility.AccessibleContext;
*/
public class ProgressMonitor
{
-
+
/**
* The accessible content for this component
*/
protected AccessibleContext accessibleContext;
-
+
/**
* parentComponent
*/
@@ -108,13 +108,13 @@ public class ProgressMonitor
boolean canceled;
/**
- * Creates a new <code>ProgressMonitor</code> instance. This is used to
- * monitor a task and pops up a dialog if the task is taking a long time to
+ * Creates a new <code>ProgressMonitor</code> instance. This is used to
+ * monitor a task and pops up a dialog if the task is taking a long time to
* run.
- *
- * @param component The parent component of the progress dialog or
+ *
+ * @param component The parent component of the progress dialog or
* <code>null</code>.
- * @param message A constant message object which works in the way it does
+ * @param message A constant message object which works in the way it does
* in {@link JOptionPane}.
* @param note A string message which can be changed while the operation goes
* on.
@@ -192,7 +192,7 @@ public class ProgressMonitor
}
- /**
+ /**
* Returns the minimum or start value of the operation.
*
* @return Minimum or start value of the operation.
@@ -283,9 +283,9 @@ public class ProgressMonitor
/**
* Returns the number of milliseconds to wait before displaying the progress
* dialog. The default value is 2000.
- *
+ *
* @return The number of milliseconds.
- *
+ *
* @see #setMillisToPopup(int)
*/
public int getMillisToPopup()
@@ -296,9 +296,9 @@ public class ProgressMonitor
/**
* Sets the number of milliseconds to wait before displaying the progress
* dialog.
- *
+ *
* @param time the number of milliseconds.
- *
+ *
* @see #getMillisToPopup()
*/
public void setMillisToPopup(int time)
@@ -336,7 +336,7 @@ public class ProgressMonitor
}
}
- /**
+ /**
* Internal method that creates the progress dialog.
*/
void createDialog()
@@ -408,9 +408,9 @@ public class ProgressMonitor
first = false;
- long expected = (progress - min == 0) ?
- (now - timestamp) * (max - min) :
- (now - timestamp) * (max - min) / (progress - min);
+ long expected = (progress - min == 0) ?
+ (now - timestamp) * (max - min) :
+ (now - timestamp) * (max - min) / (progress - min);
if (expected > millisToPopup)
{
@@ -428,7 +428,7 @@ public class ProgressMonitor
{
// The progress dialog is being displayed. We now calculate
// whether setting the progress bar to the current progress
- // value would result in a visual difference.
+ // value would result in a visual difference.
int delta = progress - progressBar.getValue();
if ((delta * progressBar.getWidth() / (max - min)) > 0)
@@ -447,10 +447,10 @@ public class ProgressMonitor
timestamp = now;
}
}
-
+
/**
* Gets the accessible context.
- *
+ *
* @return the accessible context.
*/
public AccessibleContext getAccessibleContext()
diff --git a/libjava/classpath/javax/swing/ProgressMonitorInputStream.java b/libjava/classpath/javax/swing/ProgressMonitorInputStream.java
index 90e7212..ba98bf6 100644
--- a/libjava/classpath/javax/swing/ProgressMonitorInputStream.java
+++ b/libjava/classpath/javax/swing/ProgressMonitorInputStream.java
@@ -47,8 +47,8 @@ import java.io.IOException;
/**
* An input stream with a {@link ProgressMonitor}.
- *
- * @author Andrew Selkirk
+ *
+ * @author Andrew Selkirk
* @author Robert Schuster (robertschuster@fsfe.org)
* @status updated to 1.2
* @since 1.2
@@ -68,7 +68,7 @@ public class ProgressMonitorInputStream extends FilterInputStream
/**
* Creates a new <code>ProgressMonitorInputStream</code>.
- *
+ *
* @param component the parent component for the progress monitor dialog.
* @param message the task description.
* @param stream the underlying input stream.
@@ -79,7 +79,7 @@ public class ProgressMonitorInputStream extends FilterInputStream
super(stream);
int max = 0;
-
+
try
{
max = stream.available();
@@ -94,7 +94,7 @@ public class ProgressMonitorInputStream extends FilterInputStream
/**
* Resets the input stream to the point where {@link #mark(int)} was called.
- *
+ *
* @exception IOException TODO
*/
public void reset() throws IOException
@@ -108,12 +108,12 @@ public class ProgressMonitorInputStream extends FilterInputStream
}
/**
- * Reads an unsigned byte from the input stream and returns it as an
- * <code>int</code> in the range of 0-255. Returns -1 if the end of the
+ * Reads an unsigned byte from the input stream and returns it as an
+ * <code>int</code> in the range of 0-255. Returns -1 if the end of the
* stream has been reached. The progress monitor is updated.
- *
+ *
* @return int
- *
+ *
* @exception IOException if there is a problem reading the stream.
*/
public int read() throws IOException
@@ -129,14 +129,14 @@ public class ProgressMonitorInputStream extends FilterInputStream
/**
* Reads bytes from the input stream and stores them in the supplied array,
- * and updates the progress monitor (or closes it if the end of the stream
+ * and updates the progress monitor (or closes it if the end of the stream
* is reached).
- *
+ *
* @param data the data array for returning bytes read from the stream.
- *
+ *
* @return The number of bytes read, or -1 if there are no more bytes in the
* stream.
- *
+ *
* @throws IOException if there is a problem reading bytes from the stream.
*/
public int read(byte[] data) throws IOException
@@ -159,17 +159,17 @@ public class ProgressMonitorInputStream extends FilterInputStream
}
/**
- * Reads up to <code>length</code> bytes from the input stream and stores
- * them in the supplied array at the given index, and updates the progress
+ * Reads up to <code>length</code> bytes from the input stream and stores
+ * them in the supplied array at the given index, and updates the progress
* monitor (or closes it if the end of the stream is reached).
*
* @param data the data array for returning bytes read from the stream.
- * @param offset the offset into the array where the bytes should be written.
+ * @param offset the offset into the array where the bytes should be written.
* @param length the maximum number of bytes to read from the stream.
- *
+ *
* @return The number of bytes read, or -1 if there are no more bytes in the
* stream.
- *
+ *
* @throws IOException if there is a problem reading bytes from the stream.
*/
public int read(byte[] data, int offset, int length) throws IOException
@@ -192,13 +192,13 @@ public class ProgressMonitorInputStream extends FilterInputStream
}
/**
- * Skips the specified number of bytes and updates the
+ * Skips the specified number of bytes and updates the
* {@link ProgressMonitor}.
- *
+ *
* @param length the number of bytes to skip.
*
* @return The actual number of bytes skipped.
- *
+ *
* @throws IOException if there is a problem skipping bytes in the stream.
*/
public long skip(long length) throws IOException
@@ -219,7 +219,7 @@ public class ProgressMonitorInputStream extends FilterInputStream
/**
* Closes the input stream and the associated {@link ProgressMonitor}.
- *
+ *
* @throws IOException if there is a problem closing the input stream.
*/
public void close() throws IOException
@@ -230,7 +230,7 @@ public class ProgressMonitorInputStream extends FilterInputStream
/**
* Returns the {@link ProgressMonitor} used by this input stream.
- *
+ *
* @return The progress monitor.
*/
public ProgressMonitor getProgressMonitor()
diff --git a/libjava/classpath/javax/swing/Renderer.java b/libjava/classpath/javax/swing/Renderer.java
index 9a0e81a..4759c5b 100644
--- a/libjava/classpath/javax/swing/Renderer.java
+++ b/libjava/classpath/javax/swing/Renderer.java
@@ -46,7 +46,7 @@ import java.awt.Component;
* javax.swing.tree.TreeCellRenderer}.
*
* @specnote This interface is not used and exists only for compatibility.
- *
+ *
* @author Andrew Selkirk
*/
public interface Renderer
diff --git a/libjava/classpath/javax/swing/RepaintManager.java b/libjava/classpath/javax/swing/RepaintManager.java
index bb88ebf..23c05a2 100644
--- a/libjava/classpath/javax/swing/RepaintManager.java
+++ b/libjava/classpath/javax/swing/RepaintManager.java
@@ -115,7 +115,7 @@ public class RepaintManager
super.dispatch();
}
}
-
+
/**
* The current repaint managers, indexed by their ThreadGroups.
*/
@@ -150,7 +150,7 @@ public class RepaintManager
live = false;
}
- public synchronized void setLive(boolean b)
+ public synchronized void setLive(boolean b)
{
live = b;
}
@@ -178,7 +178,7 @@ public class RepaintManager
}
- /**
+ /**
* A table storing the dirty regions of components. The keys of this
* table are components, the values are rectangles. Each component maps
* to exactly one rectangle. When more regions are marked as dirty on a
@@ -212,7 +212,7 @@ public class RepaintManager
*/
private RepaintWorker repaintWorker;
- /**
+ /**
* The set of components which need revalidation, in the "layout" sense.
* There is no additional information about "what kind of layout" they
* need (as there is with dirty regions), so it is just a vector rather
@@ -224,11 +224,11 @@ public class RepaintManager
*/
private ArrayList invalidComponents;
- /**
+ /**
* Whether or not double buffering is enabled on this repaint
* manager. This is merely a hint to clients; the RepaintManager will
* always return an offscreen buffer when one is requested.
- *
+ *
* @see #isDoubleBufferingEnabled
* @see #setDoubleBufferingEnabled
*/
@@ -478,7 +478,7 @@ public class RepaintManager
dirty = new Rectangle();
return dirty;
}
-
+
/**
* Mark a component as dirty over its entire bounds.
*
@@ -605,7 +605,7 @@ public class RepaintManager
* hierarchy of <code>dirty</code> to find the highest parent that is also
* marked dirty and merges the dirty regions.
*
- * @param dirtyRegions the dirty regions
+ * @param dirtyRegions the dirty regions
* @param dirty the component for which to find the repaint root
* @param roots the list to which new repaint roots get appended
*/
@@ -617,7 +617,7 @@ public class RepaintManager
// This will contain the dirty region in the root coordinate system,
// possibly clipped by ancestor's bounds.
- Rectangle originalDirtyRect = (Rectangle) dirtyRegions.get(dirty);
+ Rectangle originalDirtyRect = (Rectangle) dirtyRegions.get(dirty);
rectCache.setBounds(originalDirtyRect);
// The bounds of the current component.
@@ -631,7 +631,7 @@ public class RepaintManager
if (rectCache.isEmpty())
return;
- // The cumulated offsets.
+ // The cumulated offsets.
int dx = 0;
int dy = 0;
// The actual offset for the found root.
@@ -652,7 +652,7 @@ public class RepaintManager
dy += y;
rectCache.x += x;
rectCache.y += y;
-
+
x = current.getX();
y = current.getY();
w = current.getWidth();
@@ -705,8 +705,8 @@ public class RepaintManager
{
Component root = SwingUtilities.getWindowAncestor(component);
Image buffer = (Image) offscreenBuffers.get(root);
- if (buffer == null
- || buffer.getWidth(null) < proposedWidth
+ if (buffer == null
+ || buffer.getWidth(null) < proposedWidth
|| buffer.getHeight(null) < proposedHeight)
{
int width = Math.max(proposedWidth, root.getWidth());
@@ -733,11 +733,11 @@ public class RepaintManager
{
Component root = comp;
while (root != null
- && ! (root instanceof Window || root instanceof Applet))
+ && ! (root instanceof Window || root instanceof Applet))
{
- x += root.getX();
- y += root.getY();
- root = root.getParent();
+ x += root.getX();
+ y += root.getY();
+ root = root.getParent();
}
if (root != null)
@@ -774,8 +774,8 @@ public class RepaintManager
{
Component root = SwingUtilities.getWindowAncestor(comp);
Image buffer = (Image) offscreenBuffers.get(root);
- if (buffer == null
- || buffer.getWidth(null) < proposedWidth
+ if (buffer == null
+ || buffer.getWidth(null) < proposedWidth
|| buffer.getHeight(null) < proposedHeight
|| !(buffer instanceof VolatileImage))
{
@@ -789,7 +789,7 @@ public class RepaintManager
}
return buffer;
}
-
+
/**
* Get the value of the {@link #doubleBufferMaximumSize} property.
@@ -838,7 +838,7 @@ public class RepaintManager
{
return doubleBufferingEnabled;
}
-
+
public String toString()
{
return "RepaintManager";
diff --git a/libjava/classpath/javax/swing/ScrollPaneLayout.java b/libjava/classpath/javax/swing/ScrollPaneLayout.java
index 2a16f26..fa1743b 100644
--- a/libjava/classpath/javax/swing/ScrollPaneLayout.java
+++ b/libjava/classpath/javax/swing/ScrollPaneLayout.java
@@ -50,15 +50,15 @@ import javax.swing.border.Border;
/**
* ScrollPaneLayout
- * @author Andrew Selkirk
- * @version 1.0
+ * @author Andrew Selkirk
+ * @version 1.0
*/
public class ScrollPaneLayout
implements LayoutManager, ScrollPaneConstants, Serializable
{
private static final long serialVersionUID = -4480022884523193743L;
- public static class UIResource extends ScrollPaneLayout
+ public static class UIResource extends ScrollPaneLayout
implements javax.swing.plaf.UIResource
{
public UIResource()
@@ -81,10 +81,10 @@ public class ScrollPaneLayout
public ScrollPaneLayout()
{
- // Nothing to do here.
+ // Nothing to do here.
}
- public void syncWithScrollPane(JScrollPane scrollPane)
+ public void syncWithScrollPane(JScrollPane scrollPane)
{
viewport = scrollPane.getViewport();
rowHead = scrollPane.getRowHeader();
@@ -96,7 +96,7 @@ public class ScrollPaneLayout
lowerLeft = scrollPane.getCorner(LOWER_LEFT_CORNER);
lowerRight = scrollPane.getCorner(LOWER_RIGHT_CORNER);
upperLeft = scrollPane.getCorner(UPPER_LEFT_CORNER);
- upperRight = scrollPane.getCorner(UPPER_RIGHT_CORNER);
+ upperRight = scrollPane.getCorner(UPPER_RIGHT_CORNER);
}
/**
@@ -108,7 +108,7 @@ public class ScrollPaneLayout
* @return the newComponent
*/
protected Component addSingletonComponent(Component oldComponent,
- Component newComponent)
+ Component newComponent)
{
if (oldComponent != null && oldComponent != newComponent)
oldComponent.getParent().remove(oldComponent);
@@ -116,7 +116,7 @@ public class ScrollPaneLayout
}
/**
- * Add the specified component to the layout.
+ * Add the specified component to the layout.
* @param key must be one of VIEWPORT, VERTICAL_SCROLLBAR,
* HORIZONTAL_SCROLLBAR, ROW_HEADER, COLUMN_HEADER,
* LOWER_RIGHT_CORNER, LOWER_LEFT_CORNER, UPPER_RIGHT_CORNER,
@@ -124,7 +124,7 @@ public class ScrollPaneLayout
* @param component the Component to add
* @throws IllegalArgumentException if key is not as above
*/
- public void addLayoutComponent(String key, Component component)
+ public void addLayoutComponent(String key, Component component)
{
if (key == VIEWPORT)
viewport = (JViewport) component;
@@ -148,7 +148,7 @@ public class ScrollPaneLayout
throw new IllegalArgumentException();
}
- public void removeLayoutComponent(Component component)
+ public void removeLayoutComponent(Component component)
{
if (component == viewport)
viewport = null;
@@ -174,7 +174,7 @@ public class ScrollPaneLayout
{
return vsbPolicy;
}
-
+
/**
* Sets the vertical scrollbar policy.
* @param policy must be one of VERTICAL_SCROLLBAR_AS_NEEDED,
@@ -184,7 +184,7 @@ public class ScrollPaneLayout
*/
public void setVerticalScrollBarPolicy(int policy)
{
- if (policy != VERTICAL_SCROLLBAR_AS_NEEDED &&
+ if (policy != VERTICAL_SCROLLBAR_AS_NEEDED &&
policy != VERTICAL_SCROLLBAR_NEVER &&
policy != VERTICAL_SCROLLBAR_ALWAYS)
throw new IllegalArgumentException("Illegal Scrollbar Policy");
@@ -200,12 +200,12 @@ public class ScrollPaneLayout
* Sets the horizontal scrollbar policy.
* @param policy must be one of HORIZONTAL_SCROLLBAR_AS_NEEDED,
* HORIZONTAL_SCROLLBAR_NEVER, HORIZONTAL_SCROLLBAR_ALWAYS.
- * @throws IllegalArgumentException if policy is not one of the valid
+ * @throws IllegalArgumentException if policy is not one of the valid
* JScrollbar policies.
*/
public void setHorizontalScrollBarPolicy(int policy)
{
- if (policy != HORIZONTAL_SCROLLBAR_AS_NEEDED &&
+ if (policy != HORIZONTAL_SCROLLBAR_AS_NEEDED &&
policy != HORIZONTAL_SCROLLBAR_NEVER &&
policy != HORIZONTAL_SCROLLBAR_ALWAYS)
throw new IllegalArgumentException("Illegal Scrollbar Policy");
@@ -256,7 +256,7 @@ public class ScrollPaneLayout
return null;
}
- public Dimension preferredLayoutSize(Container parent)
+ public Dimension preferredLayoutSize(Container parent)
{
// Sun's implementation simply throws a ClassCastException if
// parent is no JScrollPane, so do we.
@@ -343,7 +343,7 @@ public class ScrollPaneLayout
* | c3 | h scrollbar | c4 |
* +----+--------------------+----+ y4
* x1 x2 x3 x4
- *
+ *
*/
public void layoutContainer(Container parent)
{
@@ -352,11 +352,11 @@ public class ScrollPaneLayout
JScrollPane sc = (JScrollPane) parent;
JViewport viewport = sc.getViewport();
Component view = viewport.getView();
-
+
// If there is no view in the viewport, there is no work to be done.
if (view == null)
return;
-
+
Dimension viewSize = viewport.getView().getPreferredSize();
int x1 = 0, x2 = 0, x3 = 0, x4 = 0;
@@ -388,43 +388,43 @@ public class ScrollPaneLayout
int vsbPolicy = sc.getVerticalScrollBarPolicy();
int hsbPolicy = sc.getHorizontalScrollBarPolicy();
-
+
int vsWidth = 0;
int hsHeight = 0;
- boolean showVsb =
+ boolean showVsb =
(vsb != null)
&& ((vsbPolicy == VERTICAL_SCROLLBAR_ALWAYS)
- || (vsbPolicy == VERTICAL_SCROLLBAR_AS_NEEDED
+ || (vsbPolicy == VERTICAL_SCROLLBAR_AS_NEEDED
&& viewSize.height > (y4 - y2)));
-
+
if (showVsb)
vsWidth = vsb.getPreferredSize().width;
-
+
// The horizontal scroll bar may become necessary if the vertical scroll
// bar appears, reducing the space, left for the component.
-
- boolean showHsb =
+
+ boolean showHsb =
(hsb != null)
&& ((hsbPolicy == HORIZONTAL_SCROLLBAR_ALWAYS)
- || (hsbPolicy == HORIZONTAL_SCROLLBAR_AS_NEEDED
+ || (hsbPolicy == HORIZONTAL_SCROLLBAR_AS_NEEDED
&& viewSize.width > (x4 - x2 - vsWidth)));
-
+
if (showHsb)
hsHeight = hsb.getPreferredSize().height;
-
+
// If the horizontal scroll bar appears, and the vertical scroll bar
// was not necessary assuming that there is no horizontal scroll bar,
// the vertical scroll bar may become necessary because the horizontal
// scroll bar reduces the vertical space for the component.
if (!showVsb)
{
- showVsb =
+ showVsb =
(vsb != null)
&& ((vsbPolicy == VERTICAL_SCROLLBAR_ALWAYS)
- || (vsbPolicy == VERTICAL_SCROLLBAR_AS_NEEDED
+ || (vsbPolicy == VERTICAL_SCROLLBAR_AS_NEEDED
&& viewSize.height > (y4 - y2)));
-
+
if (showVsb)
vsWidth = vsb.getPreferredSize().width;
}
@@ -482,7 +482,7 @@ public class ScrollPaneLayout
* @deprecated As of Swing 1.1 replaced by
* {@link javax.swing.JScrollPane#getViewportBorderBounds}.
*/
- public Rectangle getViewportBorderBounds(JScrollPane scrollPane)
+ public Rectangle getViewportBorderBounds(JScrollPane scrollPane)
{
return null;
}
diff --git a/libjava/classpath/javax/swing/Scrollable.java b/libjava/classpath/javax/swing/Scrollable.java
index 396d530..26fae24 100644
--- a/libjava/classpath/javax/swing/Scrollable.java
+++ b/libjava/classpath/javax/swing/Scrollable.java
@@ -1,4 +1,4 @@
-/* Scrollable.java --
+/* Scrollable.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -54,14 +54,14 @@ public interface Scrollable
* Return the preferred scrolling amount (in pixels) for the given
* scrolling direction and orientation when scrolling in small amounts
* like table lines.
- *
- * @param visibleRect the currently visible part of the component.
+ *
+ * @param visibleRect the currently visible part of the component.
* @param orientation the scrolling orientation
* @param direction the scrolling direction (negative - up, positive -down).
- * The values greater than one means that more mouse wheel or similar
+ * The values greater than one means that more mouse wheel or similar
* events were generated, and hence it is better to scroll the longer
* distance.
- *
+ *
* @return the preferred scrolling distance, negative if up or left.
*/
int getScrollableUnitIncrement(Rectangle visibleRect, int orientation,
@@ -71,15 +71,15 @@ public interface Scrollable
* Return the preferred scrolling amount (in pixels) for the given
* scrolling direction and orientation when scrolling in large amounts
* (pages).
- *
- * @param visibleRect the currently visible part of the component.
+ *
+ * @param visibleRect the currently visible part of the component.
* @param orientation the scrolling orientation
* @param direction the scrolling direction (negative - up, positive -down).
- * The values greater than one means that more mouse wheel or similar
+ * The values greater than one means that more mouse wheel or similar
* events were generated, and hence it is better to scroll the longer
* distance.
- *
- * @return the preferred scrolling distance, negative if up or left.
+ *
+ * @return the preferred scrolling distance, negative if up or left.
*/
int getScrollableBlockIncrement(Rectangle visibleRect, int orientation,
int direction);
@@ -89,7 +89,7 @@ public interface Scrollable
* view, where it is displayed, width (for instance, the text area with
* the word wrap). In such case, the horizontal scrolling should not be
* performed.
- *
+ *
* @return true is no horizontal scrolling is assumed, faster otherwise.
*/
boolean getScrollableTracksViewportWidth();
@@ -98,7 +98,7 @@ public interface Scrollable
* Return true if the height of the scrollable is always equal to the view,
* where it is displayed, height.In such case, the vertical scrolling should
* not be performed.
- *
+ *
* @return true is no horizontal scrolling is assumed, faster otherwise.
*/
boolean getScrollableTracksViewportHeight();
diff --git a/libjava/classpath/javax/swing/SingleSelectionModel.java b/libjava/classpath/javax/swing/SingleSelectionModel.java
index 9f33e33..2a76ff3 100644
--- a/libjava/classpath/javax/swing/SingleSelectionModel.java
+++ b/libjava/classpath/javax/swing/SingleSelectionModel.java
@@ -51,19 +51,19 @@ public interface SingleSelectionModel
{
/**
* Returns the selected index or <code>-1</code> if there is no selection.
- *
+ *
* @return The selected index.
- *
+ *
* @see #setSelectedIndex(int)
*/
int getSelectedIndex();
/**
- * Sets the selected index and, if this is different to the previous
+ * Sets the selected index and, if this is different to the previous
* selection, sends a {@link ChangeEvent} to all registered listeners.
- *
+ *
* @param index the index (use <code>-1</code> to represent no selection).
- *
+ *
* @see #getSelectedIndex()
* @see #clearSelection
*/
@@ -72,14 +72,14 @@ public interface SingleSelectionModel
/**
* Clears the selection by setting the selected index to <code>-1</code> and
* sends a {@link ChangeEvent} to all registered listeners. If the selected
- * index is already <code>-1</code>, this method does nothing.
+ * index is already <code>-1</code>, this method does nothing.
*/
void clearSelection();
/**
* Returns <code>true</code> if there is a selection, and <code>false</code>
- * otherwise.
- *
+ * otherwise.
+ *
* @return A boolean.
*/
boolean isSelected();
diff --git a/libjava/classpath/javax/swing/SizeRequirements.java b/libjava/classpath/javax/swing/SizeRequirements.java
index b9b5c32..1ee0e28 100644
--- a/libjava/classpath/javax/swing/SizeRequirements.java
+++ b/libjava/classpath/javax/swing/SizeRequirements.java
@@ -386,7 +386,7 @@ public class SizeRequirements implements Serializable
*
* The components are tiled in the forward direction, beginning with
* an offset of 0.
- *
+ *
* @param allocated the amount of allocated space
* @param total the total size requirements of the components
* @param children the size requirement of each component
diff --git a/libjava/classpath/javax/swing/SizeSequence.java b/libjava/classpath/javax/swing/SizeSequence.java
index cb6c8bc..69c7366 100644
--- a/libjava/classpath/javax/swing/SizeSequence.java
+++ b/libjava/classpath/javax/swing/SizeSequence.java
@@ -40,17 +40,17 @@ package javax.swing;
import java.util.Arrays;
/**
- * A sequence of values that represent the dimensions (widths or heights) of
+ * A sequence of values that represent the dimensions (widths or heights) of
* some collection of items (for example, the widths of the columns in a table).
- *
- * @author Andrew Selkirk
+ *
+ * @author Andrew Selkirk
*/
public class SizeSequence
{
// TODO: Sun's API specification for this class contains an implementation
// note regarding the encoding for the element sizes. We currently use the
// simple size encoding but we should look at improving this.
-
+
/** Storage for the element sizes. */
private int[] sizes;
@@ -63,9 +63,9 @@ public class SizeSequence
}
/**
- * Creates a new <code>SizeSequence</code> instance with the specified number
+ * Creates a new <code>SizeSequence</code> instance with the specified number
* of elements, each having a size of 0.
- *
+ *
* @param numEntries the number of elements.
*/
public SizeSequence(int numEntries)
@@ -76,7 +76,7 @@ public class SizeSequence
/**
* Creates a new <code>SizeSequence</code> instance with the specified number
* of elements all having the same size (<code>value</code>).
- *
+ *
* @param numEntries the number of elements.
* @param value the value for each element.
*/
@@ -87,9 +87,9 @@ public class SizeSequence
}
/**
- * Creates a new <code>SizeSequence</code> instance using the specified
+ * Creates a new <code>SizeSequence</code> instance using the specified
* element sizes.
- *
+ *
* @param sizes the element sizes (<code>null</code> not permitted).
*/
public SizeSequence(int[] sizes)
@@ -99,7 +99,7 @@ public class SizeSequence
/**
* Sets the size of the element at the specified index.
- *
+ *
* @param index the index.
* @param size the size.
*/
@@ -111,16 +111,16 @@ public class SizeSequence
/**
* Returns the index of the element that contains the specified position.
- *
+ *
* @param position the position.
- *
+ *
* @return The index of the element that contains the specified position.
*/
public int getIndex(int position)
{
int i = 0;
- int runningTotal = 0;
- while (i < sizes.length && position >= runningTotal + sizes[i])
+ int runningTotal = 0;
+ while (i < sizes.length && position >= runningTotal + sizes[i])
{
runningTotal += sizes[i];
i++;
@@ -131,9 +131,9 @@ public class SizeSequence
/**
* Returns the size of the specified element, or 0 if the element index is
* outside the defined range.
- *
+ *
* @param index the element index.
- *
+ *
* @return The size of the specified element, or 0 if the element index is
* outside the defined range.
*/
@@ -146,7 +146,7 @@ public class SizeSequence
/**
* Sets the sizes for the elements in the sequence.
- *
+ *
* @param sizes the element sizes (<code>null</code> not permitted).
*/
public void setSizes(int[] sizes)
@@ -156,7 +156,7 @@ public class SizeSequence
/**
* Returns an array containing the sizes for all the elements in the sequence.
- *
+ *
* @return The element sizes.
*/
public int[] getSizes()
@@ -166,9 +166,9 @@ public class SizeSequence
/**
* Returns the position of the specified element.
- *
+ *
* @param index the element index.
- *
+ *
* @return The position.
*/
public int getPosition(int index)
@@ -186,7 +186,7 @@ public class SizeSequence
* Inserts new entries into the sequence at the <code>start</code> position.
* There are <code>length</code> new entries each having the specified
* <code>value</code>.
- *
+ *
* @param start the start element.
* @param length the number of elements to insert.
* @param value the size for each of the new elements.
@@ -197,7 +197,7 @@ public class SizeSequence
System.arraycopy(sizes, 0, newSizes, 0, start);
for (int i = start; i < start + length; i++)
newSizes[i] = value;
- System.arraycopy(sizes, start, newSizes, start + length,
+ System.arraycopy(sizes, start, newSizes, start + length,
sizes.length - start);
sizes = newSizes;
}
@@ -205,7 +205,7 @@ public class SizeSequence
/**
* Removes the element(s) at index <code>start</code> (the number of elements
* removed is <code>length</code>).
- *
+ *
* @param start the index of the first element to remove.
* @param length the number of elements to remove.
*/
@@ -218,7 +218,7 @@ public class SizeSequence
int[] newSizes = new int[sizes.length - length];
System.arraycopy(sizes, 0, newSizes, 0, start);
- System.arraycopy(sizes, start + length, newSizes, start,
+ System.arraycopy(sizes, start + length, newSizes, start,
sizes.length - start - length);
sizes = newSizes;
}
diff --git a/libjava/classpath/javax/swing/SortingFocusTraversalPolicy.java b/libjava/classpath/javax/swing/SortingFocusTraversalPolicy.java
index d14ee1d3..3c07dbd 100644
--- a/libjava/classpath/javax/swing/SortingFocusTraversalPolicy.java
+++ b/libjava/classpath/javax/swing/SortingFocusTraversalPolicy.java
@@ -47,10 +47,10 @@ import java.util.TreeSet;
/**
* @author Graydon Hoare
* @author Michael Koch
- *
+ *
* @since 1.4
*/
-public class SortingFocusTraversalPolicy
+public class SortingFocusTraversalPolicy
extends InternalFrameFocusTraversalPolicy
{
/**
@@ -75,7 +75,7 @@ public class SortingFocusTraversalPolicy
* @see #getImplicitDownCycleTraversal()
*/
boolean implicitDownCycleTraversal = true;
-
+
/**
* Creates a new <code>SortingFocusTraversalPolicy</code> with no
* comparator set.
@@ -97,7 +97,7 @@ public class SortingFocusTraversalPolicy
}
/**
- * Decide whether a component is an acceptable focus owner.
+ * Decide whether a component is an acceptable focus owner.
*
* @param comp The component which is a candidate for focus ownership.
*
@@ -107,16 +107,16 @@ public class SortingFocusTraversalPolicy
protected boolean accept(Component comp)
{
return (comp.isVisible()
- && comp.isDisplayable()
- && comp.isEnabled()
- && comp.isFocusable());
+ && comp.isDisplayable()
+ && comp.isEnabled()
+ && comp.isFocusable());
}
/**
* Get the current value of the {@link #comparator} property.
*
* @return the current value of the property
- *
+ *
* @see #setComparator
*/
protected Comparator<? super Component> getComparator()
@@ -128,7 +128,7 @@ public class SortingFocusTraversalPolicy
* Set the current value of the {@link #comparator} property.
*
* @param comparator the new value of the property
- *
+ *
* @see #getComparator
*/
protected void setComparator(Comparator<? super Component> comparator)
@@ -139,11 +139,11 @@ public class SortingFocusTraversalPolicy
private TreeSet getSortedCycle(Container root, TreeSet set)
{
if (set == null)
- set = (getComparator() == null
+ set = (getComparator() == null
? new TreeSet()
: new TreeSet(getComparator()));
-
- if (root != null)
+
+ if (root != null)
{
Component[] comps = root.getComponents();
for (int i = 0; i < comps.length; ++i)
@@ -168,23 +168,23 @@ public class SortingFocusTraversalPolicy
* <code>comp</code> is a focus cycle root, an "implicit DownCycle"
* occurs and the method returns the
* <code>getDefaultComponent(comp)</code>.
- *
+ *
* @param root the focus cycle root to search for a successor within
* @param comp the component to search for the successor of
*
* @return the component following the specified component under
* the specified root, or null if no such component is found
- *
+ *
* @throws IllegalArgumentException if either argument is null, or
* if the root is not a focus cycle root of the component
*/
- public Component getComponentAfter(Container root,
+ public Component getComponentAfter(Container root,
Component comp)
{
if (comp == null || root == null || !comp.isFocusCycleRoot(root))
throw new IllegalArgumentException();
- if (getImplicitDownCycleTraversal()
+ if (getImplicitDownCycleTraversal()
&& comp instanceof Container
&& ((Container)comp).isFocusCycleRoot())
{
@@ -212,17 +212,17 @@ public class SortingFocusTraversalPolicy
* focus cycle, relative to the order imposed by {@link
* #comparator}. Candidate components are only considered if they are
* accepted by the {@link #accept} method.
- *
+ *
* @param root the focus cycle root to search for a predecessor within
* @param comp the component to search for the predecessor of
*
* @return the component preceding the specified component under the
* specified root, or null if no such component is found
- *
+ *
* @throws IllegalArgumentException if either argument is null, or
* if the root is not a focus cycle root of the component
*/
- public Component getComponentBefore(Container root,
+ public Component getComponentBefore(Container root,
Component comp)
{
if (comp == null || root == null || !comp.isFocusCycleRoot(root))
@@ -256,7 +256,7 @@ public class SortingFocusTraversalPolicy
return getFirstComponent(root);
}
- /**
+ /**
* Return the first focusable component of the focus cycle root
* <code>comp</code> under the ordering imposed by the {@link
* #comparator} property. Candidate components are only considered if
@@ -279,8 +279,8 @@ public class SortingFocusTraversalPolicy
return (Component) i.next();
return null;
}
-
- /**
+
+ /**
* Return the last focusable component of the focus cycle root
* <code>comp</code> under the ordering imposed by the {@link
* #comparator} property. Candidate components are only considered if
@@ -310,7 +310,7 @@ public class SortingFocusTraversalPolicy
* property.
*
* @return the current value of the property
- *
+ *
* @see #setImplicitDownCycleTraversal
*/
public boolean getImplicitDownCycleTraversal()
@@ -323,7 +323,7 @@ public class SortingFocusTraversalPolicy
* property.
*
* @param down the new value of the property
- *
+ *
* @see #getImplicitDownCycleTraversal
*/
public void setImplicitDownCycleTraversal(boolean down)
diff --git a/libjava/classpath/javax/swing/SpinnerDateModel.java b/libjava/classpath/javax/swing/SpinnerDateModel.java
index e5ff76f..f0e9d1e 100644
--- a/libjava/classpath/javax/swing/SpinnerDateModel.java
+++ b/libjava/classpath/javax/swing/SpinnerDateModel.java
@@ -45,8 +45,8 @@ import java.util.Date;
import javax.swing.event.ChangeEvent;
/**
- * A date model used by the {@link JSpinner} component. This implements a
- * spinner model for dates, rotating a calendar field such as month, year,
+ * A date model used by the {@link JSpinner} component. This implements a
+ * spinner model for dates, rotating a calendar field such as month, year,
* day, week, hour, minute.
*
* @author Sven de Marothy
@@ -57,21 +57,21 @@ public class SpinnerDateModel extends AbstractSpinnerModel
{
/** The current date. */
private Calendar date;
-
- /**
- * A constraint on the start or earliest permitted date (<code>null</code>
- * for no minimum).
+
+ /**
+ * A constraint on the start or earliest permitted date (<code>null</code>
+ * for no minimum).
*/
private Comparable start;
- /**
- * A constraint on the end or latest permitted date (<code>null</code> for no
- * maximum).
+ /**
+ * A constraint on the end or latest permitted date (<code>null</code> for no
+ * maximum).
*/
private Comparable end;
-
+
/**
- * The calendar field used to calculate the previous or next date.
+ * The calendar field used to calculate the previous or next date.
*/
private int calendarField;
@@ -82,7 +82,7 @@ public class SpinnerDateModel extends AbstractSpinnerModel
/**
* Constructs a <code>SpinnerDateModel</code> using the current date,
- * no start or end limit, and {@link Calendar#DAY_OF_MONTH} as the calendar
+ * no start or end limit, and {@link Calendar#DAY_OF_MONTH} as the calendar
* field.
*/
public SpinnerDateModel()
@@ -92,15 +92,15 @@ public class SpinnerDateModel extends AbstractSpinnerModel
/**
* Constructs a <code>SpinnerDateModel</code> with the specified value, lower
- * and upper bounds, and which spins the specified calendar field.
+ * and upper bounds, and which spins the specified calendar field.
* <p>
* The <code>start</code> and <code>end</code> limits must have a
* <code>compareTo</code> method that supports instances of {@link Date}, but
* do not themselves need to be instances of {@link Date} (although typically
* they are).
- *
+ *
* @param value the initial value/date (<code>null</code> not permitted).
- * @param start a constraint that specifies the earliest permitted date
+ * @param start a constraint that specifies the earliest permitted date
* value, or <code>null</code> for no lower limit.
* @param end a constraint that specifies the latest permitted date value,
* or <code>null</code> for no upper limit.
@@ -110,7 +110,7 @@ public class SpinnerDateModel extends AbstractSpinnerModel
public SpinnerDateModel(Date value, Comparable start, Comparable end,
int calendarField)
{
- if (value == null)
+ if (value == null)
throw new IllegalArgumentException("Null 'value' argument.");
if (start != null && start.compareTo(value) > 0)
throw new IllegalArgumentException("Require value on or after start.");
@@ -124,9 +124,9 @@ public class SpinnerDateModel extends AbstractSpinnerModel
}
/**
- * Returns the {@link Calendar} field used to calculate the previous and
+ * Returns the {@link Calendar} field used to calculate the previous and
* next dates in the sequence.
- *
+ *
* @return The date field code.
*/
public int getCalendarField()
@@ -136,9 +136,9 @@ public class SpinnerDateModel extends AbstractSpinnerModel
/**
* Returns the current date/time.
- *
+ *
* @return The current date/time (never <code>null</code>).
- *
+ *
* @see #getValue()
*/
public Date getDate()
@@ -147,11 +147,11 @@ public class SpinnerDateModel extends AbstractSpinnerModel
}
/**
- * Returns the lower limit on the date/time value, or <code>null</code> if
+ * Returns the lower limit on the date/time value, or <code>null</code> if
* there is no minimum date/time.
- *
+ *
* @return The lower limit.
- *
+ *
* @see #setStart(Comparable)
*/
public Comparable getStart()
@@ -160,11 +160,11 @@ public class SpinnerDateModel extends AbstractSpinnerModel
}
/**
- * Returns the upper limit on the date/time value, or <code>null</code> if
+ * Returns the upper limit on the date/time value, or <code>null</code> if
* there is no maximum date/time.
- *
+ *
* @return The upper limit.
- *
+ *
* @see #setEnd(Comparable)
*/
public Comparable getEnd()
@@ -173,9 +173,9 @@ public class SpinnerDateModel extends AbstractSpinnerModel
}
/**
- * Returns the current date in the sequence (this method returns the same as
+ * Returns the current date in the sequence (this method returns the same as
* {@link #getDate()}).
- *
+ *
* @return The current date (never <code>null</code>).
*/
public Object getValue()
@@ -185,12 +185,12 @@ public class SpinnerDateModel extends AbstractSpinnerModel
/**
* Returns the next date in the sequence, or <code>null</code> if the
- * next date is past the upper limit (if one is specified). The current date
+ * next date is past the upper limit (if one is specified). The current date
* is not changed.
- *
+ *
* @return The next date, or <code>null</code> if the current value is
* the latest date represented by the model.
- *
+ *
* @see #getEnd()
*/
public Object getNextValue()
@@ -207,12 +207,12 @@ public class SpinnerDateModel extends AbstractSpinnerModel
/**
* Returns the previous date in the sequence, or <code>null</code> if the
- * previous date is prior to the lower limit (if one is specified). The
+ * previous date is prior to the lower limit (if one is specified). The
* current date is not changed.
- *
+ *
* @return The previous date, or <code>null</code> if the current value is
* the earliest date represented by the model.
- *
+ *
* @see #getStart()
*/
public Object getPreviousValue()
@@ -228,13 +228,13 @@ public class SpinnerDateModel extends AbstractSpinnerModel
}
/**
- * Sets the date field to change when calculating the next and previous
- * values. It must be a valid {@link Calendar} field, excluding
+ * Sets the date field to change when calculating the next and previous
+ * values. It must be a valid {@link Calendar} field, excluding
* {@link Calendar#ZONE_OFFSET} and {@link Calendar#DST_OFFSET}.
- *
+ *
* @param calendarField the calendar field to set.
- *
- * @throws IllegalArgumentException if <code>calendarField</code> is not
+ *
+ * @throws IllegalArgumentException if <code>calendarField</code> is not
* a valid code.
*/
public void setCalendarField(int calendarField)
@@ -252,15 +252,15 @@ public class SpinnerDateModel extends AbstractSpinnerModel
}
/**
- * Sets the lower limit for the date/time value and, if the new limit is
- * different to the old limit, sends a {@link ChangeEvent} to all registered
- * listeners. A <code>null</code> value is interpreted as "no lower limit".
- * No check is made to ensure that the current date/time is on or after the
- * new lower limit - the caller is responsible for ensuring that this
+ * Sets the lower limit for the date/time value and, if the new limit is
+ * different to the old limit, sends a {@link ChangeEvent} to all registered
+ * listeners. A <code>null</code> value is interpreted as "no lower limit".
+ * No check is made to ensure that the current date/time is on or after the
+ * new lower limit - the caller is responsible for ensuring that this
* relationship holds. In addition, the caller should ensure that
* <code>start</code> is {@link Serializable}.
- *
- * @param start the new lower limit for the date/time value
+ *
+ * @param start the new lower limit for the date/time value
* (<code>null</code> permitted).
*/
public void setStart(Comparable start)
@@ -273,14 +273,14 @@ public class SpinnerDateModel extends AbstractSpinnerModel
}
/**
- * Sets the upper limit for the date/time value and, if the new limit is
- * different to the old limit, sends a {@link ChangeEvent} to all registered
- * listeners. A <code>null</code> value is interpreted as "no upper limit".
- * No check is made to ensure that the current date/time is on or before the
- * new upper limit - the caller is responsible for ensuring that this
+ * Sets the upper limit for the date/time value and, if the new limit is
+ * different to the old limit, sends a {@link ChangeEvent} to all registered
+ * listeners. A <code>null</code> value is interpreted as "no upper limit".
+ * No check is made to ensure that the current date/time is on or before the
+ * new upper limit - the caller is responsible for ensuring that this
* relationship holds. In addition, the caller should ensure that
* <code>end</code> is {@link Serializable}.
- *
+ *
* @param end the new upper limit for the date/time value (<code>null</code>
* permitted).
*/
@@ -297,18 +297,18 @@ public class SpinnerDateModel extends AbstractSpinnerModel
* Sets the current date and, if the new value is different to the old
* value, sends a {@link ChangeEvent} to all registered listeners.
*
- * @param value the new date (<code>null</code> not permitted, must be an
+ * @param value the new date (<code>null</code> not permitted, must be an
* instance of <code>Date</code>).
- *
- * @throws IllegalArgumentException if <code>value</code> is not an instance
+ *
+ * @throws IllegalArgumentException if <code>value</code> is not an instance
* of <code>Date</code>.
*/
public void setValue(Object value)
{
if (! (value instanceof Date) || value == null)
throw new IllegalArgumentException("Value not a date.");
-
- if (!date.getTime().equals(value))
+
+ if (!date.getTime().equals(value))
{
date.setTime((Date) value);
fireStateChanged();
diff --git a/libjava/classpath/javax/swing/SpinnerListModel.java b/libjava/classpath/javax/swing/SpinnerListModel.java
index 52ac360..de4926a 100644
--- a/libjava/classpath/javax/swing/SpinnerListModel.java
+++ b/libjava/classpath/javax/swing/SpinnerListModel.java
@@ -111,13 +111,13 @@ public class SpinnerListModel extends AbstractSpinnerModel
* to <code>getValue()</code> returns the same as <code>list.get(0)</code>.
*
* @param list The list to use for this model.
- *
+ *
* @throws IllegalArgumentException if the list is null or contains no
* elements.
*
* @see SpinnerListModel#getNextValue()
* @see SpinnerListModel#getValue()
- */
+ */
public SpinnerListModel(List<?> list)
{
// Retain a reference to the valid list.
@@ -151,9 +151,9 @@ public class SpinnerListModel extends AbstractSpinnerModel
throw new IllegalArgumentException("The supplied array was invalid.");
}
- // Retain a reference to a wrapper around the valid array.
- // The array, in list form, will be tested again here, but we can't really
- // avoid this -- a null value to Arrays.asList will throw a
+ // Retain a reference to a wrapper around the valid array.
+ // The array, in list form, will be tested again here, but we can't really
+ // avoid this -- a null value to Arrays.asList will throw a
// NullPointerException.
setList(Arrays.asList(array));
}
@@ -167,7 +167,7 @@ public class SpinnerListModel extends AbstractSpinnerModel
{
return list;
}
-
+
/**
* Returns the next value from the list, which is the same as the element
* stored at the current index + 1. Null is returned if there are no more
@@ -200,10 +200,10 @@ public class SpinnerListModel extends AbstractSpinnerModel
public Object getPreviousValue()
{
// Check for a previous value.
- if (index > 0)
+ if (index > 0)
// Return the element at the previous position.
return list.get(index - 1);
- else
+ else
// Return null as this is the start of the list.
return null;
}
@@ -266,7 +266,7 @@ public class SpinnerListModel extends AbstractSpinnerModel
* the backing list. Listeners are notified of this change.
* Following the change, <code>getNextValue()</code> and
* <code>getPreviousValue()</code> return the objects following
- * and prior to the supplied value, respectively.
+ * and prior to the supplied value, respectively.
*
* @param value The requested new value of the list.
*
diff --git a/libjava/classpath/javax/swing/SpinnerModel.java b/libjava/classpath/javax/swing/SpinnerModel.java
index 4ad962b..6cab34d 100644
--- a/libjava/classpath/javax/swing/SpinnerModel.java
+++ b/libjava/classpath/javax/swing/SpinnerModel.java
@@ -1,4 +1,4 @@
-/* SpinnerModel.java --
+/* SpinnerModel.java --
Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -107,5 +107,5 @@ public interface SpinnerModel
* @param listener The listener to remove.
*/
void removeChangeListener(ChangeListener listener);
-
+
}
diff --git a/libjava/classpath/javax/swing/SpinnerNumberModel.java b/libjava/classpath/javax/swing/SpinnerNumberModel.java
index 1abbbe3..af3fea6 100644
--- a/libjava/classpath/javax/swing/SpinnerNumberModel.java
+++ b/libjava/classpath/javax/swing/SpinnerNumberModel.java
@@ -83,7 +83,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
* @param minimum the minimum value
* @param maximum the maximum value
* @param stepSize the step size
- * @throws IllegalArgumentException if minimum &lt;= value &lt;= maximum does
+ * @throws IllegalArgumentException if minimum &lt;= value &lt;= maximum does
* not hold.
*/
public SpinnerNumberModel(double value, double minimum, double maximum,
@@ -100,7 +100,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
* @param minimum the minimum value
* @param maximum the maximum value
* @param stepSize the step size
- * @throws IllegalArgumentException if minimum &lt;= value &lt;= maximum does
+ * @throws IllegalArgumentException if minimum &lt;= value &lt;= maximum does
* not hold.
*/
public SpinnerNumberModel(int value, int minimum, int maximum, int stepSize)
@@ -111,7 +111,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
/**
* Creates a <code>SpinnerNumberModel</code> with the given attributes. The
- * caller should ensure that both <code>minimum</code> and
+ * caller should ensure that both <code>minimum</code> and
* <code>maximum</code> are serializable.
*
* @param value the initial value (<code>null</code> not permitted).
@@ -121,9 +121,9 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
*
* @throws IllegalArgumentException if minimum &lt;= value &lt;= maximum
* does not hold
- * @throws IllegalArgumentException if <code>value</code> is
+ * @throws IllegalArgumentException if <code>value</code> is
* <code>null</code>.
- * @throws IllegalArgumentException if <code>stepSize</code> is
+ * @throws IllegalArgumentException if <code>stepSize</code> is
* <code>null</code>.
*/
public SpinnerNumberModel(Number value, Comparable minimum,
@@ -165,7 +165,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
if (! (value instanceof Number))
throw new IllegalArgumentException("value must be a Number");
- if (!this.value.equals(value))
+ if (!this.value.equals(value))
{
this.value = (Number) value;
fireStateChanged();
@@ -177,7 +177,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
* {@link Number}.
*
* @return The current value.
- *
+ *
* @see #getNumber()
*/
public Object getValue()
@@ -187,10 +187,10 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
/**
* Returns the next value, or <code>null</code> if adding the step size to
- * the current value results in a value greater than the maximum value.
+ * the current value results in a value greater than the maximum value.
* The current value is not changed.
*
- * @return The next value, or <code>null</code> if the current value is the
+ * @return The next value, or <code>null</code> if the current value is the
* maximum value represented by this model.
*/
public Object getNextValue()
@@ -209,11 +209,11 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
num = new Short((short) (value.shortValue() + stepSize.shortValue()));
else
num = new Byte((byte) (value.byteValue() + stepSize.byteValue()));
-
+
// check upper bound if set
if ((maximum != null) && maximum.compareTo(num) < 0)
num = null;
-
+
return num;
}
@@ -241,7 +241,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
num = new Short((short) (value.shortValue() - stepSize.shortValue()));
else
num = new Byte((byte) (value.byteValue() - stepSize.byteValue()));
-
+
// check lower bound if set
if ((minimum != null) && minimum.compareTo(num) > 0)
num = null;
@@ -261,9 +261,9 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
/**
* Returns the minimum value, or <code>null</code> if there is no minimum.
- *
+ *
* @return The minimum value.
- *
+ *
* @see #setMinimum(Comparable)
*/
public Comparable getMinimum()
@@ -273,15 +273,15 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
/**
* Sets the minimum value and, if the new value is different to the old
- * value, sends a {@link ChangeEvent} to all registered listeners. A
+ * value, sends a {@link ChangeEvent} to all registered listeners. A
* <code>null</code> value is interpreted as "no minimum value". No check
- * is made to ensure that the new minimum is less than or equal to the
- * current value, the caller is responsible for ensuring that this
+ * is made to ensure that the new minimum is less than or equal to the
+ * current value, the caller is responsible for ensuring that this
* relationship holds. In addition, the caller should ensure that
* <code>newMinimum</code> is {@link Serializable}.
- *
+ *
* @param newMinimum the new minimum value (<code>null</code> permitted).
- *
+ *
* @see #getMinimum()
*/
public void setMinimum(Comparable newMinimum)
@@ -295,9 +295,9 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
/**
* Returns the maximum value, or <code>null</code> if there is no maximum.
- *
+ *
* @return The maximum value.
- *
+ *
* @see #getMinimum()
* @see #setMaximum(Comparable)
*/
@@ -308,15 +308,15 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
/**
* Sets the maximum value and, if the new value is different to the old
- * value, sends a {@link ChangeEvent} to all registered listeners. A
+ * value, sends a {@link ChangeEvent} to all registered listeners. A
* <code>null</code> value is interpreted as "no maximum value". No check
- * is made to ensure that the new maximum is greater than or equal to the
- * current value, the caller is responsible for ensuring that this
+ * is made to ensure that the new maximum is greater than or equal to the
+ * current value, the caller is responsible for ensuring that this
* relationship holds. In addition, the caller should ensure that
* <code>newMaximum</code> is {@link Serializable}.
- *
+ *
* @param newMaximum the new maximum (<code>null</code> permitted).
- *
+ *
* @see #getMaximum()
*/
public void setMaximum(Comparable newMaximum)
@@ -330,7 +330,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
/**
* Returns the step size.
- *
+ *
* @return The step size (never <code>null</code>).
*/
public Number getStepSize()
@@ -341,10 +341,10 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
/**
* Sets the step size and, if the new step size is different to the old
* step size, sends a {@link ChangeEvent} to all registered listeners.
- *
+ *
* @param newStepSize the new step size (<code>null</code> not permitted).
- *
- * @throws IllegalArgumentException if <code>newStepSize</code> is
+ *
+ * @throws IllegalArgumentException if <code>newStepSize</code> is
* <code>null</code>.
*/
public void setStepSize(Number newStepSize)
diff --git a/libjava/classpath/javax/swing/Spring.java b/libjava/classpath/javax/swing/Spring.java
index 4775259..4cc06e5 100644
--- a/libjava/classpath/javax/swing/Spring.java
+++ b/libjava/classpath/javax/swing/Spring.java
@@ -1,4 +1,4 @@
-/* Spring.java --
+/* Spring.java --
Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -156,12 +156,12 @@ public abstract class Spring
*/
public abstract void setValue(int value);
- private int getShrinkRange()
+ private int getShrinkRange()
{
return (getPreferredValue() - getMinimumValue());
}
- private int getExpandRange()
+ private int getExpandRange()
{
return (getMaximumValue() - getPreferredValue());
}
@@ -176,7 +176,7 @@ public abstract class Spring
return (double)(v - p) / r;
}
- void setStrain(double strain)
+ void setStrain(double strain)
{
int r = (strain < 0) ? getShrinkRange() : getExpandRange();
int v = (getPreferredValue() + (int)(strain * r));
@@ -411,7 +411,7 @@ public abstract class Spring
return pref;
return value;
}
-
+
/**
* Sets the current value.
*
@@ -536,7 +536,7 @@ public abstract class Spring
int remainder = val - s1.getValue();
s2.setValue(remainder);
}
-
+
}
@@ -735,7 +735,7 @@ public abstract class Spring
s1.setValue(Math.min(val, p1));
s2.setValue(val);
}
- else
+ else
{
s1.setValue(val);
s2.setValue(Math.min(val, p2));
diff --git a/libjava/classpath/javax/swing/SpringLayout.java b/libjava/classpath/javax/swing/SpringLayout.java
index 2595b19..2be5189 100644
--- a/libjava/classpath/javax/swing/SpringLayout.java
+++ b/libjava/classpath/javax/swing/SpringLayout.java
@@ -1,4 +1,4 @@
-/* SpringLayout.java --
+/* SpringLayout.java --
Copyright (C) 2004, 2006, Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -110,10 +110,10 @@ public class SpringLayout implements LayoutManager2
/** The Spring for the bottom edge. */
private Spring south;
- /**
+ /**
In each axis the user can set three values, i.e. x, width, east, if all
- three are set, then there's no room for manoeuvre so in those cases the
- third will be described by the below spring which is calculated in terms
+ three are set, then there's no room for manoeuvre so in those cases the
+ third will be described by the below spring which is calculated in terms
of the other two
*/
private Spring v;
@@ -189,7 +189,7 @@ public class SpringLayout implements LayoutManager2
{
Spring retVal = null;
if (edgeName.equals(SpringLayout.NORTH))
- retVal = getY();
+ retVal = getY();
else if (edgeName.equals(SpringLayout.WEST))
retVal = getX();
else if (edgeName.equals(SpringLayout.SOUTH))
@@ -202,7 +202,7 @@ public class SpringLayout implements LayoutManager2
/**
* Returns the constraint for the height of the component.
*
- * @return the height constraint.
+ * @return the height constraint.
*/
public Spring getHeight()
{
@@ -294,7 +294,7 @@ public class SpringLayout implements LayoutManager2
*/
public void setConstraint(String edgeName, Spring s)
{
-
+
if (edgeName.equals(SpringLayout.WEST))
setX(s);
else if (edgeName.equals(SpringLayout.NORTH))
@@ -394,7 +394,7 @@ public class SpringLayout implements LayoutManager2
width.setValue(Spring.UNSET);
if (height != null)
height.setValue(Spring.UNSET);
- if (east != null)
+ if (east != null)
east.setValue(Spring.UNSET);
if (south != null)
south.setValue(Spring.UNSET);
@@ -444,16 +444,16 @@ public class SpringLayout implements LayoutManager2
* The trick to SpringLayout is that the network of Springs needs to
* completely created before the positioning results are generated.
*
- * Using the springs directly during network creation will set their values
- * before the network is completed, Using Deferred Springs during creation of
- * the network allows all the edges to be connected together and the network
- * to be created without resolving the Springs until their results need to be
- * known, at which point the network is complete and the spring addition and
+ * Using the springs directly during network creation will set their values
+ * before the network is completed, Using Deferred Springs during creation of
+ * the network allows all the edges to be connected together and the network
+ * to be created without resolving the Springs until their results need to be
+ * known, at which point the network is complete and the spring addition and
* and substitution calculations will work on a complete and valid network.
*
* @author Caolan McNamara (caolanm@redhat.com)
*/
- private static class DeferredSpring extends Spring
+ private static class DeferredSpring extends Spring
{
private SpringLayout sl;
private String edgeName;
@@ -471,27 +471,27 @@ public class SpringLayout implements LayoutManager2
c = component;
}
- private Spring resolveSpring()
+ private Spring resolveSpring()
{
return sl.getConstraints(c).getConstraint(edgeName);
}
- public int getMaximumValue()
+ public int getMaximumValue()
{
return resolveSpring().getMaximumValue();
}
- public int getMinimumValue()
+ public int getMinimumValue()
{
return resolveSpring().getMinimumValue();
}
- public int getPreferredValue()
+ public int getPreferredValue()
{
return resolveSpring().getPreferredValue();
}
- public int getValue()
+ public int getValue()
{
int nRet = resolveSpring().getValue();
if (nRet == Spring.UNSET)
@@ -499,7 +499,7 @@ public class SpringLayout implements LayoutManager2
return nRet;
}
- public void setValue(int size)
+ public void setValue(int size)
{
resolveSpring().setValue(size);
}
@@ -543,18 +543,18 @@ public class SpringLayout implements LayoutManager2
}
//clip max to a value we can do meaningful calculation with
- public int getMaximumValue()
+ public int getMaximumValue()
{
int widget_width = c.getMaximumSize().width;
return Math.min(Short.MAX_VALUE, widget_width);
}
- public int getMinimumValue()
+ public int getMinimumValue()
{
return c.getMinimumSize().width;
}
- public int getPreferredValue()
+ public int getPreferredValue()
{
return c.getPreferredSize().width;
}
@@ -575,18 +575,18 @@ public class SpringLayout implements LayoutManager2
}
//clip max to a value we can do meaningful calculations with it
- public int getMaximumValue()
+ public int getMaximumValue()
{
int widget_height = c.getMaximumSize().height;
return Math.min(Short.MAX_VALUE, widget_height);
}
- public int getMinimumValue()
+ public int getMinimumValue()
{
return c.getMinimumSize().height;
}
- public int getPreferredValue()
+ public int getPreferredValue()
{
return c.getPreferredSize().height;
}
@@ -635,7 +635,7 @@ public class SpringLayout implements LayoutManager2
/**
* Returns the X alignment of the Container <code>p</code>.
- *
+ *
* @param p
* the {@link java.awt.Container} for which to determine the X
* alignment.
@@ -676,7 +676,7 @@ public class SpringLayout implements LayoutManager2
c.setHeight(null);
if (c.getEast() == null)
c.setEast(Spring.constant(0, 0, Integer.MAX_VALUE));
- if (c.getSouth() == null)
+ if (c.getSouth() == null)
c.setSouth(Spring.constant(0, 0, Integer.MAX_VALUE));
return c;
@@ -715,12 +715,12 @@ public class SpringLayout implements LayoutManager2
Component c = components[index];
Constraints constraints = getConstraints(c);
-
+
int x = constraints.getX().getValue();
int y = constraints.getY().getValue();
int width = constraints.getWidth().getValue();
int height = constraints.getHeight().getValue();
-
+
c.setBounds(x + offsetX, y + offsetY, width, height);
}
}
@@ -794,7 +794,7 @@ public class SpringLayout implements LayoutManager2
* @param e2 the edge of component 2.
* @param c2 the component 2.
*/
- public void putConstraint(String e1, Component c1, int pad, String e2,
+ public void putConstraint(String e1, Component c1, int pad, String e2,
Component c2)
{
putConstraint(e1, c1, Spring.constant(pad), e2, c2);
@@ -811,7 +811,7 @@ public class SpringLayout implements LayoutManager2
* @param e2 the edge of component 2.
* @param c2 the component 2.
*/
- public void putConstraint(String e1, Component c1, Spring s, String e2,
+ public void putConstraint(String e1, Component c1, Spring s, String e2,
Component c2)
{
Constraints constraints1 = getConstraints(c1);
diff --git a/libjava/classpath/javax/swing/SwingConstants.java b/libjava/classpath/javax/swing/SwingConstants.java
index bed8a467..fccf2ea 100644
--- a/libjava/classpath/javax/swing/SwingConstants.java
+++ b/libjava/classpath/javax/swing/SwingConstants.java
@@ -1,4 +1,4 @@
-/* SwingConstants.java --
+/* SwingConstants.java --
Copyright (C) 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -48,7 +48,7 @@ public interface SwingConstants
int LEFT = 2;
int BOTTOM = 3;
int RIGHT = 4;
-
+
int NORTH = 1;
int NORTH_EAST = 2;
int EAST = 3;
@@ -57,10 +57,10 @@ public interface SwingConstants
int SOUTH_WEST = 6;
int WEST = 7;
int NORTH_WEST = 8;
-
+
int HORIZONTAL = 0;
- int VERTICAL = 1;
-
+ int VERTICAL = 1;
+
int LEADING = 10;
int TRAILING = 11;
@@ -74,4 +74,3 @@ public interface SwingConstants
*/
int PREVIOUS = 13;
}
-
diff --git a/libjava/classpath/javax/swing/SwingUtilities.java b/libjava/classpath/javax/swing/SwingUtilities.java
index 6ff0b33..6104732 100644
--- a/libjava/classpath/javax/swing/SwingUtilities.java
+++ b/libjava/classpath/javax/swing/SwingUtilities.java
@@ -74,8 +74,8 @@ import javax.swing.text.View;
public class SwingUtilities
implements SwingConstants
{
- /**
- * This frame should be used as parent for JWindow or JDialog
+ /**
+ * This frame should be used as parent for JWindow or JDialog
* that doesn't an owner
*/
private static OwnerFrame ownerFrame;
@@ -92,7 +92,7 @@ public class SwingUtilities
* of the <em>component's</em> coordinate system, where (0,0) is the
* upper left corner of the component's bounds.
*
- * @param c the component to measure the bounds of (if <code>null</code>,
+ * @param c the component to measure the bounds of (if <code>null</code>,
* this method returns <code>null</code>).
* @param r a carrier to store the return value in (if <code>null</code>, a
* new <code>Rectangle</code> instance is created).
@@ -115,11 +115,11 @@ public class SwingUtilities
/**
* Returns the focus owner or <code>null</code> if <code>comp</code> is not
* the focus owner or a parent of it.
- *
+ *
* @param comp the focus owner or a parent of it
- *
+ *
* @return the focus owner, or <code>null</code>
- *
+ *
* @deprecated 1.4 Replaced by
* <code>KeyboardFocusManager.getFocusOwner()</code>.
*/
@@ -127,22 +127,22 @@ public class SwingUtilities
{
// Get real focus owner.
Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager()
- .getFocusOwner();
+ .getFocusOwner();
// Check if comp is the focus owner or a parent of it.
Component tmp = focusOwner;
-
+
while (tmp != null)
{
- if (tmp == comp)
- return focusOwner;
+ if (tmp == comp)
+ return focusOwner;
- tmp = tmp.getParent();
+ tmp = tmp.getParent();
}
-
+
return null;
}
-
+
/**
* Returns the <code>Accessible</code> child of the specified component
* which appears at the supplied <code>Point</code>. If there is no
@@ -280,7 +280,7 @@ public class SwingUtilities
* @param comp The component to get the JRootPane of
*
* @return a suitable JRootPane for <code>comp</code>, or <code>null</code>
- *
+ *
* @see javax.swing.RootPaneContainer#getRootPane
* @see #getAncestorOfClass
*/
@@ -354,7 +354,7 @@ public class SwingUtilities
/**
* Equivalent to calling <code>getAncestorOfClass(Window, comp)</code>.
*
- * @param comp The component to search for an ancestor window
+ * @param comp The component to search for an ancestor window
*
* @return An ancestral window, or <code>null</code> if none exists
*/
@@ -387,7 +387,7 @@ public class SwingUtilities
app = (Applet) comp;
comp = comp.getParent();
}
-
+
if (win != null)
return win;
return app;
@@ -395,7 +395,7 @@ public class SwingUtilities
/**
* Return true if a descends from b, in other words if b is an ancestor of a.
- *
+ *
* @param a The child to search the ancestry of
* @param b The potential ancestor to search for
* @return true if a is a descendent of b, false otherwise
@@ -419,7 +419,7 @@ public class SwingUtilities
* <code>(x,y)</code>. Returns <code>null</code> when either
* <code>(x,y)</code> is outside the bounds of parent, or parent is
* <code>null</code>.
- *
+ *
* @param parent The component to search the descendents of
* @param x Horizontal coordinate to search for
* @param y Vertical coordinate to search for
@@ -520,7 +520,7 @@ public class SwingUtilities
return pt;
}
-
+
public static Point convertPoint(Component source, Point aPoint, Component destination)
{
return convertPoint(source, aPoint.x, aPoint.y, destination);
@@ -704,17 +704,17 @@ public class SwingUtilities
* which is laid out in this label
*/
- public static String layoutCompoundLabel(JComponent c,
+ public static String layoutCompoundLabel(JComponent c,
FontMetrics fm,
- String text,
- Icon icon,
+ String text,
+ Icon icon,
int verticalAlignment,
- int horizontalAlignment,
+ int horizontalAlignment,
int verticalTextPosition,
- int horizontalTextPosition,
+ int horizontalTextPosition,
Rectangle viewR,
- Rectangle iconR,
- Rectangle textR,
+ Rectangle iconR,
+ Rectangle textR,
int textIconGap)
{
@@ -921,8 +921,8 @@ public class SwingUtilities
if (text == null || text.equals(""))
{
textIconGap = 0;
- textR.width = 0;
- textR.height = 0;
+ textR.width = 0;
+ textR.height = 0;
text = "";
}
else
@@ -1070,18 +1070,18 @@ public class SwingUtilities
return clipped;
}
- /**
+ /**
* Calls {@link java.awt.EventQueue#invokeLater} with the
- * specified {@link Runnable}.
+ * specified {@link Runnable}.
*/
public static void invokeLater(Runnable doRun)
{
java.awt.EventQueue.invokeLater(doRun);
}
- /**
+ /**
* Calls {@link java.awt.EventQueue#invokeAndWait} with the
- * specified {@link Runnable}.
+ * specified {@link Runnable}.
*/
public static void invokeAndWait(Runnable doRun)
throws InterruptedException,
@@ -1090,21 +1090,21 @@ public class SwingUtilities
java.awt.EventQueue.invokeAndWait(doRun);
}
- /**
+ /**
* Calls {@link java.awt.EventQueue#isDispatchThread()}.
- *
- * @return <code>true</code> if the current thread is the current AWT event
+ *
+ * @return <code>true</code> if the current thread is the current AWT event
* dispatch thread.
*/
public static boolean isEventDispatchThread()
{
return java.awt.EventQueue.isDispatchThread();
}
-
+
/**
* This method paints the given component at the given position and size.
* The component will be reparented to the container given.
- *
+ *
* @param g The Graphics object to draw with.
* @param c The Component to draw
* @param p The Container to reparent to.
@@ -1113,22 +1113,22 @@ public class SwingUtilities
* @param w The width of the drawing area.
* @param h The height of the drawing area.
*/
- public static void paintComponent(Graphics g, Component c, Container p,
+ public static void paintComponent(Graphics g, Component c, Container p,
int x, int y, int w, int h)
- {
+ {
Container parent = c.getParent();
if (parent != null)
parent.remove(c);
if (p != null)
p.add(c);
-
+
Shape savedClip = g.getClip();
-
+
g.setClip(x, y, w, h);
g.translate(x, y);
c.paint(g);
-
+
g.translate(-x, -y);
g.setClip(savedClip);
}
@@ -1136,23 +1136,23 @@ public class SwingUtilities
/**
* This method paints the given component in the given rectangle.
* The component will be reparented to the container given.
- *
+ *
* @param g The Graphics object to draw with.
* @param c The Component to draw
* @param p The Container to reparent to.
* @param r The rectangle that describes the drawing area.
- */
- public static void paintComponent(Graphics g, Component c,
+ */
+ public static void paintComponent(Graphics g, Component c,
Container p, Rectangle r)
{
paintComponent(g, c, p, r.x, r.y, r.width, r.height);
}
-
+
/**
* This method returns the common Frame owner used in JDialogs or
* JWindow when no owner is provided.
*
- * @return The common Frame
+ * @return The common Frame
*/
static Window getOwnerFrame(Window owner)
{
@@ -1188,7 +1188,7 @@ public class SwingUtilities
public static boolean isMiddleMouseButton(MouseEvent event)
{
return ((event.getModifiersEx() & InputEvent.BUTTON2_DOWN_MASK)
- == InputEvent.BUTTON2_DOWN_MASK);
+ == InputEvent.BUTTON2_DOWN_MASK);
}
/**
@@ -1201,9 +1201,9 @@ public class SwingUtilities
public static boolean isRightMouseButton(MouseEvent event)
{
return ((event.getModifiersEx() & InputEvent.BUTTON3_DOWN_MASK)
- == InputEvent.BUTTON3_DOWN_MASK);
+ == InputEvent.BUTTON3_DOWN_MASK);
}
-
+
/**
* This frame should be used when constructing a Window/JDialog without
* a parent. In this case, we are forced to use this frame as a window's
@@ -1214,9 +1214,9 @@ public class SwingUtilities
{
public void setVisible(boolean b)
{
- // Do nothing here.
+ // Do nothing here.
}
-
+
public boolean isShowing()
{
return true;
@@ -1251,9 +1251,9 @@ public class SwingUtilities
* parent-pointer chain, as illustrated:</p>
*
* <pre>
- * [{@link javax.swing.JComponent#getActionMap()}]
- * --&gt; [{@link javax.swing.ActionMap}]
- * parent --&gt; [{@link javax.swing.text.JTextComponent.KeymapActionMap}]
+ * [{@link javax.swing.JComponent#getActionMap()}]
+ * --&gt; [{@link javax.swing.ActionMap}]
+ * parent --&gt; [{@link javax.swing.text.JTextComponent.KeymapActionMap}]
* parent --&gt; [{@link javax.swing.plaf.ActionMapUIResource}]
* </pre>
*
@@ -1266,7 +1266,7 @@ public class SwingUtilities
* call as a request to remove the UI-managed ActionMap from the
* component's ActionMap parent chain.</p>
*/
- public static void replaceUIActionMap(JComponent component,
+ public static void replaceUIActionMap(JComponent component,
ActionMap uiActionMap)
{
ActionMap child = component.getActionMap();
@@ -1294,9 +1294,9 @@ public class SwingUtilities
* <em>end</em> of the parent-pointer chain, as illustrated:</p>
*
* <pre>
- * [{@link javax.swing.JComponent#getInputMap()}]
- * --&gt; [{@link javax.swing.InputMap}]
- * parent --&gt; [{@link javax.swing.text.JTextComponent.KeymapWrapper}]
+ * [{@link javax.swing.JComponent#getInputMap()}]
+ * --&gt; [{@link javax.swing.InputMap}]
+ * parent --&gt; [{@link javax.swing.text.JTextComponent.KeymapWrapper}]
* parent --&gt; [{@link javax.swing.plaf.InputMapUIResource}]
* </pre>
*
@@ -1309,8 +1309,8 @@ public class SwingUtilities
* call as a request to remove the UI-managed InputMap from the
* component's InputMap parent chain.</p>
*/
- public static void replaceUIInputMap(JComponent component,
- int condition,
+ public static void replaceUIInputMap(JComponent component,
+ int condition,
InputMap uiInputMap)
{
InputMap child = component.getInputMap(condition);
@@ -1357,7 +1357,7 @@ public class SwingUtilities
int h2 = rectB.height;
// (outer box = rectA)
- // -------------
+ // -------------
// |_____0_____|
// | |rectB| |
// |_1|_____|_2|
@@ -1393,11 +1393,11 @@ public class SwingUtilities
int n = 0;
for (int i = 0; i < 4; i++)
if (r[i] != null)
- n++;
+ n++;
Rectangle[] out = new Rectangle[n];
for (int i = 3; i >= 0; i--)
if (r[i] != null)
- out[--n] = r[i];
+ out[--n] = r[i];
return out;
}
@@ -1441,13 +1441,13 @@ public class SwingUtilities
return rect;
}
-
+
/**
* Calculates the width of a given string.
*
* @param fm the <code>FontMetrics</code> object to use
* @param str the string
- *
+ *
* @return the width of the the string.
*/
public static int computeStringWidth(FontMetrics fm, String str)
@@ -1551,7 +1551,7 @@ public class SwingUtilities
}
/**
- * Processes key bindings for the component that is associated with the
+ * Processes key bindings for the component that is associated with the
* key event. Note that this method does not make sense for
* JComponent-derived components, except when
* {@link JComponent#processKeyEvent(KeyEvent)} is overridden and super is
@@ -1575,7 +1575,7 @@ public class SwingUtilities
KeyboardManager km = KeyboardManager.getManager();
return km.processKeyStroke(c, s, ev);
}
-
+
/**
* Returns a string representing one of the horizontal alignment codes
* defined in the {@link SwingConstants} interface. The following table
@@ -1609,16 +1609,16 @@ public class SwingUtilities
* </p>
* If the supplied code is not one of those listed, this methods will throw
* an {@link IllegalArgumentException}.
- *
+ *
* @param code the code.
- *
+ *
* @return A string representing the given code.
*/
static String convertHorizontalAlignmentCodeToString(int code)
{
- switch (code)
+ switch (code)
{
- case SwingConstants.CENTER:
+ case SwingConstants.CENTER:
return "CENTER";
case SwingConstants.LEFT:
return "LEFT";
@@ -1632,7 +1632,7 @@ public class SwingUtilities
throw new IllegalArgumentException("Unrecognised code: " + code);
}
}
-
+
/**
* Returns a string representing one of the vertical alignment codes
* defined in the {@link SwingConstants} interface. The following table
@@ -1658,9 +1658,9 @@ public class SwingUtilities
* </p>
* If the supplied code is not one of those listed, this methods will throw
* an {@link IllegalArgumentException}.
- *
+ *
* @param code the code.
- *
+ *
* @return A string representing the given code.
*/
static String convertVerticalAlignmentCodeToString(int code)
@@ -1677,7 +1677,7 @@ public class SwingUtilities
throw new IllegalArgumentException("Unrecognised code: " + code);
}
}
-
+
/**
* Returns a string representing one of the default operation codes
* defined in the {@link WindowConstants} interface. The following table
@@ -1707,12 +1707,12 @@ public class SwingUtilities
* </p>
* If the supplied code is not one of those listed, this method will throw
* an {@link IllegalArgumentException}.
- *
+ *
* @param code the code.
- *
+ *
* @return A string representing the given code.
*/
- static String convertWindowConstantToString(int code)
+ static String convertWindowConstantToString(int code)
{
switch (code)
{
diff --git a/libjava/classpath/javax/swing/Timer.java b/libjava/classpath/javax/swing/Timer.java
index acd1eb4..e9954b4 100644
--- a/libjava/classpath/javax/swing/Timer.java
+++ b/libjava/classpath/javax/swing/Timer.java
@@ -51,7 +51,7 @@ import javax.swing.event.EventListenerList;
* firing <code>ActionEvent</code>s. All Timers share one (daemon)
* Thread (or java.util.Timer). All events are fired from the event
* queue.
- *
+ *
* @author Ronald Veldema
* @author Audrius Meskauskas (audriusa@Bionformatics.org) - bug fixes
* and documentation comments
@@ -99,7 +99,7 @@ public class Timer
* running, even if there's no task scheduled in it.
*/
private static java.util.Timer timer = new java.util.Timer("swing.Timer",
- true);
+ true);
/**
* If <code>true</code>, the timer prints a message to
@@ -264,12 +264,12 @@ public class Timer
* firing the first event.
*
* @param d The time gap between the subsequent events, in milliseconds
- *
+ *
* @throws IllegalArgumentException if <code>d</code> is less than zero.
*/
public void setDelay(int d)
{
- if (d < 0)
+ if (d < 0)
throw new IllegalArgumentException("Invalid delay: " + d);
delay = d;
}
@@ -291,7 +291,7 @@ public class Timer
* subsequent events.
*
* @param i the initial delay, in milliseconds
- *
+ *
* @throws IllegalArgumentException if <code>i</code> is less than zero.
*/
public void setInitialDelay(int i)
@@ -387,12 +387,12 @@ public class Timer
Task t = task;
if (t == null)
{
- t = new Task();
- if (isRepeats())
- timer.schedule(t, getInitialDelay(), getDelay());
- else
- timer.schedule(t, getInitialDelay());
- task = t;
+ t = new Task();
+ if (isRepeats())
+ timer.schedule(t, getInitialDelay(), getDelay());
+ else
+ timer.schedule(t, getInitialDelay());
+ task = t;
}
}
@@ -404,8 +404,8 @@ public class Timer
Task t = task;
if (t != null)
{
- t.cancel();
- task = null;
+ t.cancel();
+ task = null;
}
}
@@ -468,9 +468,9 @@ public class Timer
{
synchronized(queueLock)
{
- queue++;
- if (queue == 1)
- SwingUtilities.invokeLater(drainer);
+ queue++;
+ if (queue == 1)
+ SwingUtilities.invokeLater(drainer);
}
}
}
diff --git a/libjava/classpath/javax/swing/ToolTipManager.java b/libjava/classpath/javax/swing/ToolTipManager.java
index 152fc03..8a31f79 100644
--- a/libjava/classpath/javax/swing/ToolTipManager.java
+++ b/libjava/classpath/javax/swing/ToolTipManager.java
@@ -219,9 +219,9 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
{
if (! enabled)
{
- enterTimer.stop();
- exitTimer.stop();
- insideTimer.stop();
+ enterTimer.stop();
+ exitTimer.stop();
+ insideTimer.stop();
}
this.enabled = enabled;
@@ -276,7 +276,7 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
* mouse enters a Component.
*
* @param delay The initial delay before the ToolTip is shown.
- *
+ *
* @throws IllegalArgumentException if <code>delay</code> is less than zero.
*/
public void setInitialDelay(int delay)
@@ -299,7 +299,7 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
* Sets the time the ToolTip will be shown before being hidden.
*
* @param delay the delay (in milliseconds) before tool tips are hidden.
- *
+ *
* @throws IllegalArgumentException if <code>delay</code> is less than zero.
*/
public void setDismissDelay(int delay)
@@ -323,7 +323,7 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
* Component, the tooltip will be shown immediately.
*
* @param delay The reshow delay (in milliseconds).
- *
+ *
* @throws IllegalArgumentException if <code>delay</code> is less than zero.
*/
public void setReshowDelay(int delay)
@@ -386,7 +386,7 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
* This method is called when the mouse exits a JComponent registered with the
* ToolTipManager. When the mouse exits, the tooltip should be hidden
* immediately.
- *
+ *
* @param event
* The MouseEvent.
*/
@@ -421,8 +421,8 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
enterTimer.restart();
else if (insideTimer.isRunning())
{
- insideTimer.stop();
- hideTip();
+ insideTimer.stop();
+ hideTip();
}
}
@@ -517,7 +517,7 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
Point p = currentPoint;
Point cP = currentComponent.getLocationOnScreen();
Dimension dims = currentTip.getPreferredSize();
-
+
JLayeredPane pane = null;
JRootPane r = ((JRootPane) SwingUtilities.getAncestorOfClass(JRootPane.class,
currentComponent));
@@ -525,12 +525,12 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
pane = r.getLayeredPane();
if (pane == null)
return;
-
+
p.translate(cP.x, cP.y);
adjustLocation(p, pane, dims);
-
+
currentTip.setBounds(0, 0, dims.width, dims.height);
-
+
PopupFactory factory = PopupFactory.getSharedInstance();
popup = factory.getPopup(currentComponent, currentTip, p.x, p.y);
popup.show();
@@ -539,7 +539,7 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
/**
* Adjusts the point to a new location on the component,
* using the currentTip's dimensions.
- *
+ *
* @param p - the point to convert.
* @param c - the component the point is on.
* @param d - the dimensions of the currentTip.
@@ -554,10 +554,10 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
p.y += d.height;
if (p.y + d.height > c.getHeight())
p.y -= d.height;
-
+
return p;
}
-
+
/**
* This method hides the ToolTip.
* This is package-private to avoid an accessor method.
diff --git a/libjava/classpath/javax/swing/TransferHandler.java b/libjava/classpath/javax/swing/TransferHandler.java
index 2766974..abf6e8c 100644
--- a/libjava/classpath/javax/swing/TransferHandler.java
+++ b/libjava/classpath/javax/swing/TransferHandler.java
@@ -172,7 +172,7 @@ public class TransferHandler implements Serializable
super(command);
this.command = command;
}
-
+
public void actionPerformed(ActionEvent event)
{
JComponent component = (JComponent) event.getSource();
@@ -180,42 +180,42 @@ public class TransferHandler implements Serializable
Clipboard clipboard = getClipboard(component);
if (clipboard == null)
- {
- // Access denied!
- Toolkit.getDefaultToolkit().beep();
- return;
- }
+ {
+ // Access denied!
+ Toolkit.getDefaultToolkit().beep();
+ return;
+ }
if (command.equals(COMMAND_COPY))
- transferHandler.exportToClipboard(component, clipboard, COPY);
+ transferHandler.exportToClipboard(component, clipboard, COPY);
else if (command.equals(COMMAND_CUT))
- transferHandler.exportToClipboard(component, clipboard, MOVE);
+ transferHandler.exportToClipboard(component, clipboard, MOVE);
else if (command.equals(COMMAND_PASTE))
- {
- Transferable transferable = clipboard.getContents(null);
+ {
+ Transferable transferable = clipboard.getContents(null);
- if (transferable != null)
- transferHandler.importData(component, transferable);
- }
+ if (transferable != null)
+ transferHandler.importData(component, transferable);
+ }
}
-
+
/**
* Get the system cliboard or null if the caller isn't allowed to
* access the system clipboard.
- *
+ *
* @param component a component, used to get the toolkit.
* @return the clipboard
*/
private static Clipboard getClipboard(JComponent component)
{
try
- {
- return component.getToolkit().getSystemClipboard();
- }
+ {
+ return component.getToolkit().getSystemClipboard();
+ }
catch (SecurityException se)
- {
- return null;
- }
+ {
+ return null;
+ }
}
}
@@ -244,7 +244,7 @@ public class TransferHandler implements Serializable
{
// Nothing to do here.
}
-
+
}
private static class SwingDragHandler
@@ -310,7 +310,7 @@ public class TransferHandler implements Serializable
{
// Nothing to do here.
}
-
+
}
private static final long serialVersionUID = -967749805571669910L;
@@ -318,7 +318,7 @@ public class TransferHandler implements Serializable
private static final String COMMAND_COPY = "copy";
private static final String COMMAND_CUT = "cut";
private static final String COMMAND_PASTE = "paste";
-
+
public static final int NONE = 0;
public static final int COPY = 1;
public static final int MOVE = 2;
@@ -327,13 +327,13 @@ public class TransferHandler implements Serializable
private static Action copyAction = new TransferAction(COMMAND_COPY);
private static Action cutAction = new TransferAction(COMMAND_CUT);
private static Action pasteAction = new TransferAction(COMMAND_PASTE);
-
+
private int sourceActions;
private Icon visualRepresentation;
/**
* The name of the property into/from which this TransferHandler
- * imports/exports.
+ * imports/exports.
*/
private String propertyName;
@@ -426,7 +426,7 @@ public class TransferHandler implements Serializable
* from the specified component, or null if the component doesn't
* have a readable property like the transfer handler
*/
- protected Transferable createTransferable(JComponent c)
+ protected Transferable createTransferable(JComponent c)
{
Transferable transferable = null;
if (propertyName != null)
@@ -499,7 +499,7 @@ public class TransferHandler implements Serializable
*
* @throws IllegalStateException when the clipboard is not available
*/
- public void exportToClipboard(JComponent c, Clipboard clip, int action)
+ public void exportToClipboard(JComponent c, Clipboard clip, int action)
throws IllegalStateException
{
action &= getSourceActions(c);
@@ -519,7 +519,7 @@ public class TransferHandler implements Serializable
}
else
exportDone(c, null, NONE);
- }
+ }
public int getSourceActions(JComponent c)
{
@@ -536,7 +536,7 @@ public class TransferHandler implements Serializable
* component <code>c</code> by setting the property of this TransferHandler
* on that component. If this succeeds, this method returns
* <code>true</code>, otherwise <code>false</code>.
- *
+ *
*
* @param c the component to import into
* @param t the transfer data to import
@@ -544,7 +544,7 @@ public class TransferHandler implements Serializable
* @return <code>true</code> if the transfer succeeds, <code>false</code>
* otherwise
*/
- public boolean importData(JComponent c, Transferable t)
+ public boolean importData(JComponent c, Transferable t)
{
boolean ok = false;
PropertyDescriptor prop = getPropertyDescriptor(c);
diff --git a/libjava/classpath/javax/swing/UIDefaults.java b/libjava/classpath/javax/swing/UIDefaults.java
index 9766cb0..904b4c2 100644
--- a/libjava/classpath/javax/swing/UIDefaults.java
+++ b/libjava/classpath/javax/swing/UIDefaults.java
@@ -129,8 +129,8 @@ public class UIDefaults extends Hashtable<Object, Object>
{
final String className = s;
inner = new LazyValue()
- {
- public Object createValue(UIDefaults table)
+ {
+ public Object createValue(UIDefaults table)
{
try
{
@@ -152,11 +152,11 @@ public class UIDefaults extends Hashtable<Object, Object>
final String className = c;
final String methodName = m;
inner = new LazyValue()
- {
- public Object createValue(UIDefaults table)
+ {
+ public Object createValue(UIDefaults table)
{
- try
- {
+ try
+ {
return Class
.forName(className)
.getMethod(methodName, new Class[] {})
@@ -169,7 +169,7 @@ public class UIDefaults extends Hashtable<Object, Object>
}
};
}
-
+
public ProxyLazyValue(String c, Object[] os)
{
final String className = c;
@@ -178,20 +178,20 @@ public class UIDefaults extends Hashtable<Object, Object>
for (int i = 0; i < objs.length; ++i)
{
clss[i] = objs[i].getClass();
- }
+ }
inner = new LazyValue()
- {
- public Object createValue(UIDefaults table)
- {
+ {
+ public Object createValue(UIDefaults table)
+ {
try
{
return Class
.forName(className)
.getConstructor(clss)
.newInstance(objs);
- }
+ }
catch (Exception e)
- {
+ {
return null;
}
}
@@ -205,14 +205,14 @@ public class UIDefaults extends Hashtable<Object, Object>
final Object[] objs = os;
final Class[] clss = new Class[objs.length];
for (int i = 0; i < objs.length; ++i)
- {
+ {
clss[i] = objs[i].getClass();
- }
+ }
inner = new LazyValue()
- {
- public Object createValue(UIDefaults table)
- {
- try
+ {
+ public Object createValue(UIDefaults table)
+ {
+ try
{
return Class
.forName(className)
@@ -226,7 +226,7 @@ public class UIDefaults extends Hashtable<Object, Object>
}
};
}
-
+
public Object createValue(UIDefaults table)
{
return inner.createValue(table);
@@ -257,7 +257,7 @@ public class UIDefaults extends Hashtable<Object, Object>
public UIDefaults(Object[] entries)
{
this();
-
+
for (int i = 0; (2 * i + 1) < entries.length; ++i)
put(entries[2 * i], entries[2 * i + 1]);
}
@@ -293,14 +293,14 @@ public class UIDefaults extends Hashtable<Object, Object>
String keyString = (String) key;
ListIterator i = bundles.listIterator(0);
while (i.hasNext())
- {
+ {
String bundle_name = (String) i.next();
ResourceBundle res =
ResourceBundle.getBundle(bundle_name, loc);
if (res != null)
{
- try
- {
+ try
+ {
obj = res.getObject(keyString);
break;
}
@@ -329,7 +329,7 @@ public class UIDefaults extends Hashtable<Object, Object>
else if (obj instanceof ActiveValue)
{
return ((ActiveValue) obj).createValue(this);
- }
+ }
return obj;
}
@@ -582,7 +582,7 @@ public class UIDefaults extends Hashtable<Object, Object>
*
* @param key the key to the requested entry
*
- * @return The boolean entry for <code>key</code> or <code>false</code> if no
+ * @return The boolean entry for <code>key</code> or <code>false</code> if no
* such entry exists.
*/
public boolean getBoolean(Object key)
@@ -612,7 +612,7 @@ public class UIDefaults extends Hashtable<Object, Object>
* @return the insets entry for <code>key</code> or null if no such entry
* exists
*/
- public Insets getInsets(Object key)
+ public Insets getInsets(Object key)
{
Object o = get(key);
return o instanceof Insets ? (Insets) o : null;
@@ -627,7 +627,7 @@ public class UIDefaults extends Hashtable<Object, Object>
* @return the boolean entry for <code>key</code> or null if no such entry
* exists
*/
- public Insets getInsets(Object key, Locale locale)
+ public Insets getInsets(Object key, Locale locale)
{
Object o = get(key, locale);
return o instanceof Insets ? (Insets) o : null;
@@ -641,7 +641,7 @@ public class UIDefaults extends Hashtable<Object, Object>
* @return the dimension entry for <code>key</code> or null if no such entry
* exists
*/
- public Dimension getDimension(Object key)
+ public Dimension getDimension(Object key)
{
Object o = get(key);
return o instanceof Dimension ? (Dimension) o : null;
@@ -656,7 +656,7 @@ public class UIDefaults extends Hashtable<Object, Object>
* @return the boolean entry for <code>key</code> or null if no such entry
* exists
*/
- public Dimension getDimension(Object key, Locale locale)
+ public Dimension getDimension(Object key, Locale locale)
{
Object o = get(key, locale);
return o instanceof Dimension ? (Dimension) o : null;
@@ -677,7 +677,7 @@ public class UIDefaults extends Hashtable<Object, Object>
String className = (String) get(id);
if (className == null)
return null;
- try
+ try
{
if (loader == null)
loader = ClassLoader.getSystemClassLoader();
@@ -733,7 +733,7 @@ public class UIDefaults extends Hashtable<Object, Object>
Method factory;
- try
+ try
{
factory = cls.getMethod ("createUI", new Class[] { JComponent.class } );
}
@@ -749,14 +749,14 @@ public class UIDefaults extends Hashtable<Object, Object>
}
catch (java.lang.reflect.InvocationTargetException ite)
{
- getUIError ("InvocationTargetException ("+ ite.getTargetException()
- +") calling createUI(...) on " + cls.toString ());
- return null;
+ getUIError ("InvocationTargetException ("+ ite.getTargetException()
+ +") calling createUI(...) on " + cls.toString ());
+ return null;
}
catch (Exception e)
{
getUIError ("exception calling createUI(...) on " + cls.toString ());
- return null;
+ return null;
}
}
@@ -800,7 +800,7 @@ public class UIDefaults extends Hashtable<Object, Object>
* @param newValue the new value
*/
protected void firePropertyChange(String property,
- Object oldValue, Object newValue)
+ Object oldValue, Object newValue)
{
propertyChangeSupport.firePropertyChange(property, oldValue, newValue);
}
diff --git a/libjava/classpath/javax/swing/UIManager.java b/libjava/classpath/javax/swing/UIManager.java
index 0369b65..05a3fce 100644
--- a/libjava/classpath/javax/swing/UIManager.java
+++ b/libjava/classpath/javax/swing/UIManager.java
@@ -1,4 +1,4 @@
-/* UIManager.java --
+/* UIManager.java --
Copyright (C) 2002, 2003, 2004, 2005, 2006, Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -61,22 +61,22 @@ import javax.swing.plaf.metal.MetalLookAndFeel;
public class UIManager implements Serializable
{
/**
- * Represents the basic information about a {@link LookAndFeel} (LAF), so
- * that a list of installed LAFs can be presented without actually loading
+ * Represents the basic information about a {@link LookAndFeel} (LAF), so
+ * that a list of installed LAFs can be presented without actually loading
* the LAF class(es).
*/
public static class LookAndFeelInfo
{
String name, clazz;
-
+
/**
* Creates a new instance.
- *
+ *
* @param name the look and feel name.
* @param clazz the look and feel class name.
*/
- public LookAndFeelInfo(String name,
- String clazz)
+ public LookAndFeelInfo(String name,
+ String clazz)
{
this.name = name;
this.clazz = clazz;
@@ -84,17 +84,17 @@ public class UIManager implements Serializable
/**
* Returns the name of the look and feel.
- *
+ *
* @return The name of the look and feel.
*/
public String getName()
{
return name;
}
-
+
/**
* Returns the fully qualified class name for the {@link LookAndFeel}.
- *
+ *
* @return The fully qualified class name for the {@link LookAndFeel}.
*/
public String getClassName()
@@ -151,20 +151,20 @@ public class UIManager implements Serializable
i++;
return val;
}
-
+
}
UIDefaults fallback;
/**
- * Creates a new <code>MultiplexUIDefaults</code> instance with
+ * Creates a new <code>MultiplexUIDefaults</code> instance with
* <code>d</code> as the fallback defaults.
- *
+ *
* @param d the fallback defaults (<code>null</code> not permitted).
*/
MultiplexUIDefaults(UIDefaults d)
{
- if (d == null)
+ if (d == null)
throw new NullPointerException();
fallback = d;
}
@@ -219,10 +219,10 @@ public class UIManager implements Serializable
/** The installed auxiliary look and feels. */
static LookAndFeel[] auxLookAndFeels;
-
+
/** The current look and feel. */
static LookAndFeel currentLookAndFeel;
-
+
static MultiplexUIDefaults currentUIDefaults;
static UIDefaults lookAndFeelDefaults;
@@ -234,7 +234,7 @@ public class UIManager implements Serializable
static
{
String defaultlaf = System.getProperty("swing.defaultlaf");
- try
+ try
{
if (defaultlaf != null)
{
@@ -288,7 +288,7 @@ public class UIManager implements Serializable
*
* @param listener the listener to remove
*/
- public static void removePropertyChangeListener(PropertyChangeListener
+ public static void removePropertyChangeListener(PropertyChangeListener
listener)
{
listeners.removePropertyChangeListener(listener);
@@ -308,11 +308,11 @@ public class UIManager implements Serializable
/**
* Add a {@link LookAndFeel} to the list of auxiliary look and feels.
- *
+ *
* @param laf the auxiliary look and feel (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if <code>laf</code> is <code>null</code>.
- *
+ *
* @see #getAuxiliaryLookAndFeels()
*/
public static void addAuxiliaryLookAndFeel(LookAndFeel laf)
@@ -325,18 +325,18 @@ public class UIManager implements Serializable
auxLookAndFeels[0] = laf;
return;
}
-
+
LookAndFeel[] temp = new LookAndFeel[auxLookAndFeels.length + 1];
- System.arraycopy(auxLookAndFeels, 0, temp, 0, auxLookAndFeels.length);
+ System.arraycopy(auxLookAndFeels, 0, temp, 0, auxLookAndFeels.length);
auxLookAndFeels = temp;
auxLookAndFeels[auxLookAndFeels.length - 1] = laf;
}
-
+
/**
* Removes a {@link LookAndFeel} (LAF) from the list of auxiliary LAFs.
- *
+ *
* @param laf the LAF to remove.
- *
+ *
* @return <code>true</code> if the LAF was removed, and <code>false</code>
* otherwise.
*/
@@ -357,32 +357,32 @@ public class UIManager implements Serializable
LookAndFeel[] temp = new LookAndFeel[auxLookAndFeels.length - 1];
if (i == 0)
{
- System.arraycopy(auxLookAndFeels, 1, temp, 0, count - 1);
+ System.arraycopy(auxLookAndFeels, 1, temp, 0, count - 1);
}
else if (i == count - 1)
{
System.arraycopy(auxLookAndFeels, 0, temp, 0, count - 1);
}
- else
+ else
{
System.arraycopy(auxLookAndFeels, 0, temp, 0, i);
- System.arraycopy(auxLookAndFeels, i + 1, temp, i,
+ System.arraycopy(auxLookAndFeels, i + 1, temp, i,
count - i - 1);
}
auxLookAndFeels = temp;
return true;
- }
+ }
}
return false;
}
/**
* Returns an array (possibly <code>null</code>) containing the auxiliary
- * {@link LookAndFeel}s that are in use. These are used by the
+ * {@link LookAndFeel}s that are in use. These are used by the
* {@link javax.swing.plaf.multi.MultiLookAndFeel} class.
- *
+ *
* @return The auxiliary look and feels (possibly <code>null</code>).
- *
+ *
* @see #addAuxiliaryLookAndFeel(LookAndFeel)
*/
public static LookAndFeel[] getAuxiliaryLookAndFeels()
@@ -393,9 +393,9 @@ public class UIManager implements Serializable
/**
* Returns an object from the {@link UIDefaults} table for the current
* {@link LookAndFeel}.
- *
+ *
* @param key the key.
- *
+ *
* @return The object.
*/
public static Object get(Object key)
@@ -406,11 +406,11 @@ public class UIManager implements Serializable
/**
* Returns an object from the {@link UIDefaults} table for the current
* {@link LookAndFeel}.
- *
+ *
* @param key the key.
- *
+ *
* @return The object.
- *
+ *
* @since 1.4
*/
public static Object get(Object key, Locale locale)
@@ -422,70 +422,70 @@ public class UIManager implements Serializable
* Returns a boolean value from the defaults table. If there is no value
* for the specified key, or the value is not an instance of {@link Boolean},
* this method returns <code>false</code>.
- *
+ *
* @param key the key (<code>null</code> not permitted).
*
* @return The boolean value associated with the specified key.
- *
+ *
* @throws NullPointerException if <code>key</code> is <code>null</code>.
- *
+ *
* @since 1.4
*/
public static boolean getBoolean(Object key)
{
Object value = get(key);
- if (value instanceof Boolean)
+ if (value instanceof Boolean)
return ((Boolean) value).booleanValue();
return false;
}
-
+
/**
* Returns a boolean value from the defaults table. If there is no value
* for the specified key, or the value is not an instance of {@link Boolean},
* this method returns <code>false</code>.
- *
+ *
* @param key the key (<code>null</code> not permitted).
* @param locale the locale.
*
* @return The boolean value associated with the specified key.
- *
+ *
* @throws NullPointerException if <code>key</code> is <code>null</code>.
- *
+ *
* @since 1.4
*/
public static boolean getBoolean(Object key, Locale locale)
{
Object value = get(key, locale);
- if (value instanceof Boolean)
+ if (value instanceof Boolean)
return ((Boolean) value).booleanValue();
return false;
}
-
+
/**
- * Returns a border from the defaults table.
- *
+ * Returns a border from the defaults table.
+ *
* @param key the key (<code>null</code> not permitted).
- *
+ *
* @return The border associated with the given key, or <code>null</code>.
- *
+ *
* @throws NullPointerException if <code>key</code> is <code>null</code>.
*/
public static Border getBorder(Object key)
{
Object value = get(key);
- if (value instanceof Border)
+ if (value instanceof Border)
return (Border) value;
return null;
}
-
+
/**
- * Returns a border from the defaults table.
- *
+ * Returns a border from the defaults table.
+ *
* @param key the key (<code>null</code> not permitted).
* @param locale the locale.
- *
+ *
* @return The border associated with the given key, or <code>null</code>.
- *
+ *
* @throws NullPointerException if <code>key</code> is <code>null</code>.
*
* @since 1.4
@@ -493,44 +493,44 @@ public class UIManager implements Serializable
public static Border getBorder(Object key, Locale locale)
{
Object value = get(key, locale);
- if (value instanceof Border)
+ if (value instanceof Border)
return (Border) value;
return null;
}
-
+
/**
- * Returns a drawing color from the defaults table.
- *
+ * Returns a drawing color from the defaults table.
+ *
* @param key the key (<code>null</code> not permitted).
- *
+ *
* @return The color associated with the given key, or <code>null</code>.
- *
+ *
* @throws NullPointerException if <code>key</code> is <code>null</code>.
*/
public static Color getColor(Object key)
{
Object value = get(key);
- if (value instanceof Color)
+ if (value instanceof Color)
return (Color) value;
return null;
}
/**
- * Returns a drawing color from the defaults table.
- *
+ * Returns a drawing color from the defaults table.
+ *
* @param key the key (<code>null</code> not permitted).
* @param locale the locale.
- *
+ *
* @return The color associated with the given key, or <code>null</code>.
- *
+ *
* @throws NullPointerException if <code>key</code> is <code>null</code>.
- *
+ *
* @since 1.4
*/
public static Color getColor(Object key, Locale locale)
{
Object value = get(key, locale);
- if (value instanceof Color)
+ if (value instanceof Color)
return (Color) value;
return null;
}
@@ -538,17 +538,17 @@ public class UIManager implements Serializable
/**
* The fully qualified class name of the cross platform (Metal) look and feel.
* This string can be passed to Class.forName()
- *
+ *
* @return <code>"javax.swing.plaf.metal.MetalLookAndFeel"</code>
*/
public static String getCrossPlatformLookAndFeelClassName()
- {
+ {
return "javax.swing.plaf.metal.MetalLookAndFeel";
}
/**
- * Returns the default values for this look and feel.
- *
+ * Returns the default values for this look and feel.
+ *
* @return The {@link UIDefaults} for the current {@link LookAndFeel}.
*/
public static UIDefaults getDefaults()
@@ -559,37 +559,37 @@ public class UIManager implements Serializable
}
/**
- * Returns a dimension from the defaults table.
- *
+ * Returns a dimension from the defaults table.
+ *
* @param key the key (<code>null</code> not permitted).
- *
+ *
* @return The color associated with the given key, or <code>null</code>.
- *
+ *
* @throws NullPointerException if <code>key</code> is <code>null</code>.
*/
public static Dimension getDimension(Object key)
{
Object value = get(key);
- if (value instanceof Dimension)
+ if (value instanceof Dimension)
return (Dimension) value;
return null;
}
/**
- * Returns a dimension from the defaults table.
- *
+ * Returns a dimension from the defaults table.
+ *
* @param key the key (<code>null</code> not permitted).
* @param locale the locale.
- *
+ *
* @return The color associated with the given key, or <code>null</code>.
- *
+ *
* @throws NullPointerException if <code>key</code> is <code>null</code>.
* @since 1.4
*/
public static Dimension getDimension(Object key, Locale locale)
{
Object value = get(key, locale);
- if (value instanceof Dimension)
+ if (value instanceof Dimension)
return (Dimension) value;
return null;
}
@@ -601,15 +601,15 @@ public class UIManager implements Serializable
* @param key an Object that specifies the font. Typically,
* this is a String such as
* <code>TitledBorder.font</code>.
- *
+ *
* @return The font associated with the given key, or <code>null</code>.
- *
+ *
* @throws NullPointerException if <code>key</code> is <code>null</code>.
*/
public static Font getFont(Object key)
{
Object value = get(key);
- if (value instanceof Font)
+ if (value instanceof Font)
return (Font) value;
return null;
}
@@ -622,65 +622,65 @@ public class UIManager implements Serializable
* this is a String such as
* <code>TitledBorder.font</code>.
* @param locale the locale.
- *
+ *
* @return The font associated with the given key, or <code>null</code>.
- *
+ *
* @throws NullPointerException if <code>key</code> is <code>null</code>.
- *
+ *
* @since 1.4
*/
public static Font getFont(Object key, Locale locale)
{
Object value = get(key, locale);
- if (value instanceof Font)
+ if (value instanceof Font)
return (Font) value;
return null;
}
/**
- * Returns an icon from the defaults table.
- *
+ * Returns an icon from the defaults table.
+ *
* @param key the key (<code>null</code> not permitted).
- *
+ *
* @return The icon associated with the given key, or <code>null</code>.
- *
+ *
* @throws NullPointerException if <code>key</code> is <code>null</code>.
*/
public static Icon getIcon(Object key)
{
Object value = get(key);
- if (value instanceof Icon)
+ if (value instanceof Icon)
return (Icon) value;
return null;
}
-
+
/**
- * Returns an icon from the defaults table.
- *
+ * Returns an icon from the defaults table.
+ *
* @param key the key (<code>null</code> not permitted).
* @param locale the locale.
- *
+ *
* @return The icon associated with the given key, or <code>null</code>.
- *
+ *
* @throws NullPointerException if <code>key</code> is <code>null</code>.
* @since 1.4
*/
public static Icon getIcon(Object key, Locale locale)
{
Object value = get(key, locale);
- if (value instanceof Icon)
+ if (value instanceof Icon)
return (Icon) value;
return null;
}
-
+
/**
* Returns an Insets object from the defaults table.
- *
+ *
* @param key the key (<code>null</code> not permitted).
- *
+ *
* @return The insets associated with the given key, or <code>null</code>.
- *
- * @throws NullPointerException if <code>key</code> is <code>null</code>.
+ *
+ * @throws NullPointerException if <code>key</code> is <code>null</code>.
*/
public static Insets getInsets(Object key)
{
@@ -693,13 +693,13 @@ public class UIManager implements Serializable
/**
* Returns an Insets object from the defaults table.
- *
+ *
* @param key the key (<code>null</code> not permitted).
* @param locale the locale.
- *
+ *
* @return The insets associated with the given key, or <code>null</code>.
- *
- * @throws NullPointerException if <code>key</code> is <code>null</code>.
+ *
+ * @throws NullPointerException if <code>key</code> is <code>null</code>.
* @since 1.4
*/
public static Insets getInsets(Object key, Locale locale)
@@ -714,7 +714,7 @@ public class UIManager implements Serializable
/**
* Returns an array containing information about the {@link LookAndFeel}s
* that are installed.
- *
+ *
* @return A list of the look and feels that are available (installed).
*/
public static LookAndFeelInfo[] getInstalledLookAndFeels()
@@ -726,9 +726,9 @@ public class UIManager implements Serializable
* Returns the integer value of the {@link Integer} associated with the
* given key. If there is no value, or the value is not an instance of
* {@link Integer}, this method returns 0.
- *
+ *
* @param key the key (<code>null</code> not permitted).
- *
+ *
* @return The integer value associated with the given key, or 0.
*/
public static int getInt(Object key)
@@ -743,12 +743,12 @@ public class UIManager implements Serializable
* Returns the integer value of the {@link Integer} associated with the
* given key. If there is no value, or the value is not an instance of
* {@link Integer}, this method returns 0.
- *
+ *
* @param key the key (<code>null</code> not permitted).
* @param locale the locale.
- *
+ *
* @return The integer value associated with the given key, or 0.
- *
+ *
* @since 1.4
*/
public static int getInt(Object key, Locale locale)
@@ -761,9 +761,9 @@ public class UIManager implements Serializable
/**
* Returns the current look and feel (which may be <code>null</code>).
- *
+ *
* @return The current look and feel.
- *
+ *
* @see #setLookAndFeel(LookAndFeel)
*/
public static LookAndFeel getLookAndFeel()
@@ -774,7 +774,7 @@ public class UIManager implements Serializable
/**
* Returns the <code>UIDefaults</code> table of the currently active
* look and feel.
- *
+ *
* @return The {@link UIDefaults} for the current {@link LookAndFeel}.
*/
public static UIDefaults getLookAndFeelDefaults()
@@ -783,11 +783,11 @@ public class UIManager implements Serializable
}
/**
- * Returns the {@link String} associated with the given key. If the value
+ * Returns the {@link String} associated with the given key. If the value
* is not a {@link String}, this method returns <code>null</code>.
- *
+ *
* @param key the key (<code>null</code> not permitted).
- *
+ *
* @return The string associated with the given key, or <code>null</code>.
*/
public static String getString(Object key)
@@ -797,16 +797,16 @@ public class UIManager implements Serializable
return (String) s;
return null;
}
-
+
/**
- * Returns the {@link String} associated with the given key. If the value
+ * Returns the {@link String} associated with the given key. If the value
* is not a {@link String}, this method returns <code>null</code>.
- *
+ *
* @param key the key (<code>null</code> not permitted).
* @param locale the locale.
- *
+ *
* @return The string associated with the given key, or <code>null</code>.
- *
+ *
* @since 1.4
*/
public static String getString(Object key, Locale locale)
@@ -816,14 +816,14 @@ public class UIManager implements Serializable
return (String) s;
return null;
}
-
+
/**
* Returns the name of the {@link LookAndFeel} class that implements the
* native systems look and feel if there is one, otherwise the name
* of the default cross platform LookAndFeel class.
- *
+ *
* @return The fully qualified class name for the system look and feel.
- *
+ *
* @see #getCrossPlatformLookAndFeelClassName()
*/
public static String getSystemLookAndFeelClassName()
@@ -832,9 +832,9 @@ public class UIManager implements Serializable
}
/**
- * Returns UI delegate from the current {@link LookAndFeel} that renders the
+ * Returns UI delegate from the current {@link LookAndFeel} that renders the
* target component.
- *
+ *
* @param target the target component.
*/
public static ComponentUI getUI(JComponent target)
@@ -844,7 +844,7 @@ public class UIManager implements Serializable
/**
* Creates a new look and feel and adds it to the current array.
- *
+ *
* @param name the look and feel name.
* @param className the fully qualified name of the class that implements the
* look and feel.
@@ -868,7 +868,7 @@ public class UIManager implements Serializable
/**
* Stores an object in the defaults table.
- *
+ *
* @param key the key.
* @param value the value.
*/
@@ -884,15 +884,15 @@ public class UIManager implements Serializable
{
installed = infos;
}
-
+
/**
* Sets the current {@link LookAndFeel}.
- *
+ *
* @param newLookAndFeel the new look and feel (<code>null</code> permitted).
- *
- * @throws UnsupportedLookAndFeelException if the look and feel is not
+ *
+ * @throws UnsupportedLookAndFeelException if the look and feel is not
* supported on the current platform.
- *
+ *
* @see LookAndFeel#isSupportedLookAndFeel()
*/
public static void setLookAndFeel(LookAndFeel newLookAndFeel)
@@ -905,7 +905,7 @@ public class UIManager implements Serializable
if (oldLookAndFeel != null)
oldLookAndFeel.uninitialize();
- // Set the current default look and feel using a LookAndFeel object.
+ // Set the current default look and feel using a LookAndFeel object.
currentLookAndFeel = newLookAndFeel;
if (newLookAndFeel != null)
{
@@ -919,7 +919,7 @@ public class UIManager implements Serializable
}
else
{
- currentUIDefaults = null;
+ currentUIDefaults = null;
}
listeners.firePropertyChange("lookAndFeel", oldLookAndFeel, newLookAndFeel);
//revalidate();
@@ -928,12 +928,12 @@ public class UIManager implements Serializable
/**
* Set the current default look and feel using a class name.
- *
+ *
* @param className the look and feel class name.
- *
- * @throws UnsupportedLookAndFeelException if the look and feel is not
+ *
+ * @throws UnsupportedLookAndFeelException if the look and feel is not
* supported on the current platform.
- *
+ *
* @see LookAndFeel#isSupportedLookAndFeel()
*/
public static void setLookAndFeel(String className)
diff --git a/libjava/classpath/javax/swing/UnsupportedLookAndFeelException.java b/libjava/classpath/javax/swing/UnsupportedLookAndFeelException.java
index b65119a..74c6ac8 100644
--- a/libjava/classpath/javax/swing/UnsupportedLookAndFeelException.java
+++ b/libjava/classpath/javax/swing/UnsupportedLookAndFeelException.java
@@ -1,4 +1,4 @@
-/* UnsupportedLookAndFeelException.java --
+/* UnsupportedLookAndFeelException.java --
Copyright (C) 2002, 2006, Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -40,14 +40,14 @@ package javax.swing;
/**
* Thrown by the {@link UIManager#setLookAndFeel(LookAndFeel)} method when the
* specified look and feel is not supported on the current platform.
- *
+ *
* @see LookAndFeel#isSupportedLookAndFeel()
*/
public class UnsupportedLookAndFeelException extends Exception
{
/**
* Creates a new exception instance with the specified message.
- *
+ *
* @param s the exception message.
*/
public UnsupportedLookAndFeelException(String s)
diff --git a/libjava/classpath/javax/swing/ViewportLayout.java b/libjava/classpath/javax/swing/ViewportLayout.java
index b61834e..02f9626 100644
--- a/libjava/classpath/javax/swing/ViewportLayout.java
+++ b/libjava/classpath/javax/swing/ViewportLayout.java
@@ -46,13 +46,13 @@ import java.awt.Rectangle;
import java.io.Serializable;
/**
- * The default layout for {@link JViewport}. The viewport makes its view the
- * same size as itself, but not smaller than its minimum size.
- *
+ * The default layout for {@link JViewport}. The viewport makes its view the
+ * same size as itself, but not smaller than its minimum size.
+ *
* If the port extends extends into space <em>past</em> the edge of the view,
* this layout manager moves the port up or to the left, in view space, by the
* amount of empty space (keep the lower and right edges lined up).
- *
+ *
* @author Andrew Selkirk
* @author Graydon Hoare
* @author Audrius Meskauskas (audriusa@Bioinformatics.org)
@@ -61,15 +61,15 @@ public class ViewportLayout implements LayoutManager, Serializable
{
private static final long serialVersionUID = -788225906076097229L;
- public ViewportLayout()
+ public ViewportLayout()
{
// Nothing to do here.
}
-
+
/**
* The method is not used with this manager.
*/
- public void addLayoutComponent(String name, Component c)
+ public void addLayoutComponent(String name, Component c)
{
// Nothing to do here.
}
@@ -77,20 +77,20 @@ public class ViewportLayout implements LayoutManager, Serializable
/**
* The method is not used with this manager.
*/
- public void removeLayoutComponent(Component c)
+ public void removeLayoutComponent(Component c)
{
// Nothing to do here.
}
-
+
/**
* Get the preferred layout size. If the view implements
- * {@link Scrollable}, this method returns
+ * {@link Scrollable}, this method returns
* {@link Scrollable#getPreferredScrollableViewportSize}.
* Otherwise, it returns {@link Component#getPreferredSize()}.
- *
+ *
* @return the preferred layout size, as described about.
*/
- public Dimension preferredLayoutSize(Container parent)
+ public Dimension preferredLayoutSize(Container parent)
{
JViewport vp = (JViewport)parent;
Component view = vp.getView();
@@ -107,13 +107,13 @@ public class ViewportLayout implements LayoutManager, Serializable
/**
* Get the minimum layout size. Normally this method returns the value,
* returned by the view method {@link Component#getMinimumSize()}.
- *
- * If the view is not set, the zero size is returned.
+ *
+ * If the view is not set, the zero size is returned.
*
* @param parent the viewport
* @return the minimum layout size.
*/
- public Dimension minimumLayoutSize(Container parent)
+ public Dimension minimumLayoutSize(Container parent)
{
// These values have been determined by the Mauve test for this method.
return new Dimension(4, 4);
@@ -132,7 +132,7 @@ public class ViewportLayout implements LayoutManager, Serializable
* <li>In {@link JViewport#setViewSize(Dimension)}, the view size is never
* set smaller that its minimum size.</li>
* </ol>
- *
+ *
* @see JViewport#getViewSize
* @see JViewport#setViewSize
* @see JViewport#getViewPosition
diff --git a/libjava/classpath/javax/swing/WindowConstants.java b/libjava/classpath/javax/swing/WindowConstants.java
index 598a61e..63ec2cb 100644
--- a/libjava/classpath/javax/swing/WindowConstants.java
+++ b/libjava/classpath/javax/swing/WindowConstants.java
@@ -38,14 +38,14 @@ exception statement from your version. */
package javax.swing;
/**
- * Defines some constants that are used in Swing's top-level containers. See
+ * Defines some constants that are used in Swing's top-level containers. See
* the following methods:
* <ul>
* <li>{@link JFrame#setDefaultCloseOperation(int)};</li>
* <li>{@link JInternalFrame#setDefaultCloseOperation(int)};</li>
* <li>{@link JDialog#setDefaultCloseOperation(int)};</li>
* </ul>
- *
+ *
* @author Andrew Selkirk
*/
public interface WindowConstants
@@ -62,16 +62,16 @@ public interface WindowConstants
/**
* Dispose the container when it is closed.
- *
+ *
* @see Window#dispose()
*/
int DISPOSE_ON_CLOSE = 2;
/**
* Exit the application when the container is closed.
- *
+ *
* @see System#exit(int)
- *
+ *
* @since 1.4
*/
int EXIT_ON_CLOSE = 3;
diff --git a/libjava/classpath/javax/swing/border/AbstractBorder.java b/libjava/classpath/javax/swing/border/AbstractBorder.java
index 16bb238..f75bcbb 100644
--- a/libjava/classpath/javax/swing/border/AbstractBorder.java
+++ b/libjava/classpath/javax/swing/border/AbstractBorder.java
@@ -1,4 +1,4 @@
-/* AbstractBorder.java --
+/* AbstractBorder.java --
Copyright (C) 2003, 2006, Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -87,10 +87,10 @@ public abstract class AbstractBorder implements Border, Serializable
}
/**
- * Returns the insets required for drawing this border around the specified
+ * Returns the insets required for drawing this border around the specified
* component.
*
- * @param c the component that the border applies to (ignored here,
+ * @param c the component that the border applies to (ignored here,
* subclasses may use it).
*
* @return an Insets object whose <code>left</code>, <code>right</code>,
@@ -106,25 +106,25 @@ public abstract class AbstractBorder implements Border, Serializable
}
/**
- * Returns the insets required for drawing this border around the specified
- * component. The default implementation provided here sets the
- * <code>left</code>, <code>right</code>, <code>top</code> and
- * <code>bottom</code> fields of the passed <code>insets</code> parameter to
+ * Returns the insets required for drawing this border around the specified
+ * component. The default implementation provided here sets the
+ * <code>left</code>, <code>right</code>, <code>top</code> and
+ * <code>bottom</code> fields of the passed <code>insets</code> parameter to
* zero.
*
- * @param c the component that the border applies to (ignored here,
+ * @param c the component that the border applies to (ignored here,
* subclasses may use it).
- * @param insets an instance that will be overwritten and returned as the
- * result (<code>null</code> not permitted).
+ * @param insets an instance that will be overwritten and returned as the
+ * result (<code>null</code> not permitted).
*
- * @return The border insets (the same object that was passed as the
+ * @return The border insets (the same object that was passed as the
* <code>insets</code> argument).
*
* @see #getBorderInsets(Component)
- *
+ *
* @throws NullPointerException if <code>insets</code> is <code>null</code>.
*/
- public Insets getBorderInsets(Component c, Insets insets)
+ public Insets getBorderInsets(Component c, Insets insets)
{
insets.left = insets.right = insets.top = insets.bottom = 0;
return insets;
@@ -139,14 +139,14 @@ public abstract class AbstractBorder implements Border, Serializable
*
* @return <code>false</code>.
*/
- public boolean isBorderOpaque()
+ public boolean isBorderOpaque()
{
return false;
}
/**
- * Returns a rectangle that covers the specified area minus the insets
- * required to draw this border. Components that wish to determine an area
+ * Returns a rectangle that covers the specified area minus the insets
+ * required to draw this border. Components that wish to determine an area
* into which they can safely draw without intersecting with a border might
* want to use this helper method.
*
@@ -155,7 +155,7 @@ public abstract class AbstractBorder implements Border, Serializable
* @param y the vertical position of the border.
* @param width the width of the available area for the border.
* @param height the height of the available area for the border.
- *
+ *
* @return The interior rectangle.
*/
public Rectangle getInteriorRectangle(Component c, int x, int y, int width,
@@ -163,12 +163,12 @@ public abstract class AbstractBorder implements Border, Serializable
{
return getInteriorRectangle(c, this, x, y, width, height);
}
-
+
/**
- * Returns a rectangle that covers the specified area minus the insets
+ * Returns a rectangle that covers the specified area minus the insets
* required to draw the specified border (if the border is <code>null</code>,
- * zero insets are assumed). Components that wish to determine an area into
- * which they can safely draw without intersecting with a border might want
+ * zero insets are assumed). Components that wish to determine an area into
+ * which they can safely draw without intersecting with a border might want
* to use this helper method.
*
* @param c the component in the center of this border.
@@ -177,7 +177,7 @@ public abstract class AbstractBorder implements Border, Serializable
* @param y the vertical position of the border.
* @param width the width of the available area for the border.
* @param height the height of the available area for the border.
- *
+ *
* @return The interior rectangle.
*/
public static Rectangle getInteriorRectangle(Component c, Border b, int x,
diff --git a/libjava/classpath/javax/swing/border/BevelBorder.java b/libjava/classpath/javax/swing/border/BevelBorder.java
index 5b4761e..b91961d 100644
--- a/libjava/classpath/javax/swing/border/BevelBorder.java
+++ b/libjava/classpath/javax/swing/border/BevelBorder.java
@@ -1,4 +1,4 @@
-/* BevelBorder.java --
+/* BevelBorder.java --
Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -76,12 +76,12 @@ public class BevelBorder extends AbstractBorder
* pressed into the screen.
*/
public static final int LOWERED = 1;
-
+
/**
* The type of this BevelBorder, which is either {@link #RAISED}
* or {@link #LOWERED}.
- */
+ */
protected int bevelType;
@@ -296,7 +296,7 @@ public class BevelBorder extends AbstractBorder
return insets;
}
-
+
/**
* Determines the color that will be used for the outer side of
* highlighted edges when painting the border. If a highlight color
@@ -306,7 +306,7 @@ public class BevelBorder extends AbstractBorder
* @param c the component enclosed by this border.
*
* @return The color.
- *
+ *
* @see #getHighlightInnerColor(java.awt.Component)
* @see java.awt.Color#brighter()
*/
@@ -329,7 +329,7 @@ public class BevelBorder extends AbstractBorder
* @param c the component enclosed by this border.
*
* @return The color.
- *
+ *
* @see java.awt.Component#getBackground()
* @see java.awt.Color#brighter()
*/
@@ -352,7 +352,7 @@ public class BevelBorder extends AbstractBorder
* @param c the component enclosed by this border.
*
* @return The color.
- *
+ *
* @see java.awt.Component#getBackground()
* @see java.awt.Color#darker()
*/
@@ -374,7 +374,7 @@ public class BevelBorder extends AbstractBorder
* @param c the component enclosed by this border.
*
* @return The color.
- *
+ *
* @see #getShadowInnerColor(java.awt.Component)
* @see java.awt.Color#darker()
*/
@@ -392,7 +392,7 @@ public class BevelBorder extends AbstractBorder
* highlighted edges when painting the border, or <code>null</code>
* if that color will be derived from the background of the enclosed
* Component.
- *
+ *
* @return The color (possibly <code>null</code>).
*/
public Color getHighlightOuterColor()
@@ -406,7 +406,7 @@ public class BevelBorder extends AbstractBorder
* highlighted edges when painting the border, or <code>null</code>
* if that color will be derived from the background of the enclosed
* Component.
- *
+ *
* @return The color (possibly <code>null</code>).
*/
public Color getHighlightInnerColor()
@@ -420,7 +420,7 @@ public class BevelBorder extends AbstractBorder
* shadowed edges when painting the border, or <code>null</code> if
* that color will be derived from the background of the enclosed
* Component.
- *
+ *
* @return The color (possibly <code>null</code>).
*/
public Color getShadowInnerColor()
@@ -434,19 +434,19 @@ public class BevelBorder extends AbstractBorder
* shadowed edges when painting the border, or <code>null</code> if
* that color will be derived from the background of the enclosed
* Component.
- *
+ *
* @return The color (possibly <code>null</code>).
*/
public Color getShadowOuterColor()
{
return shadowOuter;
}
-
-
+
+
/**
* Returns the appearance of this border, which is either {@link
* #RAISED} or {@link #LOWERED}.
- *
+ *
* @return The bevel type ({@link #RAISED} or {@link #LOWERED}).
*/
public int getBevelType()
@@ -475,7 +475,7 @@ public class BevelBorder extends AbstractBorder
* because Color.brighten() and Color.darken() always return an
* opaque color.
*/
- return
+ return
((highlightOuter == null) || (highlightOuter.getAlpha() == 255))
&& ((highlightInner == null) || (highlightInner.getAlpha() == 255))
&& ((shadowInner == null) || (shadowInner.getAlpha() == 255))
@@ -523,7 +523,7 @@ public class BevelBorder extends AbstractBorder
/**
* Paints a two-pixel bevel in four colors.
- *
+ *
* <pre>
* ++++++++++++
* +..........# + = color a
@@ -582,4 +582,3 @@ public class BevelBorder extends AbstractBorder
}
}
}
-
diff --git a/libjava/classpath/javax/swing/border/Border.java b/libjava/classpath/javax/swing/border/Border.java
index f4af3fb..da25832 100644
--- a/libjava/classpath/javax/swing/border/Border.java
+++ b/libjava/classpath/javax/swing/border/Border.java
@@ -1,4 +1,4 @@
-/* Border.java --
+/* Border.java --
Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -79,7 +79,7 @@ public interface Border
*/
void paintBorder(Component c, Graphics g, int x, int y, int width,
int height);
-
+
/**
* Measures the width of this border.
*
@@ -90,7 +90,7 @@ public interface Border
* width of the border at the respective edge.
*/
Insets getBorderInsets(Component c);
-
+
/**
* Determines whether this border fills every pixel in its area
* when painting.
diff --git a/libjava/classpath/javax/swing/border/CompoundBorder.java b/libjava/classpath/javax/swing/border/CompoundBorder.java
index ba2e745..d811150 100644
--- a/libjava/classpath/javax/swing/border/CompoundBorder.java
+++ b/libjava/classpath/javax/swing/border/CompoundBorder.java
@@ -1,4 +1,4 @@
-/* CompoundBorder.java --
+/* CompoundBorder.java --
Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -115,7 +115,7 @@ public class CompoundBorder extends AbstractBorder
*/
public boolean isBorderOpaque()
{
- // Although the API specification states that this method
+ // Although the API specification states that this method
// returns true if both the inside and outside borders are non-null
// and opaque, and false otherwise, a mauve test shows that if both
// the inside or outside borders are null, then true is returned.
@@ -137,7 +137,7 @@ public class CompoundBorder extends AbstractBorder
/**
* Paints the compound border by first painting the outside border,
- * then painting the inside border tightly nested into the outside.
+ * then painting the inside border tightly nested into the outside.
*
* @param c the component whose border is to be painted.
* @param g the graphics for painting.
@@ -233,7 +233,7 @@ public class CompoundBorder extends AbstractBorder
* Returns the outside border, which is painted outside both the
* bordered Component and the inside border. It is valid for the
* result to be <code>null</code>.
- *
+ *
* @return The outside border (possibly <code>null</code>).
*/
public Border getOutsideBorder()
@@ -245,7 +245,7 @@ public class CompoundBorder extends AbstractBorder
* Returns the inside border, which is painted between the bordered
* Component and the outside border. It is valid for the result to
* be <code>null</code>.
- *
+ *
* @return The inside border (possibly <code>null</code>).
*/
public Border getInsideBorder()
diff --git a/libjava/classpath/javax/swing/border/EmptyBorder.java b/libjava/classpath/javax/swing/border/EmptyBorder.java
index c8e9c60..da66511 100644
--- a/libjava/classpath/javax/swing/border/EmptyBorder.java
+++ b/libjava/classpath/javax/swing/border/EmptyBorder.java
@@ -1,4 +1,4 @@
-/* EmptyBorder.java --
+/* EmptyBorder.java --
Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -202,8 +202,8 @@ public class EmptyBorder extends AbstractBorder
{
return getBorderInsets(null, null);
}
-
-
+
+
/**
* Determines whether this border fills every pixel in its area
* when painting. Since an empty border does not paint any pixels
diff --git a/libjava/classpath/javax/swing/border/EtchedBorder.java b/libjava/classpath/javax/swing/border/EtchedBorder.java
index cd48b18..e9ee9e2 100644
--- a/libjava/classpath/javax/swing/border/EtchedBorder.java
+++ b/libjava/classpath/javax/swing/border/EtchedBorder.java
@@ -1,4 +1,4 @@
-/* EtchedBorder.java --
+/* EtchedBorder.java --
Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -63,8 +63,8 @@ public class EtchedBorder extends AbstractBorder
* of Apple/Sun JDK 1.3.1 on MacOS X 10.1.5.
*/
static final long serialVersionUID = 4001244046866360638L;
-
-
+
+
/**
* Indicates that the border appears as coming out of the
* background.
@@ -78,13 +78,13 @@ public class EtchedBorder extends AbstractBorder
*/
public static final int LOWERED = 1;
-
+
/**
* The type of this EtchedBorder, which is either {@link #RAISED}
* or {@link #LOWERED}.
*/
protected int etchType;
-
+
/**
* The highlight color, or <code>null</code> to indicate that the
@@ -139,8 +139,8 @@ public class EtchedBorder extends AbstractBorder
* assign a value here.
*/
}
-
-
+
+
/**
* Constructs a lowered EtchedBorder, explicitly selecting the
* colors that will be used for highlight and shadow.
@@ -157,8 +157,8 @@ public class EtchedBorder extends AbstractBorder
{
this(LOWERED, highlight, shadow);
}
-
-
+
+
/**
* Constructs an EtchedBorder with the specified appearance,
* explicitly selecting the colors that will be used for
@@ -186,8 +186,8 @@ public class EtchedBorder extends AbstractBorder
this.highlight = highlight;
this.shadow = shadow;
}
-
-
+
+
/**
* Paints the border for a given component.
*
@@ -214,8 +214,8 @@ public class EtchedBorder extends AbstractBorder
break;
}
}
-
-
+
+
/**
* Measures the width of this border.
*
@@ -277,11 +277,11 @@ public class EtchedBorder extends AbstractBorder
((highlight == null) || (highlight.getAlpha() == 255))
&& ((shadow == null) || (shadow.getAlpha() == 255));
}
-
+
/**
* Returns the appearance of this EtchedBorder, which is either
* {@link #RAISED} or {@link #LOWERED}.
- *
+ *
* @return The type ({@link #RAISED} or {@link #LOWERED}).
*/
public int getEtchType()
@@ -300,7 +300,7 @@ public class EtchedBorder extends AbstractBorder
* @param c the component enclosed by this border.
*
* @return The color.
- *
+ *
* @see java.awt.Component#getBackground()
* @see java.awt.Color#brighter()
*/
@@ -316,7 +316,7 @@ public class EtchedBorder extends AbstractBorder
* Returns the color that will be used for highlighted parts when
* painting the border, or <code>null</code> if that color will be
* derived from the background of the enclosed Component.
- *
+ *
* @return The highlight color (possibly <code>null</code>).
*/
public Color getHighlightColor()
@@ -335,7 +335,7 @@ public class EtchedBorder extends AbstractBorder
* @param c the component enclosed by this border.
*
* @return The shadow color.
- *
+ *
* @see java.awt.Component#getBackground()
* @see java.awt.Color#darker()
*/
@@ -346,13 +346,13 @@ public class EtchedBorder extends AbstractBorder
else
return c.getBackground().darker();
}
-
-
+
+
/**
* Returns the color that will be used for shadowed parts when
* painting the border, or <code>null</code> if that color will be
* derived from the background of the enclosed Component.
- *
+ *
* @return The shadow color (possibly <code>null</code>).
*/
public Color getShadowColor()
diff --git a/libjava/classpath/javax/swing/border/LineBorder.java b/libjava/classpath/javax/swing/border/LineBorder.java
index 31e19fe..e78bbee 100644
--- a/libjava/classpath/javax/swing/border/LineBorder.java
+++ b/libjava/classpath/javax/swing/border/LineBorder.java
@@ -1,4 +1,4 @@
-/* LineBorder.java --
+/* LineBorder.java --
Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -121,12 +121,12 @@ public class LineBorder extends AbstractBorder
{
this (color, thickness, /* roundedCorners */ false);
}
-
-
+
+
/**
* Constructs a LineBorder given its color, thickness, and whether
* it has rounded corners.
- *
+ *
* <p><img src="doc-files/LineBorder-1.png" width="500" height="200"
* alt="[An illustration of two LineBorders]" />
*
@@ -159,12 +159,12 @@ public class LineBorder extends AbstractBorder
this.thickness = thickness;
this.roundedCorners = roundedCorners;
}
-
-
+
+
/**
* Returns a black, one pixel thick, plain {@link LineBorder}. The method
* may always return the same (singleton) {@link LineBorder} instance.
- *
+ *
* @return The border.
*/
public static Border createBlackLineBorder()
@@ -174,15 +174,15 @@ public class LineBorder extends AbstractBorder
*/
if (blackLineBorder == null)
blackLineBorder = new LineBorder(Color.black);
-
+
return blackLineBorder;
}
-
-
+
+
/**
* Returns a gray, one pixel thick, plain {@link LineBorder}. The method
* may always return the same (singleton) {@link LineBorder} instance.
- *
+ *
* @return The border.
*/
public static Border createGrayLineBorder()
@@ -192,11 +192,11 @@ public class LineBorder extends AbstractBorder
*/
if (grayLineBorder == null)
grayLineBorder = new LineBorder(Color.gray);
-
+
return grayLineBorder;
}
-
-
+
+
/**
* Paints the line border around a given Component.
*
@@ -255,8 +255,8 @@ public class LineBorder extends AbstractBorder
g.setColor(oldColor);
}
}
-
-
+
+
/**
* Measures the width of this border.
*
@@ -273,8 +273,8 @@ public class LineBorder extends AbstractBorder
{
return new Insets(thickness, thickness, thickness, thickness);
}
-
-
+
+
/**
* Measures the width of this border, storing the results into a
* pre-existing Insets object.
@@ -295,30 +295,30 @@ public class LineBorder extends AbstractBorder
insets.left = insets.right = insets.top = insets.bottom = thickness;
return insets;
}
-
-
+
+
/**
* Returns the color of the line.
- *
+ *
* @return The line color (never <code>null</code>).
*/
public Color getLineColor()
{
return lineColor;
}
-
-
+
+
/**
* Returns the thickness of the line in pixels.
- *
+ *
* @return The line thickness (in pixels).
*/
public int getThickness()
{
return thickness;
}
-
-
+
+
/**
* Returns whether this LineBorder os drawm with rounded
* or with plain corners.
@@ -330,8 +330,8 @@ public class LineBorder extends AbstractBorder
{
return roundedCorners;
}
-
-
+
+
/**
* Determines whether this border fills every pixel in its area
* when painting.
diff --git a/libjava/classpath/javax/swing/border/MatteBorder.java b/libjava/classpath/javax/swing/border/MatteBorder.java
index 944cd28..c0c2d77 100644
--- a/libjava/classpath/javax/swing/border/MatteBorder.java
+++ b/libjava/classpath/javax/swing/border/MatteBorder.java
@@ -1,4 +1,4 @@
-/* MatteBorder.java --
+/* MatteBorder.java --
Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -61,8 +61,8 @@ public class MatteBorder extends EmptyBorder
* of Apple/Sun JDK 1.3.1 on MacOS X 10.1.5.
*/
static final long serialVersionUID = 4422248989617298224L;
-
-
+
+
/**
* The color that is used for filling the border, or
* <code>null</code> if the border is filled with repetitions of a
@@ -71,8 +71,8 @@ public class MatteBorder extends EmptyBorder
* @see #tileIcon
*/
protected Color color;
-
-
+
+
/**
* The icon is used for filling the border with a tile, or
* <code>null</code> if the border is filled with a solid
@@ -81,8 +81,8 @@ public class MatteBorder extends EmptyBorder
* @see #color
*/
protected Icon tileIcon;
-
-
+
+
/**
* Constructs a MatteBorder given the width on each side
* and a fill color.
@@ -171,8 +171,8 @@ public class MatteBorder extends EmptyBorder
borderInsets.bottom, borderInsets.right,
tileIcon);
}
-
-
+
+
/**
* Constructs a MatteBorder given an icon for tiling the
* border area. The icon width is used for the border insets
@@ -188,8 +188,8 @@ public class MatteBorder extends EmptyBorder
{
this(-1, -1, -1, -1, tileIcon);
}
-
-
+
+
/**
* Paints the border for a given component.
*
@@ -215,8 +215,8 @@ public class MatteBorder extends EmptyBorder
i.right, height - i.bottom,
width - i.right, i.top);
}
-
-
+
+
/**
* Measures the width of this border.
*
@@ -236,8 +236,8 @@ public class MatteBorder extends EmptyBorder
*/
return this.getBorderInsets(c, null);
}
-
-
+
+
/**
* Measures the width of this border, storing the results into a
* pre-existing Insets object.
@@ -271,8 +271,8 @@ public class MatteBorder extends EmptyBorder
*/
return super.getBorderInsets(c, insets);
}
-
-
+
+
/**
* Measures the width of this border.
*
@@ -290,34 +290,34 @@ public class MatteBorder extends EmptyBorder
*/
return this.getBorderInsets(null, null);
}
-
-
+
+
/**
* Returns the color that is used for filling the border, or
* <code>null</code> if the border is filled with repetitions of a
* tile icon.
- *
+ *
* @return The color (possibly <code>null</code>).
*/
public Color getMatteColor()
{
return color;
}
-
-
+
+
/**
* Returns the icon is used for tiling the border, or
* <code>null</code> if the border is filled with a color instead of
* an icon.
- *
+ *
* @return The icon (possibly <code>null</code>).
*/
public Icon getTileIcon()
{
return tileIcon;
}
-
-
+
+
/**
* Determines whether this border fills every pixel in its area
* when painting.
@@ -330,7 +330,7 @@ public class MatteBorder extends EmptyBorder
{
return (color != null) && (color.getAlpha() == 255);
}
-
+
/**
* Paints a rectangular area of the border. This private helper
@@ -372,7 +372,7 @@ public class MatteBorder extends EmptyBorder
}
return;
}
-
+
// If this border has no icon end painting here.
if (tileIcon == null)
return;
diff --git a/libjava/classpath/javax/swing/border/SoftBevelBorder.java b/libjava/classpath/javax/swing/border/SoftBevelBorder.java
index 028fd00..c0c9ae8 100644
--- a/libjava/classpath/javax/swing/border/SoftBevelBorder.java
+++ b/libjava/classpath/javax/swing/border/SoftBevelBorder.java
@@ -1,4 +1,4 @@
-/* SoftBevelBorder.java --
+/* SoftBevelBorder.java --
Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -242,7 +242,7 @@ public class SoftBevelBorder extends BevelBorder
return insets;
}
-
+
/**
* Determines whether this border fills every pixel in its area
* when painting.
@@ -261,7 +261,7 @@ public class SoftBevelBorder extends BevelBorder
/**
* Paints a soft bevel in four colors.
- *
+ *
* <pre>
* +++++++++++.
* ++.........# + = color a
diff --git a/libjava/classpath/javax/swing/border/TitledBorder.java b/libjava/classpath/javax/swing/border/TitledBorder.java
index 38ccd72..4d4f3af 100644
--- a/libjava/classpath/javax/swing/border/TitledBorder.java
+++ b/libjava/classpath/javax/swing/border/TitledBorder.java
@@ -1,4 +1,4 @@
-/* TitledBorder.java --
+/* TitledBorder.java --
Copyright (C) 2003, 2004, 2005, 2006, Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -241,7 +241,7 @@ public class TitledBorder extends AbstractBorder
* on MacOS X 10.1.5.
*/
static final long serialVersionUID = 8012999415147721601L;
-
+
/**
* The title, or <code>null</code> to display no title.
@@ -257,7 +257,7 @@ public class TitledBorder extends AbstractBorder
*/
protected Border border;
-
+
/**
* The vertical position of the title text relative to the border,
* which is one of {@link #ABOVE_TOP}, {@link #TOP}, {@link
@@ -318,7 +318,7 @@ public class TitledBorder extends AbstractBorder
this(border, /* title */ "", LEADING, TOP,
/* titleFont */ null, /* titleColor */ null);
}
-
+
/**
* Constructs a TitledBorder given its border and title text.
@@ -334,7 +334,7 @@ public class TitledBorder extends AbstractBorder
this(border, title, LEADING, TOP,
/* titleFont */ null, /* titleColor */ null);
}
-
+
/**
* Constructs a TitledBorder given its border, title text, horizontal
@@ -350,7 +350,7 @@ public class TitledBorder extends AbstractBorder
* text in relation to the border. The value must be one of
* {@link #LEFT}, {@link #CENTER}, {@link #RIGHT}, {@link #LEADING},
* {@link #TRAILING}, or {@link #DEFAULT_JUSTIFICATION}.
-
+
* @param titlePosition the vertical position of the title text
* in relation to the border. The value must be one of
* {@link #ABOVE_TOP}, {@link #TOP}, {@link #BELOW_TOP},
@@ -366,7 +366,7 @@ public class TitledBorder extends AbstractBorder
this(border, title, titleJustification, titlePosition,
/* titleFont */ null, /* titleColor */ null);
}
-
+
/**
* Constructs a TitledBorder given its border, title text, horizontal
@@ -401,7 +401,7 @@ public class TitledBorder extends AbstractBorder
this(border, title, titleJustification, titlePosition, titleFont,
/* titleColor */ null);
}
-
+
/**
* Constructs a TitledBorder given its border, title text, horizontal
@@ -448,8 +448,8 @@ public class TitledBorder extends AbstractBorder
this.titleFont = titleFont;
this.titleColor = titleColor;
}
-
-
+
+
/**
* Paints the border and the title text.
*
@@ -460,7 +460,7 @@ public class TitledBorder extends AbstractBorder
* @param width the width of the available area for painting the border.
* @param height the height of the available area for painting the border.
*/
- public void paintBorder(Component c, Graphics g,
+ public void paintBorder(Component c, Graphics g,
int x, int y, int width, int height)
{
Rectangle borderRect = new Rectangle(x + EDGE_SPACING, y + EDGE_SPACING,
@@ -666,7 +666,7 @@ public class TitledBorder extends AbstractBorder
borderRect.width,
borderRect.height);
}
-
+
}
else
{
@@ -683,7 +683,7 @@ public class TitledBorder extends AbstractBorder
borderRect.width,
borderRect.height);
}
-
+
}
g.setClip(saved);
}
@@ -710,7 +710,7 @@ public class TitledBorder extends AbstractBorder
{
return getBorderInsets(c, new Insets(0, 0, 0, 0));
}
-
+
/**
* Measures the width of this border, storing the results into a
@@ -795,8 +795,8 @@ public class TitledBorder extends AbstractBorder
}
return insets;
}
-
-
+
+
/**
* Returns <code>false</code>, indicating that there are pixels inside
* the area of this border where the background shines through.
@@ -961,7 +961,7 @@ public class TitledBorder extends AbstractBorder
public void setTitlePosition(int titlePosition)
{
if ((titlePosition < DEFAULT_POSITION) || (titlePosition > BELOW_BOTTOM))
- throw new IllegalArgumentException(titlePosition
+ throw new IllegalArgumentException(titlePosition
+ " is not a valid title position.");
// Swing borders are not JavaBeans, thus no need to fire an event.
@@ -983,7 +983,7 @@ public class TitledBorder extends AbstractBorder
{
if ((titleJustification < DEFAULT_JUSTIFICATION)
|| (titleJustification > TRAILING))
- throw new IllegalArgumentException(titleJustification
+ throw new IllegalArgumentException(titleJustification
+ " is not a valid title justification.");
// Swing borders are not JavaBeans, thus no need to fire an event.
@@ -1027,7 +1027,7 @@ public class TitledBorder extends AbstractBorder
*
* @param c the Component for which this TitledBorder constitutes
* a border.
- *
+ *
* @return The minimum size.
*/
public Dimension getMinimumSize(Component c)
diff --git a/libjava/classpath/javax/swing/colorchooser/AbstractColorChooserPanel.java b/libjava/classpath/javax/swing/colorchooser/AbstractColorChooserPanel.java
index efb5277..a554208 100644
--- a/libjava/classpath/javax/swing/colorchooser/AbstractColorChooserPanel.java
+++ b/libjava/classpath/javax/swing/colorchooser/AbstractColorChooserPanel.java
@@ -77,9 +77,9 @@ public abstract class AbstractColorChooserPanel extends JPanel
/**
* Returns the key code for the mnemonic for this panel. This method returns
* zero to indicate no mnemonic, subclasses can override this.
- *
+ *
* @return <code>0</code>, to indicate no mnemonic key code.
- *
+ *
* @see #getDisplayedMnemonicIndex()
* @since 1.4
*/
@@ -87,14 +87,14 @@ public abstract class AbstractColorChooserPanel extends JPanel
{
return 0;
}
-
+
/**
- * Returns the index of the character in the display name that is the
+ * Returns the index of the character in the display name that is the
* mnemonic. This method returns <code>-1</code> to indicate no mnemonic,
* subclasses can override.
- *
+ *
* @return <code>-1</code>, to indicate no mnemonic.
- *
+ *
* @see #getDisplayName()
* @see #getMnemonic()
* @since 1.4
@@ -103,7 +103,7 @@ public abstract class AbstractColorChooserPanel extends JPanel
{
return -1;
}
-
+
/**
* This method updates the chooser panel when the JColorChooser's color has
* changed.
diff --git a/libjava/classpath/javax/swing/colorchooser/ColorChooserComponentFactory.java b/libjava/classpath/javax/swing/colorchooser/ColorChooserComponentFactory.java
index 923ea53..ef8ea21 100644
--- a/libjava/classpath/javax/swing/colorchooser/ColorChooserComponentFactory.java
+++ b/libjava/classpath/javax/swing/colorchooser/ColorChooserComponentFactory.java
@@ -64,7 +64,7 @@ public class ColorChooserComponentFactory
*/
public static AbstractColorChooserPanel[] getDefaultChooserPanels()
{
- AbstractColorChooserPanel[] values =
+ AbstractColorChooserPanel[] values =
{
new DefaultSwatchChooserPanel(),
new DefaultHSBChooserPanel(),
diff --git a/libjava/classpath/javax/swing/colorchooser/ColorSelectionModel.java b/libjava/classpath/javax/swing/colorchooser/ColorSelectionModel.java
index b660505..7831e47 100644
--- a/libjava/classpath/javax/swing/colorchooser/ColorSelectionModel.java
+++ b/libjava/classpath/javax/swing/colorchooser/ColorSelectionModel.java
@@ -47,22 +47,22 @@ import javax.swing.event.ChangeListener;
/**
* A model that is used by the {@link JColorChooser} component to represent the
* selected color.
- *
- * @author Andrew Selkirk
+ *
+ * @author Andrew Selkirk
*/
-public interface ColorSelectionModel
+public interface ColorSelectionModel
{
/**
* Returns the selected color.
- *
+ *
* @return The selected color.
*/
Color getSelectedColor();
/**
* Sets the selected color.
- *
+ *
* @param color the selected color.
*/
void setSelectedColor(Color color);
@@ -70,13 +70,13 @@ public interface ColorSelectionModel
/**
* Registers a listener to receive {@link ChangeEvent} notifications
* from this model.
- *
+ *
* @param listener the listener.
*/
void addChangeListener(ChangeListener listener);
/**
- * Deregisters a listener so that it no longer receives {@link ChangeEvent}
+ * Deregisters a listener so that it no longer receives {@link ChangeEvent}
* notifications from this action.
*
* @param listener the listener.
diff --git a/libjava/classpath/javax/swing/colorchooser/DefaultColorSelectionModel.java b/libjava/classpath/javax/swing/colorchooser/DefaultColorSelectionModel.java
index aae2bed..07493f6 100644
--- a/libjava/classpath/javax/swing/colorchooser/DefaultColorSelectionModel.java
+++ b/libjava/classpath/javax/swing/colorchooser/DefaultColorSelectionModel.java
@@ -113,8 +113,8 @@ public class DefaultColorSelectionModel implements ColorSelectionModel,
throw new Error("ColorSelectionModel cannot be set to have null color.");
if (color != selectedColor)
{
- this.selectedColor = color;
- fireStateChanged();
+ this.selectedColor = color;
+ fireStateChanged();
}
}
diff --git a/libjava/classpath/javax/swing/colorchooser/DefaultHSBChooserPanel.java b/libjava/classpath/javax/swing/colorchooser/DefaultHSBChooserPanel.java
index 112d021..d035fe19 100644
--- a/libjava/classpath/javax/swing/colorchooser/DefaultHSBChooserPanel.java
+++ b/libjava/classpath/javax/swing/colorchooser/DefaultHSBChooserPanel.java
@@ -206,7 +206,7 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
{
Point p = e.getPoint();
if (p.x < 0 || p.y < 0 || p.y > imgHeight || p.x > imgWidth)
- return;
+ return;
gradientPoint = p;
update(p);
@@ -231,11 +231,11 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
{
handlingMouse = true;
if (hSpinner.isEnabled())
- updateH(p);
+ updateH(p);
else if (sSpinner.isEnabled())
- updateS(p);
+ updateS(p);
else
- updateB(p);
+ updateB(p);
handlingMouse = false;
}
@@ -309,21 +309,21 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
public void stateChanged(ChangeEvent e)
{
if (internalChange)
- return;
+ return;
Integer value = new Integer(slider.getValue());
switch (locked)
{
- case HLOCKED:
- hSpinner.setValue(value);
- break;
- case SLOCKED:
- sSpinner.setValue(value);
- break;
- case BLOCKED:
- bSpinner.setValue(value);
- break;
+ case HLOCKED:
+ hSpinner.setValue(value);
+ break;
+ case SLOCKED:
+ sSpinner.setValue(value);
+ break;
+ case BLOCKED:
+ bSpinner.setValue(value);
+ break;
}
}
}
@@ -344,18 +344,18 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
JSpinner change;
if (e.getSource() == hRadio)
{
- locked = HLOCKED;
- change = hSpinner;
+ locked = HLOCKED;
+ change = hSpinner;
}
else if (e.getSource() == sRadio)
{
- locked = SLOCKED;
- change = sSpinner;
+ locked = SLOCKED;
+ change = sSpinner;
}
else
{
- locked = BLOCKED;
- change = bSpinner;
+ locked = BLOCKED;
+ change = bSpinner;
}
change.setEnabled(((AbstractButton) e.getSource()).isSelected());
@@ -380,7 +380,7 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
public void stateChanged(ChangeEvent e)
{
if (internalChange)
- return;
+ return;
float h = ((Number) hSpinner.getValue()).intValue() / 360f;
float s = ((Number) sSpinner.getValue()).intValue() / 100f;
@@ -393,8 +393,8 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
if (! handlingMouse && slider != null && ! slider.getValueIsAdjusting())
{
- updateImage();
- updateTrack();
+ updateImage();
+ updateTrack();
}
repaint();
}
@@ -435,44 +435,44 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
if (! spinnerTrigger)
{
- hSpinner.setValue(new Integer((int) (hsbVals[0] * 360)));
- sSpinner.setValue(new Integer((int) (hsbVals[1] * 100)));
- bSpinner.setValue(new Integer((int) (hsbVals[2] * 100)));
+ hSpinner.setValue(new Integer((int) (hsbVals[0] * 360)));
+ sSpinner.setValue(new Integer((int) (hsbVals[1] * 100)));
+ bSpinner.setValue(new Integer((int) (hsbVals[2] * 100)));
}
switch (locked)
{
case HLOCKED:
- if (slider != null)
- slider.setValue(((Number) hSpinner.getValue()).intValue());
- if (! handlingMouse)
- {
- gradientPoint.x = (int) ((1
- - ((Number) sSpinner.getValue()).intValue() / 100f) * imgWidth);
- gradientPoint.y = (int) ((1
- - ((Number) bSpinner.getValue()).intValue() / 100f) * imgHeight);
- }
- break;
+ if (slider != null)
+ slider.setValue(((Number) hSpinner.getValue()).intValue());
+ if (! handlingMouse)
+ {
+ gradientPoint.x = (int) ((1
+ - ((Number) sSpinner.getValue()).intValue() / 100f) * imgWidth);
+ gradientPoint.y = (int) ((1
+ - ((Number) bSpinner.getValue()).intValue() / 100f) * imgHeight);
+ }
+ break;
case SLOCKED:
- if (slider != null)
- slider.setValue(((Number) sSpinner.getValue()).intValue());
- if (! handlingMouse)
- {
- gradientPoint.x = (int) (((Number) hSpinner.getValue()).intValue() / 360f * imgWidth);
- gradientPoint.y = (int) ((1
- - ((Number) bSpinner.getValue()).intValue() / 100f) * imgHeight);
- }
- break;
+ if (slider != null)
+ slider.setValue(((Number) sSpinner.getValue()).intValue());
+ if (! handlingMouse)
+ {
+ gradientPoint.x = (int) (((Number) hSpinner.getValue()).intValue() / 360f * imgWidth);
+ gradientPoint.y = (int) ((1
+ - ((Number) bSpinner.getValue()).intValue() / 100f) * imgHeight);
+ }
+ break;
case BLOCKED:
- if (slider != null)
- slider.setValue(((Number) bSpinner.getValue()).intValue());
- if (! handlingMouse)
- {
- gradientPoint.x = (int) (((Number) hSpinner.getValue()).intValue() / 360f * imgWidth);
- gradientPoint.y = (int) ((1
- - ((Number) sSpinner.getValue()).intValue() / 100f) * imgHeight);
- }
- break;
+ if (slider != null)
+ slider.setValue(((Number) bSpinner.getValue()).intValue());
+ if (! handlingMouse)
+ {
+ gradientPoint.x = (int) (((Number) hSpinner.getValue()).intValue() / 360f * imgWidth);
+ gradientPoint.y = (int) ((1
+ - ((Number) sSpinner.getValue()).intValue() / 100f) * imgHeight);
+ }
+ break;
}
internalChange = false;
@@ -498,21 +498,21 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
gradientPanel = new JPanel()
{
- public Dimension getPreferredSize()
- {
- return new Dimension(imgWidth, imgHeight);
- }
-
- public void paint(Graphics g)
- {
- if (gradientImage != null)
- g.drawImage(gradientImage, 0, 0, this);
-
- Color saved = g.getColor();
- g.setColor(Color.WHITE);
- g.drawOval(gradientPoint.x - 3, gradientPoint.y - 3, 6, 6);
- g.setColor(saved);
- }
+ public Dimension getPreferredSize()
+ {
+ return new Dimension(imgWidth, imgHeight);
+ }
+
+ public void paint(Graphics g)
+ {
+ if (gradientImage != null)
+ g.drawImage(gradientImage, 0, 0, this);
+
+ Color saved = g.getColor();
+ g.setColor(Color.WHITE);
+ g.drawOval(gradientPoint.x - 3, gradientPoint.y - 3, 6, 6);
+ g.setColor(saved);
+ }
};
MouseAdapter ml = new MainGradientMouseListener();
@@ -521,16 +521,16 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
trackPanel = new JPanel()
{
- public Dimension getPreferredSize()
- {
- return new Dimension(trackWidth, imgHeight);
- }
-
- public void paint(Graphics g)
- {
- if (trackImage != null)
- g.drawImage(trackImage, 0, 0, this);
- }
+ public Dimension getPreferredSize()
+ {
+ return new Dimension(trackWidth, imgHeight);
+ }
+
+ public void paint(Graphics g)
+ {
+ if (trackImage != null)
+ g.drawImage(trackImage, 0, 0, this);
+ }
};
slider = new JSlider();
@@ -682,9 +682,9 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
for (int j = 0; j < imgHeight; j++)
for (int i = 0; i < imgWidth; i++)
- pix[index++] = Color.HSBtoRGB(hValue, (imgWidth - i * 1f) / imgWidth,
- (imgHeight - j * 1f) / imgHeight)
- | (255 << 24);
+ pix[index++] = Color.HSBtoRGB(hValue, (imgWidth - i * 1f) / imgWidth,
+ (imgHeight - j * 1f) / imgHeight)
+ | (255 << 24);
gradientImage = createImage(new MemoryImageSource(imgWidth, imgHeight,
pix, 0, imgWidth));
@@ -702,9 +702,9 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
int index = 0;
for (int j = 0; j < imgHeight; j++)
for (int i = 0; i < imgWidth; i++)
- pix[index++] = Color.HSBtoRGB(i * 1f / imgWidth,
- (imgHeight - j * 1f) / imgHeight, bValue)
- | (255 << 24);
+ pix[index++] = Color.HSBtoRGB(i * 1f / imgWidth,
+ (imgHeight - j * 1f) / imgHeight, bValue)
+ | (255 << 24);
gradientImage = createImage(new MemoryImageSource(imgWidth, imgHeight,
pix, 0, imgWidth));
@@ -722,9 +722,9 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
int index = 0;
for (int j = 0; j < imgHeight; j++)
for (int i = 0; i < imgWidth; i++)
- pix[index++] = Color.HSBtoRGB(i * 1f / imgWidth, sValue,
- (imgHeight - j * 1f) / imgHeight)
- | (255 << 24);
+ pix[index++] = Color.HSBtoRGB(i * 1f / imgWidth, sValue,
+ (imgHeight - j * 1f) / imgHeight)
+ | (255 << 24);
gradientImage = createImage(new MemoryImageSource(imgWidth, imgHeight,
pix, 0, imgWidth));
}
@@ -739,14 +739,14 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
switch (locked)
{
case HLOCKED:
- updateHLockImage();
- break;
+ updateHLockImage();
+ break;
case SLOCKED:
- updateSLockImage();
- break;
+ updateSLockImage();
+ break;
case BLOCKED:
- updateBLockImage();
- break;
+ updateBLockImage();
+ break;
}
}
@@ -777,18 +777,18 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
slider.setMinimum(0);
if (locked == HLOCKED)
{
- slider.setMaximum(359);
- slider.setValue(((Number) hSpinner.getValue()).intValue());
- slider.setInverted(true);
+ slider.setMaximum(359);
+ slider.setValue(((Number) hSpinner.getValue()).intValue());
+ slider.setInverted(true);
}
else
{
- slider.setMaximum(100);
- slider.setInverted(false);
- if (sRadio.isSelected())
- slider.setValue(((Number) sSpinner.getValue()).intValue());
- else
- slider.setValue(((Number) bSpinner.getValue()).intValue());
+ slider.setMaximum(100);
+ slider.setInverted(false);
+ if (sRadio.isSelected())
+ slider.setValue(((Number) sSpinner.getValue()).intValue());
+ else
+ slider.setValue(((Number) bSpinner.getValue()).intValue());
}
repaint();
}
@@ -803,14 +803,14 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
switch (locked)
{
case HLOCKED:
- updateHTrack();
- break;
+ updateHTrack();
+ break;
case SLOCKED:
- updateSTrack();
- break;
+ updateSTrack();
+ break;
case BLOCKED:
- updateBTrack();
- break;
+ updateBTrack();
+ break;
}
}
@@ -825,8 +825,8 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
for (int j = 0; j < imgHeight; j++)
for (int i = 0; i < trackWidth; i++)
- trackPix[trackIndex++] = Color.HSBtoRGB(j * 1f / imgHeight, 1f, 1f)
- | (255 << 24);
+ trackPix[trackIndex++] = Color.HSBtoRGB(j * 1f / imgHeight, 1f, 1f)
+ | (255 << 24);
trackImage = createImage(new MemoryImageSource(trackWidth, imgHeight,
trackPix, 0, trackWidth));
@@ -846,9 +846,9 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
int trackIndex = 0;
for (int j = 0; j < imgHeight; j++)
for (int i = 0; i < trackWidth; i++)
- trackPix[trackIndex++] = Color.HSBtoRGB(hValue,
- (imgHeight - j * 1f) / imgHeight,
- bValue) | (255 << 24);
+ trackPix[trackIndex++] = Color.HSBtoRGB(hValue,
+ (imgHeight - j * 1f) / imgHeight,
+ bValue) | (255 << 24);
trackImage = createImage(new MemoryImageSource(trackWidth, imgHeight,
trackPix, 0, trackWidth));
@@ -868,9 +868,9 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
int trackIndex = 0;
for (int j = 0; j < imgHeight; j++)
for (int i = 0; i < trackWidth; i++)
- trackPix[trackIndex++] = Color.HSBtoRGB(hValue, sValue,
- (imgHeight - j * 1f) / imgHeight)
- | (255 << 24);
+ trackPix[trackIndex++] = Color.HSBtoRGB(hValue, sValue,
+ (imgHeight - j * 1f) / imgHeight)
+ | (255 << 24);
trackImage = createImage(new MemoryImageSource(trackWidth, imgHeight,
trackPix, 0, trackWidth));
diff --git a/libjava/classpath/javax/swing/colorchooser/DefaultRGBChooserPanel.java b/libjava/classpath/javax/swing/colorchooser/DefaultRGBChooserPanel.java
index 39a1732..24f0a9a 100644
--- a/libjava/classpath/javax/swing/colorchooser/DefaultRGBChooserPanel.java
+++ b/libjava/classpath/javax/swing/colorchooser/DefaultRGBChooserPanel.java
@@ -72,7 +72,7 @@ class DefaultRGBChooserPanel extends AbstractColorChooserPanel
public void stateChanged(ChangeEvent e)
{
if (updateChange)
- return;
+ return;
int color = R.getValue() << 16 | G.getValue() << 8 | B.getValue();
@@ -95,7 +95,7 @@ class DefaultRGBChooserPanel extends AbstractColorChooserPanel
public void stateChanged(ChangeEvent e)
{
if (updateChange)
- return;
+ return;
int red = ((Number) RSpinner.getValue()).intValue();
int green = ((Number) GSpinner.getValue()).intValue();
@@ -198,21 +198,21 @@ class DefaultRGBChooserPanel extends AbstractColorChooserPanel
if (! sliderChange)
{
- if (R != null)
- R.setValue(red);
- if (G != null)
- G.setValue(green);
- if (B != null)
- B.setValue(blue);
+ if (R != null)
+ R.setValue(red);
+ if (G != null)
+ G.setValue(green);
+ if (B != null)
+ B.setValue(blue);
}
if (! spinnerChange)
{
- if (GSpinner != null)
- GSpinner.setValue(new Integer(green));
- if (RSpinner != null)
- RSpinner.setValue(new Integer(red));
- if (BSpinner != null)
- BSpinner.setValue(new Integer(blue));
+ if (GSpinner != null)
+ GSpinner.setValue(new Integer(green));
+ if (RSpinner != null)
+ RSpinner.setValue(new Integer(red));
+ if (BSpinner != null)
+ BSpinner.setValue(new Integer(blue));
}
updateChange = false;
diff --git a/libjava/classpath/javax/swing/colorchooser/DefaultSwatchChooserPanel.java b/libjava/classpath/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
index ff34368..99b7157 100644
--- a/libjava/classpath/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
+++ b/libjava/classpath/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
@@ -213,7 +213,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
/** The color (255, 153, 153). */
public static final Color C255153153 = new Color(255, 153, 153);
- static Color[] colors =
+ static Color[] colors =
{
// Row 1
Color.WHITE, new Color(204, 255, 255), C204255255, C204255255, C204255255,
@@ -224,7 +224,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
C255204204, new Color(255, 255, 204), C204255204,
C204255204, C204255204, C204255204, C204255204,
C204255204, C204255204, C204255204, C204255204,
-
+
// Row 2
C204204204, new Color(153, 255, 255), new Color(153, 204, 255), C153153255,
C153153255, C153153255, C153153255, C153153255,
@@ -237,7 +237,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
new Color(204, 255, 153), C153255153, C153255153,
C153255153, C153255153, C153255153, C153255153,
C153255153, new Color(153, 255, 204),
-
+
// Row 3
C204204204, new Color(102, 255, 255), new Color(102, 204, 255),
new Color(102, 153, 255), C102102255, C102102255,
@@ -256,7 +256,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
C102255102, C102255102, C102255102,
new Color(102, 255, 153),
new Color(102, 255, 204),
-
+
// Row 4
new Color(153, 153, 153), new Color(51, 255, 255), new Color(51, 204, 255),
new Color(51, 153, 255), new Color(51, 102, 255),
@@ -272,7 +272,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
C051255051, C051255051, C051255051,
new Color(51, 255, 102), new Color(51, 255, 153),
new Color(51, 255, 204),
-
+
// Row 5
new Color(153, 153, 153), new Color(0, 255, 255), new Color(0, 204, 255),
new Color(0, 153, 255), new Color(0, 102, 255),
@@ -289,7 +289,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
new Color(51, 255, 0), new Color(0, 255, 0),
new Color(0, 255, 51), new Color(0, 255, 102),
new Color(0, 255, 153), new Color(0, 255, 204),
-
+
// Row 6
new Color(102, 102, 102), C000204204, C000204204, new Color(0, 153, 204),
new Color(0, 102, 204), new Color(0, 51, 204),
@@ -305,7 +305,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
new Color(0, 204, 0), new Color(0, 204, 51),
new Color(0, 204, 102), new Color(0, 204, 153),
new Color(0, 204, 204),
-
+
// Row 7
new Color(102, 102, 102), C000153153, C000153153, C000153153,
new Color(0, 102, 153), new Color(0, 51, 153),
@@ -319,7 +319,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
new Color(102, 153, 0), new Color(51, 153, 0),
new Color(0, 153, 0), new Color(0, 153, 51),
new Color(0, 153, 102), C000153153, C000153153,
-
+
// Row 8
new Color(51, 51, 51), C000102102, C000102102, C000102102, C000102102,
new Color(0, 51, 102), new Color(0, 0, 102),
@@ -332,7 +332,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
new Color(51, 102, 0), new Color(0, 102, 0),
new Color(0, 102, 51), C000102102, C000102102,
C000102102,
-
+
// Row 9.
Color.BLACK, C000051051, C000051051, C000051051, C000051051, C000051051,
new Color(0, 0, 51), C051000051, C051000051,
@@ -369,8 +369,8 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
{
if (x % (cellWidth + gap) > cellWidth
|| y % (cellHeight + gap) > cellHeight)
- // position is located in gap.
- return null;
+ // position is located in gap.
+ return null;
int row = y / (cellHeight + gap);
int col = x / (cellWidth + gap);
@@ -401,14 +401,14 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
for (int i = 0; i < numRows; i++)
{
- for (int j = 0; j < numCols; j++)
- {
- graphics.setColor(colors[index++]);
- graphics.fill3DRect(currX, currY, cellWidth, cellHeight, true);
- currX += gap + cellWidth;
- }
- currX = insets.left;
- currY += gap + cellHeight;
+ for (int j = 0; j < numCols; j++)
+ {
+ graphics.setColor(colors[index++]);
+ graphics.fill3DRect(currX, currY, cellWidth, cellHeight, true);
+ currX += gap + cellWidth;
+ }
+ currX = insets.left;
+ currY += gap + cellHeight;
}
graphics.setColor(saved);
}
@@ -424,7 +424,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
{
Color c = getColorForPosition(e.getX(), e.getY());
if (c == null)
- return null;
+ return null;
return (c.getRed() + "," + c.getGreen() + "," + c.getBlue());
}
}
@@ -467,8 +467,8 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
{
if (x % (cellWidth + gap) > cellWidth
|| y % (cellHeight + gap) > cellHeight)
- // position is located in gap.
- return null;
+ // position is located in gap.
+ return null;
int row = y / (cellHeight + gap);
int col = x / (cellWidth + gap);
@@ -483,7 +483,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
{
colors = new Color[numRows * numCols];
for (int i = 0; i < colors.length; i++)
- colors[i] = defaultColor;
+ colors[i] = defaultColor;
}
/**
@@ -508,7 +508,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
void addColorToQueue(Color c)
{
if (--start == -1)
- start = numRows * numCols - 1;
+ start = numRows * numCols - 1;
colors[start] = c;
}
@@ -527,14 +527,14 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
for (int i = 0; i < numRows; i++)
{
- for (int j = 0; j < numCols; j++)
- {
- g.setColor(colors[getIndexForCell(i, j)]);
- g.fill3DRect(currX, currY, cellWidth, cellHeight, true);
- currX += cellWidth + gap;
- }
- currX = insets.left;
- currY += cellWidth + gap;
+ for (int j = 0; j < numCols; j++)
+ {
+ g.setColor(colors[getIndexForCell(i, j)]);
+ g.fill3DRect(currX, currY, cellWidth, cellHeight, true);
+ currX += cellWidth + gap;
+ }
+ currX = insets.left;
+ currY += cellWidth + gap;
}
}
@@ -549,7 +549,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
{
Color c = getColorForPosition(e.getX(), e.getY());
if (c == null)
- return null;
+ return null;
return c.getRed() + "," + c.getGreen() + "," + c.getBlue();
}
}
@@ -609,11 +609,11 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
for (int i = 0; i < comps.length; i++)
{
- pref[i] = comps[i].getPreferredSize();
- if (pref[i] == null)
- return;
- maxHeight = Math.max(maxHeight, pref[i].height);
- totalWidth += pref[i].width;
+ pref[i] = comps[i].getPreferredSize();
+ if (pref[i] == null)
+ return;
+ maxHeight = Math.max(maxHeight, pref[i].height);
+ totalWidth += pref[i].width;
}
ypos = (parent.getSize().height - maxHeight) / 2 + insets.top;
@@ -621,10 +621,10 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
for (int i = 0; i < comps.length; i++)
{
- if (pref[i] == null)
- continue;
- comps[i].setBounds(xpos, ypos, pref[i].width, pref[i].height);
- xpos += pref[i].width;
+ if (pref[i] == null)
+ continue;
+ comps[i].setBounds(xpos, ypos, pref[i].width, pref[i].height);
+ xpos += pref[i].width;
}
}
@@ -667,11 +667,11 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
for (int i = 0; i < comps.length; i++)
{
- pref = comps[i].getPreferredSize();
- if (pref == null)
- continue;
- xmax += pref.width;
- ymax = Math.max(ymax, pref.height);
+ pref = comps[i].getPreferredSize();
+ if (pref == null)
+ continue;
+ xmax += pref.width;
+ ymax = Math.max(ymax, pref.height);
}
Insets insets = parent.getInsets();
@@ -713,11 +713,11 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
for (int i = 0; i < comps.length; i++)
{
- pref = comps[i].getPreferredSize();
- if (pref == null)
- continue;
- comps[i].setBounds(insets.left, currY, pref.width, pref.height);
- currY += pref.height;
+ pref = comps[i].getPreferredSize();
+ if (pref == null)
+ continue;
+ comps[i].setBounds(insets.left, currY, pref.width, pref.height);
+ currY += pref.height;
}
}
@@ -750,12 +750,12 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
Dimension pref;
for (int i = 0; i < comps.length; i++)
{
- pref = comps[i].getPreferredSize();
- if (pref != null)
- {
- width = Math.max(width, pref.width);
- height += pref.height;
- }
+ pref = comps[i].getPreferredSize();
+ if (pref != null)
+ {
+ width = Math.max(width, pref.width);
+ height += pref.height;
+ }
}
return new Dimension(width + insets.left + insets.right,
diff --git a/libjava/classpath/javax/swing/event/AncestorEvent.java b/libjava/classpath/javax/swing/event/AncestorEvent.java
index d06c6e3..27b469a 100644
--- a/libjava/classpath/javax/swing/event/AncestorEvent.java
+++ b/libjava/classpath/javax/swing/event/AncestorEvent.java
@@ -50,7 +50,7 @@ import javax.swing.JComponent;
public class AncestorEvent extends AWTEvent
{
private static final long serialVersionUID = -8079801679695605002L;
-
+
public static final int ANCESTOR_ADDED = 1;
public static final int ANCESTOR_REMOVED = 2;
public static final int ANCESTOR_MOVED = 3;
@@ -66,7 +66,7 @@ public class AncestorEvent extends AWTEvent
* @param ancestorParent parent ancestor
*/
public AncestorEvent(JComponent source, int id, Container ancestor,
- Container ancestorParent)
+ Container ancestorParent)
{
super(source, id);
this.sourceComponent = source;
diff --git a/libjava/classpath/javax/swing/event/AncestorListener.java b/libjava/classpath/javax/swing/event/AncestorListener.java
index 61d5aed..623956f 100644
--- a/libjava/classpath/javax/swing/event/AncestorListener.java
+++ b/libjava/classpath/javax/swing/event/AncestorListener.java
@@ -47,23 +47,23 @@ import java.util.EventListener;
*/
public interface AncestorListener extends EventListener {
- /**
- * Ancestor Added
- * @param event Ancestor Event
- */
- void ancestorAdded(AncestorEvent event);
+ /**
+ * Ancestor Added
+ * @param event Ancestor Event
+ */
+ void ancestorAdded(AncestorEvent event);
- /**
- * Ancestor Removed
- * @param event Ancestor Event
- */
- void ancestorRemoved(AncestorEvent event);
+ /**
+ * Ancestor Removed
+ * @param event Ancestor Event
+ */
+ void ancestorRemoved(AncestorEvent event);
- /**
- * Ancestor Moved
- * @param event Ancestor Event
- */
- void ancestorMoved(AncestorEvent event);
+ /**
+ * Ancestor Moved
+ * @param event Ancestor Event
+ */
+ void ancestorMoved(AncestorEvent event);
} // AncestorListener
diff --git a/libjava/classpath/javax/swing/event/CaretEvent.java b/libjava/classpath/javax/swing/event/CaretEvent.java
index 7de05a8..ef0436d 100644
--- a/libjava/classpath/javax/swing/event/CaretEvent.java
+++ b/libjava/classpath/javax/swing/event/CaretEvent.java
@@ -43,14 +43,14 @@ import java.util.EventObject;
* CaretEvent
* @author Andrew Selkirk
*/
-public abstract class CaretEvent extends EventObject
+public abstract class CaretEvent extends EventObject
{
/**
* CaretEvent constructor
* @param source Source object
*/
- public CaretEvent(Object source)
+ public CaretEvent(Object source)
{
super(source);
}
@@ -67,4 +67,4 @@ public abstract class CaretEvent extends EventObject
*/
public abstract int getMark();
-}
+}
diff --git a/libjava/classpath/javax/swing/event/CaretListener.java b/libjava/classpath/javax/swing/event/CaretListener.java
index aeee434..ab7305d 100644
--- a/libjava/classpath/javax/swing/event/CaretListener.java
+++ b/libjava/classpath/javax/swing/event/CaretListener.java
@@ -46,11 +46,11 @@ import java.util.EventListener;
*/
public interface CaretListener extends EventListener {
- /**
- * Caret position has been updated
- * @param event Caret Event
- */
- void caretUpdate(CaretEvent event);
+ /**
+ * Caret position has been updated
+ * @param event Caret Event
+ */
+ void caretUpdate(CaretEvent event);
} // CaretListener
diff --git a/libjava/classpath/javax/swing/event/CellEditorListener.java b/libjava/classpath/javax/swing/event/CellEditorListener.java
index d2dd5ba..4252c27 100644
--- a/libjava/classpath/javax/swing/event/CellEditorListener.java
+++ b/libjava/classpath/javax/swing/event/CellEditorListener.java
@@ -46,17 +46,17 @@ import java.util.EventListener;
*/
public interface CellEditorListener extends EventListener {
- /**
- * Editing has been canceled
- * @param event Change Event
- */
- void editingCanceled(ChangeEvent event);
-
- /**
- * Editing has been stopped
- * @param event Change Event
- */
- void editingStopped(ChangeEvent event);
+ /**
+ * Editing has been canceled
+ * @param event Change Event
+ */
+ void editingCanceled(ChangeEvent event);
+
+ /**
+ * Editing has been stopped
+ * @param event Change Event
+ */
+ void editingStopped(ChangeEvent event);
} // CellEditorListener
diff --git a/libjava/classpath/javax/swing/event/ChangeEvent.java b/libjava/classpath/javax/swing/event/ChangeEvent.java
index 8854282..8683412 100644
--- a/libjava/classpath/javax/swing/event/ChangeEvent.java
+++ b/libjava/classpath/javax/swing/event/ChangeEvent.java
@@ -41,24 +41,24 @@ import java.util.EventObject;
/**
* An event used to signal a state change for an object.
- *
+ *
* @see ChangeListener
* @see CellEditorListener
* @see TableColumnModelListener
- *
+ *
* @author Andrew Selkirk
* @author Ronald Veldema
*/
-public class ChangeEvent
- extends EventObject
+public class ChangeEvent
+ extends EventObject
{
/**
* Creates a new <code>ChangeEvent</code> instance for the specified source.
- *
+ *
* @param source the source for the event (<code>null</code> not permitted).
*/
- public ChangeEvent(Object source)
+ public ChangeEvent(Object source)
{
super(source);
}
diff --git a/libjava/classpath/javax/swing/event/ChangeListener.java b/libjava/classpath/javax/swing/event/ChangeListener.java
index 7580970..0f9d087 100644
--- a/libjava/classpath/javax/swing/event/ChangeListener.java
+++ b/libjava/classpath/javax/swing/event/ChangeListener.java
@@ -40,22 +40,22 @@ package javax.swing.event;
import java.util.EventListener;
/**
- * A <code>ChangeListener</code> can register with an object to receive
+ * A <code>ChangeListener</code> can register with an object to receive
* notification of state changes (for objects that support this mechanism).
- *
+ *
* @author Andrew Selkirk
* @author Ronald Veldema
*/
-public interface ChangeListener
- extends EventListener
+public interface ChangeListener
+ extends EventListener
{
/**
* Called by an object to notify the listener that the object's state has
- * changed. The incoming <code>event</code> identifies the
+ * changed. The incoming <code>event</code> identifies the
* <code>source</code> of the event, allowing the listener to differentiate
* when it is listening for changes in multiple sources.
- *
+ *
* @param event the change event.
*/
void stateChanged(ChangeEvent event);
diff --git a/libjava/classpath/javax/swing/event/DocumentEvent.java b/libjava/classpath/javax/swing/event/DocumentEvent.java
index 8223049..4e12355 100644
--- a/libjava/classpath/javax/swing/event/DocumentEvent.java
+++ b/libjava/classpath/javax/swing/event/DocumentEvent.java
@@ -75,7 +75,7 @@ public interface DocumentEvent
* @return Element[]
*/
Element[] getChildrenAdded();
-
+
}
/**
diff --git a/libjava/classpath/javax/swing/event/DocumentListener.java b/libjava/classpath/javax/swing/event/DocumentListener.java
index df5e784..28a7d9d 100644
--- a/libjava/classpath/javax/swing/event/DocumentListener.java
+++ b/libjava/classpath/javax/swing/event/DocumentListener.java
@@ -46,23 +46,23 @@ import java.util.EventListener;
*/
public interface DocumentListener extends EventListener {
- /**
- * Changed update
- * @param event Document Event
- */
- void changedUpdate(DocumentEvent event);
+ /**
+ * Changed update
+ * @param event Document Event
+ */
+ void changedUpdate(DocumentEvent event);
- /**
- * Insert update
- * @param event Document Event
- */
- void insertUpdate(DocumentEvent event);
+ /**
+ * Insert update
+ * @param event Document Event
+ */
+ void insertUpdate(DocumentEvent event);
- /**
- * Remove update
- * @param event Document Event
- */
- void removeUpdate(DocumentEvent event);
+ /**
+ * Remove update
+ * @param event Document Event
+ */
+ void removeUpdate(DocumentEvent event);
} // DocumentListener
diff --git a/libjava/classpath/javax/swing/event/EventListenerList.java b/libjava/classpath/javax/swing/event/EventListenerList.java
index 8c76f7f..940d157 100644
--- a/libjava/classpath/javax/swing/event/EventListenerList.java
+++ b/libjava/classpath/javax/swing/event/EventListenerList.java
@@ -107,8 +107,8 @@ public class EventListenerList
* have no listeners.
*/
private static final Object[] NO_LISTENERS = new Object[0];
-
-
+
+
/**
* An array with all currently registered listeners. The array has
* twice as many elements as there are listeners. For an even
@@ -118,7 +118,7 @@ public class EventListenerList
*/
protected transient Object[] listenerList = NO_LISTENERS;
-
+
/**
* EventListenerList constructor
*/
@@ -194,7 +194,7 @@ public class EventListenerList
/**
* Returns an array containing a sequence of listenerType/listener pairs, one
* for each listener.
- *
+ *
* @return An array containing the listener types and references.
*/
public Object[] getListenerList()
@@ -240,7 +240,7 @@ public class EventListenerList
for (int i = listenerList.length - 2; i >= 0; i -= 2)
if (listenerList[i] == c)
result[f++] = (EventListener) listenerList[i + 1];
-
+
return (T[]) result;
}
diff --git a/libjava/classpath/javax/swing/event/HyperlinkEvent.java b/libjava/classpath/javax/swing/event/HyperlinkEvent.java
index 4afa009..75092b5 100644
--- a/libjava/classpath/javax/swing/event/HyperlinkEvent.java
+++ b/libjava/classpath/javax/swing/event/HyperlinkEvent.java
@@ -54,12 +54,12 @@ public class HyperlinkEvent extends EventObject
public static final EventType ENTERED = new EventType("ENTERED"); // TODO
public static final EventType EXITED = new EventType("EXITED"); // TODO
public static final EventType ACTIVATED = new EventType("ACTIVATED"); // TODO
-
+
private String type;
/**
* Creates a new Event type.
- *
+ *
* @param type String representing the event type.
*/
private EventType(String type)
@@ -77,7 +77,7 @@ public class HyperlinkEvent extends EventObject
}
private static final long serialVersionUID = -2054640811732867012L;
-
+
private EventType type;
private URL url;
private String description;
@@ -85,7 +85,7 @@ public class HyperlinkEvent extends EventObject
/**
* Creates a new <code>HyperlinkEvent</code> with the given arguments.
- *
+ *
* @param source The object this link is associated to.
* @param type The type of event.
* @param url The URL this link pointing too.
@@ -97,21 +97,21 @@ public class HyperlinkEvent extends EventObject
/**
* Creates a new <code>HyperlinkEvent</code> with the given arguments.
- *
+ *
* @param source The object this link is associated to.
* @param type The type of event.
* @param url The URL this link pointing too.
* @param description The description for this link.
*/
public HyperlinkEvent(Object source, EventType type, URL url,
- String description)
+ String description)
{
this (source, type, url, description, null);
}
-
+
/**
* Creates a new <code>HyperlinkEvent</code> with the given arguments.
- *
+ *
* @param source The object this link is associated to.
* @param type The type of event.
* @param url The URL this link pointing too.
@@ -119,7 +119,7 @@ public class HyperlinkEvent extends EventObject
* @param element The element in the document representing the anchor.
*/
public HyperlinkEvent(Object source, EventType type, URL url,
- String description, Element element)
+ String description, Element element)
{
super(source);
this.type = type;
@@ -135,7 +135,7 @@ public class HyperlinkEvent extends EventObject
{
return element;
}
-
+
/**
* Returns the URL of this event.
*/
diff --git a/libjava/classpath/javax/swing/event/HyperlinkListener.java b/libjava/classpath/javax/swing/event/HyperlinkListener.java
index 5dede99..0e01ba7 100644
--- a/libjava/classpath/javax/swing/event/HyperlinkListener.java
+++ b/libjava/classpath/javax/swing/event/HyperlinkListener.java
@@ -47,11 +47,11 @@ import java.util.EventListener;
*/
public interface HyperlinkListener extends EventListener {
- /**
- * Hyperlink updated
- * @param event Hyperlink Event
- */
- void hyperlinkUpdate(HyperlinkEvent event);
+ /**
+ * Hyperlink updated
+ * @param event Hyperlink Event
+ */
+ void hyperlinkUpdate(HyperlinkEvent event);
} // HyperlinkListener
diff --git a/libjava/classpath/javax/swing/event/InternalFrameAdapter.java b/libjava/classpath/javax/swing/event/InternalFrameAdapter.java
index dfa88c3..da893c7 100644
--- a/libjava/classpath/javax/swing/event/InternalFrameAdapter.java
+++ b/libjava/classpath/javax/swing/event/InternalFrameAdapter.java
@@ -52,7 +52,7 @@ public abstract class InternalFrameAdapter implements InternalFrameListener
{
// Nothing to do here.
}
-
+
/**
* Internal frame activated.
*
diff --git a/libjava/classpath/javax/swing/event/InternalFrameEvent.java b/libjava/classpath/javax/swing/event/InternalFrameEvent.java
index 4e289bf..1d7145d 100644
--- a/libjava/classpath/javax/swing/event/InternalFrameEvent.java
+++ b/libjava/classpath/javax/swing/event/InternalFrameEvent.java
@@ -44,7 +44,7 @@ import javax.swing.JInternalFrame;
/**
* An event that indicates a change to a {@link JInternalFrame} component.
- *
+ *
* @author Andrew Selkirk
*/
public class InternalFrameEvent extends AWTEvent
@@ -98,12 +98,12 @@ public class InternalFrameEvent extends AWTEvent
/**
* Creates a new <code>JInternalFrameEvent</code> instance.
- *
+ *
* @param source the source of this event (<code>null</code> not permitted).
* @param id the event ID of this event (see the constants defined by this
* class).
- *
- * @throws IllegalArgumentException if <code>source</code> is
+ *
+ * @throws IllegalArgumentException if <code>source</code> is
* <code>null</code>.
*/
public InternalFrameEvent(JInternalFrame source, int id)
@@ -114,23 +114,23 @@ public class InternalFrameEvent extends AWTEvent
/**
* Returns the <code>JInternalFrame</code> component that is the source for
* this event.
- *
+ *
* @return The source.
- *
+ *
* @since 1.3
*/
public JInternalFrame getInternalFrame()
{
return (JInternalFrame) source;
}
-
+
/**
- * Returns a string that indicates the event id. This is used by the
+ * Returns a string that indicates the event id. This is used by the
* {@link #toString()} method.
- *
+ *
* @return A string that indicates the event id.
*/
- public String paramString()
+ public String paramString()
{
switch (id) {
case INTERNAL_FRAME_ACTIVATED:
diff --git a/libjava/classpath/javax/swing/event/InternalFrameListener.java b/libjava/classpath/javax/swing/event/InternalFrameListener.java
index d1b2812..36874d2 100644
--- a/libjava/classpath/javax/swing/event/InternalFrameListener.java
+++ b/libjava/classpath/javax/swing/event/InternalFrameListener.java
@@ -46,47 +46,47 @@ import java.util.EventListener;
*/
public interface InternalFrameListener extends EventListener {
- /**
- * Internal frame activated
- * @param event Internal Frame Event
- */
- void internalFrameActivated(InternalFrameEvent event);
-
- /**
- * Internal frame closed
- * @param event Internal Frame Event
- */
- void internalFrameClosed(InternalFrameEvent event);
-
- /**
- * Internal frame closing
- * @param event Internal Frame Event
- */
- void internalFrameClosing(InternalFrameEvent event);
-
- /**
- * Internal frame deactivated
- * @param event Internal Frame Event
- */
- void internalFrameDeactivated(InternalFrameEvent event);
-
- /**
- * Internal frame deiconified
- * @param event Internal Frame Event
- */
- void internalFrameDeiconified(InternalFrameEvent event);
-
- /**
- * Internal frame iconified
- * @param event Internal Frame Event
- */
- void internalFrameIconified(InternalFrameEvent event);
-
- /**
- * Internal frame opened
- * @param event Internal Frame Event
- */
- void internalFrameOpened(InternalFrameEvent event);
+ /**
+ * Internal frame activated
+ * @param event Internal Frame Event
+ */
+ void internalFrameActivated(InternalFrameEvent event);
+
+ /**
+ * Internal frame closed
+ * @param event Internal Frame Event
+ */
+ void internalFrameClosed(InternalFrameEvent event);
+
+ /**
+ * Internal frame closing
+ * @param event Internal Frame Event
+ */
+ void internalFrameClosing(InternalFrameEvent event);
+
+ /**
+ * Internal frame deactivated
+ * @param event Internal Frame Event
+ */
+ void internalFrameDeactivated(InternalFrameEvent event);
+
+ /**
+ * Internal frame deiconified
+ * @param event Internal Frame Event
+ */
+ void internalFrameDeiconified(InternalFrameEvent event);
+
+ /**
+ * Internal frame iconified
+ * @param event Internal Frame Event
+ */
+ void internalFrameIconified(InternalFrameEvent event);
+
+ /**
+ * Internal frame opened
+ * @param event Internal Frame Event
+ */
+ void internalFrameOpened(InternalFrameEvent event);
} // InternalFrameListener
diff --git a/libjava/classpath/javax/swing/event/ListDataEvent.java b/libjava/classpath/javax/swing/event/ListDataEvent.java
index 897fc12..51fa887 100644
--- a/libjava/classpath/javax/swing/event/ListDataEvent.java
+++ b/libjava/classpath/javax/swing/event/ListDataEvent.java
@@ -43,40 +43,40 @@ import java.util.EventObject;
/**
* An event that contains information about a modification to the content of
* a list.
- *
+ *
* @author Andrew Selkirk
* @author Ronald Veldema
*/
public class ListDataEvent extends EventObject
{
private static final long serialVersionUID = 2510353260071004774L;
-
+
/** An event type indicating that the list content has been modified. */
public static final int CONTENTS_CHANGED = 0;
-
+
/** An event type indicating that an interval has been added to the list. */
public static final int INTERVAL_ADDED = 1;
-
- /**
- * An event type indicating that an interval has been removed from the
- * list.
+
+ /**
+ * An event type indicating that an interval has been removed from the
+ * list.
*/
public static final int INTERVAL_REMOVED = 2;
private int type;
private int index0;
private int index1;
-
+
/**
* Creates a <code>ListDataEvent</code> object.
- *
+ *
* @param source the source of the event (<code>null</code> not permitted).
- * @param type the type of the event (should be one of
- * {@link #CONTENTS_CHANGED}, {@link #INTERVAL_ADDED} or
+ * @param type the type of the event (should be one of
+ * {@link #CONTENTS_CHANGED}, {@link #INTERVAL_ADDED} or
* {@link #INTERVAL_REMOVED}, although this is not enforced).
- * @param index0 the index for one end of the modified range of list
+ * @param index0 the index for one end of the modified range of list
* elements.
- * @param index1 the index for the other end of the modified range of list
+ * @param index1 the index for the other end of the modified range of list
* elements.
*/
public ListDataEvent(Object source, int type, int index0, int index1)
@@ -86,10 +86,10 @@ public class ListDataEvent extends EventObject
this.index0 = Math.min(index0, index1);
this.index1 = Math.max(index0, index1);
}
-
+
/**
* Returns the index of the first item in the range of modified list items.
- *
+ *
* @return The index of the first item in the range of modified list items.
*/
public int getIndex0()
@@ -99,7 +99,7 @@ public class ListDataEvent extends EventObject
/**
* Returns the index of the last item in the range of modified list items.
- *
+ *
* @return The index of the last item in the range of modified list items.
*/
public int getIndex1()
@@ -109,24 +109,24 @@ public class ListDataEvent extends EventObject
/**
* Returns a code representing the type of this event, which is usually one
- * of {@link #CONTENTS_CHANGED}, {@link #INTERVAL_ADDED} or
+ * of {@link #CONTENTS_CHANGED}, {@link #INTERVAL_ADDED} or
* {@link #INTERVAL_REMOVED}.
- *
+ *
* @return The event type.
*/
public int getType()
{
return type;
}
-
+
/**
* Returns a string representing the state of this event.
- *
+ *
* @return A string.
*/
public String toString()
{
- return getClass().getName() + "[type=" + type + ",index0=" + index0
+ return getClass().getName() + "[type=" + type + ",index0=" + index0
+ ",index1=" + index1 + "]";
}
}
diff --git a/libjava/classpath/javax/swing/event/ListDataListener.java b/libjava/classpath/javax/swing/event/ListDataListener.java
index f42777d..4bbe1e5 100644
--- a/libjava/classpath/javax/swing/event/ListDataListener.java
+++ b/libjava/classpath/javax/swing/event/ListDataListener.java
@@ -44,11 +44,11 @@ import javax.swing.ListModel;
/**
* A <code>ListDataListener</code> can register with a {@link ListModel} and
* receive notification of updates to the model.
- *
+ *
* @author Andrew Selkirk
* @author Ronald Veldema
*/
-public interface ListDataListener extends EventListener
+public interface ListDataListener extends EventListener
{
/**
@@ -56,7 +56,7 @@ public interface ListDataListener extends EventListener
* in some way. This method will be called if the change cannot be
* notified via the {@link #intervalAdded(ListDataEvent)} or the
* {@link #intervalRemoved(ListDataEvent)} methods.
- *
+ *
* @param event the event.
*/
void contentsChanged(ListDataEvent event);
@@ -65,16 +65,16 @@ public interface ListDataListener extends EventListener
* Notifies the listener that one or more items have been added to the
* list. The <code>event</code> argument can supply the indices for the
* range of items added.
- *
+ *
* @param event the event.
*/
void intervalAdded(ListDataEvent event);
/**
* Notifies the listener that one or more items have been removed from
- * the list. The <code>event</code> argument can supply the indices for
+ * the list. The <code>event</code> argument can supply the indices for
* the range of items removed.
- *
+ *
* @param event the event.
*/
void intervalRemoved(ListDataEvent event);
diff --git a/libjava/classpath/javax/swing/event/ListSelectionEvent.java b/libjava/classpath/javax/swing/event/ListSelectionEvent.java
index d79cbfa..97555d1 100644
--- a/libjava/classpath/javax/swing/event/ListSelectionEvent.java
+++ b/libjava/classpath/javax/swing/event/ListSelectionEvent.java
@@ -45,22 +45,22 @@ import javax.swing.ListSelectionModel;
* An event that indicates a change to a list selection, including the source
* of the change (a {@link ListSelectionModel}) and the range of items in the
* list that have potentially changed their selection status.
- *
+ *
* @author Andrew Selkirk
* @author Ronald Veldema
*/
-public class ListSelectionEvent extends EventObject
+public class ListSelectionEvent extends EventObject
{
- /**
- * The index of the first list item in the range of items that has
- * potentially had its selection status modified.
+ /**
+ * The index of the first list item in the range of items that has
+ * potentially had its selection status modified.
*/
private int firstIndex = 0;
- /**
- * The index of the last list item in the range of items that has
- * potentially had its selection status modified.
+ /**
+ * The index of the last list item in the range of items that has
+ * potentially had its selection status modified.
*/
private int lastIndex = 0;
@@ -69,52 +69,52 @@ public class ListSelectionEvent extends EventObject
/**
* Creates a new <code>ListSelectionEvent</code>.
- *
+ *
* @param source the event source (<code>null</code> not permitted).
* @param firstIndex the first index.
* @param lastIndex the last index.
- * @param isAdjusting a flag indicating that this event is one in a series
+ * @param isAdjusting a flag indicating that this event is one in a series
* of events updating a selection.
- *
- * @throws IllegalArgumentException if <code>source</code> is
+ *
+ * @throws IllegalArgumentException if <code>source</code> is
* <code>null</code>.
*/
public ListSelectionEvent(Object source, int firstIndex,
- int lastIndex, boolean isAdjusting)
+ int lastIndex, boolean isAdjusting)
{
super(source);
this.firstIndex = firstIndex;
this.lastIndex = lastIndex;
this.isAdjusting = isAdjusting;
}
-
+
/**
* Returns the first index.
- *
+ *
* @return The first index.
*/
- public int getFirstIndex()
+ public int getFirstIndex()
{
return firstIndex;
}
/**
* Returns the last index.
- *
+ *
* @return The last index.
*/
- public int getLastIndex()
+ public int getLastIndex()
{
return lastIndex;
}
/**
- * Returns the flag that indicates that this event is one in a series of
+ * Returns the flag that indicates that this event is one in a series of
* events updating a selection.
- *
+ *
* @return A boolean.
*/
- public boolean getValueIsAdjusting()
+ public boolean getValueIsAdjusting()
{
return isAdjusting;
}
@@ -122,13 +122,13 @@ public class ListSelectionEvent extends EventObject
/**
* Returns a string representation of the event, typically used for debugging
* purposes.
- *
+ *
* @return A string representation of the event.
*/
- public String toString()
+ public String toString()
{
- return this.getClass().toString() + "[ source=" + source.toString()
- + " firstIndex= " + firstIndex + " lastIndex= " + lastIndex
+ return this.getClass().toString() + "[ source=" + source.toString()
+ + " firstIndex= " + firstIndex + " lastIndex= " + lastIndex
+ " isAdjusting= " + isAdjusting + " ]";
}
diff --git a/libjava/classpath/javax/swing/event/ListSelectionListener.java b/libjava/classpath/javax/swing/event/ListSelectionListener.java
index a21dc73..20e40da 100644
--- a/libjava/classpath/javax/swing/event/ListSelectionListener.java
+++ b/libjava/classpath/javax/swing/event/ListSelectionListener.java
@@ -42,20 +42,20 @@ import java.util.EventListener;
import javax.swing.ListSelectionModel;
/**
- * A listener that receives {@link ListSelectionEvent} notifications,
+ * A listener that receives {@link ListSelectionEvent} notifications,
* typically from a {@link ListSelectionModel} when it is modified.
*
* @author Andrew Selkirk
* @author Ronald Veldema
*/
-public interface ListSelectionListener extends EventListener
+public interface ListSelectionListener extends EventListener
{
/**
* Receives notification of a {@link ListSelectionEvent}.
- *
+ *
* @param event the event.
*/
void valueChanged(ListSelectionEvent event);
-} \ No newline at end of file
+}
diff --git a/libjava/classpath/javax/swing/event/MenuDragMouseEvent.java b/libjava/classpath/javax/swing/event/MenuDragMouseEvent.java
index 6be11bc..952d99e 100644
--- a/libjava/classpath/javax/swing/event/MenuDragMouseEvent.java
+++ b/libjava/classpath/javax/swing/event/MenuDragMouseEvent.java
@@ -48,14 +48,14 @@ import javax.swing.MenuSelectionManager;
* MenuDragMouseEvent
* @author Andrew Selkirk
*/
-public class MenuDragMouseEvent extends MouseEvent
+public class MenuDragMouseEvent extends MouseEvent
{
/**
* path
*/
private MenuElement[] path = null;
-
+
/**
* manager
*/
@@ -76,29 +76,29 @@ public class MenuDragMouseEvent extends MouseEvent
*/
public MenuDragMouseEvent(Component source, int id, long when, int modifiers,
int x, int y, int clickCount, boolean popupTrigger,
- MenuElement[] path, MenuSelectionManager manager)
+ MenuElement[] path, MenuSelectionManager manager)
{
super(source, id, when, modifiers, x, y, clickCount, popupTrigger);
this.path = path;
this.manager = manager;
- }
+ }
/**
* Get path
* @return path
*/
- public MenuElement[] getPath()
+ public MenuElement[] getPath()
{
return path;
- }
+ }
/**
* Get menu selection manager
* @return manager
*/
- public MenuSelectionManager getMenuSelectionManager()
+ public MenuSelectionManager getMenuSelectionManager()
{
return manager;
}
-}
+}
diff --git a/libjava/classpath/javax/swing/event/MenuDragMouseListener.java b/libjava/classpath/javax/swing/event/MenuDragMouseListener.java
index bfca315..d0cd053 100644
--- a/libjava/classpath/javax/swing/event/MenuDragMouseListener.java
+++ b/libjava/classpath/javax/swing/event/MenuDragMouseListener.java
@@ -46,29 +46,29 @@ import java.util.EventListener;
*/
public interface MenuDragMouseListener extends EventListener {
- /**
- * Menu drag mouse dragged
- * @param event Menu Drag Mouse Event
- */
- void menuDragMouseDragged(MenuDragMouseEvent event);
+ /**
+ * Menu drag mouse dragged
+ * @param event Menu Drag Mouse Event
+ */
+ void menuDragMouseDragged(MenuDragMouseEvent event);
- /**
- * Menu drag mouse entered
- * @param event Menu Drag Mouse Event
- */
- void menuDragMouseEntered(MenuDragMouseEvent event);
+ /**
+ * Menu drag mouse entered
+ * @param event Menu Drag Mouse Event
+ */
+ void menuDragMouseEntered(MenuDragMouseEvent event);
- /**
- * Menu drag mouse exited
- * @param event Menu Drag Mouse Event
- */
- void menuDragMouseExited(MenuDragMouseEvent event);
+ /**
+ * Menu drag mouse exited
+ * @param event Menu Drag Mouse Event
+ */
+ void menuDragMouseExited(MenuDragMouseEvent event);
- /**
- * Menu drag mouse released
- * @param event Menu Drag Mouse Event
- */
- void menuDragMouseReleased(MenuDragMouseEvent event);
+ /**
+ * Menu drag mouse released
+ * @param event Menu Drag Mouse Event
+ */
+ void menuDragMouseReleased(MenuDragMouseEvent event);
} // MenuDragMouseListener
diff --git a/libjava/classpath/javax/swing/event/MenuEvent.java b/libjava/classpath/javax/swing/event/MenuEvent.java
index 8ba3292..6a7e021 100644
--- a/libjava/classpath/javax/swing/event/MenuEvent.java
+++ b/libjava/classpath/javax/swing/event/MenuEvent.java
@@ -44,14 +44,14 @@ import java.util.EventObject;
* @author Andrew Selkirk
* @author Ronald Veldema
*/
-public class MenuEvent extends EventObject
+public class MenuEvent extends EventObject
{
/**
* Constructor MenuEvent
* @param source Source object
*/
- public MenuEvent(Object source)
+ public MenuEvent(Object source)
{
super(source);
}
diff --git a/libjava/classpath/javax/swing/event/MenuKeyEvent.java b/libjava/classpath/javax/swing/event/MenuKeyEvent.java
index 3335850..937089e 100644
--- a/libjava/classpath/javax/swing/event/MenuKeyEvent.java
+++ b/libjava/classpath/javax/swing/event/MenuKeyEvent.java
@@ -48,14 +48,14 @@ import javax.swing.MenuSelectionManager;
* MenuKeyEvent
* @author Andrew Selkirk
*/
-public class MenuKeyEvent extends KeyEvent
+public class MenuKeyEvent extends KeyEvent
{
/**
* path
*/
private MenuElement[] path = null;
-
+
/**
* manager
*/
@@ -74,18 +74,18 @@ public class MenuKeyEvent extends KeyEvent
*/
public MenuKeyEvent(Component source, int id, long when, int modifiers,
int keyCode, char keyChar, MenuElement[] path,
- MenuSelectionManager manager)
+ MenuSelectionManager manager)
{
super(source, id, when, modifiers, keyCode, keyChar);
this.path = path;
this.manager = manager;
- }
+ }
/**
* getPath
* @return path
*/
- public MenuElement[] getPath()
+ public MenuElement[] getPath()
{
return path;
}
@@ -94,9 +94,9 @@ public class MenuKeyEvent extends KeyEvent
* getMenuSelectionManager
* @return MenuSelectionManager
*/
- public MenuSelectionManager getMenuSelectionManager()
+ public MenuSelectionManager getMenuSelectionManager()
{
return manager;
}
-}
+}
diff --git a/libjava/classpath/javax/swing/event/MenuKeyListener.java b/libjava/classpath/javax/swing/event/MenuKeyListener.java
index 7a1eb89..36d6ecd 100644
--- a/libjava/classpath/javax/swing/event/MenuKeyListener.java
+++ b/libjava/classpath/javax/swing/event/MenuKeyListener.java
@@ -46,23 +46,23 @@ import java.util.EventListener;
*/
public interface MenuKeyListener extends EventListener {
- /**
- * Menu key pressed
- * @param event Menu Key Event
- */
- void menuKeyPressed(MenuKeyEvent event);
+ /**
+ * Menu key pressed
+ * @param event Menu Key Event
+ */
+ void menuKeyPressed(MenuKeyEvent event);
- /**
- * Menu key released
- * @param event Menu Key Event
- */
- void menuKeyReleased(MenuKeyEvent event);
+ /**
+ * Menu key released
+ * @param event Menu Key Event
+ */
+ void menuKeyReleased(MenuKeyEvent event);
- /**
- * Menu key typed
- * @param event Menu Key Event
- */
- void menuKeyTyped(MenuKeyEvent event);
+ /**
+ * Menu key typed
+ * @param event Menu Key Event
+ */
+ void menuKeyTyped(MenuKeyEvent event);
} // MenuKeyListener
diff --git a/libjava/classpath/javax/swing/event/MenuListener.java b/libjava/classpath/javax/swing/event/MenuListener.java
index dba704a..10a18f2 100644
--- a/libjava/classpath/javax/swing/event/MenuListener.java
+++ b/libjava/classpath/javax/swing/event/MenuListener.java
@@ -46,23 +46,23 @@ import java.util.EventListener;
*/
public interface MenuListener extends EventListener {
- /**
- * Menu canceled
- * @param event Menu Event
- */
- void menuCanceled(MenuEvent event);
+ /**
+ * Menu canceled
+ * @param event Menu Event
+ */
+ void menuCanceled(MenuEvent event);
- /**
- * Menu deselected
- * @param event Menu Event
- */
- void menuDeselected(MenuEvent event);
+ /**
+ * Menu deselected
+ * @param event Menu Event
+ */
+ void menuDeselected(MenuEvent event);
- /**
- * Menu selected
- * @param event Menu Event
- */
- void menuSelected(MenuEvent event);
+ /**
+ * Menu selected
+ * @param event Menu Event
+ */
+ void menuSelected(MenuEvent event);
} // MenuListener
diff --git a/libjava/classpath/javax/swing/event/MouseInputListener.java b/libjava/classpath/javax/swing/event/MouseInputListener.java
index 3d879b9..fc92615 100644
--- a/libjava/classpath/javax/swing/event/MouseInputListener.java
+++ b/libjava/classpath/javax/swing/event/MouseInputListener.java
@@ -46,7 +46,7 @@ import java.awt.event.MouseMotionListener;
* @author Andrew Selkirk
*/
public interface MouseInputListener extends MouseListener,
- MouseMotionListener
+ MouseMotionListener
{
// This interface only pulls together MouseListener and MouseMotionListener
// without adding any methods on its own.
diff --git a/libjava/classpath/javax/swing/event/PopupMenuEvent.java b/libjava/classpath/javax/swing/event/PopupMenuEvent.java
index 0555550..640b900 100644
--- a/libjava/classpath/javax/swing/event/PopupMenuEvent.java
+++ b/libjava/classpath/javax/swing/event/PopupMenuEvent.java
@@ -46,13 +46,13 @@ import java.util.EventObject;
*/
public class PopupMenuEvent extends EventObject {
- /**
- * Constructor PopupMenuEvent
- * @param source Source
- */
- public PopupMenuEvent(Object source) {
- super(source);
- } // PopupMenuEvent()
+ /**
+ * Constructor PopupMenuEvent
+ * @param source Source
+ */
+ public PopupMenuEvent(Object source) {
+ super(source);
+ } // PopupMenuEvent()
} // PopupMenuEvent
diff --git a/libjava/classpath/javax/swing/event/PopupMenuListener.java b/libjava/classpath/javax/swing/event/PopupMenuListener.java
index dc917d2..18d68f4 100644
--- a/libjava/classpath/javax/swing/event/PopupMenuListener.java
+++ b/libjava/classpath/javax/swing/event/PopupMenuListener.java
@@ -46,23 +46,23 @@ import java.util.EventListener;
*/
public interface PopupMenuListener extends EventListener {
- /**
- * Popup Menu Canceled
- * @param event Popup Menu Event
- */
- void popupMenuCanceled(PopupMenuEvent event);
+ /**
+ * Popup Menu Canceled
+ * @param event Popup Menu Event
+ */
+ void popupMenuCanceled(PopupMenuEvent event);
- /**
- * Popup Menu will become invisible
- * @param event Popup Menu Event
- */
- void popupMenuWillBecomeInvisible(PopupMenuEvent event);
+ /**
+ * Popup Menu will become invisible
+ * @param event Popup Menu Event
+ */
+ void popupMenuWillBecomeInvisible(PopupMenuEvent event);
- /**
- * Popup Menu will become visible
- * @param event Popup Menu Event
- */
- void popupMenuWillBecomeVisible(PopupMenuEvent event);
+ /**
+ * Popup Menu will become visible
+ * @param event Popup Menu Event
+ */
+ void popupMenuWillBecomeVisible(PopupMenuEvent event);
} // PopupMenuListener
diff --git a/libjava/classpath/javax/swing/event/SwingPropertyChangeSupport.java b/libjava/classpath/javax/swing/event/SwingPropertyChangeSupport.java
index 7fb8aa6..5228b3d 100644
--- a/libjava/classpath/javax/swing/event/SwingPropertyChangeSupport.java
+++ b/libjava/classpath/javax/swing/event/SwingPropertyChangeSupport.java
@@ -51,19 +51,19 @@ import java.beans.PropertyChangeSupport;
* @author Andrew Selkirk
*/
public final class SwingPropertyChangeSupport
- extends PropertyChangeSupport
+ extends PropertyChangeSupport
{
private static final long serialVersionUID = 7162625831330845068L;
/**
* Creates a new instance.
- *
+ *
* @param source the source (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if <code>source</code> is <code>null</code>.
*/
- public SwingPropertyChangeSupport(Object source)
+ public SwingPropertyChangeSupport(Object source)
{
super(source);
}
diff --git a/libjava/classpath/javax/swing/event/TableColumnModelEvent.java b/libjava/classpath/javax/swing/event/TableColumnModelEvent.java
index cff4913..70bd7d05 100644
--- a/libjava/classpath/javax/swing/event/TableColumnModelEvent.java
+++ b/libjava/classpath/javax/swing/event/TableColumnModelEvent.java
@@ -46,7 +46,7 @@ import javax.swing.table.TableColumnModel;
* TableColumnModelEvent
* @author Andrew Selkirk
*/
-public class TableColumnModelEvent extends EventObject
+public class TableColumnModelEvent extends EventObject
{
/**
@@ -65,7 +65,7 @@ public class TableColumnModelEvent extends EventObject
* @param from From index
* @param to To index
*/
- public TableColumnModelEvent(TableColumnModel source, int from, int to)
+ public TableColumnModelEvent(TableColumnModel source, int from, int to)
{
super(source);
fromIndex = from;
@@ -76,18 +76,18 @@ public class TableColumnModelEvent extends EventObject
* getFromIndex.
* @return From index
*/
- public int getFromIndex()
+ public int getFromIndex()
{
return fromIndex;
- }
+ }
/**
- * getToIndex.
+ * getToIndex.
* @return To index
*/
- public int getToIndex()
+ public int getToIndex()
{
return toIndex;
}
-} \ No newline at end of file
+}
diff --git a/libjava/classpath/javax/swing/event/TableColumnModelListener.java b/libjava/classpath/javax/swing/event/TableColumnModelListener.java
index 522e0a8..362a4d9 100644
--- a/libjava/classpath/javax/swing/event/TableColumnModelListener.java
+++ b/libjava/classpath/javax/swing/event/TableColumnModelListener.java
@@ -44,25 +44,25 @@ import javax.swing.table.TableColumnModel;
/**
* A <code>TableColumnModelListener</code> can register with a
* {@link TableColumnModel} to receive notification of changes to the model.
- *
+ *
* @author Andrew Selkirk
*/
-public interface TableColumnModelListener
- extends EventListener
+public interface TableColumnModelListener
+ extends EventListener
{
/**
* Called by the {@link TableColumnModel} to indicate that a column has been
* added to the model.
- *
+ *
* @param event information about the column addition.
*/
void columnAdded(TableColumnModelEvent event);
/**
- * Called by the {@link TableColumnModel} to indicate that the model's
+ * Called by the {@link TableColumnModel} to indicate that the model's
* column margin has changed.
- *
+ *
* @param event the event (identifies the source).
*/
void columnMarginChanged(ChangeEvent event);
@@ -70,7 +70,7 @@ public interface TableColumnModelListener
/**
* Called by the {@link TableColumnModel} to indicate that a column has been
* moved.
- *
+ *
* @param event information about the column move.
*/
void columnMoved(TableColumnModelEvent event);
@@ -78,15 +78,15 @@ public interface TableColumnModelListener
/**
* Called by the {@link TableColumnModel} to indicate that a column has been
* removed from the model.
- *
+ *
* @param event information about the column removal.
*/
void columnRemoved(TableColumnModelEvent event);
/**
- * Called by the {@link TableColumnModel} to indicate that the column
+ * Called by the {@link TableColumnModel} to indicate that the column
* selection state has changed.
- *
+ *
* @param event information about the column selection state.
*/
void columnSelectionChanged(ListSelectionEvent event);
diff --git a/libjava/classpath/javax/swing/event/TableModelEvent.java b/libjava/classpath/javax/swing/event/TableModelEvent.java
index e15174c..b75a78a 100644
--- a/libjava/classpath/javax/swing/event/TableModelEvent.java
+++ b/libjava/classpath/javax/swing/event/TableModelEvent.java
@@ -44,58 +44,58 @@ import javax.swing.table.TableModel;
/**
* An event that describes changes to a {@link TableModel}.
- *
+ *
* @see javax.swing.event.TableModelListener
- *
+ *
* @author Andrew Selkirk
*/
public class TableModelEvent extends EventObject
{
private static final long serialVersionUID = -7849342674552212824L;
-
+
/** A column index representing all columns. */
public static final int ALL_COLUMNS = -1;
-
- /**
- * An event type indicating that one or more rows have been deleted from the
- * model.
+
+ /**
+ * An event type indicating that one or more rows have been deleted from the
+ * model.
*/
public static final int DELETE = -1;
-
+
/** A row index representing the header row. */
public static final int HEADER_ROW = -1;
-
- /**
- * An event type indicating that one or more rows have been inserted into the
- * model.
+
+ /**
+ * An event type indicating that one or more rows have been inserted into the
+ * model.
*/
public static final int INSERT = 1;
-
+
/** An event type indicating that data has been updated in the model. */
public static final int UPDATE = 0;
/** The column in the table model that the event relates to. */
protected int column = 0;
-
+
/** The first row in the table model that the event relates to. */
protected int firstRow = 0;
-
+
/** The last row in the table model that the event relates to. */
protected int lastRow = 0;
-
- /**
- * The event type (one of {@link #UPDATE}, {@link #INSERT}, {@link #DELETE}).
+
+ /**
+ * The event type (one of {@link #UPDATE}, {@link #INSERT}, {@link #DELETE}).
*/
protected int type = 0;
/**
- * Creates a new <code>TableModelEvent</code> indicating an {@link #UPDATE}
+ * Creates a new <code>TableModelEvent</code> indicating an {@link #UPDATE}
* to the data in all columns and rows.
- *
+ *
* @param source the source object (<code>null</code> not permitted).
- *
- * @throws IllegalArgumentException if <code>source</code> is
- * <code>null</code>.
+ *
+ * @throws IllegalArgumentException if <code>source</code> is
+ * <code>null</code>.
*/
public TableModelEvent(TableModel source)
{
@@ -105,11 +105,11 @@ public class TableModelEvent extends EventObject
/**
* Creates a new <code>TableModelEvent</code> indicating an {@link #UPDATE}
* to the data in a single row across all columns.
- *
+ *
* @param source the source object (<code>null</code> not permitted).
* @param row the updated row.
- *
- * @throws IllegalArgumentException if <code>source</code> is
+ *
+ * @throws IllegalArgumentException if <code>source</code> is
* <code>null</code>.
*/
public TableModelEvent(TableModel source, int row)
@@ -120,12 +120,12 @@ public class TableModelEvent extends EventObject
/**
* Creates a new <code>TableModelEvent</code> indicating an {@link #UPDATE}
* to the data in the specified rows across all columns.
- *
+ *
* @param source the source object (<code>null</code> not permitted).
* @param firstRow the first row of update.
* @param lastRow the last row of update.
- *
- * @throws IllegalArgumentException if <code>source</code> is
+ *
+ * @throws IllegalArgumentException if <code>source</code> is
* <code>null</code>.
*/
public TableModelEvent(TableModel source, int firstRow, int lastRow)
@@ -135,18 +135,18 @@ public class TableModelEvent extends EventObject
/**
* Creates a new <code>TableModelEvent</code> indicating an {@link #UPDATE}
- * to the data in the specified rows and column. Use {@link #ALL_COLUMNS}
+ * to the data in the specified rows and column. Use {@link #ALL_COLUMNS}
* for the <code>column</code> argument to indicate all columns.
- *
+ *
* @param source the source object (<code>null</code> not permitted).
* @param firstRow the first row of update.
* @param lastRow the last row of update.
* @param column the affected column.
- *
- * @throws IllegalArgumentException if <code>source</code> is
+ *
+ * @throws IllegalArgumentException if <code>source</code> is
* <code>null</code>.
*/
- public TableModelEvent(TableModel source, int firstRow, int lastRow,
+ public TableModelEvent(TableModel source, int firstRow, int lastRow,
int column)
{
this(source, firstRow, lastRow, column, UPDATE);
@@ -157,17 +157,17 @@ public class TableModelEvent extends EventObject
* the specified <code>type</code> on the data in the specified rows and
* column. The event type is usually one of {@link #UPDATE}, {@link #INSERT},
* and {@link #DELETE}.
- *
+ *
* @param source the source object (<code>null</code> not permitted).
* @param firstRow the first row of update.
* @param lastRow the last row of update.
* @param column the affected column.
* @param type the type of change.
- *
- * @throws IllegalArgumentException if <code>source</code> is
+ *
+ * @throws IllegalArgumentException if <code>source</code> is
* <code>null</code>.
*/
- public TableModelEvent(TableModel source, int firstRow, int lastRow,
+ public TableModelEvent(TableModel source, int firstRow, int lastRow,
int column, int type)
{
super(source);
@@ -179,7 +179,7 @@ public class TableModelEvent extends EventObject
/**
* Returns the affected column of this event.
- *
+ *
* @return The column index.
*/
public int getColumn()
@@ -189,7 +189,7 @@ public class TableModelEvent extends EventObject
/**
* Returns the first affected row of this event.
- *
+ *
* @return The row index.
*/
public int getFirstRow()
@@ -199,7 +199,7 @@ public class TableModelEvent extends EventObject
/**
* Returns the last affected row of this event.
- *
+ *
* @return The row index.
*/
public int getLastRow()
@@ -208,9 +208,9 @@ public class TableModelEvent extends EventObject
}
/**
- * Returns the type of change indicated by this event (usually one of
+ * Returns the type of change indicated by this event (usually one of
* {@link #UPDATE}, {@link #INSERT}, {@link #DELETE}).
- *
+ *
* @return The type.
*/
public int getType()
diff --git a/libjava/classpath/javax/swing/event/TableModelListener.java b/libjava/classpath/javax/swing/event/TableModelListener.java
index 21e5ea0..612712f 100644
--- a/libjava/classpath/javax/swing/event/TableModelListener.java
+++ b/libjava/classpath/javax/swing/event/TableModelListener.java
@@ -40,21 +40,21 @@ package javax.swing.event;
import java.util.EventListener;
/**
- * A <code>TableModelListener</code> can register with a
+ * A <code>TableModelListener</code> can register with a
* {@link javax.swing.table.TableModel} and receive notification of updates to
* the model.
- *
+ *
* @author Andrew Selkirk
*/
-public interface TableModelListener extends EventListener
+public interface TableModelListener extends EventListener
{
/**
- * Called to notify the listener that the
+ * Called to notify the listener that the
* {@link javax.swing.table.TableModel} has been updated.
- *
+ *
* @param event contains details of the update.
*/
void tableChanged(TableModelEvent event);
-}
+}
diff --git a/libjava/classpath/javax/swing/event/TreeExpansionEvent.java b/libjava/classpath/javax/swing/event/TreeExpansionEvent.java
index 5820b33..99e1666 100644
--- a/libjava/classpath/javax/swing/event/TreeExpansionEvent.java
+++ b/libjava/classpath/javax/swing/event/TreeExpansionEvent.java
@@ -46,7 +46,7 @@ import javax.swing.tree.TreePath;
* TreeExpansionEvent
* @author Andrew Selkirk
*/
-public class TreeExpansionEvent extends EventObject
+public class TreeExpansionEvent extends EventObject
{
/**
@@ -59,7 +59,7 @@ public class TreeExpansionEvent extends EventObject
* @param source Source object
* @param path Path
*/
- public TreeExpansionEvent(Object source, TreePath path)
+ public TreeExpansionEvent(Object source, TreePath path)
{
super(source);
this.path = path;
@@ -69,9 +69,9 @@ public class TreeExpansionEvent extends EventObject
* getPath
* @return Tree path
*/
- public TreePath getPath()
+ public TreePath getPath()
{
return path;
- }
+ }
-}
+}
diff --git a/libjava/classpath/javax/swing/event/TreeExpansionListener.java b/libjava/classpath/javax/swing/event/TreeExpansionListener.java
index 45a5ef9..3461f2c 100644
--- a/libjava/classpath/javax/swing/event/TreeExpansionListener.java
+++ b/libjava/classpath/javax/swing/event/TreeExpansionListener.java
@@ -43,7 +43,7 @@ import java.util.EventListener;
* TreeExpansionListener public interface
* @author Andrew Selkirk
*/
-public interface TreeExpansionListener extends EventListener
+public interface TreeExpansionListener extends EventListener
{
/**
diff --git a/libjava/classpath/javax/swing/event/TreeModelEvent.java b/libjava/classpath/javax/swing/event/TreeModelEvent.java
index 2d562a5..490126f 100644
--- a/libjava/classpath/javax/swing/event/TreeModelEvent.java
+++ b/libjava/classpath/javax/swing/event/TreeModelEvent.java
@@ -46,7 +46,7 @@ import javax.swing.tree.TreePath;
* TreeModelEvent
* @author Andrew Selkirk
*/
-public class TreeModelEvent extends EventObject
+public class TreeModelEvent extends EventObject
{
/**
@@ -63,17 +63,17 @@ public class TreeModelEvent extends EventObject
* path
*/
protected TreePath path = null;
-
+
/**
* Constructor TreeModelEvent
* @param source Source object
* @param path
*/
- public TreeModelEvent(Object source, Object[] path)
+ public TreeModelEvent(Object source, Object[] path)
{
super(source);
this.path = new TreePath(path);
- }
+ }
/**
* Constructor TreeModelEvent
@@ -83,24 +83,24 @@ public class TreeModelEvent extends EventObject
* @param children Children
*/
public TreeModelEvent(Object source, Object[] path,
- int[] childIndices, Object[] children)
+ int[] childIndices, Object[] children)
{
super(source);
this.path = new TreePath(path);
this.childIndices = childIndices;
this.children = children;
- }
+ }
/**
* Constructor TreeModelEvent
* @param source Source object
* @param path Path
*/
- public TreeModelEvent(Object source, TreePath path)
+ public TreeModelEvent(Object source, TreePath path)
{
super(source);
this.path = path;
- }
+ }
/**
* Constructor TreeModelEvent
@@ -110,59 +110,59 @@ public class TreeModelEvent extends EventObject
* @param children Children
*/
public TreeModelEvent(Object source, TreePath path,
- int[] childIndices, Object[] children)
+ int[] childIndices, Object[] children)
{
super(source);
this.path = path;
this.childIndices = childIndices;
this.children = children;
- }
+ }
/**
* getChildIndices
* @return child indices
*/
- public int[] getChildIndices()
+ public int[] getChildIndices()
{
return childIndices;
- }
+ }
/**
* getChildren
* @return children
*/
- public Object[] getChildren()
+ public Object[] getChildren()
{
return children;
- }
+ }
/**
* getPath
* @return path
*/
- public Object[] getPath()
+ public Object[] getPath()
{
return path.getPath();
- }
+ }
/**
* getTreePath
* @return TreePath
*/
- public TreePath getTreePath()
+ public TreePath getTreePath()
{
return path;
- }
+ }
- /**
+ /**
* String representation
* @return String representation
*/
- public String toString()
+ public String toString()
{
- return getClass() + " [Source: " + getSource() + ", TreePath: "
- + getTreePath() + ", Child Indicies: " + getChildIndices()
+ return getClass() + " [Source: " + getSource() + ", TreePath: "
+ + getTreePath() + ", Child Indicies: " + getChildIndices()
+ ", Children: " + getChildren() + ", Path: " + getPath() +"]";
- }
+ }
-}
+}
diff --git a/libjava/classpath/javax/swing/event/TreeModelListener.java b/libjava/classpath/javax/swing/event/TreeModelListener.java
index 57b5c51..7804105 100644
--- a/libjava/classpath/javax/swing/event/TreeModelListener.java
+++ b/libjava/classpath/javax/swing/event/TreeModelListener.java
@@ -46,29 +46,29 @@ import java.util.EventListener;
*/
public interface TreeModelListener extends EventListener {
- /**
- * Tree nodes changed
- * @param event Tree Model Event
- */
- void treeNodesChanged(TreeModelEvent event);
+ /**
+ * Tree nodes changed
+ * @param event Tree Model Event
+ */
+ void treeNodesChanged(TreeModelEvent event);
- /**
- * Tree nodes inserted
- * @param event Tree Model Event
- */
- void treeNodesInserted(TreeModelEvent event);
+ /**
+ * Tree nodes inserted
+ * @param event Tree Model Event
+ */
+ void treeNodesInserted(TreeModelEvent event);
- /**
- * Tree nodes removed
- * @param event Tree Model Event
- */
- void treeNodesRemoved(TreeModelEvent event);
+ /**
+ * Tree nodes removed
+ * @param event Tree Model Event
+ */
+ void treeNodesRemoved(TreeModelEvent event);
- /**
- * Tree structured changed
- * @param event Tree Model Event
- */
- void treeStructureChanged(TreeModelEvent event);
+ /**
+ * Tree structured changed
+ * @param event Tree Model Event
+ */
+ void treeStructureChanged(TreeModelEvent event);
} // TreeModelListener
diff --git a/libjava/classpath/javax/swing/event/TreeSelectionEvent.java b/libjava/classpath/javax/swing/event/TreeSelectionEvent.java
index 532a1db..830170d 100644
--- a/libjava/classpath/javax/swing/event/TreeSelectionEvent.java
+++ b/libjava/classpath/javax/swing/event/TreeSelectionEvent.java
@@ -44,14 +44,14 @@ import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
/**
- * An event that carries information about a change to a
+ * An event that carries information about a change to a
* {@link TreeSelectionModel}.
- *
+ *
* @see TreeSelectionListener
- *
+ *
* @author Andrew Selkirk
*/
-public class TreeSelectionEvent extends EventObject
+public class TreeSelectionEvent extends EventObject
{
/**
@@ -77,112 +77,112 @@ public class TreeSelectionEvent extends EventObject
/**
* Creates a new <code>TreeSelectionEvent</code>.
- *
- * @param source the source (usually a {@link TreeSelectionModel},
+ *
+ * @param source the source (usually a {@link TreeSelectionModel},
* <code>null</code> not permitted).
- * @param paths an array of the paths that have been added to or removed
+ * @param paths an array of the paths that have been added to or removed
* from the selection.
* @param areNew a flag for each path where <code>true</code> indicates the
- * corresponding path has been added to the selection and
+ * corresponding path has been added to the selection and
* <code>false</code> indicates the path has been removed.
* @param oldLeadSelectionPath the old lead selection path (<code>null</code>
* permitted).
* @param newLeadSelectionPath the new lead selection path (<code>null</code>
* permitted).
*
- * @throws IllegalArgumentException if <code>source</code> is
+ * @throws IllegalArgumentException if <code>source</code> is
* <code>null</code>.
*/
public TreeSelectionEvent(Object source, TreePath[] paths,
- boolean[] areNew, TreePath oldLeadSelectionPath,
- TreePath newLeadSelectionPath)
+ boolean[] areNew, TreePath oldLeadSelectionPath,
+ TreePath newLeadSelectionPath)
{
super(source);
- this.paths = paths;
- this.areNew = areNew;
- this.oldLeadSelectionPath = oldLeadSelectionPath;
- this.newLeadSelectionPath = newLeadSelectionPath;
+ this.paths = paths;
+ this.areNew = areNew;
+ this.oldLeadSelectionPath = oldLeadSelectionPath;
+ this.newLeadSelectionPath = newLeadSelectionPath;
}
/**
* Creates a new <code>TreeSelectionEvent</code>.
- *
+ *
* @param source the event source (usually a {@link TreeSelectionModel},
* <code>null</code> not permitted).
* @param path the path.
- * @param isNew <code>true</code> indicates that <code>path</code> has been
- * added to the selection, and <code>false</code> indicates that it has
+ * @param isNew <code>true</code> indicates that <code>path</code> has been
+ * added to the selection, and <code>false</code> indicates that it has
* been removed.
* @param oldLeadSelectionPath the old lead selection path (<code>null</code>
* permitted).
* @param newLeadSelectionPath the new lead selection path (<code>null</code>
* permitted).
- *
- * @throws IllegalArgumentException if <code>source</code> is
+ *
+ * @throws IllegalArgumentException if <code>source</code> is
* <code>null</code>.
*/
public TreeSelectionEvent(Object source, TreePath path,
- boolean isNew, TreePath oldLeadSelectionPath,
- TreePath newLeadSelectionPath)
+ boolean isNew, TreePath oldLeadSelectionPath,
+ TreePath newLeadSelectionPath)
{
super(source);
this.paths = new TreePath[]{path};
this.areNew = new boolean[]{isNew};
- this.oldLeadSelectionPath = oldLeadSelectionPath;
- this.newLeadSelectionPath = newLeadSelectionPath;
+ this.oldLeadSelectionPath = oldLeadSelectionPath;
+ this.newLeadSelectionPath = newLeadSelectionPath;
}
/**
* Returns the first path element.
- *
+ *
* @return The first path element.
- *
+ *
* @see #getPaths()
*/
public TreePath getPath()
{
return paths[0];
- }
+ }
/**
* Returns an array of the paths that changed in the selection.
- *
+ *
* @return The paths that changed in the selection.
- *
+ *
* @see #isAddedPath(TreePath)
*/
public TreePath[] getPaths()
{
return (TreePath[]) paths.clone();
- }
+ }
/**
* Returns <code>true</code> if the path returned by {@link #getPath()} has
* been added to the selection, and <code>false</code> if it has been
* removed.
- *
+ *
* @return A boolean.
- *
+ *
* @see #isAddedPath(int)
*/
public boolean isAddedPath()
{
return areNew[0];
- }
+ }
/**
- * Returns <code>true</code> if <code>path</code> has been added to the
+ * Returns <code>true</code> if <code>path</code> has been added to the
* selection, and <code>false</code> if the path has been removed from the
* selection.
- *
+ *
* @param path the path to check.
- *
+ *
* @return A flag indicating whether the path has been added to, or removed
* from, the selection.
- *
+ *
* @throw IllegalArgumentException if <code>path</code> is not one of the
* paths in {@link #getPaths()}.
- *
+ *
* @see #isAddedPath(int)
*/
public boolean isAddedPath(TreePath path)
@@ -192,20 +192,20 @@ public class TreeSelectionEvent extends EventObject
return areNew[i];
throw new IllegalArgumentException("Unknown 'path' argument.");
- }
+ }
/**
- * Returns <code>true</code> if the path at the specified index has been
- * added to the selection, and <code>false</code> if the path has been
+ * Returns <code>true</code> if the path at the specified index has been
+ * added to the selection, and <code>false</code> if the path has been
* removed from the selection.
- *
+ *
* @param index the path index.
- *
+ *
* @return A flag indicating whether the path has been added to, or removed
* from, the selection.
- *
+ *
* @since 1.3
- *
+ *
* @see #isAddedPath(TreePath)
*/
public boolean isAddedPath(int index)
@@ -215,21 +215,21 @@ public class TreeSelectionEvent extends EventObject
/**
* Returns the old lead selection path.
- *
+ *
* @return The old lead selection path (possibly <code>null</code>).
- *
+ *
* @see #getNewLeadSelectionPath()
*/
public TreePath getOldLeadSelectionPath()
{
return oldLeadSelectionPath;
- }
+ }
/**
* Returns the new lead selection path.
- *
+ *
* @return The new lead selection path (possibly <code>null</code>).
- *
+ *
* @see #getOldLeadSelectionPath()
*/
public TreePath getNewLeadSelectionPath()
@@ -240,18 +240,18 @@ public class TreeSelectionEvent extends EventObject
/**
* Creates a shallow copy of this <code>TreeSelectionEvent</code>, replacing
* the source with <code>source</code>.
- *
+ *
* @param source the new event source (<code>null</code> not permitted).
- *
+ *
* @return A cloned event with another event source.
- *
- * @throws IllegalArgumentException if <code>source</code> is
+ *
+ * @throws IllegalArgumentException if <code>source</code> is
* <code>null</code>.
*/
public Object cloneWithSource(Object source)
{
return new TreeSelectionEvent (source, paths, areNew, oldLeadSelectionPath,
newLeadSelectionPath);
- }
+ }
-}
+}
diff --git a/libjava/classpath/javax/swing/event/TreeSelectionListener.java b/libjava/classpath/javax/swing/event/TreeSelectionListener.java
index 2171e39..8f8711d 100644
--- a/libjava/classpath/javax/swing/event/TreeSelectionListener.java
+++ b/libjava/classpath/javax/swing/event/TreeSelectionListener.java
@@ -44,17 +44,17 @@ import javax.swing.tree.TreeSelectionModel;
/**
* A listener that receives {@link TreeSelectionEvent} notifications from a
* source (such as a {@link TreeSelectionModel}).
- *
+ *
* @author Andrew Selkirk
*/
-public interface TreeSelectionListener extends EventListener
+public interface TreeSelectionListener extends EventListener
{
/**
* Receives notification of a change to a tree selection model.
- *
+ *
* @param event information about the event.
*/
void valueChanged(TreeSelectionEvent event);
-}
+}
diff --git a/libjava/classpath/javax/swing/event/TreeWillExpandListener.java b/libjava/classpath/javax/swing/event/TreeWillExpandListener.java
index 89d3764..7bdcbe4 100644
--- a/libjava/classpath/javax/swing/event/TreeWillExpandListener.java
+++ b/libjava/classpath/javax/swing/event/TreeWillExpandListener.java
@@ -49,7 +49,7 @@ public interface TreeWillExpandListener extends EventListener
{
/**
* Invoked whenever a node in the tree is about to be collapsed.
- *
+ *
* @param event The tree expansion Event
*/
void treeWillCollapse(TreeExpansionEvent event)
@@ -57,9 +57,9 @@ public interface TreeWillExpandListener extends EventListener
/**
* Invoked whenever a node in the tree is about to be expanded.
- *
+ *
* @param event The tree expansion Event
*/
void treeWillExpand(TreeExpansionEvent event)
throws ExpandVetoException;
-}
+}
diff --git a/libjava/classpath/javax/swing/event/UndoableEditEvent.java b/libjava/classpath/javax/swing/event/UndoableEditEvent.java
index b59cead..b889bb6 100644
--- a/libjava/classpath/javax/swing/event/UndoableEditEvent.java
+++ b/libjava/classpath/javax/swing/event/UndoableEditEvent.java
@@ -47,7 +47,7 @@ import javax.swing.undo.UndoableEdit;
* @author Andrew Selkirk
* @author Ronald Veldema
*/
-public class UndoableEditEvent extends EventObject
+public class UndoableEditEvent extends EventObject
{
private static final long serialVersionUID = 4418044561759134484L;
@@ -62,19 +62,19 @@ public class UndoableEditEvent extends EventObject
* @param source TODO
* @param edit TODO
*/
- public UndoableEditEvent(Object source, UndoableEdit edit)
+ public UndoableEditEvent(Object source, UndoableEdit edit)
{
super(source);
this.edit = edit;
- }
+ }
/**
* getEdit
* @return UndoableEdit
*/
- public UndoableEdit getEdit()
+ public UndoableEdit getEdit()
{
return edit;
}
-}
+}
diff --git a/libjava/classpath/javax/swing/filechooser/FileFilter.java b/libjava/classpath/javax/swing/filechooser/FileFilter.java
index de11525..68bcb65 100644
--- a/libjava/classpath/javax/swing/filechooser/FileFilter.java
+++ b/libjava/classpath/javax/swing/filechooser/FileFilter.java
@@ -45,12 +45,12 @@ import javax.swing.JFileChooser;
/**
* The base class for filters that control the visibility of files in the
* {@link JFileChooser} component.
- *
+ *
* @see JFileChooser#addChoosableFileFilter(FileFilter)
- *
- * @author Andrew Selkirk
+ *
+ * @author Andrew Selkirk
*/
-public abstract class FileFilter
+public abstract class FileFilter
{
/**
@@ -64,20 +64,20 @@ public abstract class FileFilter
/**
* Returns <code>true</code> if the specified file matches the filter, and
* <code>false</code> otherwise.
- *
+ *
* @param file the file.
- *
+ *
* @return A boolean.
*/
public abstract boolean accept(File file);
/**
- * Returns a description of the files that will be selected by the filter
- * (for example, "Java source files"). This description will usually be
+ * Returns a description of the files that will be selected by the filter
+ * (for example, "Java source files"). This description will usually be
* displayed on the {@link JFileChooser} component, often in a combo box that
* is used to select the appropriate filter (in cases where more than one
* filter is available).
- *
+ *
* @return A description of the filter.
*/
public abstract String getDescription();
diff --git a/libjava/classpath/javax/swing/filechooser/FileSystemView.java b/libjava/classpath/javax/swing/filechooser/FileSystemView.java
index 41d865a..5c3c0b8 100644
--- a/libjava/classpath/javax/swing/filechooser/FileSystemView.java
+++ b/libjava/classpath/javax/swing/filechooser/FileSystemView.java
@@ -46,14 +46,14 @@ import javax.swing.JFileChooser;
/**
- * The base class providing a view of the file system for use by the
+ * The base class providing a view of the file system for use by the
* {@link JFileChooser} component.
*/
public abstract class FileSystemView
{
/** The instance returned by {@link #getFileSystemView()}. */
private static FileSystemView defaultFileSystemView;
-
+
/**
* Creates a new file object with the given name in the specified directory.
*
@@ -101,12 +101,12 @@ public abstract class FileSystemView
* Creates a new folder with a unique name in the specified directory and
* returns a {@link File} object representing the new directory.
*
- * @param containingDir the directory to contain the new folder
+ * @param containingDir the directory to contain the new folder
* (<code>null</code> not permitted).
*
* @return A {@link File} object representing the new directory.
*
- * @throws IOException if an exception occurs while creating the new
+ * @throws IOException if an exception occurs while creating the new
* directory.
*/
public abstract File createNewFolder(File containingDir)
@@ -137,8 +137,8 @@ public abstract class FileSystemView
}
/**
- * Returns an array containing the files in the given directory. The
- * <code>useFileHiding</code> controls whether or not hidden files are
+ * Returns an array containing the files in the given directory. The
+ * <code>useFileHiding</code> controls whether or not hidden files are
* included in the result.
*
* @param dir the directory (if <code>null</code>
@@ -158,7 +158,7 @@ public abstract class FileSystemView
ArrayList trim = new ArrayList();
for (int i = 0; i < files.length; i++)
if (! files[i].isHidden())
- trim.add(files[i]);
+ trim.add(files[i]);
File[] value = (File[]) trim.toArray(new File[trim.size()]);
return value;
}
@@ -220,12 +220,12 @@ public abstract class FileSystemView
}
/**
- * Returns the name of a file as it would be displayed by the underlying
+ * Returns the name of a file as it would be displayed by the underlying
* system.
*
* @param f the file.
*
- * @return the name of a file as it would be displayed by the underlying
+ * @return the name of a file as it would be displayed by the underlying
* system
*
* @specnote The specification suggests that the information here is
@@ -242,8 +242,8 @@ public abstract class FileSystemView
}
/**
- * Returns the icon that would be displayed for the given file by the
- * underlying system. This implementation returns <code>null</code>,
+ * Returns the icon that would be displayed for the given file by the
+ * underlying system. This implementation returns <code>null</code>,
* subclasses must override.
*
* @param f the file.
@@ -256,8 +256,8 @@ public abstract class FileSystemView
}
/**
- * Returns the type description of a file that would be displayed by the
- * underlying system. This implementation returns <code>null</code>,
+ * Returns the type description of a file that would be displayed by the
+ * underlying system. This implementation returns <code>null</code>,
* subclasses must override.
*
* @param f the file.
@@ -282,7 +282,7 @@ public abstract class FileSystemView
}
/**
- * Returns <code>true</code> if the given directory represents a disk
+ * Returns <code>true</code> if the given directory represents a disk
* drive, and <code>false</code> otherwise. This default implementation
* always returns <code>false</code>.
*
@@ -326,12 +326,12 @@ public abstract class FileSystemView
String filename = dir.getAbsolutePath();
for (int i = 0; i < roots.length; i++)
if (roots[i].getAbsolutePath().equals(filename))
- return true;
+ return true;
return false;
}
/**
- * Returns <code>true</code> if the given directory represents a floppy
+ * Returns <code>true</code> if the given directory represents a floppy
* drive, and <code>false</code> otherwise. This default implementation
* always returns <code>false</code>.
*
@@ -345,12 +345,12 @@ public abstract class FileSystemView
}
/**
- * Returns <code>true</code> if the given file is hidden, and
+ * Returns <code>true</code> if the given file is hidden, and
* <code>false</code> otherwise.
*
* @param f the file.
*
- * @return <code>true</code> if the given file is hidden, and
+ * @return <code>true</code> if the given file is hidden, and
* <code>false</code> otherwise.
*/
public boolean isHiddenFile(File f)
@@ -359,13 +359,13 @@ public abstract class FileSystemView
}
/**
- * Returns <code>true</code> if <code>folder</code> is the parent of
+ * Returns <code>true</code> if <code>folder</code> is the parent of
* <code>file</code>, and <code>false</code> otherwise.
*
* @param folder the folder (<code>null</code> not permitted).
* @param file the file (<code>null</code> not permitted).
*
- * @return <code>true</code> if <code>folder</code> is the parent of
+ * @return <code>true</code> if <code>folder</code> is the parent of
* <code>file</code>, and <code>false</code> otherwise.
*/
public boolean isParent(File folder, File file)
@@ -390,13 +390,13 @@ public abstract class FileSystemView
}
/**
- * Returns <code>true</code> if the file is traversable, and
+ * Returns <code>true</code> if the file is traversable, and
* <code>false</code> otherwise. Here, all directories are considered
- * traversable, and files are considered non-traversable.
+ * traversable, and files are considered non-traversable.
*
* @param f the file or directory (<code>null</code> not permitted).
*
- * @return <code>true</code> if the file is traversable, and
+ * @return <code>true</code> if the file is traversable, and
* <code>false</code> otherwise.
*/
public Boolean isTraversable(File f)
diff --git a/libjava/classpath/javax/swing/filechooser/FileView.java b/libjava/classpath/javax/swing/filechooser/FileView.java
index 8c2be32..cfa39996 100644
--- a/libjava/classpath/javax/swing/filechooser/FileView.java
+++ b/libjava/classpath/javax/swing/filechooser/FileView.java
@@ -43,86 +43,86 @@ import java.io.File;
import javax.swing.Icon;
/**
- * An abstract class that provides presentation information about files and
+ * An abstract class that provides presentation information about files and
* directories. .
- *
+ *
* @author Andrew Selkirk
*/
-public abstract class FileView
+public abstract class FileView
{
/**
* Creates a new <code>FileView</code> instance.
*/
- public FileView()
+ public FileView()
{
// Nothing to do here.
- }
+ }
/**
* Returns the name for the specified file. This method always returns
* <code>null</code> and should be overridden by subclasses.
- *
+ *
* @param file the file.
- *
+ *
* @return Always <code>null</code>.
*/
- public String getName(File file)
+ public String getName(File file)
{
return null;
- }
+ }
/**
* Returns a description for the specified file. This method always returns
* <code>null</code> and should be overridden by subclasses.
- *
+ *
* @param file the file.
- *
+ *
* @return Always <code>null</code>.
*/
- public String getDescription(File file)
+ public String getDescription(File file)
{
return null;
- }
+ }
/**
- * Returns a description for the type of the specified file. This method
+ * Returns a description for the type of the specified file. This method
* always returns <code>null</code> and should be overridden by subclasses.
- *
+ *
* @param file the file.
- *
+ *
* @return Always <code>null</code>.
*/
- public String getTypeDescription(File file)
+ public String getTypeDescription(File file)
{
return null;
- }
+ }
/**
- * Returns an {@link Icon} to represent the specified file. This method
+ * Returns an {@link Icon} to represent the specified file. This method
* always returns <code>null</code> and should be overridden by subclasses.
- *
+ *
* @param file the file.
- *
+ *
* @return Always <code>null</code>.
*/
- public Icon getIcon(File file)
+ public Icon getIcon(File file)
{
return null;
- }
+ }
/**
* Returns {@link Boolean#TRUE} if the given directory is traversable, and
- * {@link Boolean#FALSE} if it is not. This method always returns
+ * {@link Boolean#FALSE} if it is not. This method always returns
* <code>null</code> and should be overridden by subclasses.
- *
+ *
* @param directory the directory.
- *
+ *
* @return Always <code>null</code>.
*/
- public Boolean isTraversable(File directory)
+ public Boolean isTraversable(File directory)
{
return null;
- }
+ }
}
diff --git a/libjava/classpath/javax/swing/filechooser/UnixFileSystemView.java b/libjava/classpath/javax/swing/filechooser/UnixFileSystemView.java
index f8d71e1..1341768 100644
--- a/libjava/classpath/javax/swing/filechooser/UnixFileSystemView.java
+++ b/libjava/classpath/javax/swing/filechooser/UnixFileSystemView.java
@@ -48,7 +48,7 @@ import javax.swing.Icon;
/**
* A concrete implementation of {@link FileSystemView} that is appropriate for
* Unix-like systems.
- *
+ *
* @see FileSystemView#getFileSystemView()
*/
class UnixFileSystemView extends FileSystemView
@@ -58,18 +58,18 @@ class UnixFileSystemView extends FileSystemView
/**
* Creates a new folder with a unique name in the specified directory and
- * returns a {@link File} object representing the new directory. The name
- * of the new folder is <code>NewFolder</code> or, if a directory or file
- * with that name already exists, <code>NewFolder.n</code> where
- * <code>n</code> is the lowest integer greater than zero that results in
+ * returns a {@link File} object representing the new directory. The name
+ * of the new folder is <code>NewFolder</code> or, if a directory or file
+ * with that name already exists, <code>NewFolder.n</code> where
+ * <code>n</code> is the lowest integer greater than zero that results in
* a unique directory name.
*
- * @param containingDir the directory to contain the new folder
+ * @param containingDir the directory to contain the new folder
* (<code>null</code> not permitted).
*
* @return A {@link File} object representing the new directory.
*
- * @throws IOException if an exception occurs while creating the new
+ * @throws IOException if an exception occurs while creating the new
* directory.
*/
public File createNewFolder(File containingDir) throws IOException
@@ -80,22 +80,22 @@ class UnixFileSystemView extends FileSystemView
+ NEW_FOLDER_NAME;
while (f == null)
{
- String full = filename;
- if (count > 0)
- full += "." + (count++);
- f = new File(full);
- if (f.isDirectory() || f.isFile())
- {
- count++;
- f = null;
- }
+ String full = filename;
+ if (count > 0)
+ full += "." + (count++);
+ f = new File(full);
+ if (f.isDirectory() || f.isFile())
+ {
+ count++;
+ f = null;
+ }
}
f.mkdir();
return f;
}
/**
- * Returns an array containing the file system root.
+ * Returns an array containing the file system root.
*
* @return An array containing the file system root.
*/
@@ -105,12 +105,12 @@ class UnixFileSystemView extends FileSystemView
}
/**
- * Returns the name of a file as it would be displayed by the underlying
+ * Returns the name of a file as it would be displayed by the underlying
* system.
*
* @param f the file.
*
- * @return the name of a file as it would be displayed by the underlying
+ * @return the name of a file as it would be displayed by the underlying
* system
*/
public String getSystemDisplayName(File f)
@@ -137,7 +137,7 @@ class UnixFileSystemView extends FileSystemView
}
/**
- * Returns the icon that would be displayed for the given file by the
+ * Returns the icon that would be displayed for the given file by the
* underlying system. This method is NOT YET IMPLEMENTED.
*
* @param f the file.
@@ -152,7 +152,7 @@ class UnixFileSystemView extends FileSystemView
}
/**
- * Returns the description of a file that would be displayed by the
+ * Returns the description of a file that would be displayed by the
* underlying system. This method is NOT YET IMPLEMENTED.
*
* @param f the file.
diff --git a/libjava/classpath/javax/swing/plaf/BorderUIResource.java b/libjava/classpath/javax/swing/plaf/BorderUIResource.java
index 317cb09..1742494 100644
--- a/libjava/classpath/javax/swing/plaf/BorderUIResource.java
+++ b/libjava/classpath/javax/swing/plaf/BorderUIResource.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -96,8 +96,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
* called.
*/
private static Border loweredBevelBorderUIResource;
-
-
+
+
/**
* A shared instance of a {@link BevelBorderUIResource} whose
* <code>bevelType</code> is {@link
@@ -106,8 +106,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
* called.
*/
private static Border raisedBevelBorderUIResource;
-
-
+
+
/**
* A shared instance of a {@link LineBorderUIResource} for
* a one-pixel thick black line, or <code>null</code> if
@@ -132,7 +132,7 @@ public class BorderUIResource implements Border, UIResource, Serializable
etchedBorderUIResource = new EtchedBorderUIResource();
return etchedBorderUIResource;
}
-
+
/**
* Returns a shared instance of {@link BevelBorderUIResource} whose
@@ -170,8 +170,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
BevelBorder.RAISED);
return raisedBevelBorderUIResource;
}
-
-
+
+
/**
* Returns a shared instance of {@link LineBorderUIResource} for
* a black, one-pixel width border.
@@ -193,23 +193,23 @@ public class BorderUIResource implements Border, UIResource, Serializable
* The wrapped border.
*/
private Border delegate;
-
-
+
+
/**
* Constructs a <code>BorderUIResource</code> for wrapping
* a <code>Border</code> object.
- *
+ *
* @param delegate the border to be wrapped.
*/
public BorderUIResource(Border delegate)
{
if (delegate == null)
throw new IllegalArgumentException();
-
+
this.delegate = delegate;
}
-
+
/**
* Paints the border around an enclosed component by calling
* the <code>paintBorder</code> method of the wrapped delegate.
@@ -226,8 +226,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
{
delegate.paintBorder(c, g, x, y, width, height);
}
-
-
+
+
/**
* Measures the width of this border by calling the
* <code>getBorderInsets</code> method of the wrapped
@@ -240,11 +240,11 @@ public class BorderUIResource implements Border, UIResource, Serializable
* width of the border at the respective edge.
*/
public Insets getBorderInsets(Component c)
- {
+ {
return delegate.getBorderInsets(c);
}
-
-
+
+
/**
* Determines whether this border fills every pixel in its area
* when painting by calling the <code>isBorderOpaque</code>
@@ -255,7 +255,7 @@ public class BorderUIResource implements Border, UIResource, Serializable
* can shine through the border.
*/
public boolean isBorderOpaque()
- {
+ {
return delegate.isBorderOpaque();
}
@@ -272,12 +272,12 @@ public class BorderUIResource implements Border, UIResource, Serializable
* @author Brian Jones (cbj@gnu.org)
* @author Sascha Brawer (brawer@dandelis.ch)
*/
- public static class BevelBorderUIResource
+ public static class BevelBorderUIResource
extends BevelBorder
implements UIResource, Serializable
{
private static final long serialVersionUID = -1275542891108351642L;
-
+
/**
* Constructs a BevelBorderUIResource whose colors will be derived
* from the background of the enclosed component. The background
@@ -296,12 +296,12 @@ public class BorderUIResource implements Border, UIResource, Serializable
* @throws IllegalArgumentException if <code>bevelType</code> has
* an unsupported value.
*/
- public BevelBorderUIResource(int bevelType)
- {
+ public BevelBorderUIResource(int bevelType)
+ {
super(bevelType);
}
-
-
+
+
/**
* Constructs a BevelBorderUIResource given its appearance type
* and two colors for its highlight and shadow.
@@ -334,9 +334,9 @@ public class BorderUIResource implements Border, UIResource, Serializable
* @throws NullPointerException if <code>highlight</code> or
* <code>shadow</code> is <code>null</code>.
*/
- public BevelBorderUIResource(int bevelType,
- Color highlight,
- Color shadow)
+ public BevelBorderUIResource(int bevelType,
+ Color highlight,
+ Color shadow)
{
super(bevelType, highlight, shadow);
}
@@ -382,15 +382,15 @@ public class BorderUIResource implements Border, UIResource, Serializable
Color highlightOuter,
Color highlightInner,
Color shadowOuter,
- Color shadowInner)
+ Color shadowInner)
{
super(bevelType,
highlightOuter, highlightInner,
shadowOuter, shadowInner);
}
}
-
-
+
+
/**
* A {@link javax.swing.border.CompoundBorder} that also implements the
* {@link UIResource} marker interface. This is useful for
@@ -408,7 +408,7 @@ public class BorderUIResource implements Border, UIResource, Serializable
implements UIResource, Serializable
{
private static final long serialVersionUID = 7550017084975167341L;
-
+
/**
* Constructs a CompoundBorderUIResource with the specified inside
* and outside borders.
@@ -429,8 +429,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
super(outsideBorder, insideBorder);
}
}
-
-
+
+
/**
* An {@link javax.swing.border.EmptyBorder} that also implements the
* {@link UIResource} marker interface. This is useful for
@@ -447,12 +447,12 @@ public class BorderUIResource implements Border, UIResource, Serializable
* @author Brian Jones (cbj@gnu.org)
* @author Sascha Brawer (brawer@dandelis.ch)
*/
- public static class EmptyBorderUIResource
+ public static class EmptyBorderUIResource
extends EmptyBorder
implements UIResource, Serializable
{
private static final long serialVersionUID = -4914187529340071708L;
-
+
/**
* Constructs an empty border given the number of pixels required
* on each side.
@@ -473,8 +473,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
{
super(top, left, bottom, right);
}
-
-
+
+
/**
* Constructs an empty border given the number of pixels required
* on each side, passed in an Insets object.
@@ -486,8 +486,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
super(insets);
}
}
-
-
+
+
/**
* An {@link javax.swing.border.EtchedBorder} that also implements the
* {@link UIResource} marker interface. This is useful for
@@ -509,7 +509,7 @@ public class BorderUIResource implements Border, UIResource, Serializable
implements UIResource, Serializable
{
private static final long serialVersionUID = -8186391754165296656L;
-
+
/**
* Constructs an EtchedBorderUIResource that appears lowered into
* the surface. The colors will be derived from the background
@@ -519,8 +519,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
{
super();
}
-
-
+
+
/**
* Constructs an EtchedBorderUIResource with the specified
* appearance. The colors will be derived from the background
@@ -537,12 +537,12 @@ public class BorderUIResource implements Border, UIResource, Serializable
* @throws IllegalArgumentException if <code>etchType</code> has
* an unsupported value.
*/
- public EtchedBorderUIResource(int etchType)
+ public EtchedBorderUIResource(int etchType)
{
super(etchType);
}
-
-
+
+
/**
* Constructs a lowered EtchedBorderUIResource, explicitly
* selecting the colors that will be used for highlight and
@@ -560,8 +560,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
{
super(highlight, shadow);
}
-
-
+
+
/**
* Constructs an EtchedBorderUIResource with the specified
* appearance, explicitly selecting the colors that will be used
@@ -590,8 +590,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
super(etchType, highlight, shadow);
}
}
-
-
+
+
/**
* A {@link javax.swing.border.LineBorder} that also implements the
* {@link UIResource} marker interface. This is useful for
@@ -612,7 +612,7 @@ public class BorderUIResource implements Border, UIResource, Serializable
implements UIResource, Serializable
{
private static final long serialVersionUID = -6171232338180172310L;
-
+
/**
* Constructs a LineBorderUIResource given its color. The border
* will be one pixel thick and have plain corners.
@@ -621,10 +621,10 @@ public class BorderUIResource implements Border, UIResource, Serializable
*/
public LineBorderUIResource(Color color)
{
- super(color);
+ super(color);
}
-
-
+
+
/**
* Constructs a LineBorder given its color and thickness. The
* border will have plain corners.
@@ -636,13 +636,13 @@ public class BorderUIResource implements Border, UIResource, Serializable
{
super(color, thickness);
}
-
-
+
+
/* Note: Since JDK1.3, javax.swing.border.LineBorder also has a
* constructor which accepts a value for the roundedCorners
* property. However, as of JDK1.4.1, the LineBorderUIResource
* subclass does not have a corresponding constructor.
- *
+ *
* A request for enhancing the Swing API has been filed with Sun:
* http://developer.java.sun.com/developer/bugParade/bugs/4879999.html
*/
@@ -669,7 +669,7 @@ public class BorderUIResource implements Border, UIResource, Serializable
implements UIResource, Serializable
{
private static final long serialVersionUID = -8107923147541851122L;
-
+
/**
* Constructs a MatteBorderUIResource given the width on each side
* and a fill color.
@@ -690,8 +690,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
{
super(top, left, bottom, right, color);
}
-
-
+
+
/**
* Constructs a MatteBorderUIResource given the width on each side
* and an icon for tiling the border area.
@@ -712,8 +712,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
{
super(top, left, bottom, right, tileIcon);
}
-
-
+
+
/**
* Constructs a MatteBorderUIResource given an icon for tiling the
* border area. The icon width is used for the border insets at
@@ -724,15 +724,15 @@ public class BorderUIResource implements Border, UIResource, Serializable
* height="150" alt="[A picture of a MatteBorder made by this
* constructor]" /></p>
*
- * @param tileIcon an icon for tiling the border area.
+ * @param tileIcon an icon for tiling the border area.
*/
public MatteBorderUIResource(Icon tileIcon)
{
super(tileIcon);
}
}
-
-
+
+
/**
* A {@link javax.swing.border.TitledBorder} that also implements the
* {@link UIResource} marker interface. This is useful for
@@ -750,7 +750,7 @@ public class BorderUIResource implements Border, UIResource, Serializable
implements UIResource, Serializable
{
private static final long serialVersionUID = 7667113547406407427L;
-
+
/**
* Constructs a TitledBorderUIResource given the text of its title.
*
@@ -761,8 +761,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
{
super(title);
}
-
-
+
+
/**
* Constructs an initially untitled TitledBorderUIResource
* given another border.
@@ -775,8 +775,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
{
super(border);
}
-
-
+
+
/**
* Constructs a TitledBorder given its border and title text.
*
@@ -878,8 +878,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
super(border, title, titleJustification, titlePosition,
titleFont);
}
-
-
+
+
/**
* Constructs a TitledBorder given its border, title text,
* horizontal alignment, vertical position, font, and color.
@@ -928,4 +928,3 @@ public class BorderUIResource implements Border, UIResource, Serializable
}
}
}
-
diff --git a/libjava/classpath/javax/swing/plaf/ColorChooserUI.java b/libjava/classpath/javax/swing/plaf/ColorChooserUI.java
index 1609141..e9cb32c 100644
--- a/libjava/classpath/javax/swing/plaf/ColorChooserUI.java
+++ b/libjava/classpath/javax/swing/plaf/ColorChooserUI.java
@@ -56,4 +56,3 @@ public abstract class ColorChooserUI extends ComponentUI
/* The constructor does not do anything. */
}
}
-
diff --git a/libjava/classpath/javax/swing/plaf/ColorUIResource.java b/libjava/classpath/javax/swing/plaf/ColorUIResource.java
index 36e10f2..3c9db2e 100644
--- a/libjava/classpath/javax/swing/plaf/ColorUIResource.java
+++ b/libjava/classpath/javax/swing/plaf/ColorUIResource.java
@@ -62,7 +62,7 @@ public class ColorUIResource extends Color implements UIResource
* @param g the green intensity, which must be in the range [0 .. 255].
* @param b the blue intensity, which must be in the range [0 .. 255].
*
- * @throws IllegalArgumentException if any of the values is outside the
+ * @throws IllegalArgumentException if any of the values is outside the
* specified range.
*/
public ColorUIResource(int r, int g, int b)
@@ -95,7 +95,7 @@ public class ColorUIResource extends Color implements UIResource
* @param g the green intensity, which must be in the range [0.0 .. 1.0].
* @param b the blue intensity, which must be in the range [0.0 .. 1.0].
*
- * @throws IllegalArgumentException if any of the values is outside the
+ * @throws IllegalArgumentException if any of the values is outside the
* specified range.
*/
public ColorUIResource(float r, float g, float b)
diff --git a/libjava/classpath/javax/swing/plaf/ComboBoxUI.java b/libjava/classpath/javax/swing/plaf/ComboBoxUI.java
index 58f6e81..0a06d26 100644
--- a/libjava/classpath/javax/swing/plaf/ComboBoxUI.java
+++ b/libjava/classpath/javax/swing/plaf/ComboBoxUI.java
@@ -55,7 +55,7 @@ public abstract class ComboBoxUI extends ComponentUI
{
// Nothing to do here.
}
-
+
/**
* Sets the visibility of the popup button.
*
@@ -77,7 +77,7 @@ public abstract class ComboBoxUI extends ComponentUI
* visible, <code>false</code> otherwise.
*/
public abstract boolean isPopupVisible(JComboBox c);
-
+
/**
* Determines whether the combo box can receive input focus.
*
@@ -88,5 +88,5 @@ public abstract class ComboBoxUI extends ComponentUI
* input focus, <code>false</code> otherwise.
*/
public abstract boolean isFocusTraversable(JComboBox c);
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/ComponentInputMapUIResource.java b/libjava/classpath/javax/swing/plaf/ComponentInputMapUIResource.java
index cfc43e4..4553562 100644
--- a/libjava/classpath/javax/swing/plaf/ComponentInputMapUIResource.java
+++ b/libjava/classpath/javax/swing/plaf/ComponentInputMapUIResource.java
@@ -66,4 +66,3 @@ public class ComponentInputMapUIResource extends ComponentInputMap
super(component);
}
}
-
diff --git a/libjava/classpath/javax/swing/plaf/ComponentUI.java b/libjava/classpath/javax/swing/plaf/ComponentUI.java
index be7b68a..35f2de3 100644
--- a/libjava/classpath/javax/swing/plaf/ComponentUI.java
+++ b/libjava/classpath/javax/swing/plaf/ComponentUI.java
@@ -80,7 +80,7 @@ import javax.swing.JComponent;
*
* @author Sascha Brawer (brawer@dandelis.ch)
*/
-public abstract class ComponentUI
+public abstract class ComponentUI
{
/**
* Constructs a new UI delegate.
@@ -89,8 +89,8 @@ public abstract class ComponentUI
{
// Nothing to do here.
}
-
-
+
+
/**
* Sets up the specified component so it conforms the the design
* guidelines of the implemented look and feel. When the look and
@@ -145,8 +145,8 @@ public abstract class ComponentUI
{
// The default implementation does not change any properties.
}
-
-
+
+
/**
* Paints the component according to the design guidelines
* of the look and feel. Most subclasses will want to override
@@ -162,8 +162,8 @@ public abstract class ComponentUI
// Nothing is done here. This method is meant to be overridden by
// subclasses.
}
-
-
+
+
/**
* Fills the specified component with its background color
* (unless the <code>opaque</code> property is <code>false</code>)
@@ -192,7 +192,7 @@ public abstract class ComponentUI
}
paint(g, c);
}
-
+
/**
* Determines the preferred size of a component. The default
* implementation returns <code>null</code>, which means that
@@ -209,8 +209,8 @@ public abstract class ComponentUI
{
return null;
}
-
-
+
+
/**
* Determines the minimum size of a component. The default
* implementation calls {@link #getPreferredSize}, but subclasses
@@ -265,7 +265,7 @@ public abstract class ComponentUI
* inside its parent.
*/
public boolean contains(JComponent c, int x, int y)
- {
+ {
/* JComponent.contains calls the ui delegate for hit
* testing. Therefore, endless mutual recursion would result if we
* called c.contains(x, y) here.
@@ -282,8 +282,8 @@ public abstract class ComponentUI
return (x >= 0) && (x < c.getWidth())
&& (y >= 0) && (y < c.getHeight());
}
-
-
+
+
/**
* Creates a delegate object for the specified component. Users
* should use the <code>createUI</code> method of a suitable
@@ -298,7 +298,7 @@ public abstract class ComponentUI
"javax.swing.plaf.ComponentUI does not implement createUI; call "
+ "createUI on a subclass.");
}
-
+
/**
* Counts the number of accessible children in the component. The
diff --git a/libjava/classpath/javax/swing/plaf/FileChooserUI.java b/libjava/classpath/javax/swing/plaf/FileChooserUI.java
index e9be8f2..fafd21d2 100644
--- a/libjava/classpath/javax/swing/plaf/FileChooserUI.java
+++ b/libjava/classpath/javax/swing/plaf/FileChooserUI.java
@@ -63,7 +63,7 @@ public abstract class FileChooserUI extends ComponentUI
// Nothing to do here.
}
-
+
/**
* Returns a <code>FileFilter</code> that accepts every file. While
* the filtering itself is not specific to any look and feel, the
diff --git a/libjava/classpath/javax/swing/plaf/IconUIResource.java b/libjava/classpath/javax/swing/plaf/IconUIResource.java
index 8ac9e08..48503f8 100644
--- a/libjava/classpath/javax/swing/plaf/IconUIResource.java
+++ b/libjava/classpath/javax/swing/plaf/IconUIResource.java
@@ -63,7 +63,7 @@ public class IconUIResource implements Icon, UIResource, Serializable
/**
- * The icon that is wrapped by this <code>IconUIResource</code> (never
+ * The icon that is wrapped by this <code>IconUIResource</code> (never
* <code>null</code>).
*/
private Icon delegate;
diff --git a/libjava/classpath/javax/swing/plaf/SplitPaneUI.java b/libjava/classpath/javax/swing/plaf/SplitPaneUI.java
index 59ededf..faf17cb 100644
--- a/libjava/classpath/javax/swing/plaf/SplitPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/SplitPaneUI.java
@@ -93,8 +93,8 @@ public abstract class SplitPaneUI extends ComponentUI
* @return the current location of the divider.
*/
public abstract int getDividerLocation(JSplitPane pane);
-
-
+
+
/**
* Determines the minimum location of the divider.
*
diff --git a/libjava/classpath/javax/swing/plaf/TabbedPaneUI.java b/libjava/classpath/javax/swing/plaf/TabbedPaneUI.java
index 01a7720..59136e0 100644
--- a/libjava/classpath/javax/swing/plaf/TabbedPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/TabbedPaneUI.java
@@ -60,8 +60,8 @@ public abstract class TabbedPaneUI extends ComponentUI
{
// Nothing to do here.
}
-
-
+
+
/**
* Determines which tab lies at a given position.
*
@@ -79,7 +79,7 @@ public abstract class TabbedPaneUI extends ComponentUI
*/
public abstract int tabForCoordinate(JTabbedPane pane,
int x, int y);
-
+
/**
* Calculates the bounding box of a tab.
@@ -108,4 +108,3 @@ public abstract class TabbedPaneUI extends ComponentUI
*/
public abstract int getTabRunCount(JTabbedPane pane);
}
-
diff --git a/libjava/classpath/javax/swing/plaf/TextUI.java b/libjava/classpath/javax/swing/plaf/TextUI.java
index 9f2737c..424cee9 100644
--- a/libjava/classpath/javax/swing/plaf/TextUI.java
+++ b/libjava/classpath/javax/swing/plaf/TextUI.java
@@ -61,7 +61,7 @@ public abstract class TextUI extends ComponentUI
{
/**
* Constructs a new <code>TextUI</code>.
- */
+ */
public TextUI()
{
// Nothing to do here.
@@ -155,7 +155,7 @@ public abstract class TextUI extends ComponentUI
*/
public abstract int viewToModel(JTextComponent tc, Point loc,
Position.Bias[] outBias);
-
+
/**
@@ -235,7 +235,7 @@ public abstract class TextUI extends ComponentUI
Position.Bias startBias,
Position.Bias endBias);
-
+
/**
* Retrieves the <code>EditorKit</code> managing policies and
* persistent state.
@@ -246,8 +246,8 @@ public abstract class TextUI extends ComponentUI
* @return the <code>EditorKit</code> used by <code>tc</code>.
*/
public abstract EditorKit getEditorKit(JTextComponent tc);
-
-
+
+
/**
* Retrieves the root of the view tree that visually presents
* the text.
diff --git a/libjava/classpath/javax/swing/plaf/UIResource.java b/libjava/classpath/javax/swing/plaf/UIResource.java
index fe398fe..511aaa7 100644
--- a/libjava/classpath/javax/swing/plaf/UIResource.java
+++ b/libjava/classpath/javax/swing/plaf/UIResource.java
@@ -1,4 +1,4 @@
-/* UIResource.java
+/* UIResource.java
Copyright (C) 1999 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -44,14 +44,14 @@ package javax.swing.plaf;
* renderer with <code>ComponentUI.uninstallUI()</code> the renderer
* property is set to <code>null</code>.
* <br>
- * A comparison against null can be used with all properties except for
- * the <code>java.awt.Component</code> properties font, foreground, and
+ * A comparison against null can be used with all properties except for
+ * the <code>java.awt.Component</code> properties font, foreground, and
* background. The container can provide the value of the properties if
* they are initialized or set to <code>null</code>.
- *
+ *
* @author Brian Jones
*
- * @see ComponentUI
+ * @see ComponentUI
*/
public interface UIResource
{
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicArrowButton.java b/libjava/classpath/javax/swing/plaf/basic/BasicArrowButton.java
index 781269b..1d6e887 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicArrowButton.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicArrowButton.java
@@ -51,15 +51,15 @@ import javax.swing.SwingConstants;
* A button that displays an arrow (triangle) that points {@link #NORTH},
* {@link #SOUTH}, {@link #EAST} or {@link #WEST}. This button is used by
* the {@link BasicComboBoxUI} class.
- *
+ *
* @see BasicComboBoxUI#createArrowButton
*/
public class BasicArrowButton extends JButton implements SwingConstants
{
- /**
- * The direction that the arrow points.
- *
+ /**
+ * The direction that the arrow points.
+ *
* @see #getDirection()
*/
protected int direction;
@@ -89,7 +89,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
* in the specified direction. If the <code>direction</code> is not one of
* the specified constants, no arrow is drawn.
*
- * @param direction The direction the arrow points in (one of:
+ * @param direction The direction the arrow points in (one of:
* {@link #NORTH}, {@link #SOUTH}, {@link #EAST} and {@link #WEST}).
*/
public BasicArrowButton(int direction)
@@ -103,7 +103,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
* Creates a new BasicArrowButton object with the given colors and
* direction.
*
- * @param direction The direction to point in (one of:
+ * @param direction The direction to point in (one of:
* {@link #NORTH}, {@link #SOUTH}, {@link #EAST} and {@link #WEST}).
* @param background The background color.
* @param shadow The shadow color.
@@ -133,7 +133,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
}
/**
- * Returns the direction of the arrow (one of: {@link #NORTH},
+ * Returns the direction of the arrow (one of: {@link #NORTH},
* {@link #SOUTH}, {@link #EAST} and {@link #WEST}).
*
* @return The direction of the arrow.
@@ -146,7 +146,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
/**
* Sets the direction of the arrow.
*
- * @param dir The new direction of the arrow (one of: {@link #NORTH},
+ * @param dir The new direction of the arrow (one of: {@link #NORTH},
* {@link #SOUTH}, {@link #EAST} and {@link #WEST}).
*/
public void setDirection(int dir)
@@ -163,23 +163,23 @@ public class BasicArrowButton extends JButton implements SwingConstants
public void paint(Graphics g)
{
super.paint(g);
-
+
int height = getHeight();
int size = height / 4;
-
+
int x = (getWidth() - size) / 2;
int y = (height - size) / 2;
-
+
ButtonModel m = getModel();
if (m.isArmed())
{
x++;
y++;
}
-
+
paintTriangle(g, x, y, size, direction, isEnabled());
}
-
+
/**
* Returns the preferred size of the arrow button.
*
@@ -220,17 +220,17 @@ public class BasicArrowButton extends JButton implements SwingConstants
}
/**
- * Paints a triangle with the given size, location and direction. It is
+ * Paints a triangle with the given size, location and direction. It is
* difficult to explain the rationale behind the positioning of the triangle
- * relative to the given (x, y) position - by trial and error we seem to
- * match the behaviour of the reference implementation (which is missing a
+ * relative to the given (x, y) position - by trial and error we seem to
+ * match the behaviour of the reference implementation (which is missing a
* specification for this method).
*
* @param g the graphics device.
* @param x the x-coordinate for the triangle's location.
* @param y the y-coordinate for the triangle's location.
* @param size the arrow size (depth).
- * @param direction the direction of the arrow (one of: {@link #NORTH},
+ * @param direction the direction of the arrow (one of: {@link #NORTH},
* {@link #SOUTH}, {@link #EAST} and {@link #WEST}).
* @param isEnabled if <code>true</code> the arrow is drawn in the enabled
* state, otherwise it is drawn in the disabled state.
@@ -258,11 +258,11 @@ public class BasicArrowButton extends JButton implements SwingConstants
}
g.setColor(savedColor);
}
-
+
/**
- * Paints an upward-pointing triangle. This method is called by the
+ * Paints an upward-pointing triangle. This method is called by the
* {@link #paintTriangle(Graphics, int, int, int, int, boolean)} method.
- *
+ *
* @param g the graphics device.
* @param x the x-coordinate for the anchor point.
* @param y the y-coordinate for the anchor point.
@@ -270,7 +270,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
* @param isEnabled if <code>true</code> the arrow is drawn in the enabled
* state, otherwise it is drawn in the disabled state.
*/
- private void paintTriangleNorth(Graphics g, int x, int y, int size,
+ private void paintTriangleNorth(Graphics g, int x, int y, int size,
boolean isEnabled)
{
int tipX = x + (size - 2) / 2;
@@ -297,11 +297,11 @@ public class BasicArrowButton extends JButton implements SwingConstants
g.drawLine(baseX1 + 1, baseY + 1, baseX2 + 1, baseY + 1);
}
}
-
+
/**
- * Paints an downward-pointing triangle. This method is called by the
+ * Paints an downward-pointing triangle. This method is called by the
* {@link #paintTriangle(Graphics, int, int, int, int, boolean)} method.
- *
+ *
* @param g the graphics device.
* @param x the x-coordinate for the anchor point.
* @param y the y-coordinate for the anchor point.
@@ -309,7 +309,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
* @param isEnabled if <code>true</code> the arrow is drawn in the enabled
* state, otherwise it is drawn in the disabled state.
*/
- private void paintTriangleSouth(Graphics g, int x, int y, int size,
+ private void paintTriangleSouth(Graphics g, int x, int y, int size,
boolean isEnabled)
{
int tipX = x + (size - 2) / 2;
@@ -337,11 +337,11 @@ public class BasicArrowButton extends JButton implements SwingConstants
g.drawLine(tipX + 1, tipY + 1, baseX2 + 1, baseY + 1);
}
}
-
+
/**
- * Paints a right-pointing triangle. This method is called by the
+ * Paints a right-pointing triangle. This method is called by the
* {@link #paintTriangle(Graphics, int, int, int, int, boolean)} method.
- *
+ *
* @param g the graphics device.
* @param x the x-coordinate for the anchor point.
* @param y the y-coordinate for the anchor point.
@@ -349,7 +349,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
* @param isEnabled if <code>true</code> the arrow is drawn in the enabled
* state, otherwise it is drawn in the disabled state.
*/
- private void paintTriangleEast(Graphics g, int x, int y, int size,
+ private void paintTriangleEast(Graphics g, int x, int y, int size,
boolean isEnabled)
{
int tipX = x + (size - 1);
@@ -357,7 +357,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
int baseX = x;
int baseY1 = tipY - (size - 1);
int baseY2 = tipY + (size - 1);
-
+
Polygon triangle = new Polygon();
triangle.addPoint(tipX, tipY);
triangle.addPoint(baseX, baseY1);
@@ -378,11 +378,11 @@ public class BasicArrowButton extends JButton implements SwingConstants
g.drawLine(baseX + 1, baseY2 + 1, tipX + 1, tipY + 1);
}
}
-
+
/**
- * Paints a left-pointing triangle. This method is called by the
+ * Paints a left-pointing triangle. This method is called by the
* {@link #paintTriangle(Graphics, int, int, int, int, boolean)} method.
- *
+ *
* @param g the graphics device.
* @param x the x-coordinate for the anchor point.
* @param y the y-coordinate for the anchor point.
@@ -390,7 +390,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
* @param isEnabled if <code>true</code> the arrow is drawn in the enabled
* state, otherwise it is drawn in the disabled state.
*/
- private void paintTriangleWest(Graphics g, int x, int y, int size,
+ private void paintTriangleWest(Graphics g, int x, int y, int size,
boolean isEnabled)
{
int tipX = x;
@@ -398,7 +398,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
int baseX = x + (size - 1);
int baseY1 = tipY - (size - 1);
int baseY2 = tipY + (size - 1);
-
+
Polygon triangle = new Polygon();
triangle.addPoint(tipX, tipY);
triangle.addPoint(baseX, baseY1);
@@ -418,5 +418,5 @@ public class BasicArrowButton extends JButton implements SwingConstants
g.drawLine(baseX + 1, baseY1 + 1, baseX + 1, baseY2 + 1);
}
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicBorders.java b/libjava/classpath/javax/swing/plaf/basic/BasicBorders.java
index 5e2cf2e..83afc33 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicBorders.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicBorders.java
@@ -252,7 +252,7 @@ public class BasicBorders
* <code>UIDefaults</code> of the currently active look and feel
* using the keys <code>&#x201c;SplitPane.darkShadow&#x201d;</code> and
* <code>&#x201c;SplitPane.highlight&#x201d;</code>.
- *
+ *
* <p><img src="doc-files/BasicBorders.SplitPaneBorder-1.png" width="520"
* height="200" alt="[A screen shot for JSplitPane.HORIZONTAL_SPLIT]" />
*
@@ -284,7 +284,7 @@ public class BasicBorders
* other two edges is the background color of the divider.
*
* <p><img src="doc-files/BasicBorders.SplitPaneDividerBorder-1.png"
- * width="520" height="200" alt=
+ * width="520" height="200" alt=
* "[A screen shot for JSplitPane.HORIZONTAL_SPLIT]" />
*
* @return an instance of <code>SplitPaneDividerBorder</code>, which is
@@ -332,7 +332,7 @@ public class BasicBorders
UIManager.getColor("TextField.light"),
UIManager.getColor("TextField.highlight"));
}
-
+
/**
* Returns a two-pixel thick, green
@@ -407,8 +407,8 @@ public class BasicBorders
return sharedMarginBorder;
}
-
-
+
+
/**
* A border whose appearance depends on the state of
* the enclosed button.
@@ -429,36 +429,36 @@ public class BasicBorders
* of Apple/Sun JDK 1.3.1 on MacOS X 10.1.5.
*/
static final long serialVersionUID = -157053874580739687L;
-
-
+
+
/**
* The color for drawing the shaded parts of the border.
* @see javax.swing.plaf.basic.BasicGraphicsUtils#drawBezel
*/
protected Color shadow;
-
-
+
+
/**
* The color for drawing the dark shaded parts of the border.
* @see javax.swing.plaf.basic.BasicGraphicsUtils#drawBezel
*/
protected Color darkShadow;
-
-
+
+
/**
* The color for drawing the highlighted parts of the border.
* @see javax.swing.plaf.basic.BasicGraphicsUtils#drawBezel
*/
protected Color highlight;
-
-
+
+
/**
* The color for drawing the bright highlighted parts of the border.
* @see javax.swing.plaf.basic.BasicGraphicsUtils#drawBezel
*/
protected Color lightHighlight;
-
-
+
+
/**
* Constructs a new border for drawing a button in the Basic
* look and feel.
@@ -485,7 +485,7 @@ public class BasicBorders
? lightHighlight
: Color.white;
}
-
+
/**
* Paints the ButtonBorder around a given component.
@@ -503,10 +503,10 @@ public class BasicBorders
int x, int y, int width, int height)
{
ButtonModel bmodel = null;
-
+
if (c instanceof AbstractButton)
bmodel = ((AbstractButton) c).getModel();
-
+
BasicGraphicsUtils.drawBezel(
g, x, y, width, height,
/* pressed */ (bmodel != null)
@@ -516,8 +516,8 @@ public class BasicBorders
&& ((JButton) c).isDefaultButton(),
shadow, darkShadow, highlight, lightHighlight);
}
-
-
+
+
/**
* Measures the width of this border.
*
@@ -534,7 +534,7 @@ public class BasicBorders
* <code>bottom</code> fields indicate the width of the
* border at the respective edge.
*
- * @see #getBorderInsets(java.awt.Component, java.awt.Insets)
+ * @see #getBorderInsets(java.awt.Component, java.awt.Insets)
*/
public Insets getBorderInsets(Component c)
{
@@ -545,7 +545,7 @@ public class BasicBorders
return getBorderInsets(c, null);
}
-
+
/**
* Measures the width of this border, storing the results into a
* pre-existing Insets object.
@@ -583,8 +583,8 @@ public class BasicBorders
return insets;
}
}
-
-
+
+
/**
* A border that makes its enclosed component appear as lowered
* into the surface. Typically used for text fields.
@@ -668,7 +668,7 @@ public class BasicBorders
? lightHighlight : Color.white;
}
-
+
/**
* Paints the FieldBorder around a given component.
*
@@ -688,8 +688,8 @@ public class BasicBorders
shadow, darkShadow,
highlight, lightHighlight);
}
-
-
+
+
/**
* Measures the width of this border.
*
@@ -749,8 +749,8 @@ public class BasicBorders
return insets;
}
}
-
-
+
+
/**
* An invisible, but spacing border whose margin is determined
* by calling the <code>getMargin()</code> method of the enclosed
@@ -772,8 +772,8 @@ public class BasicBorders
* of Apple/Sun JDK 1.3.1 on MacOS X 10.1.5.
*/
static final long serialVersionUID = -3035848353448896090L;
-
-
+
+
/**
* Constructs a new MarginBorder.
*/
@@ -781,7 +781,7 @@ public class BasicBorders
{
// Nothing to do here.
}
-
+
/**
* Measures the width of this border.
*
@@ -797,8 +797,8 @@ public class BasicBorders
{
return getBorderInsets(c, new Insets(0, 0, 0, 0));
}
-
-
+
+
/**
* Determines the insets of this border by calling the
* <code>getMargin()</code> method of the enclosed component. The
@@ -839,7 +839,7 @@ public class BasicBorders
margin = ((JToolBar) c).getMargin();
else if (c instanceof JTextComponent)
margin = ((JTextComponent) c).getMargin();
-
+
if (margin == null)
insets.top = insets.left = insets.bottom = insets.right = 0;
else
@@ -853,7 +853,7 @@ public class BasicBorders
return insets;
}
}
-
+
/**
* A border for drawing a separator line below JMenuBar.
@@ -872,8 +872,8 @@ public class BasicBorders
* of Apple/Sun JDK 1.3.1 on MacOS X 10.1.5.
*/
static final long serialVersionUID = -6909056571935227506L;
-
-
+
+
/**
* The shadow color, which is used for the upper line of the
* two-pixel thick bottom edge.
@@ -949,7 +949,7 @@ public class BasicBorders
g.setColor(highlight);
g.drawLine(x + 1, y + 1, x + width - 3, y + 1);
- g.drawLine(x + width - 1, y, x + width - 1, y + 1);
+ g.drawLine(x + width - 1, y, x + width - 1, y + 1);
}
finally
{
@@ -1098,7 +1098,7 @@ public class BasicBorders
{
lowered = button.isSelected()
|| (/* mouse inside */ bmodel.isArmed() && bmodel.isPressed());
- focused = button.hasFocus() && button.isFocusPainted();
+ focused = button.hasFocus() && button.isFocusPainted();
}
if (lowered)
@@ -1112,8 +1112,8 @@ public class BasicBorders
shadow, darkShadow,
highlight, lightHighlight);
}
-
-
+
+
/**
* Measures the width of this border.
*
@@ -1124,7 +1124,7 @@ public class BasicBorders
* <code>bottom</code> fields indicate the width of the
* border at the respective edge.
*
- * @see #getBorderInsets(java.awt.Component, java.awt.Insets)
+ * @see #getBorderInsets(java.awt.Component, java.awt.Insets)
*/
public Insets getBorderInsets(Component c)
{
@@ -1135,7 +1135,7 @@ public class BasicBorders
return getBorderInsets(c, null);
}
-
+
/**
* Measures the width of this border, storing the results into a
* pre-existing Insets object.
@@ -1439,7 +1439,7 @@ public class BasicBorders
y += rect.y - 1;
int right = x + rect.width + 1;
int bottom = y + rect.height + 1;
-
+
Color oldColor = g.getColor();
try
{
@@ -1466,7 +1466,7 @@ public class BasicBorders
}
}
-
+
/**
* Measures the width of this border.
*
@@ -1616,7 +1616,7 @@ public class BasicBorders
return true;
}
-
+
/**
* Determines the JSplitPane whose divider is being painted.
*
@@ -1661,7 +1661,7 @@ public class BasicBorders
*/
static final long serialVersionUID = -3528666548001058394L;
-
+
/**
* Constructs a new border for drawing a JToggleButton in
* the Basic look and feel.
@@ -1708,7 +1708,7 @@ public class BasicBorders
* is selected or not.
*/
BasicGraphicsUtils.drawBezel(g, x, y, width, height,
- /* pressed */ false,
+ /* pressed */ false,
/* default */ false,
shadow, darkShadow,
highlight, lightHighlight);
@@ -1725,7 +1725,7 @@ public class BasicBorders
* <code>bottom</code> fields indicate the width of the
* border at the respective edge.
*
- * @see #getBorderInsets(java.awt.Component, java.awt.Insets)
+ * @see #getBorderInsets(java.awt.Component, java.awt.Insets)
*/
public Insets getBorderInsets(Component c)
{
@@ -1736,7 +1736,7 @@ public class BasicBorders
return getBorderInsets(c, null);
}
-
+
/**
* Measures the width of this border, storing the results into a
* pre-existing Insets object.
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicButtonListener.java b/libjava/classpath/javax/swing/plaf/basic/BasicButtonListener.java
index c99de2c..22033b6 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicButtonListener.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicButtonListener.java
@@ -131,7 +131,7 @@ public class BasicButtonListener
{
// Do nothing here.
}
-
+
public void propertyChange(PropertyChangeEvent e)
{
// Store the TextLayout for this in a client property for speed-up
@@ -166,31 +166,31 @@ public class BasicButtonListener
*
* @param b the button to check
*/
- protected void checkOpacity(AbstractButton b)
- {
+ protected void checkOpacity(AbstractButton b)
+ {
b.setOpaque(b.isContentAreaFilled());
}
-
- public void focusGained(FocusEvent e)
- {
+
+ public void focusGained(FocusEvent e)
+ {
if (e.getSource() instanceof AbstractButton)
{
AbstractButton button = (AbstractButton) e.getSource();
if (button.isFocusPainted())
- button.repaint();
+ button.repaint();
}
}
-
+
public void focusLost(FocusEvent e)
{
if (e.getSource() instanceof AbstractButton)
{
AbstractButton button = (AbstractButton) e.getSource();
if (button.isFocusPainted())
- button.repaint();
+ button.repaint();
}
}
-
+
public void installKeyboardActions(JComponent c)
{
ButtonUI ui = ((AbstractButton) c).getUI();
@@ -198,7 +198,7 @@ public class BasicButtonListener
{
// Install InputMap.
BasicButtonUI basicUI = (BasicButtonUI) ui;
- String prefix = basicUI.getPropertyPrefix();
+ String prefix = basicUI.getPropertyPrefix();
InputMap focusInputMap =
(InputMap) UIManager.get(prefix + "focusInputMap");
SwingUtilities.replaceUIInputMap(c, JComponent.WHEN_FOCUSED,
@@ -212,11 +212,11 @@ public class BasicButtonListener
}
SwingUtilities.replaceUIActionMap(c, am);
}
-
- c.getActionMap().put("pressed",
- new AbstractAction()
+
+ c.getActionMap().put("pressed",
+ new AbstractAction()
{
- public void actionPerformed(ActionEvent e)
+ public void actionPerformed(ActionEvent e)
{
AbstractButton button = (AbstractButton) e.getSource();
ButtonModel model = button.getModel();
@@ -225,11 +225,11 @@ public class BasicButtonListener
model.setPressed(true);
}
});
-
- c.getActionMap().put("released",
- new AbstractAction()
+
+ c.getActionMap().put("released",
+ new AbstractAction()
{
- public void actionPerformed(ActionEvent e)
+ public void actionPerformed(ActionEvent e)
{
AbstractButton button = (AbstractButton) e.getSource();
ButtonModel model = button.getModel();
@@ -237,7 +237,7 @@ public class BasicButtonListener
model.setPressed(false);
model.setArmed(false);
}
- });
+ });
}
/**
@@ -259,23 +259,23 @@ public class BasicButtonListener
SwingUtilities.replaceUIActionMap(c, null);
SwingUtilities.replaceUIInputMap(c, JComponent.WHEN_FOCUSED, null);
}
-
+
public void stateChanged(ChangeEvent e)
{
// Need to repaint when the button state changes.
((AbstractButton) e.getSource()).repaint();
}
-
+
public void mouseMoved(MouseEvent e)
{
// Nothing to do here.
}
-
+
public void mouseDragged(MouseEvent e)
{
// Nothing to do here.
}
-
+
public void mouseClicked(MouseEvent e)
{
// Nothing to do here.
@@ -305,7 +305,7 @@ public class BasicButtonListener
}
/**
- * Accept a mouse release event and set the button's
+ * Accept a mouse release event and set the button's
* "pressed" property to <code>true</code>, if the model
* is armed. If the model is not armed, ignore the event.
*
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicButtonUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicButtonUI.java
index 9f685bb..1697c24 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicButtonUI.java
@@ -120,7 +120,7 @@ public class BasicButtonUI extends ButtonUI
*
* @return A new UI capable of drawing the component
*/
- public static ComponentUI createUI(final JComponent c)
+ public static ComponentUI createUI(final JComponent c)
{
if (sharedUI == null)
sharedUI = new BasicButtonUI();
@@ -129,9 +129,9 @@ public class BasicButtonUI extends ButtonUI
/**
* Returns the default gap between the button's text and icon (in pixels).
- *
+ *
* @param b the button (ignored).
- *
+ *
* @return The gap.
*/
public int getDefaultTextIconGap(AbstractButton b)
@@ -141,19 +141,19 @@ public class BasicButtonUI extends ButtonUI
/**
* Sets the text shift offset to zero.
- *
+ *
* @see #setTextShiftOffset()
*/
protected void clearTextShiftOffset()
{
textShiftOffset = 0;
}
-
+
/**
* Returns the text shift offset.
- *
+ *
* @return The text shift offset.
- *
+ *
* @see #clearTextShiftOffset()
* @see #setTextShiftOffset()
*/
@@ -164,7 +164,7 @@ public class BasicButtonUI extends ButtonUI
/**
* Sets the text shift offset to the value in {@link #defaultTextShiftOffset}.
- *
+ *
* @see #clearTextShiftOffset()
*/
protected void setTextShiftOffset()
@@ -185,7 +185,7 @@ public class BasicButtonUI extends ButtonUI
/**
* Installs the default settings.
- *
+ *
* @param b the button (<code>null</code> not permitted).
*/
protected void installDefaults(AbstractButton b)
@@ -218,7 +218,7 @@ public class BasicButtonUI extends ButtonUI
/**
* Removes the defaults added by {@link #installDefaults(AbstractButton)}.
- *
+ *
* @param b the button (<code>null</code> not permitted).
*/
protected void uninstallDefaults(AbstractButton b)
@@ -229,11 +229,11 @@ public class BasicButtonUI extends ButtonUI
/**
* Creates and returns a new instance of {@link BasicButtonListener}. This
- * method provides a hook to make it easy for subclasses to install a
+ * method provides a hook to make it easy for subclasses to install a
* different listener.
- *
+ *
* @param b the button.
- *
+ *
* @return A new listener.
*/
protected BasicButtonListener createButtonListener(AbstractButton b)
@@ -249,7 +249,7 @@ public class BasicButtonUI extends ButtonUI
/**
* Installs listeners for the button.
- *
+ *
* @param b the button (<code>null</code> not permitted).
*/
protected void installListeners(AbstractButton b)
@@ -259,7 +259,7 @@ public class BasicButtonUI extends ButtonUI
{
b.addChangeListener(listener);
b.addPropertyChangeListener(listener);
- b.addFocusListener(listener);
+ b.addFocusListener(listener);
b.addMouseListener(listener);
b.addMouseMotionListener(listener);
}
@@ -271,7 +271,7 @@ public class BasicButtonUI extends ButtonUI
/**
* Uninstalls listeners for the button.
- *
+ *
* @param b the button (<code>null</code> not permitted).
*/
protected void uninstallListeners(AbstractButton b)
@@ -281,7 +281,7 @@ public class BasicButtonUI extends ButtonUI
{
b.removeChangeListener(listener);
b.removePropertyChangeListener(listener);
- b.removeFocusListener(listener);
+ b.removeFocusListener(listener);
b.removeMouseListener(listener);
b.removeMouseMotionListener(listener);
}
@@ -304,12 +304,12 @@ public class BasicButtonUI extends ButtonUI
/**
* Install the BasicButtonUI as the UI for a particular component.
* This means registering all the UI's listeners with the component,
- * and setting any properties of the button which are particular to
+ * and setting any properties of the button which are particular to
* this look and feel.
*
* @param c The component to install the UI into
*/
- public void installUI(final JComponent c)
+ public void installUI(final JComponent c)
{
super.installUI(c);
if (c instanceof AbstractButton)
@@ -395,7 +395,7 @@ public class BasicButtonUI extends ButtonUI
*
* @return The preferred dimensions of the component
*/
- public Dimension getPreferredSize(JComponent c)
+ public Dimension getPreferredSize(JComponent c)
{
AbstractButton b = (AbstractButton) c;
Dimension d = BasicGraphicsUtils.getPreferredButtonSize(b,
@@ -417,7 +417,7 @@ public class BasicButtonUI extends ButtonUI
i = b.getRolloverSelectedIcon();
else if (b.getRolloverIcon() != null)
i = b.getRolloverIcon();
- }
+ }
else if (b.isSelected() && b.isEnabled())
{
@@ -434,7 +434,7 @@ public class BasicButtonUI extends ButtonUI
}
/**
- * Paint the component, which is an {@link AbstractButton}, according to
+ * Paint the component, which is an {@link AbstractButton}, according to
* its current state.
*
* @param g The graphics context to paint with
@@ -462,13 +462,13 @@ public class BasicButtonUI extends ButtonUI
g.setFont(f);
Icon icon = b.getIcon();
String text = b.getText();
- text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f),
+ text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f),
text, icon,
- b.getVerticalAlignment(),
+ b.getVerticalAlignment(),
b.getHorizontalAlignment(),
- b.getVerticalTextPosition(),
+ b.getVerticalTextPosition(),
b.getHorizontalTextPosition(),
- viewR, iconR, textR,
+ viewR, iconR, textR,
text == null ? 0
: b.getIconTextGap());
@@ -541,7 +541,7 @@ public class BasicButtonUI extends ButtonUI
/**
* Paints the background area of an {@link AbstractButton} in the pressed
- * state. This means filling the supplied area with a darker than normal
+ * state. This means filling the supplied area with a darker than normal
* background.
*
* @param g The graphics context to paint with
@@ -557,7 +557,7 @@ public class BasicButtonUI extends ButtonUI
g.fillRect(area.x, area.y, area.width, area.height);
}
}
-
+
/**
* Paints the "text" property of an {@link AbstractButton}.
*
@@ -567,8 +567,8 @@ public class BasicButtonUI extends ButtonUI
* @param text The text to paint
*/
protected void paintText(Graphics g, JComponent c, Rectangle textRect,
- String text)
- {
+ String text)
+ {
AbstractButton b = (AbstractButton) c;
Font f = b.getFont();
g.setFont(f);
@@ -602,10 +602,10 @@ public class BasicButtonUI extends ButtonUI
* @since 1.4
*/
protected void paintText(Graphics g, AbstractButton b, Rectangle textRect,
- String text)
+ String text)
{
paintText(g, (JComponent) b, textRect, text);
- }
+ }
/**
* A helper method that finds the BasicButtonListener for the specified
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
index e45970e..79ce7b8 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
@@ -52,7 +52,7 @@ import javax.swing.plaf.ComponentUI;
*/
public class BasicCheckBoxMenuItemUI extends BasicMenuItemUI
{
-
+
/**
* Creates a new BasicCheckBoxMenuItemUI object.
*/
@@ -60,7 +60,7 @@ public class BasicCheckBoxMenuItemUI extends BasicMenuItemUI
{
super();
}
-
+
/**
* Factory method to create a BasicCheckBoxMenuItemUI for the given {@link
* JComponent}, which should be a JCheckBoxMenuItem
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java
index 43001b8..0a4da00 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java
@@ -47,14 +47,14 @@ import javax.swing.plaf.ComponentUI;
* A UI delegate for the {@link JCheckBox} component.
*/
public class BasicCheckBoxUI extends BasicRadioButtonUI
-{
-
+{
+
/**
- * Returns a UI delegate (that is, an instance of this class) for the
+ * Returns a UI delegate (that is, an instance of this class) for the
* specified component.
- *
+ *
* @param c the component (this should be a {@link JCheckBox}).
- *
+ *
* @return A new instance of <code>BasicCheckBoxUI</code>.
*/
public static ComponentUI createUI(JComponent c)
@@ -63,7 +63,7 @@ public class BasicCheckBoxUI extends BasicRadioButtonUI
}
/**
- * Returns the prefix for entries in the {@link UIManager} defaults table
+ * Returns the prefix for entries in the {@link UIManager} defaults table
* (<code>"CheckBox."</code> in this case).
*
* @return "CheckBox."
@@ -73,7 +73,3 @@ public class BasicCheckBoxUI extends BasicRadioButtonUI
return "CheckBox.";
}
}
-
-
-
-
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicColorChooserUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicColorChooserUI.java
index f37cbd7..10b5643 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicColorChooserUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicColorChooserUI.java
@@ -74,12 +74,12 @@ public class BasicColorChooserUI extends ColorChooserUI
public void propertyChange(PropertyChangeEvent e)
{
if (e.getPropertyName() == JColorChooser.CHOOSER_PANELS_PROPERTY)
- makeTabs(chooser.getChooserPanels());
+ makeTabs(chooser.getChooserPanels());
else if (e.getPropertyName() == JColorChooser.PREVIEW_PANEL_PROPERTY)
- updatePreviewPanel(chooser.getPreviewPanel());
+ updatePreviewPanel(chooser.getPreviewPanel());
else if (e.getPropertyName() == JColorChooser.SELECTION_MODEL_PROPERTY)
- ((AbstractColorChooserPanel) pane.getSelectedComponent())
- .updateChooser();
+ ((AbstractColorChooserPanel) pane.getSelectedComponent())
+ .updateChooser();
chooser.repaint();
}
@@ -100,10 +100,10 @@ public class BasicColorChooserUI extends ColorChooserUI
{
if (pane != null)
{
- AbstractColorChooserPanel panel = (AbstractColorChooserPanel) pane
- .getSelectedComponent();
- if (panel != null)
- panel.updateChooser();
+ AbstractColorChooserPanel panel = (AbstractColorChooserPanel) pane
+ .getSelectedComponent();
+ if (panel != null)
+ panel.updateChooser();
}
chooser.repaint();
}
@@ -190,30 +190,30 @@ public class BasicColorChooserUI extends ColorChooserUI
{
if (c instanceof JColorChooser)
{
- chooser = (JColorChooser) c;
- chooser.setLayout(new BorderLayout());
+ chooser = (JColorChooser) c;
+ chooser.setLayout(new BorderLayout());
- // Do this first, so we avoid doing work for property change events.
- defaultChoosers = createDefaultChoosers();
- chooser.setChooserPanels(defaultChoosers);
- pane = new JTabbedPane();
+ // Do this first, so we avoid doing work for property change events.
+ defaultChoosers = createDefaultChoosers();
+ chooser.setChooserPanels(defaultChoosers);
+ pane = new JTabbedPane();
- pane.addChangeListener(new ChangeListener()
- {
- public void stateChanged(ChangeEvent e)
- {
- pane.repaint();
- }
- });
+ pane.addChangeListener(new ChangeListener()
+ {
+ public void stateChanged(ChangeEvent e)
+ {
+ pane.repaint();
+ }
+ });
- makeTabs(defaultChoosers);
+ makeTabs(defaultChoosers);
- chooser.add(pane, BorderLayout.NORTH);
+ chooser.add(pane, BorderLayout.NORTH);
- installPreviewPanel();
+ installPreviewPanel();
- installDefaults();
- installListeners();
+ installDefaults();
+ installListeners();
}
}
@@ -274,9 +274,9 @@ public class BasicColorChooserUI extends ColorChooserUI
{
if (prevContainer == null)
{
- prevContainer = new JPanel();
- prevContainer.setLayout(new BorderLayout());
- chooser.add(prevContainer, BorderLayout.CENTER);
+ prevContainer = new JPanel();
+ prevContainer.setLayout(new BorderLayout());
+ chooser.add(prevContainer, BorderLayout.CENTER);
}
prevContainer.removeAll();
prevContainer.add(preview, BorderLayout.CENTER);
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxEditor.java b/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxEditor.java
index d879261..b04f3fa 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxEditor.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxEditor.java
@@ -69,7 +69,7 @@ public class BasicComboBoxEditor extends Object implements ComboBoxEditor,
}
/**
- * Returns the component that will be used by the combo box to display and
+ * Returns the component that will be used by the combo box to display and
* edit the currently selected item in the combo box.
*
* @return The editor component, which is a {@link JTextField} in this case.
@@ -138,7 +138,7 @@ public class BasicComboBoxEditor extends Object implements ComboBoxEditor,
}
/**
- * Adds an {@link ActionListener} to the editor component. If the user will
+ * Adds an {@link ActionListener} to the editor component. If the user will
* edit currently selected item in the textfield and pressEnter, then action
* will be performed. The actionPerformed of this ActionListener should
* change the selected item of the comboBox to the newly editted selected
@@ -163,7 +163,7 @@ public class BasicComboBoxEditor extends Object implements ComboBoxEditor,
}
/**
- * A subclass of {@link BasicComboBoxEditor} that implements the
+ * A subclass of {@link BasicComboBoxEditor} that implements the
* {@link UIResource} interface.
*/
public static class UIResource extends BasicComboBoxEditor
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java b/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java
index 3c8d1e8..761d7d1 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java
@@ -51,12 +51,12 @@ import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
/**
- * A renderer for a {@link JComboBox}.
+ * A renderer for a {@link JComboBox}.
*
* @author Olga Rodimina
*/
-public class BasicComboBoxRenderer
- extends JLabel
+public class BasicComboBoxRenderer
+ extends JLabel
implements ListCellRenderer, Serializable
{
/**
@@ -75,7 +75,7 @@ public class BasicComboBoxRenderer
/**
* Returns preferredSize of the renderer
- *
+ *
* @return preferredSize of the renderer
*/
public Dimension getPreferredSize()
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java
index ff636d6..07d4f42 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java
@@ -100,9 +100,9 @@ public class BasicComboBoxUI extends ComboBoxUI
protected JComboBox comboBox;
/**
- * The component that is responsible for displaying/editing the selected
- * item of the combo box.
- *
+ * The component that is responsible for displaying/editing the selected
+ * item of the combo box.
+ *
* @see BasicComboBoxEditor#getEditorComponent()
*/
protected Component editor;
@@ -144,11 +144,11 @@ public class BasicComboBoxUI extends ComboBoxUI
* Popup list containing the combo box's menu items.
*/
protected ComboPopup popup;
-
+
protected KeyListener popupKeyListener;
-
+
protected MouseListener popupMouseListener;
-
+
protected MouseMotionListener popupMouseMotionListener;
/**
@@ -187,7 +187,7 @@ public class BasicComboBoxUI extends ComboBoxUI
}
/**
- * A factory method to create a UI delegate for the given
+ * A factory method to create a UI delegate for the given
* {@link JComponent}, which should be a {@link JComboBox}.
*
* @param c The {@link JComponent} a UI is being created for.
@@ -203,7 +203,7 @@ public class BasicComboBoxUI extends ComboBoxUI
* Installs the UI for the given {@link JComponent}.
*
* @param c the JComponent to install a UI for.
- *
+ *
* @see #uninstallUI(JComponent)
*/
public void installUI(JComponent c)
@@ -230,7 +230,7 @@ public class BasicComboBoxUI extends ComboBoxUI
{
currentEditor = createEditor();
comboBox.setEditor(currentEditor);
- }
+ }
installComponents();
installListeners();
@@ -246,7 +246,7 @@ public class BasicComboBoxUI extends ComboBoxUI
* Uninstalls the UI for the given {@link JComponent}.
*
* @param c The JComponent that is having this UI removed.
- *
+ *
* @see #installUI(JComponent)
*/
public void uninstallUI(JComponent c)
@@ -262,9 +262,9 @@ public class BasicComboBoxUI extends ComboBoxUI
}
/**
- * Installs the defaults that are defined in the {@link BasicLookAndFeel}
+ * Installs the defaults that are defined in the {@link BasicLookAndFeel}
* for this {@link JComboBox}.
- *
+ *
* @see #uninstallDefaults()
*/
protected void installDefaults()
@@ -276,7 +276,7 @@ public class BasicComboBoxUI extends ComboBoxUI
/**
* Creates and installs the listeners for this UI.
- *
+ *
* @see #uninstallListeners()
*/
protected void installListeners()
@@ -312,7 +312,7 @@ public class BasicComboBoxUI extends ComboBoxUI
/**
* Uninstalls the defaults and sets any objects created during
* install to <code>null</code>.
- *
+ *
* @see #installDefaults()
*/
protected void uninstallDefaults()
@@ -322,7 +322,7 @@ public class BasicComboBoxUI extends ComboBoxUI
if (comboBox.getForeground() instanceof UIResource)
comboBox.setForeground(null);
-
+
if (comboBox.getBackground() instanceof UIResource)
comboBox.setBackground(null);
@@ -331,7 +331,7 @@ public class BasicComboBoxUI extends ComboBoxUI
/**
* Detaches all the listeners we attached in {@link #installListeners}.
- *
+ *
* @see #installListeners()
*/
protected void uninstallListeners()
@@ -429,7 +429,7 @@ public class BasicComboBoxUI extends ComboBoxUI
}
/**
- * Creates and returns a layout manager for the combo box. Subclasses can
+ * Creates and returns a layout manager for the combo box. Subclasses can
* override this method to provide a different layout.
*
* @return a layout manager for the combo box.
@@ -452,7 +452,7 @@ public class BasicComboBoxUI extends ComboBoxUI
/**
* Creates the component that will be responsible for displaying/editing
- * the selected item in the combo box. This editor is used only when combo
+ * the selected item in the combo box. This editor is used only when combo
* box is editable.
*
* @return A new component that will be responsible for displaying/editing
@@ -484,7 +484,7 @@ public class BasicComboBoxUI extends ComboBoxUI
/**
* Uninstalls components from this {@link JComboBox}.
- *
+ *
* @see #installComponents()
*/
protected void uninstallComponents()
@@ -546,7 +546,7 @@ public class BasicComboBoxUI extends ComboBoxUI
}
/**
- * Unconfigures the editor for this combo box.
+ * Unconfigures the editor for this combo box.
*/
protected void unconfigureEditor()
{
@@ -558,7 +558,7 @@ public class BasicComboBoxUI extends ComboBoxUI
/**
* Configures the arrow button.
- *
+ *
* @see #configureArrowButton()
*/
public void configureArrowButton()
@@ -569,7 +569,7 @@ public class BasicComboBoxUI extends ComboBoxUI
arrowButton.setFocusable(false);
arrowButton.addMouseListener(popup.getMouseListener());
arrowButton.addMouseMotionListener(popup.getMouseMotionListener());
-
+
// Mark the button as not closing the popup, we handle this ourselves.
arrowButton.putClientProperty(BasicLookAndFeel.DONT_CANCEL_POPUP,
Boolean.TRUE);
@@ -578,7 +578,7 @@ public class BasicComboBoxUI extends ComboBoxUI
/**
* Unconfigures the arrow button.
- *
+ *
* @see #configureArrowButton()
*
* @specnote The specification says this method is implementation specific
@@ -613,7 +613,7 @@ public class BasicComboBoxUI extends ComboBoxUI
*
* @param c The JComboBox to check
*
- * @return <code>true</code> if popup part of the JComboBox is visible and
+ * @return <code>true</code> if popup part of the JComboBox is visible and
* <code>false</code> otherwise.
*/
public boolean isPopupVisible(JComboBox c)
@@ -917,12 +917,12 @@ public class BasicComboBoxUI extends ComboBoxUI
= new DefaultListCellRenderer();
/**
- * Returns the default size for the display area of a combo box that does
+ * Returns the default size for the display area of a combo box that does
* not contain any elements. This method returns the width and height of
- * a single space in the current font, plus a margin of 1 pixel.
+ * a single space in the current font, plus a margin of 1 pixel.
*
* @return The default display size.
- *
+ *
* @see #getDisplaySize()
*/
protected Dimension getDefaultSize()
@@ -937,7 +937,7 @@ public class BasicComboBoxUI extends ComboBoxUI
}
/**
- * Returns the size of the display area for the combo box. This size will be
+ * Returns the size of the display area for the combo box. This size will be
* the size of the combo box, not including the arrowButton.
*
* @return The size of the display area for the combo box.
@@ -950,11 +950,11 @@ public class BasicComboBoxUI extends ComboBoxUI
{
renderer = DEFAULT_RENDERER;
}
-
+
Object prototype = comboBox.getPrototypeDisplayValue();
if (prototype != null)
{
- Component comp = renderer.getListCellRendererComponent(listBox,
+ Component comp = renderer.getListCellRendererComponent(listBox,
prototype, -1, false, false);
currentValuePane.add(comp);
comp.setFont(comboBox.getFont());
@@ -971,7 +971,7 @@ public class BasicComboBoxUI extends ComboBoxUI
{
for (int i = 0; i < size; ++i)
{
- Component comp = renderer.getListCellRendererComponent(listBox,
+ Component comp = renderer.getListCellRendererComponent(listBox,
model.getElementAt(i), -1, false, false);
currentValuePane.add(comp);
comp.setFont(comboBox.getFont());
@@ -1009,7 +1009,7 @@ public class BasicComboBoxUI extends ComboBoxUI
(InputMap) UIManager.get("ComboBox.ancestorInputMap"));
// Install any action maps here.
}
-
+
/**
* Uninstalls the keyboard actions for the {@link JComboBox} there were
* installed by in {@link #installListeners}.
@@ -1024,7 +1024,7 @@ public class BasicComboBoxUI extends ComboBoxUI
/**
* A {@link LayoutManager} used to position the sub-components of the
* {@link JComboBox}.
- *
+ *
* @see BasicComboBoxUI#createLayoutManager()
*/
public class ComboBoxLayoutManager implements LayoutManager
@@ -1040,7 +1040,7 @@ public class BasicComboBoxUI extends ComboBoxUI
/**
* Adds a component to the layout. This method does nothing, since the
* layout manager doesn't need to track the components.
- *
+ *
* @param name the name to associate the component with (ignored).
* @param comp the component (ignored).
*/
@@ -1052,7 +1052,7 @@ public class BasicComboBoxUI extends ComboBoxUI
/**
* Removes a component from the layout. This method does nothing, since
* the layout manager doesn't need to track the components.
- *
+ *
* @param comp the component.
*/
public void removeLayoutComponent(Component comp)
@@ -1063,7 +1063,7 @@ public class BasicComboBoxUI extends ComboBoxUI
/**
* Returns preferred layout size of the JComboBox.
*
- * @param parent the Container for which the preferred size should be
+ * @param parent the Container for which the preferred size should be
* calculated.
*
* @return The preferred size for the given container
@@ -1075,9 +1075,9 @@ public class BasicComboBoxUI extends ComboBoxUI
/**
* Returns the minimum layout size.
- *
+ *
* @param parent the container.
- *
+ *
* @return The minimum size.
*/
public Dimension minimumLayoutSize(Container parent)
@@ -1095,7 +1095,7 @@ public class BasicComboBoxUI extends ComboBoxUI
*/
public void layoutContainer(Container parent)
{
- // Position editor component to the left of arrow button if combo box is
+ // Position editor component to the left of arrow button if combo box is
// editable
Insets i = getInsets();
int arrowSize = comboBox.getHeight() - (i.top + i.bottom);
@@ -1152,7 +1152,7 @@ public class BasicComboBoxUI extends ComboBoxUI
}
/**
- * Handles {@link ItemEvent}s fired by the {@link JComboBox} when its
+ * Handles {@link ItemEvent}s fired by the {@link JComboBox} when its
* selected item changes.
*/
public class ItemHandler extends Object implements ItemListener
@@ -1297,7 +1297,7 @@ public class BasicComboBoxUI extends ComboBoxUI
}
}
}
-
+
}
/**
@@ -1328,7 +1328,7 @@ public class BasicComboBoxUI extends ComboBoxUI
/**
* Invoked whenever bound property of JComboBox changes.
- *
+ *
* @param e the event.
*/
public void propertyChange(PropertyChangeEvent e)
@@ -1404,7 +1404,7 @@ public class BasicComboBoxUI extends ComboBoxUI
isMinimumSizeDirty = true;
comboBox.revalidate();
}
- // FIXME: Need to handle changes in other bound properties.
+ // FIXME: Need to handle changes in other bound properties.
}
}
}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicComboPopup.java b/libjava/classpath/javax/swing/plaf/basic/BasicComboPopup.java
index 11f832a..3e54ca7 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicComboPopup.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicComboPopup.java
@@ -483,7 +483,7 @@ public class BasicComboPopup extends JPopupMenu implements ComboPopup
*/
protected void installListListeners()
{
- // mouse listener listening to mouse events occuring in the
+ // mouse listener listening to mouse events occuring in the
// combo box's list of items.
listMouseListener = createListMouseListener();
list.addMouseListener(listMouseListener);
@@ -613,7 +613,7 @@ public class BasicComboPopup extends JPopupMenu implements ComboPopup
*/
protected void autoScrollUp()
{
- // scroll up the scroll bar to make the item above visible
+ // scroll up the scroll bar to make the item above visible
JScrollBar scrollbar = scroller.getVerticalScrollBar();
int scrollToNext = list.getScrollableUnitIncrement(super.getBounds(),
SwingConstants.VERTICAL,
@@ -621,8 +621,8 @@ public class BasicComboPopup extends JPopupMenu implements ComboPopup
scrollbar.setValue(scrollbar.getValue() - scrollToNext);
- // If we haven't reached the begging of the combo box's list of items,
- // then highlight next element above currently highlighted element
+ // If we haven't reached the begging of the combo box's list of items,
+ // then highlight next element above currently highlighted element
if (list.getSelectedIndex() != 0)
list.setSelectedIndex(list.getSelectedIndex() - 1);
}
@@ -633,7 +633,7 @@ public class BasicComboPopup extends JPopupMenu implements ComboPopup
*/
protected void autoScrollDown()
{
- // scroll scrollbar down to make next item visible
+ // scroll scrollbar down to make next item visible
JScrollBar scrollbar = scroller.getVerticalScrollBar();
int scrollToNext = list.getScrollableUnitIncrement(super.getBounds(),
SwingConstants.VERTICAL,
@@ -713,12 +713,12 @@ public class BasicComboPopup extends JPopupMenu implements ComboPopup
for (int i = 0; i < maxRowCount; i++)
{
- Component comp = rend.getListCellRendererComponent(list,
- comboBox.getModel()
- .getElementAt(i),
- -1, false, false);
- Dimension dim = comp.getPreferredSize();
- totalHeight += dim.height;
+ Component comp = rend.getListCellRendererComponent(list,
+ comboBox.getModel()
+ .getElementAt(i),
+ -1, false, false);
+ Dimension dim = comp.getPreferredSize();
+ totalHeight += dim.height;
}
return totalHeight == 0 ? 100 : totalHeight;
@@ -995,9 +995,9 @@ public class BasicComboPopup extends JPopupMenu implements ComboPopup
{
if (e.getPropertyName().equals("renderer"))
{
- list.setCellRenderer(comboBox.getRenderer());
- if (isVisible())
- hide();
+ list.setCellRenderer(comboBox.getRenderer());
+ if (isVisible())
+ hide();
}
if (e.getPropertyName().equals("model"))
{
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicDesktopIconUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicDesktopIconUI.java
index 3f87302..e522938 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicDesktopIconUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicDesktopIconUI.java
@@ -118,7 +118,7 @@ public class BasicDesktopIconUI extends DesktopIconUI
yOffset = e.getY();
pane = frame.getDesktopPane();
if (pane != null)
- pane.getDesktopManager().beginDraggingFrame(desktopIcon);
+ pane.getDesktopManager().beginDraggingFrame(desktopIcon);
}
/**
@@ -129,7 +129,7 @@ public class BasicDesktopIconUI extends DesktopIconUI
public void mouseReleased(MouseEvent e)
{
if (pane != null)
- pane.getDesktopManager().endDraggingFrame(desktopIcon);
+ pane.getDesktopManager().endDraggingFrame(desktopIcon);
xOffset = 0;
yOffset = 0;
}
@@ -147,9 +147,9 @@ public class BasicDesktopIconUI extends DesktopIconUI
int newHeight)
{
if (pane != null)
- pane.getDesktopManager().dragFrame(f, newX, newY);
+ pane.getDesktopManager().dragFrame(f, newX, newY);
else
- desktopIcon.setBounds(newX, newY, newWidth, newHeight);
+ desktopIcon.setBounds(newX, newY, newWidth, newHeight);
}
}
@@ -308,7 +308,7 @@ public class BasicDesktopIconUI extends DesktopIconUI
/** The PropertyChangeListener listening to the JDesktopIcon. */
private transient PropertyChangeListener propertyHandler;
-
+
/** The default icon used when no frame icon is given by the JInternalFrame. */
static Icon defaultIcon = new InternalFrameDefaultMenuIcon();
@@ -389,15 +389,15 @@ public class BasicDesktopIconUI extends DesktopIconUI
{
if (c instanceof JDesktopIcon)
{
- desktopIcon = (JDesktopIcon) c;
- desktopIcon.setLayout(new BorderLayout());
- frame = desktopIcon.getInternalFrame();
+ desktopIcon = (JDesktopIcon) c;
+ desktopIcon.setLayout(new BorderLayout());
+ frame = desktopIcon.getInternalFrame();
- installDefaults();
- installComponents();
- installListeners();
+ installDefaults();
+ installComponents();
+ installListeners();
- desktopIcon.setOpaque(true);
+ desktopIcon.setOpaque(true);
}
}
@@ -409,11 +409,11 @@ public class BasicDesktopIconUI extends DesktopIconUI
public void uninstallUI(JComponent c)
{
desktopIcon.setOpaque(false);
-
+
uninstallListeners();
uninstallComponents();
uninstallDefaults();
-
+
frame = null;
desktopIcon.setLayout(null);
desktopIcon = null;
@@ -444,7 +444,7 @@ public class BasicDesktopIconUI extends DesktopIconUI
protected void uninstallComponents()
{
desktopIcon.remove(button);
-
+
button = null;
}
@@ -460,29 +460,29 @@ public class BasicDesktopIconUI extends DesktopIconUI
propertyHandler = new PropertyChangeListener()
{
- public void propertyChange(PropertyChangeEvent e)
- {
- if (e.getPropertyName().equals(JInternalFrame.TITLE_PROPERTY))
- button.setText(desktopIcon.getInternalFrame().getTitle());
- else if (e.getPropertyName().equals(JInternalFrame.FRAME_ICON_PROPERTY))
- {
- Icon use = desktopIcon.getInternalFrame().getFrameIcon();
- if (use == null)
- use = defaultIcon;
- button.setIcon(use);
- }
- desktopIcon.revalidate();
- desktopIcon.repaint();
- }
+ public void propertyChange(PropertyChangeEvent e)
+ {
+ if (e.getPropertyName().equals(JInternalFrame.TITLE_PROPERTY))
+ button.setText(desktopIcon.getInternalFrame().getTitle());
+ else if (e.getPropertyName().equals(JInternalFrame.FRAME_ICON_PROPERTY))
+ {
+ Icon use = desktopIcon.getInternalFrame().getFrameIcon();
+ if (use == null)
+ use = defaultIcon;
+ button.setIcon(use);
+ }
+ desktopIcon.revalidate();
+ desktopIcon.repaint();
+ }
};
frame.addPropertyChangeListener(propertyHandler);
button.addActionListener(new ActionListener()
{
- public void actionPerformed(ActionEvent e)
- {
+ public void actionPerformed(ActionEvent e)
+ {
deiconize();
- }
+ }
});
}
@@ -492,10 +492,10 @@ public class BasicDesktopIconUI extends DesktopIconUI
protected void uninstallListeners()
{
// button is nulled so no need to remove it.
-
+
frame.removePropertyChangeListener(propertyHandler);
propertyHandler = null;
-
+
desktopIcon.removeMouseMotionListener(mouseHandler);
desktopIcon.removeMouseListener(mouseHandler);
}
@@ -506,7 +506,7 @@ public class BasicDesktopIconUI extends DesktopIconUI
protected void installDefaults()
{
// FIXME: Move border to defaults.
- desktopIcon.setBorder(new DesktopIconBorder());
+ desktopIcon.setBorder(new DesktopIconBorder());
}
/**
@@ -578,7 +578,7 @@ public class BasicDesktopIconUI extends DesktopIconUI
/**
* This method deiconizes the JInternalFrame associated with the JDesktopIcon.
*/
- public void deiconize()
+ public void deiconize()
{
try
{
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicDesktopPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicDesktopPaneUI.java
index 4116858..cbc3f9f 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicDesktopPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicDesktopPaneUI.java
@@ -94,7 +94,7 @@ public class BasicDesktopPaneUI extends DesktopPaneUI
public boolean isEnabled()
{
if (desktop.getSelectedFrame() != null)
- return desktop.getSelectedFrame().isClosable();
+ return desktop.getSelectedFrame().isClosable();
return false;
}
}
@@ -133,7 +133,7 @@ public class BasicDesktopPaneUI extends DesktopPaneUI
public boolean isEnabled()
{
if (desktop.getSelectedFrame() != null)
- return desktop.getSelectedFrame().isMaximizable();
+ return desktop.getSelectedFrame().isMaximizable();
return false;
}
}
@@ -172,7 +172,7 @@ public class BasicDesktopPaneUI extends DesktopPaneUI
public boolean isEnabled()
{
if (desktop.getSelectedFrame() != null)
- return desktop.getSelectedFrame().isIconifiable();
+ return desktop.getSelectedFrame().isIconifiable();
return false;
}
}
@@ -191,23 +191,23 @@ public class BasicDesktopPaneUI extends DesktopPaneUI
*/
public void actionPerformed(ActionEvent e)
{
- // This is supposed to set the next selected frame.
+ // This is supposed to set the next selected frame.
JInternalFrame[] frames = desktop.getAllFrames();
if (frames.length == 0)
- return;
+ return;
JInternalFrame sFrame = frames[0];
if (desktop.getSelectedFrame() != null)
- sFrame = desktop.getSelectedFrame();
+ sFrame = desktop.getSelectedFrame();
int i = 0;
for (; i < frames.length; i++)
- if (frames[i] == sFrame)
- break;
+ if (frames[i] == sFrame)
+ break;
- // FIXME: Navigate actions go reverse too.
+ // FIXME: Navigate actions go reverse too.
if (i == frames.length)
- i = 0;
+ i = 0;
desktop.setSelectedFrame(frames[i]);
}
@@ -399,11 +399,11 @@ public class BasicDesktopPaneUI extends DesktopPaneUI
{
if (c instanceof JDesktopPane)
{
- desktop = (JDesktopPane) c;
+ desktop = (JDesktopPane) c;
- installDefaults();
- installDesktopManager();
- installKeyboardActions();
+ installDefaults();
+ installDesktopManager();
+ installKeyboardActions();
}
}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java b/libjava/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java
index b1fb727..62657ad 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java
@@ -54,7 +54,7 @@ import javax.swing.filechooser.FileSystemView;
/**
* Implements an AbstractListModel for directories where the source
- * of the files is a JFileChooser object.
+ * of the files is a JFileChooser object.
*
* This class is used for sorting and ordering the file list in
* a JFileChooser L&F object.
@@ -188,7 +188,7 @@ public class BasicDirectoryModel extends AbstractListModel
if (filechooser.accept(files[i]))
accepted.add(files[i]);
}
-
+
// Occasional check if we have been interrupted.
if (isInterrupted())
return;
@@ -286,7 +286,7 @@ public class BasicDirectoryModel extends AbstractListModel
List added = newCache.subList(start, end);
UpdateSwingRequest r = new UpdateSwingRequest(added, start,
- null, 0);
+ null, 0);
invokeLater(r);
newCache = null;
}
@@ -332,10 +332,10 @@ public class BasicDirectoryModel extends AbstractListModel
{
public int compare(Object o1, Object o2)
{
- if (lt((File) o1, (File) o2))
- return -1;
- else
- return 1;
+ if (lt((File) o1, (File) o2))
+ return -1;
+ else
+ return 1;
}
};
@@ -366,7 +366,7 @@ public class BasicDirectoryModel extends AbstractListModel
}
/**
- * Fires a content change event.
+ * Fires a content change event.
*/
public void fireContentsChanged()
{
@@ -397,7 +397,7 @@ public class BasicDirectoryModel extends AbstractListModel
}
/**
- * Returns the (java.io.File) object at
+ * Returns the (java.io.File) object at
* an index in the list.
*
* @param index The list index
@@ -441,7 +441,7 @@ public class BasicDirectoryModel extends AbstractListModel
}
/**
- * Returns the size of the list, which only includes directories
+ * Returns the size of the list, which only includes directories
* if the JFileChooser is set to DIRECTORIES_ONLY.
*
* Otherwise, both directories and files are included in the count.
@@ -537,12 +537,12 @@ public class BasicDirectoryModel extends AbstractListModel
|| property.equals(JFileChooser.FILE_VIEW_CHANGED_PROPERTY)
)
{
- validateFileCache();
+ validateFileCache();
}
}
/**
- * Renames a file - However, does <I>not</I> re-sort the list
+ * Renames a file - However, does <I>not</I> re-sort the list
* or replace the old file with the new one in the list.
*
* @param oldFile The old file
@@ -584,4 +584,3 @@ public class BasicDirectoryModel extends AbstractListModel
}
}
}
-
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicEditorPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicEditorPaneUI.java
index d514a87..6ddd251 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicEditorPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicEditorPaneUI.java
@@ -1,4 +1,4 @@
-/* BasicEditorPaneUI.java --
+/* BasicEditorPaneUI.java --
Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java
index 4b6e2f7..347686d 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java
@@ -72,7 +72,7 @@ import javax.swing.plaf.metal.MetalIconFactory;
/**
- * A UI delegate for the {@link JFileChooser} component under the
+ * A UI delegate for the {@link JFileChooser} component under the
* {@link BasicLookAndFeel}.
*/
public class BasicFileChooserUI extends FileChooserUI
@@ -89,7 +89,7 @@ public class BasicFileChooserUI extends FileChooserUI
{
// Nothing to do here.
}
-
+
/**
* Returns <code>true</code> always, as all files are accepted by this
* filter.
@@ -116,7 +116,7 @@ public class BasicFileChooserUI extends FileChooserUI
/**
* Handles a user action to approve the dialog selection.
- *
+ *
* @see BasicFileChooserUI#getApproveSelectionAction()
*/
protected class ApproveSelectionAction extends AbstractAction
@@ -131,7 +131,7 @@ public class BasicFileChooserUI extends FileChooserUI
/**
* Sets the current selection and closes the dialog.
- *
+ *
* @param e the action event.
*/
public void actionPerformed(ActionEvent e)
@@ -159,8 +159,8 @@ public class BasicFileChooserUI extends FileChooserUI
else
{
File f = new File(filechooser.getCurrentDirectory(), getFileName());
- if ( selectedDir != null )
- f = selectedDir;
+ if ( selectedDir != null )
+ f = selectedDir;
if (filechooser.isTraversable(f))
{
filechooser.setCurrentDirectory(f);
@@ -212,7 +212,7 @@ public class BasicFileChooserUI extends FileChooserUI
}
/**
- * Retrieves the icon associated with the specified file/directory, if
+ * Retrieves the icon associated with the specified file/directory, if
* there is one.
*
* @param f the file/directory.
@@ -225,8 +225,8 @@ public class BasicFileChooserUI extends FileChooserUI
}
/**
- * Returns a description of the given file/directory. In this
- * implementation, the description is the same as the name returned by
+ * Returns a description of the given file/directory. In this
+ * implementation, the description is the same as the name returned by
* {@link #getName(File)}.
*
* @param f the file/directory.
@@ -249,11 +249,11 @@ public class BasicFileChooserUI extends FileChooserUI
{
Icon val = getCachedIcon(f);
if (val != null)
- return val;
+ return val;
if (filechooser.isTraversable(f))
- val = directoryIcon;
+ val = directoryIcon;
else
- val = fileIcon;
+ val = fileIcon;
cacheIcon(f, val);
return val;
}
@@ -287,9 +287,9 @@ public class BasicFileChooserUI extends FileChooserUI
public String getTypeDescription(File f)
{
if (filechooser.isTraversable(f))
- return dirDescText;
+ return dirDescText;
else
- return fileDescText;
+ return fileDescText;
}
/**
@@ -308,7 +308,7 @@ public class BasicFileChooserUI extends FileChooserUI
/**
* Handles an action to cancel the file chooser.
- *
+ *
* @see BasicFileChooserUI#getCancelSelectionAction()
*/
protected class CancelSelectionAction extends AbstractAction
@@ -338,7 +338,7 @@ public class BasicFileChooserUI extends FileChooserUI
/**
* An action to handle changes to the parent directory (for example, via
* a click on the "up folder" button).
- *
+ *
* @see BasicFileChooserUI#getChangeToParentDirectoryAction()
*/
protected class ChangeToParentDirectoryAction extends AbstractAction
@@ -366,7 +366,7 @@ public class BasicFileChooserUI extends FileChooserUI
/**
* A mouse listener that handles double-click events.
- *
+ *
* @see BasicFileChooserUI#createDoubleClickListener(JFileChooser, JList)
*/
protected class DoubleClickListener extends MouseAdapter
@@ -392,7 +392,7 @@ public class BasicFileChooserUI extends FileChooserUI
/**
* Handles a mouse click event.
- *
+ *
* @param e the event.
*/
public void mouseClicked(MouseEvent e)
@@ -422,7 +422,7 @@ public class BasicFileChooserUI extends FileChooserUI
String path = p.toString();
File f = fsv.createFileObject(path);
filechooser.setSelectedFile(f);
-
+
if (filechooser.isMultiSelectionEnabled())
{
int[] inds = list.getSelectedIndices();
@@ -431,7 +431,7 @@ public class BasicFileChooserUI extends FileChooserUI
allFiles[i] = (File) list.getModel().getElementAt(inds[i]);
filechooser.setSelectedFiles(allFiles);
}
-
+
if (filechooser.isTraversable(f))
{
setDirectorySelected(true);
@@ -444,18 +444,18 @@ public class BasicFileChooserUI extends FileChooserUI
}
lastSelected = path;
parentPath = f.getParent();
-
+
if (f.isFile())
setFileName(f.getName());
- else if (filechooser.getFileSelectionMode() !=
- JFileChooser.FILES_ONLY)
+ else if (filechooser.getFileSelectionMode() !=
+ JFileChooser.FILES_ONLY)
setFileName(path);
}
}
/**
* Handles a mouse entered event (NOT IMPLEMENTED).
- *
+ *
* @param e the mouse event.
*/
public void mouseEntered(MouseEvent e)
@@ -465,9 +465,9 @@ public class BasicFileChooserUI extends FileChooserUI
}
/**
- * An action that changes the file chooser to display the user's home
- * directory.
- *
+ * An action that changes the file chooser to display the user's home
+ * directory.
+ *
* @see BasicFileChooserUI#getGoHomeAction()
*/
protected class GoHomeAction extends AbstractAction
@@ -497,7 +497,7 @@ public class BasicFileChooserUI extends FileChooserUI
/**
* An action that handles the creation of a new folder/directory.
- *
+ *
* @see BasicFileChooserUI#getNewFolderAction()
*/
protected class NewFolderAction extends AbstractAction
@@ -519,12 +519,12 @@ public class BasicFileChooserUI extends FileChooserUI
{
try
{
- filechooser.getFileSystemView().createNewFolder(filechooser
- .getCurrentDirectory());
+ filechooser.getFileSystemView().createNewFolder(filechooser
+ .getCurrentDirectory());
}
catch (IOException ioe)
{
- return;
+ return;
}
filechooser.rescanCurrentDirectory();
filechooser.repaint();
@@ -533,7 +533,7 @@ public class BasicFileChooserUI extends FileChooserUI
/**
* A listener for selection events in the file list.
- *
+ *
* @see BasicFileChooserUI#createListSelectionListener(JFileChooser)
*/
protected class SelectionListener implements ListSelectionListener
@@ -556,24 +556,24 @@ public class BasicFileChooserUI extends FileChooserUI
JList list = (JList) e.getSource();
Object f = list.getSelectedValue();
if (f == null)
- return;
+ return;
File file = filechooser.getFileSystemView().createFileObject(f.toString());
if (! filechooser.isTraversable(file))
- {
- selectedDir = null;
- filechooser.setSelectedFile(file);
- }
+ {
+ selectedDir = null;
+ filechooser.setSelectedFile(file);
+ }
else
- {
- selectedDir = file;
- filechooser.setSelectedFile(null);
- }
+ {
+ selectedDir = file;
+ filechooser.setSelectedFile(null);
+ }
}
}
/**
* DOCUMENT ME!
- *
+ *
* @see BasicFileChooserUI#getUpdateAction()
*/
protected class UpdateAction extends AbstractAction
@@ -722,46 +722,46 @@ public class BasicFileChooserUI extends FileChooserUI
// FIXME: describe what is contained in the bottom panel
/** The bottom panel. */
JPanel bottomPanel;
-
+
/** The close panel. */
JPanel closePanel;
/** Text box that displays file name */
JTextField entry;
-
+
/** Current parent path */
String parentPath;
-
+
/**
* The action for the 'approve' button.
* @see #getApproveSelectionAction()
*/
private ApproveSelectionAction approveSelectionAction;
-
+
/**
* The action for the 'cancel' button.
* @see #getCancelSelectionAction()
*/
private CancelSelectionAction cancelSelectionAction;
-
+
/**
* The action for the 'go home' control button.
* @see #getGoHomeAction()
*/
private GoHomeAction goHomeAction;
-
+
/**
* The action for the 'up folder' control button.
* @see #getChangeToParentDirectoryAction()
*/
private ChangeToParentDirectoryAction changeToParentDirectoryAction;
-
+
/**
* The action for the 'new folder' control button.
* @see #getNewFolderAction()
*/
private NewFolderAction newFolderAction;
-
+
/**
* The action for ???. // FIXME: what is this?
* @see #getUpdateAction()
@@ -774,7 +774,7 @@ public class BasicFileChooserUI extends FileChooserUI
* the directory on "Open" when in that mode.
*/
private File selectedDir;
-
+
// -- end private --
/**
@@ -810,7 +810,7 @@ public class BasicFileChooserUI extends FileChooserUI
/**
* Installs the UI for the specified component.
- *
+ *
* @param c the component (should be a {@link JFileChooser}).
*/
public void installUI(JComponent c)
@@ -825,7 +825,7 @@ public class BasicFileChooserUI extends FileChooserUI
installDefaults(fc);
installComponents(fc);
installListeners(fc);
-
+
File path = filechooser.getCurrentDirectory();
if (path != null)
parentPath = path.getParent();
@@ -834,7 +834,7 @@ public class BasicFileChooserUI extends FileChooserUI
/**
* Uninstalls this UI from the given component.
- *
+ *
* @param c the component (should be a {@link JFileChooser}).
*/
public void uninstallUI(JComponent c)
@@ -868,7 +868,7 @@ public class BasicFileChooserUI extends FileChooserUI
if (parentFiles.size() == 0)
return;
- }
+ }
/**
* Creates and install the subcomponents for the file chooser.
@@ -996,9 +996,9 @@ public class BasicFileChooserUI extends FileChooserUI
directoryOpenButtonText = "Open";
directoryOpenButtonToolTipText = "Open selected directory";
- directoryOpenButtonMnemonic
+ directoryOpenButtonMnemonic
= new Integer((String) UIManager.get("FileChooser.directoryOpenButtonMnemonic")).intValue();
-
+
helpButtonText = "Help";
helpButtonToolTipText = "FileChooser help";
helpButtonMnemonic = new Integer((String) UIManager.get("FileChooser.helpButtonMnemonic")).intValue();
@@ -1010,7 +1010,7 @@ public class BasicFileChooserUI extends FileChooserUI
saveButtonText = "Save";
saveButtonToolTipText = "Save selected file";
saveButtonMnemonic = new Integer((String) UIManager.get("FileChooser.saveButtonMnemonic")).intValue();
-
+
updateButtonText = "Update";
updateButtonToolTipText = "Update directory listing";
updateButtonMnemonic = new Integer((String) UIManager.get("FileChooser.updateButtonMnemonic")).intValue();
@@ -1041,7 +1041,7 @@ public class BasicFileChooserUI extends FileChooserUI
saveButtonText = null;
saveButtonToolTipText = null;
-
+
updateButtonText = null;
updateButtonToolTipText = null;
}
@@ -1067,9 +1067,9 @@ public class BasicFileChooserUI extends FileChooserUI
/**
* Creates a listener to handle changes to the properties of the given
* file chooser component.
- *
+ *
* @param fc the file chooser component.
- *
+ *
* @return A new listener.
*/
public PropertyChangeListener createPropertyChangeListener(JFileChooser fc)
@@ -1080,7 +1080,7 @@ public class BasicFileChooserUI extends FileChooserUI
/**
* Returns the current file name.
- *
+ *
* @return The current file name.
*/
public String getFileName()
@@ -1092,7 +1092,7 @@ public class BasicFileChooserUI extends FileChooserUI
* Returns the current directory name.
*
* @return The directory name.
- *
+ *
* @see #setDirectoryName(String)
*/
public String getDirectoryName()
@@ -1105,12 +1105,12 @@ public class BasicFileChooserUI extends FileChooserUI
* Sets the file name.
*
* @param filename the file name.
- *
+ *
* @see #getFileName()
*/
public void setFileName(String filename)
{
- // FIXME: it might be the case that this method provides an access
+ // FIXME: it might be the case that this method provides an access
// point for the JTextField (or whatever) a subclass is using...
//this.filename = filename;
}
@@ -1119,7 +1119,7 @@ public class BasicFileChooserUI extends FileChooserUI
* Sets the directory name (NOT IMPLEMENTED).
*
* @param dirname the directory name.
- *
+ *
* @see #getDirectoryName()
*/
public void setDirectoryName(String dirname)
@@ -1149,7 +1149,7 @@ public class BasicFileChooserUI extends FileChooserUI
}
/**
- * Returns the {@link JFileChooser} component that this UI delegate
+ * Returns the {@link JFileChooser} component that this UI delegate
* represents.
*
* @return The component represented by this UI delegate.
@@ -1184,7 +1184,7 @@ public class BasicFileChooserUI extends FileChooserUI
/**
* Returns the tool tip text for the approve (open/save) button. This first
* checks the file chooser to see if a value has been explicitly set - if
- * not, a default value appropriate for the type of file chooser is
+ * not, a default value appropriate for the type of file chooser is
* returned.
*
* @param fc the file chooser.
@@ -1236,7 +1236,7 @@ public class BasicFileChooserUI extends FileChooserUI
}
/**
- * Returns <code>true</code> if a directory is selected, and
+ * Returns <code>true</code> if a directory is selected, and
* <code>false</code> otherwise.
*
* @return A boolean.
@@ -1295,7 +1295,7 @@ public class BasicFileChooserUI extends FileChooserUI
* @param fc the file chooser component.
*
* @return The file view.
- *
+ *
* @see JFileChooser#getFileView()
*/
public FileView getFileView(JFileChooser fc)
@@ -1309,7 +1309,7 @@ public class BasicFileChooserUI extends FileChooserUI
* @param fc the file chooser (<code>null</code> not permitted).
*
* @return The dialog title.
- *
+ *
* @see JFileChooser#getDialogTitle()
*/
public String getDialogTitle(JFileChooser fc)
@@ -1326,7 +1326,7 @@ public class BasicFileChooserUI extends FileChooserUI
* @param fc the file chooser (<code>null</code> not permitted).
*
* @return The approve button mnemonic.
- *
+ *
* @see JFileChooser#getApproveButtonMnemonic()
*/
public int getApproveButtonMnemonic(JFileChooser fc)
@@ -1345,7 +1345,7 @@ public class BasicFileChooserUI extends FileChooserUI
* @param fc the file chooser (<code>null</code> not permitted).
*
* @return The approve button text.
- *
+ *
* @see JFileChooser#getApproveButtonText()
*/
public String getApproveButtonText(JFileChooser fc)
@@ -1362,7 +1362,7 @@ public class BasicFileChooserUI extends FileChooserUI
}
/**
- * Creates and returns a new action that will be used with the "new folder"
+ * Creates and returns a new action that will be used with the "new folder"
* button.
*
* @return A new instance of {@link NewFolderAction}.
@@ -1375,7 +1375,7 @@ public class BasicFileChooserUI extends FileChooserUI
}
/**
- * Creates and returns a new action that will be used with the "home folder"
+ * Creates and returns a new action that will be used with the "home folder"
* button.
*
* @return A new instance of {@link GoHomeAction}.
@@ -1426,7 +1426,7 @@ public class BasicFileChooserUI extends FileChooserUI
/**
* Returns the update action (an instance of {@link UpdateAction}).
*
- * @return An action.
+ * @return An action.
*/
public Action getUpdateAction()
{
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java
index 9c7f1c4..5559214 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java
@@ -66,4 +66,4 @@ public class BasicFormattedTextFieldUI extends BasicTextFieldUI
{
return "FormattedTextField";
}
-} \ No newline at end of file
+}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java b/libjava/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java
index e73c39b..f270d33 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java
@@ -142,7 +142,7 @@ public class BasicGraphicsUtils
g.setColor(darkShadow);
g.drawLine(x + 1, y + 1, x2 - 2, y + 1); // top, inner
g.drawLine(x + 1, y + 2, x + 1, y2 - 2); // left, inner
-
+
g.setColor(highlight);
g.drawLine(x + 1, y2 - 1, x2 - 1, y2 - 1); // bottom, inner
g.drawLine(x2 - 1, y + 1, x2 - 1, y2 - 2); // right, inner
@@ -156,8 +156,8 @@ public class BasicGraphicsUtils
g.setColor(oldColor);
}
}
-
-
+
+
/**
* Determines the width of the border that gets painted by
* {@link #drawEtchedRect}.
@@ -229,7 +229,7 @@ public class BasicGraphicsUtils
{
return new Insets(2, 2, 2, 2);
}
-
+
/**
* Draws a border that is suitable for buttons of the Basic look and
@@ -310,8 +310,8 @@ public class BasicGraphicsUtils
g.setColor(oldColor);
}
}
-
-
+
+
/**
* Draws a rectangle that appears lowered into the surface, given
* four colors that are used for drawing.
@@ -363,8 +363,8 @@ public class BasicGraphicsUtils
darkShadow, shadow,
highlight, lightHighlight);
}
-
-
+
+
/**
* Draws a String at the given location, underlining the first
* occurence of a specified character. The algorithm for determining
@@ -390,7 +390,7 @@ public class BasicGraphicsUtils
* the GNU Classpath implementation does not underline
* anything if <code>underlinedChar</code> is outside
* the range of <code>char</code>.
- *
+ *
* @param x the x coordinate of the text, as it would be passed to
* {@link java.awt.Graphics#drawString(java.lang.String,
* int, int)}.
@@ -436,7 +436,7 @@ public class BasicGraphicsUtils
* <code>text</code>. If <code>underlinedIndex</code> falls
* outside the range <code>[0, text.length() - 1]</code>, the
* text will be drawn without underlining anything.
- *
+ *
* @param x the x coordinate of the text, as it would be passed to
* {@link java.awt.Graphics#drawString(java.lang.String,
* int, int)}.
@@ -518,7 +518,7 @@ public class BasicGraphicsUtils
underline.width = underlineX1 - underlineX2;
}
-
+
underline.height = lineMetrics.getUnderlineThickness();
underline.y = lineMetrics.getUnderlineOffset();
if (underline.y == 0)
@@ -597,7 +597,7 @@ public class BasicGraphicsUtils
* <code>text</code>. If <code>underlinedIndex</code> falls
* outside the range <code>[0, text.length() - 1]</code>, the
* text will be drawn without underlining anything.
- *
+ *
* @param x the x coordinate of the text, as it would be passed to
* {@link java.awt.Graphics#drawString(java.lang.String,
* int, int)}.
@@ -683,7 +683,7 @@ public class BasicGraphicsUtils
underline.width = underlineX1 - underlineX2;
}
-
+
underline.height = lineMetrics.getUnderlineThickness();
underline.y = lineMetrics.getUnderlineOffset();
if (underline.y == 0)
@@ -761,8 +761,8 @@ public class BasicGraphicsUtils
* and <code>height</code> fields indicate the preferred
* extent in pixels.
*
- * @see javax.swing.SwingUtilities#layoutCompoundLabel(JComponent,
- * FontMetrics, String, Icon, int, int, int, int, Rectangle, Rectangle,
+ * @see javax.swing.SwingUtilities#layoutCompoundLabel(JComponent,
+ * FontMetrics, String, Icon, int, int, int, int, Rectangle, Rectangle,
* Rectangle, int)
*/
public static Dimension getPreferredButtonSize(AbstractButton b,
@@ -795,7 +795,7 @@ public class BasicGraphicsUtils
b.getFontMetrics(b.getFont()), // see comment above
b.getText(),
b.getIcon(),
- b.getVerticalAlignment(),
+ b.getVerticalAlignment(),
b.getHorizontalAlignment(),
b.getVerticalTextPosition(),
b.getHorizontalTextPosition(),
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicHTML.java b/libjava/classpath/javax/swing/plaf/basic/BasicHTML.java
index 6e26d53..a7ce8b1 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicHTML.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicHTML.java
@@ -145,7 +145,7 @@ public class BasicHTML
{
if (view != null)
view.setParent(null);
-
+
if (v != null)
v.setParent(this);
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicIconFactory.java b/libjava/classpath/javax/swing/plaf/basic/BasicIconFactory.java
index cad0d0e..1b5afa7 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicIconFactory.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicIconFactory.java
@@ -53,16 +53,16 @@ public class BasicIconFactory implements Serializable
{
static final long serialVersionUID = 5605588811185324383L;
- private static class DummyIcon
+ private static class DummyIcon
implements Icon
- {
- public int getIconHeight()
- {
- return 10;
+ {
+ public int getIconHeight()
+ {
+ return 10;
}
- public int getIconWidth()
- {
- return 10;
+ public int getIconWidth()
+ {
+ return 10;
}
public void paintIcon(Component c, Graphics g, int x, int y)
{
@@ -118,7 +118,7 @@ public class BasicIconFactory implements Serializable
}
/**
- * The icon used for {@link JCheckBoxMenuItem}s in the
+ * The icon used for {@link JCheckBoxMenuItem}s in the
* {@link BasicLookAndFeel}. This icon has a size of 9x9 pixels.
*/
static class CheckBoxMenuItemIcon
@@ -155,14 +155,14 @@ public class BasicIconFactory implements Serializable
public void paintIcon(Component c, Graphics g, int x, int y)
{
JCheckBoxMenuItem item = (JCheckBoxMenuItem) c;
- if (item.isSelected())
+ if (item.isSelected())
{
// paint the check...
g.setColor(Color.black);
g.drawLine(x + 1, y + 3, x + 1, y + 4);
g.drawLine(x + 2, y + 4, x + 2, y + 5);
for (int i = 0; i < 5; i++)
- g.drawLine(x + 3 + i, y + 5 - i, x + 3 + i, y + 6 - i);
+ g.drawLine(x + 3 + i, y + 5 - i, x + 3 + i, y + 6 - i);
}
}
}
@@ -212,7 +212,7 @@ public class BasicIconFactory implements Serializable
}
/** The cached CheckBoxIcon instance. */
private static CheckBoxIcon checkBoxIcon;
-
+
/** The cached RadioButtonIcon instance. */
private static RadioButtonIcon radioButtonIcon;
@@ -246,34 +246,34 @@ public class BasicIconFactory implements Serializable
{
return new DummyIcon();
}
-
+
/**
* Returns a new instance of a 4 x 8 icon showing a small black triangle that
- * points to the right. This is displayed in menu items that have a
+ * points to the right. This is displayed in menu items that have a
* sub menu.
- *
+ *
* @return The icon.
*/
public static Icon getMenuArrowIcon()
{
return new Icon()
{
- public int getIconHeight()
- {
- return 8;
- }
- public int getIconWidth()
- {
- return 4;
- }
- public void paintIcon(Component c, Graphics g, int x, int y)
- {
- Color saved = g.getColor();
- g.setColor(Color.BLACK);
+ public int getIconHeight()
+ {
+ return 8;
+ }
+ public int getIconWidth()
+ {
+ return 4;
+ }
+ public void paintIcon(Component c, Graphics g, int x, int y)
+ {
+ Color saved = g.getColor();
+ g.setColor(Color.BLACK);
for (int i = 0; i < 4; i++)
g.drawLine(x + i, y + i, x + i, y + 7 - i);
- g.setColor(saved);
- }
+ g.setColor(saved);
+ }
};
}
@@ -308,19 +308,19 @@ public class BasicIconFactory implements Serializable
/**
* Creates and returns an icon used when rendering {@link JCheckBoxMenuItem}
* components.
- *
+ *
* @return An icon.
*/
public static Icon getCheckBoxMenuItemIcon()
{
return new CheckBoxMenuItemIcon();
}
-
+
public static Icon getRadioButtonMenuItemIcon()
{
return getRadioButtonIcon();
}
-
+
public static Icon createEmptyFrameIcon()
{
return new DummyIcon();
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java b/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
index ea8b460..4846605 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
@@ -89,7 +89,7 @@ public class BasicInternalFrameTitlePane extends JComponent
{
super("Close");
}
-
+
/**
* This method is called when something closes the JInternalFrame.
*
@@ -371,7 +371,7 @@ public class BasicInternalFrameTitlePane extends JComponent
{
Icon frameIcon = frame.getFrameIcon();
if (frameIcon == null)
- frameIcon = BasicDesktopIconUI.defaultIcon;
+ frameIcon = BasicDesktopIconUI.defaultIcon;
frameIcon.paintIcon(this, g, 0, 0);
}
@@ -453,8 +453,8 @@ public class BasicInternalFrameTitlePane extends JComponent
}
if (title != null)
- title.setBounds(insets.left + menupref.width, insets.top,
- loc - menupref.width - insets.left, height);
+ title.setBounds(insets.left + menupref.width, insets.top,
+ loc - menupref.width - insets.left, height);
}
/**
@@ -581,7 +581,7 @@ public class BasicInternalFrameTitlePane extends JComponent
/** The icon displayed in the close button. */
protected Icon closeIcon;
-
+
/** The JInternalFrame that this TitlePane is used in. */
protected JInternalFrame frame;
@@ -620,7 +620,7 @@ public class BasicInternalFrameTitlePane extends JComponent
* This is package-private to avoid an accessor method.
*/
transient JLabel title;
-
+
static
{
// not constants in JDK
@@ -739,7 +739,7 @@ public class BasicInternalFrameTitlePane extends JComponent
selectedTitleColor = UIManager.getColor("InternalFrame.activeTitleBackground");
notSelectedTextColor = UIManager.getColor("InternalFrame.inactiveTitleForeground");
notSelectedTitleColor = UIManager.getColor("InternalFrame.inactiveTitleBackground");
-
+
closeIcon = UIManager.getIcon("InternalFrame.closeIcon");
iconIcon = UIManager.getIcon("InternalFrame.iconifyIcon");
maxIcon = UIManager.getIcon("InternalFrame.maximizeIcon");
@@ -755,7 +755,7 @@ public class BasicInternalFrameTitlePane extends JComponent
selectedTitleColor = null;
notSelectedTextColor = null;
notSelectedTitleColor = null;
-
+
closeIcon = null;
iconIcon = null;
maxIcon = null;
@@ -894,17 +894,17 @@ public class BasicInternalFrameTitlePane extends JComponent
paintTitleBackground(g);
if (frame.getTitle() != null && title != null)
{
- Color saved = g.getColor();
+ Color saved = g.getColor();
Font f = title.getFont();
g.setFont(f);
FontMetrics fm = g.getFontMetrics(f);
- if (frame.isSelected())
- g.setColor(selectedTextColor);
- else
- g.setColor(notSelectedTextColor);
- title.setText(getTitle(frame.getTitle(), fm, title.getBounds().width));
- SwingUtilities.paintComponent(g, title, null, title.getBounds());
- g.setColor(saved);
+ if (frame.isSelected())
+ g.setColor(selectedTextColor);
+ else
+ g.setColor(notSelectedTextColor);
+ title.setText(getTitle(frame.getTitle(), fm, title.getBounds().width));
+ SwingUtilities.paintComponent(g, title, null, title.getBounds());
+ g.setColor(saved);
}
}
@@ -964,7 +964,7 @@ public class BasicInternalFrameTitlePane extends JComponent
{
// FIXME: Implement postClosingEvent when I figure out what
// it's supposed to do.
- // It says that this fires an WINDOW_CLOSING like event.
+ // It says that this fires an WINDOW_CLOSING like event.
// So the closest thing is some kind of InternalFrameEvent.
// But none is fired.
// Can't see it called or anything.
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java
index 87c5268..da37e2b 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java
@@ -170,10 +170,10 @@ public class BasicInternalFrameUI extends InternalFrameUI
implements SwingConstants
{
/**
- * The current shape of the cursor.
+ * The current shape of the cursor.
*/
transient int showingCursor;
-
+
/** FIXME: Use for something. */
protected final int RESIZE_NONE = 0;
@@ -188,7 +188,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/** Cache rectangle that can be reused. */
private transient Rectangle cacheRect = new Rectangle();
-
+
/**
* This method is called when the mouse is clicked.
*
@@ -209,7 +209,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
{
// We do nothing if the attempt has been vetoed.
}
-
+
// There is nothing to do when the mouse is clicked
// on the border.
}
@@ -288,7 +288,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when the mouse exits the JInternalFrame.
- *
+ *
* @param e The MouseEvent.
*/
public void mouseExited(MouseEvent e)
@@ -302,7 +302,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when the mouse is moved inside the JInternalFrame.
- *
+ *
* @param e The MouseEvent.
*/
public void mouseMoved(MouseEvent e)
@@ -318,10 +318,10 @@ public class BasicInternalFrameUI extends InternalFrameUI
setCursor(e);
}
}
-
+
/**
* Set the mouse cursor, how applicable.
- *
+ *
* @param e the current mouse event.
*/
void setCursor(MouseEvent e)
@@ -337,7 +337,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when the mouse is pressed.
- *
+ *
* @param e The MouseEvent.
*/
public void mousePressed(MouseEvent e)
@@ -381,7 +381,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
dm.endDraggingFrame(frame);
frame.putClientProperty("bufferedDragging", null);
}
-
+
setCursor(e);
}
@@ -398,7 +398,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
{
Rectangle b = frame.getBounds();
int corner = InternalFrameBorder.cornerSize;
-
+
if (x < corner && y < corner)
return Cursor.NW_RESIZE_CURSOR;
else if (x > b.width - corner && y < corner)
@@ -429,7 +429,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
{
/**
* This method is called when the JDesktopPane is hidden.
- *
+ *
* @param e
* The ComponentEvent fired.
*/
@@ -440,7 +440,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when the JDesktopPane is moved.
- *
+ *
* @param e
* The ComponentEvent fired.
*/
@@ -451,7 +451,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when the JDesktopPane is resized.
- *
+ *
* @param e
* The ComponentEvent fired.
*/
@@ -469,7 +469,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when the JDesktopPane is shown.
- *
+ *
* @param e
* The ComponentEvent fired.
*/
@@ -487,7 +487,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when the given Component is added to the
* JInternalFrame.
- *
+ *
* @param name
* The name of the Component.
* @param c
@@ -501,7 +501,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is used to set the bounds of the children of the
* JInternalFrame.
- *
+ *
* @param c
* The Container to lay out.
*/
@@ -562,7 +562,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method returns the minimum layout size.
- *
+ *
* @param c
* The Container to find a minimum layout size for.
* @return The minimum dimensions for the JInternalFrame.
@@ -574,7 +574,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* Th8is method returns the preferred layout size.
- *
+ *
* @param c
* The Container to find a preferred layout size for.
* @return The preferred dimensions for the JInternalFrame.
@@ -586,7 +586,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* DOCUMENT ME!
- *
+ *
* @param c
* DOCUMENT ME!
* @param min
@@ -694,7 +694,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when the mouse enters the glass pane.
- *
+ *
* @param e
* The MouseEvent.
*/
@@ -705,7 +705,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when the mouse is clicked on the glass pane.
- *
+ *
* @param e
* The MouseEvent.
*/
@@ -716,7 +716,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when the mouse is dragged in the glass pane.
- *
+ *
* @param e
* The MouseEvent.
*/
@@ -727,7 +727,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when the mouse exits the glass pane.
- *
+ *
* @param e
* The MouseEvent.
*/
@@ -738,7 +738,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when the mouse is moved in the glass pane.
- *
+ *
* @param e
* The MouseEvent.
*/
@@ -749,7 +749,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when the mouse is pressed in the glass pane.
- *
+ *
* @param e
* The MouseEvent.
*/
@@ -764,7 +764,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when the mouse is released in the glass pane.
- *
+ *
* @param e
* The MouseEvent.
*/
@@ -776,7 +776,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This is a helper method that dispatches the GlassPane MouseEvents to the
* proper component.
- *
+ *
* @param e the mouse event to be dispatched
*/
private void handleEvent(MouseEvent e)
@@ -885,7 +885,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method is called when one of the JInternalFrame's properties change.
- *
+ *
* @param evt
* The PropertyChangeEvent.
*/
@@ -971,8 +971,8 @@ public class BasicInternalFrameUI extends InternalFrameUI
class InternalFrameBorder extends AbstractBorder implements
UIResource
{
- /**
- * The width of the border.
+ /**
+ * The width of the border.
*/
static final int bSize = 5;
@@ -983,7 +983,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method returns whether the border is opaque.
- *
+ *
* @return Whether the border is opaque.
*/
public boolean isBorderOpaque()
@@ -993,7 +993,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method returns the insets of the border.
- *
+ *
* @param c
* The Component to find border insets for.
* @return The border insets.
@@ -1005,7 +1005,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
/**
* This method paints the border.
- *
+ *
* @param c
* The Component that owns the border.
* @param g
@@ -1051,9 +1051,9 @@ public class BasicInternalFrameUI extends InternalFrameUI
g.fill3DRect(0, cornerSize, bSize, b.height - 2 * cornerSize, false);
g.fill3DRect(cornerSize, 0, b.width - 2 * cornerSize, bSize, false);
- g.fill3DRect(cornerSize, b.height - bSize, b.width - 2 * cornerSize,
+ g.fill3DRect(cornerSize, b.height - bSize, b.width - 2 * cornerSize,
bSize, false);
- g.fill3DRect(b.width - bSize, cornerSize, bSize,
+ g.fill3DRect(b.width - bSize, cornerSize, bSize,
b.height - 2 * cornerSize, false);
g.translate(-x, -y);
@@ -1595,7 +1595,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
replacePane(northPane, c);
northPane = c;
// the following is needed to make internal frames draggable when using
- // the JGoodies PlasticLookAndFeel, because it overrides the
+ // the JGoodies PlasticLookAndFeel, because it overrides the
// createNorthPane() method and doesn't assign anything to the titlePane
// field. It is possible there is another way to make this work, but
// I didn't find it...
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicLabelUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicLabelUI.java
index 045740d..9469b56 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicLabelUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicLabelUI.java
@@ -114,7 +114,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
/**
* Returns the preferred size of this component as calculated by the
- * {@link #layoutCL(JLabel, FontMetrics, String, Icon, Rectangle, Rectangle,
+ * {@link #layoutCL(JLabel, FontMetrics, String, Icon, Rectangle, Rectangle,
* Rectangle)} method.
*
* @param c This {@link JComponent} to get a preferred size for.
@@ -188,7 +188,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
/**
* The method that paints the label according to its current state.
- *
+ *
* @param g The {@link Graphics} object to paint with.
* @param c The {@link JComponent} to paint.
*/
@@ -217,7 +217,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
text = layoutCL(b, fm, text, icon, vr, ir, tr);
if (icon != null)
- icon.paintIcon(b, g, ir.x, ir.y);
+ icon.paintIcon(b, g, ir.x, ir.y);
if (text != null && ! text.equals(""))
{
@@ -239,7 +239,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
/**
* This method is simply calls SwingUtilities's layoutCompoundLabel.
- *
+ *
* @param label The label to lay out.
* @param fontMetrics The FontMetrics for the font used.
* @param text The text to paint.
@@ -247,7 +247,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
* @param viewR The entire viewable rectangle.
* @param iconR The icon bounds rectangle.
* @param textR The text bounds rectangle.
- *
+ *
* @return A possibly clipped version of the text.
*/
protected String layoutCL(JLabel label, FontMetrics fontMetrics, String text,
@@ -421,11 +421,11 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
{
// add a keystroke for the given mnemonic mapping to 'press';
InputMap keyMap = new InputMap();
- keyMap.put(KeyStroke.getKeyStroke(mnemonic, KeyEvent.VK_ALT),
+ keyMap.put(KeyStroke.getKeyStroke(mnemonic, KeyEvent.VK_ALT),
"press");
- SwingUtilities.replaceUIInputMap(l,
+ SwingUtilities.replaceUIInputMap(l,
JComponent.WHEN_IN_FOCUSED_WINDOW, keyMap);
-
+
// add an action to focus the component when 'press' happens
ActionMap map = new ActionMap();
map.put("press", new AbstractAction() {
@@ -439,7 +439,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
});
SwingUtilities.replaceUIActionMap(l, map);
}
- }
+ }
}
/**
@@ -450,7 +450,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
protected void uninstallKeyboardActions(JLabel l)
{
SwingUtilities.replaceUIActionMap(l, null);
- SwingUtilities.replaceUIInputMap(l, JComponent.WHEN_IN_FOCUSED_WINDOW,
+ SwingUtilities.replaceUIInputMap(l, JComponent.WHEN_IN_FOCUSED_WINDOW,
null);
}
@@ -500,9 +500,9 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
int newMnemonic = ((Integer) e.getNewValue()).intValue();
InputMap keyMap = label.getInputMap(
JComponent.WHEN_IN_FOCUSED_WINDOW);
- keyMap.put(KeyStroke.getKeyStroke(oldMnemonic,
+ keyMap.put(KeyStroke.getKeyStroke(oldMnemonic,
KeyEvent.ALT_DOWN_MASK), null);
- keyMap.put(KeyStroke.getKeyStroke(newMnemonic,
+ keyMap.put(KeyStroke.getKeyStroke(newMnemonic,
KeyEvent.ALT_DOWN_MASK), "press");
}
}
@@ -512,8 +512,8 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
InputMap keyMap = label.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
int mnemonic = label.getDisplayedMnemonic();
if (mnemonic > 0)
- keyMap.put(KeyStroke.getKeyStroke(mnemonic, KeyEvent.ALT_DOWN_MASK),
- "press");
+ keyMap.put(KeyStroke.getKeyStroke(mnemonic, KeyEvent.ALT_DOWN_MASK),
+ "press");
}
}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicListUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicListUI.java
index befc227..0e33957 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicListUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicListUI.java
@@ -78,7 +78,7 @@ import javax.swing.plaf.ListUI;
import javax.swing.plaf.UIResource;
/**
- * The Basic Look and Feel UI delegate for the
+ * The Basic Look and Feel UI delegate for the
* JList.
*/
public class BasicListUI extends ListUI
@@ -111,7 +111,7 @@ public class BasicListUI extends ListUI
}
/**
- * Helper method to repaint the focused cell's
+ * Helper method to repaint the focused cell's
* lost or acquired focus state.
*/
protected void repaintCellFocus()
@@ -170,7 +170,7 @@ public class BasicListUI extends ListUI
public class ListSelectionHandler implements ListSelectionListener
{
/**
- * Called when the list selection changes.
+ * Called when the list selection changes.
*
* @param e The event representing the change
*/
@@ -197,7 +197,7 @@ public class BasicListUI extends ListUI
ActionListener target;
String bindingCommandName;
- public ActionListenerProxy(ActionListener li,
+ public ActionListenerProxy(ActionListener li,
String cmd)
{
target = li;
@@ -237,13 +237,13 @@ public class BasicListUI extends ListUI
{
int lead = list.getLeadSelectionIndex();
int max = list.getModel().getSize() - 1;
- DefaultListSelectionModel selModel
+ DefaultListSelectionModel selModel
= (DefaultListSelectionModel) list.getSelectionModel();
String command = e.getActionCommand();
// Do nothing if list is empty
if (max == -1)
return;
-
+
if (command.equals("selectNextRow"))
{
selectNextIndex();
@@ -265,7 +265,7 @@ public class BasicListUI extends ListUI
}
else if (command.equals("selectLastRow"))
{
- list.setSelectedIndex(list.getModel().getSize() - 1);
+ list.setSelectedIndex(list.getModel().getSize() - 1);
}
else if (command.equals("selectLastRowChangeLead"))
{
@@ -276,7 +276,7 @@ public class BasicListUI extends ListUI
int target;
if (lead == list.getLastVisibleIndex())
{
- target = Math.min(max, lead + (list.getLastVisibleIndex()
+ target = Math.min(max, lead + (list.getLastVisibleIndex()
- list.getFirstVisibleIndex() + 1));
}
else
@@ -288,7 +288,7 @@ public class BasicListUI extends ListUI
int target;
if (lead == list.getLastVisibleIndex())
{
- target = Math.min(max, lead + (list.getLastVisibleIndex()
+ target = Math.min(max, lead + (list.getLastVisibleIndex()
- list.getFirstVisibleIndex() + 1));
}
else
@@ -300,7 +300,7 @@ public class BasicListUI extends ListUI
int target;
if (lead == list.getFirstVisibleIndex())
{
- target = Math.max(0, lead - (list.getLastVisibleIndex()
+ target = Math.max(0, lead - (list.getLastVisibleIndex()
- list.getFirstVisibleIndex() + 1));
}
else
@@ -312,7 +312,7 @@ public class BasicListUI extends ListUI
int target;
if (lead == list.getFirstVisibleIndex())
{
- target = Math.max(0, lead - (list.getLastVisibleIndex()
+ target = Math.max(0, lead - (list.getLastVisibleIndex()
- list.getFirstVisibleIndex() + 1));
}
else
@@ -344,12 +344,12 @@ public class BasicListUI extends ListUI
int target;
if (lead == list.getFirstVisibleIndex())
{
- target = Math.max(0, lead - (list.getLastVisibleIndex()
+ target = Math.max(0, lead - (list.getLastVisibleIndex()
- list.getFirstVisibleIndex() + 1));
}
else
target = list.getFirstVisibleIndex();
- list.setSelectedIndex(target);
+ list.setSelectedIndex(target);
}
else if (command.equals("selectLastRowExtendSelection"))
{
@@ -360,7 +360,7 @@ public class BasicListUI extends ListUI
int target;
if (lead == list.getLastVisibleIndex())
{
- target = Math.min(max, lead + (list.getLastVisibleIndex()
+ target = Math.min(max, lead + (list.getLastVisibleIndex()
- list.getFirstVisibleIndex() + 1));
}
else
@@ -384,7 +384,7 @@ public class BasicListUI extends ListUI
{
selModel.moveLeadSelectionIndex(Math.max(0, lead - 1));
}
- }
+ }
else if (command.equals("addToSelection"))
{
list.addSelectionInterval(lead, lead);
@@ -402,20 +402,20 @@ public class BasicListUI extends ListUI
list.removeSelectionInterval(lead, lead);
selModel.setAnchorSelectionIndex(lead);
}
- else
+ else
{
- // DEBUG: uncomment the following line to print out
+ // DEBUG: uncomment the following line to print out
// key bindings that aren't implemented yet
-
+
// System.out.println ("not implemented: "+e.getActionCommand());
}
-
+
list.ensureIndexIsVisible(list.getLeadSelectionIndex());
}
}
/**
- * A helper class which listens for {@link MouseEvent}s
+ * A helper class which listens for {@link MouseEvent}s
* from the {@link JList}.
*/
public class MouseInputHandler implements MouseInputListener
@@ -436,20 +436,20 @@ public class BasicListUI extends ListUI
{
if (list.getSelectionMode() == ListSelectionModel.SINGLE_SELECTION)
list.setSelectedIndex(index);
- else if (list.getSelectionMode() ==
+ else if (list.getSelectionMode() ==
ListSelectionModel.SINGLE_INTERVAL_SELECTION)
// COMPAT: the IBM VM is compatible with the following line of code.
- // However, compliance with Sun's VM would correspond to replacing
- // getAnchorSelectionIndex() with getLeadSelectionIndex().This is
- // both unnatural and contradictory to the way they handle other
+ // However, compliance with Sun's VM would correspond to replacing
+ // getAnchorSelectionIndex() with getLeadSelectionIndex().This is
+ // both unnatural and contradictory to the way they handle other
// similar UI interactions.
list.setSelectionInterval(list.getAnchorSelectionIndex(), index);
else
// COMPAT: both Sun and IBM are compatible instead with:
// list.setSelectionInterval
// (list.getLeadSelectionIndex(),index);
- // Note that for IBM this is contradictory to what they did in
- // the above situation for SINGLE_INTERVAL_SELECTION.
+ // Note that for IBM this is contradictory to what they did in
+ // the above situation for SINGLE_INTERVAL_SELECTION.
// The most natural thing to do is the following:
if (list.isSelectedIndex(list.getAnchorSelectionIndex()))
list.getSelectionModel().setLeadSelectionIndex(index);
@@ -467,7 +467,7 @@ public class BasicListUI extends ListUI
}
else
list.setSelectedIndex(index);
-
+
list.ensureIndexIsVisible(list.getLeadSelectionIndex());
}
@@ -530,7 +530,7 @@ public class BasicListUI extends ListUI
return;
if (!event.isShiftDown() && !event.isControlDown())
list.setSelectedIndex(index);
-
+
list.ensureIndexIsVisible(list.getLeadSelectionIndex());
}
@@ -664,7 +664,7 @@ public class BasicListUI extends ListUI
/** The width of a single cell in the list. */
protected int cellWidth;
- /**
+ /**
* An array of varying heights of cells in the list, in cases where each
* cell might have a different height. This field is used when the
* <code>fixedCellHeight</code> property of the list is not set. Otherwise
@@ -692,7 +692,7 @@ public class BasicListUI extends ListUI
* The {@link CellRendererPane} that is used for painting.
*/
protected CellRendererPane rendererPane;
-
+
/** The action bound to KeyStrokes. */
ListAction action;
@@ -729,7 +729,7 @@ public class BasicListUI extends ListUI
* @param index1 The first row to include in the bounds
* @param index2 The last row to incude in the bounds
*
- * @return A rectangle encompassing the range of rows between
+ * @return A rectangle encompassing the range of rows between
* <code>index1</code> and <code>index2</code> inclusive, or null
* such a rectangle couldn't be calculated for the given indexes.
*/
@@ -953,7 +953,7 @@ public class BasicListUI extends ListUI
}
/**
- * Resets to <code>null</code> those defaults which were installed in
+ * Resets to <code>null</code> those defaults which were installed in
* {@link #installDefaults}
*/
protected void uninstallDefaults()
@@ -1002,7 +1002,7 @@ public class BasicListUI extends ListUI
list.removeMouseMotionListener(mouseInputListener);
list.removePropertyChangeListener(propertyChangeListener);
}
-
+
/**
* Installs keyboard actions for this UI in the {@link JList}.
*/
@@ -1125,7 +1125,7 @@ public class BasicListUI extends ListUI
* Gets the size this list would prefer to assume. This is calculated by
* calling {@link #getCellBounds} over the entire list.
*
- * @param c Ignored; uses the saved {@link JList} reference
+ * @param c Ignored; uses the saved {@link JList} reference
*
* @return DOCUMENT ME!
*/
@@ -1150,7 +1150,7 @@ public class BasicListUI extends ListUI
{
// We cast to double here to force double divisions.
double modelSize = size;
- int neededColumns = (int) Math.ceil(modelSize / visibleRows);
+ int neededColumns = (int) Math.ceil(modelSize / visibleRows);
int adjustedRows = (int) Math.ceil(modelSize / neededColumns);
h = maxCellHeight * adjustedRows;
w = cellWidth * neededColumns;
@@ -1220,7 +1220,7 @@ public class BasicListUI extends ListUI
* cell in the list.
*
* @param g The graphics context to paint with
- * @param c Ignored; uses the saved {@link JList} reference
+ * @param c Ignored; uses the saved {@link JList} reference
*/
public void paint(Graphics g, JComponent c)
{
@@ -1238,7 +1238,7 @@ public class BasicListUI extends ListUI
int startIndex = locationToIndex(list, new Point(clip.x, clip.y));
int endIndex = locationToIndex(list, new Point(clip.x + clip.width,
clip.y + clip.height));
-
+
for (int row = startIndex; row <= endIndex; ++row)
{
Rectangle bounds = getCellBounds(list, row, row);
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java b/libjava/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java
index 1543094..9a1f544 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java
@@ -96,7 +96,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel
* are targetted at a menu/submenu/menubar or not. If not,
* the MenuSelectionManager is messaged to close the currently opened menus,
* if any.
- *
+ *
* @author Roman Kennke (kennke@aicas.com)
*/
private class PopupHelper implements AWTEventListener
@@ -227,9 +227,9 @@ public abstract class BasicLookAndFeel extends LookAndFeel
}
/**
- * Creates and returns a new instance of the default resources for this look
+ * Creates and returns a new instance of the default resources for this look
* and feel.
- *
+ *
* @return The UI defaults.
*/
public UIDefaults getDefaults()
@@ -247,9 +247,9 @@ public abstract class BasicLookAndFeel extends LookAndFeel
}
/**
- * Populates the <code>defaults</code> table with mappings between class IDs
+ * Populates the <code>defaults</code> table with mappings between class IDs
* and fully qualified class names for the UI delegates.
- *
+ *
* @param defaults the defaults table (<code>null</code> not permitted).
*/
protected void initClassDefaults(UIDefaults defaults)
@@ -314,7 +314,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel
* {@link #loadSystemColors(UIDefaults, String[], boolean)}. If the
* look and feel is a native look and feel, these defaults may be overridden
* by the corresponding SystemColor constants.
- *
+ *
* @param defaults the defaults table (<code>null</code> not permitted).
*/
protected void initSystemColorDefaults(UIDefaults defaults)
@@ -365,7 +365,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel
* <code>false</code>
* @param useNative when <code>true</code>, installs the values of the
* SystemColor constants, when <code>false</code>, install the values
- * from <code>systemColors</code>
+ * from <code>systemColors</code>
*/
protected void loadSystemColors(UIDefaults defaults, String[] systemColors,
boolean useNative)
@@ -479,19 +479,19 @@ public abstract class BasicLookAndFeel extends LookAndFeel
protected void initComponentDefaults(UIDefaults defaults)
{
Object[] uiDefaults;
-
+
Color highLight = new Color(249, 247, 246);
Color light = new Color(239, 235, 231);
Color shadow = new Color(139, 136, 134);
Color darkShadow = new Color(16, 16, 16);
-
+
uiDefaults = new Object[] {
"AbstractUndoableEdit.undoText", "Undo",
"AbstractUndoableEdit.redoText", "Redo",
"Button.background", new ColorUIResource(Color.LIGHT_GRAY),
"Button.border",
- new UIDefaults.LazyValue()
+ new UIDefaults.LazyValue()
{
public Object createValue(UIDefaults table)
{
@@ -528,7 +528,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel
return BasicIconFactory.getCheckBoxIcon();
}
},
- "CheckBox.checkIcon",
+ "CheckBox.checkIcon",
new UIDefaults.LazyValue()
{
public Object createValue(UIDefaults def)
@@ -549,7 +549,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel
"CheckBoxMenuItem.background", new ColorUIResource(light),
"CheckBoxMenuItem.border", new BasicBorders.MarginBorder(),
"CheckBoxMenuItem.borderPainted", Boolean.FALSE,
- "CheckBoxMenuItem.checkIcon",
+ "CheckBoxMenuItem.checkIcon",
new UIDefaults.LazyValue()
{
public Object createValue(UIDefaults def)
@@ -637,7 +637,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel
"EditorPane.font", new FontUIResource("Serif", Font.PLAIN, 12),
"EditorPane.foreground", new ColorUIResource(Color.black),
"EditorPane.inactiveForeground", new ColorUIResource(Color.gray),
- "EditorPane.focusInputMap", new UIDefaults.LazyInputMap(new Object[] {
+ "EditorPane.focusInputMap", new UIDefaults.LazyInputMap(new Object[] {
KeyStroke.getKeyStroke("shift UP"), "selection-up",
KeyStroke.getKeyStroke("ctrl RIGHT"), "caret-next-word",
KeyStroke.getKeyStroke("shift ctrl LEFT"), "selection-previous-word",
@@ -782,21 +782,21 @@ public abstract class BasicLookAndFeel extends LookAndFeel
"InternalFrame.border",
new UIDefaults.LazyValue()
{
- public Object createValue(UIDefaults table)
- {
- Color lineColor = new Color(238, 238, 238);
- Border inner = BorderFactory.createLineBorder(lineColor, 1);
- Color shadowInner = new Color(184, 207, 229);
- Color shadowOuter = new Color(122, 138, 153);
- Border outer = BorderFactory.createBevelBorder(BevelBorder.RAISED,
- Color.WHITE,
- Color.WHITE,
- shadowOuter,
- shadowInner);
- Border border = new BorderUIResource.CompoundBorderUIResource(outer,
- inner);
- return border;
- }
+ public Object createValue(UIDefaults table)
+ {
+ Color lineColor = new Color(238, 238, 238);
+ Border inner = BorderFactory.createLineBorder(lineColor, 1);
+ Color shadowInner = new Color(184, 207, 229);
+ Color shadowOuter = new Color(122, 138, 153);
+ Border outer = BorderFactory.createBevelBorder(BevelBorder.RAISED,
+ Color.WHITE,
+ Color.WHITE,
+ shadowOuter,
+ shadowInner);
+ Border border = new BorderUIResource.CompoundBorderUIResource(outer,
+ inner);
+ return border;
+ }
},
"InternalFrame.borderColor", new ColorUIResource(light),
"InternalFrame.borderDarkShadow", new ColorUIResource(Color.BLACK),
@@ -1459,60 +1459,60 @@ public abstract class BasicLookAndFeel extends LookAndFeel
"TextPane.foreground", new ColorUIResource(Color.black),
"TextPane.inactiveForeground", new ColorUIResource(Color.gray),
"TextPane.focusInputMap", new UIDefaults.LazyInputMap(new Object[] {
- KeyStroke.getKeyStroke("shift UP"), "selection-up",
- KeyStroke.getKeyStroke("ctrl RIGHT"), "caret-next-word",
- KeyStroke.getKeyStroke("shift ctrl LEFT"), "selection-previous-word",
- KeyStroke.getKeyStroke("shift KP_UP"), "selection-up",
- KeyStroke.getKeyStroke("DOWN"), "caret-down",
- KeyStroke.getKeyStroke("shift ctrl T"), "previous-link-action",
- KeyStroke.getKeyStroke("ctrl LEFT"), "caret-previous-word",
- KeyStroke.getKeyStroke("CUT"), "cut-to-clipboard",
- KeyStroke.getKeyStroke("END"), "caret-end-line",
- KeyStroke.getKeyStroke("shift PAGE_UP"), "selection-page-up",
- KeyStroke.getKeyStroke("KP_UP"), "caret-up",
- KeyStroke.getKeyStroke("DELETE"), "delete-next",
- KeyStroke.getKeyStroke("ctrl HOME"), "caret-begin",
- KeyStroke.getKeyStroke("shift LEFT"), "selection-backward",
- KeyStroke.getKeyStroke("ctrl END"), "caret-end",
- KeyStroke.getKeyStroke("BACK_SPACE"), "delete-previous",
- KeyStroke.getKeyStroke("shift ctrl RIGHT"), "selection-next-word",
- KeyStroke.getKeyStroke("LEFT"), "caret-backward",
- KeyStroke.getKeyStroke("KP_LEFT"), "caret-backward",
- KeyStroke.getKeyStroke("shift KP_RIGHT"), "selection-forward",
- KeyStroke.getKeyStroke("ctrl SPACE"), "activate-link-action",
- KeyStroke.getKeyStroke("ctrl H"), "delete-previous",
- KeyStroke.getKeyStroke("ctrl BACK_SLASH"), "unselect",
- KeyStroke.getKeyStroke("ENTER"), "insert-break",
- KeyStroke.getKeyStroke("shift HOME"), "selection-begin-line",
- KeyStroke.getKeyStroke("RIGHT"), "caret-forward",
- KeyStroke.getKeyStroke("shift ctrl PAGE_UP"), "selection-page-left",
- KeyStroke.getKeyStroke("shift DOWN"), "selection-down",
- KeyStroke.getKeyStroke("PAGE_DOWN"), "page-down",
- KeyStroke.getKeyStroke("shift KP_LEFT"), "selection-backward",
- KeyStroke.getKeyStroke("shift ctrl O"), "toggle-componentOrientation",
- KeyStroke.getKeyStroke("ctrl X"), "cut-to-clipboard",
- KeyStroke.getKeyStroke("shift ctrl PAGE_DOWN"), "selection-page-right",
- KeyStroke.getKeyStroke("ctrl C"), "copy-to-clipboard",
- KeyStroke.getKeyStroke("ctrl KP_RIGHT"), "caret-next-word",
- KeyStroke.getKeyStroke("shift END"), "selection-end-line",
- KeyStroke.getKeyStroke("ctrl KP_LEFT"), "caret-previous-word",
- KeyStroke.getKeyStroke("HOME"), "caret-begin-line",
- KeyStroke.getKeyStroke("ctrl V"), "paste-from-clipboard",
- KeyStroke.getKeyStroke("KP_DOWN"), "caret-down",
- KeyStroke.getKeyStroke("ctrl A"), "select-all",
- KeyStroke.getKeyStroke("shift RIGHT"), "selection-forward",
- KeyStroke.getKeyStroke("shift ctrl END"), "selection-end",
- KeyStroke.getKeyStroke("COPY"), "copy-to-clipboard",
- KeyStroke.getKeyStroke("shift ctrl KP_LEFT"), "selection-previous-word",
- KeyStroke.getKeyStroke("ctrl T"), "next-link-action",
- KeyStroke.getKeyStroke("shift KP_DOWN"), "selection-down",
- KeyStroke.getKeyStroke("TAB"), "insert-tab",
- KeyStroke.getKeyStroke("UP"), "caret-up",
- KeyStroke.getKeyStroke("shift ctrl HOME"), "selection-begin",
- KeyStroke.getKeyStroke("shift PAGE_DOWN"), "selection-page-down",
- KeyStroke.getKeyStroke("KP_RIGHT"), "caret-forward",
- KeyStroke.getKeyStroke("shift ctrl KP_RIGHT"), "selection-next-word",
- KeyStroke.getKeyStroke("PAGE_UP"), "page-up",
+ KeyStroke.getKeyStroke("shift UP"), "selection-up",
+ KeyStroke.getKeyStroke("ctrl RIGHT"), "caret-next-word",
+ KeyStroke.getKeyStroke("shift ctrl LEFT"), "selection-previous-word",
+ KeyStroke.getKeyStroke("shift KP_UP"), "selection-up",
+ KeyStroke.getKeyStroke("DOWN"), "caret-down",
+ KeyStroke.getKeyStroke("shift ctrl T"), "previous-link-action",
+ KeyStroke.getKeyStroke("ctrl LEFT"), "caret-previous-word",
+ KeyStroke.getKeyStroke("CUT"), "cut-to-clipboard",
+ KeyStroke.getKeyStroke("END"), "caret-end-line",
+ KeyStroke.getKeyStroke("shift PAGE_UP"), "selection-page-up",
+ KeyStroke.getKeyStroke("KP_UP"), "caret-up",
+ KeyStroke.getKeyStroke("DELETE"), "delete-next",
+ KeyStroke.getKeyStroke("ctrl HOME"), "caret-begin",
+ KeyStroke.getKeyStroke("shift LEFT"), "selection-backward",
+ KeyStroke.getKeyStroke("ctrl END"), "caret-end",
+ KeyStroke.getKeyStroke("BACK_SPACE"), "delete-previous",
+ KeyStroke.getKeyStroke("shift ctrl RIGHT"), "selection-next-word",
+ KeyStroke.getKeyStroke("LEFT"), "caret-backward",
+ KeyStroke.getKeyStroke("KP_LEFT"), "caret-backward",
+ KeyStroke.getKeyStroke("shift KP_RIGHT"), "selection-forward",
+ KeyStroke.getKeyStroke("ctrl SPACE"), "activate-link-action",
+ KeyStroke.getKeyStroke("ctrl H"), "delete-previous",
+ KeyStroke.getKeyStroke("ctrl BACK_SLASH"), "unselect",
+ KeyStroke.getKeyStroke("ENTER"), "insert-break",
+ KeyStroke.getKeyStroke("shift HOME"), "selection-begin-line",
+ KeyStroke.getKeyStroke("RIGHT"), "caret-forward",
+ KeyStroke.getKeyStroke("shift ctrl PAGE_UP"), "selection-page-left",
+ KeyStroke.getKeyStroke("shift DOWN"), "selection-down",
+ KeyStroke.getKeyStroke("PAGE_DOWN"), "page-down",
+ KeyStroke.getKeyStroke("shift KP_LEFT"), "selection-backward",
+ KeyStroke.getKeyStroke("shift ctrl O"), "toggle-componentOrientation",
+ KeyStroke.getKeyStroke("ctrl X"), "cut-to-clipboard",
+ KeyStroke.getKeyStroke("shift ctrl PAGE_DOWN"), "selection-page-right",
+ KeyStroke.getKeyStroke("ctrl C"), "copy-to-clipboard",
+ KeyStroke.getKeyStroke("ctrl KP_RIGHT"), "caret-next-word",
+ KeyStroke.getKeyStroke("shift END"), "selection-end-line",
+ KeyStroke.getKeyStroke("ctrl KP_LEFT"), "caret-previous-word",
+ KeyStroke.getKeyStroke("HOME"), "caret-begin-line",
+ KeyStroke.getKeyStroke("ctrl V"), "paste-from-clipboard",
+ KeyStroke.getKeyStroke("KP_DOWN"), "caret-down",
+ KeyStroke.getKeyStroke("ctrl A"), "select-all",
+ KeyStroke.getKeyStroke("shift RIGHT"), "selection-forward",
+ KeyStroke.getKeyStroke("shift ctrl END"), "selection-end",
+ KeyStroke.getKeyStroke("COPY"), "copy-to-clipboard",
+ KeyStroke.getKeyStroke("shift ctrl KP_LEFT"), "selection-previous-word",
+ KeyStroke.getKeyStroke("ctrl T"), "next-link-action",
+ KeyStroke.getKeyStroke("shift KP_DOWN"), "selection-down",
+ KeyStroke.getKeyStroke("TAB"), "insert-tab",
+ KeyStroke.getKeyStroke("UP"), "caret-up",
+ KeyStroke.getKeyStroke("shift ctrl HOME"), "selection-begin",
+ KeyStroke.getKeyStroke("shift PAGE_DOWN"), "selection-page-down",
+ KeyStroke.getKeyStroke("KP_RIGHT"), "caret-forward",
+ KeyStroke.getKeyStroke("shift ctrl KP_RIGHT"), "selection-next-word",
+ KeyStroke.getKeyStroke("PAGE_UP"), "page-up",
KeyStroke.getKeyStroke("PASTE"), "paste-from-clipboard"
}),
"TextPane.margin", new InsetsUIResource(3, 3, 3, 3),
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicMenuBarUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicMenuBarUI.java
index cd25a3b..b9e2912 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicMenuBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicMenuBarUI.java
@@ -109,20 +109,20 @@ public class BasicMenuBarUI extends MenuBarUI
defaultManager.setSelectedPath(me);
}
}
-
+
}
protected ChangeListener changeListener;
/*ContainerListener that listens to the ContainerEvents fired from menu bar*/
protected ContainerListener containerListener;
-
+
/*Property change listeners that listener to PropertyChangeEvent from menu bar*/
private PropertyChangeListener propertyChangeListener;
/* menu bar for which this UI delegate is for*/
protected JMenuBar menuBar;
-
+
/* MouseListener that listens to the mouseEvents fired from menu bar*/
private MouseInputListener mouseListener;
@@ -398,7 +398,7 @@ public class BasicMenuBarUI extends MenuBarUI
menuBar.repaint();
}
}
-
+
private class MouseInputHandler implements MouseInputListener
{
/**
@@ -409,7 +409,7 @@ public class BasicMenuBarUI extends MenuBarUI
public void mouseClicked(MouseEvent e)
{
MenuElement[] me = menuBar.getSubElements();
-
+
for (int i = 0; i < me.length; i++)
{
JMenu menu = menuBar.getMenu(i);
@@ -417,7 +417,7 @@ public class BasicMenuBarUI extends MenuBarUI
menu.setSelected(false);
}
}
-
+
/**
* Handles mouse pressed event
*
@@ -427,7 +427,7 @@ public class BasicMenuBarUI extends MenuBarUI
{
// TODO: What should be done here, if anything?
}
-
+
/**
* Handles mouse released event
*
@@ -437,7 +437,7 @@ public class BasicMenuBarUI extends MenuBarUI
{
// TODO: What should be done here, if anything?
}
-
+
/**
* Handles mouse exited event
*
@@ -447,7 +447,7 @@ public class BasicMenuBarUI extends MenuBarUI
{
// TODO: What should be done here, if anything?
}
-
+
/**
* Handles mouse dragged event
*
@@ -457,7 +457,7 @@ public class BasicMenuBarUI extends MenuBarUI
{
// TODO: What should be done here, if anything?
}
-
+
/**
* Handles mouse moved event
*
@@ -467,7 +467,7 @@ public class BasicMenuBarUI extends MenuBarUI
{
// TODO: What should be done here, if anything?
}
-
+
/**
* Handles mouse entered event
*
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java
index 5fafb41..40b5393 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -128,7 +128,7 @@ public class BasicMenuItemUI extends MenuItemUI
* Number of spaces between icon and text.
*/
protected int defaultTextIconGap = 4;
-
+
/**
* Color of the text when menu item is disabled
*/
@@ -222,14 +222,14 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* A class to handle PropertChangeEvents for the JMenuItem
- * @author Anthony Balkissoon abalkiss at redhat dot com.
+ * @author Anthony Balkissoon abalkiss at redhat dot com.
*/
class PropertyChangeHandler implements PropertyChangeListener
{
/**
* This method is called when a property of the menuItem is changed.
* Currently it is only used to update the accelerator key bindings.
- *
+ *
* @param e
* the PropertyChangeEvent
*/
@@ -238,7 +238,7 @@ public class BasicMenuItemUI extends MenuItemUI
String property = e.getPropertyName();
if (property.equals("accelerator"))
{
- InputMap map = SwingUtilities.getUIInputMap(menuItem,
+ InputMap map = SwingUtilities.getUIInputMap(menuItem,
JComponent.WHEN_IN_FOCUSED_WINDOW);
if (map != null)
map.remove((KeyStroke) e.getOldValue());
@@ -266,7 +266,7 @@ public class BasicMenuItemUI extends MenuItemUI
}
}
}
-
+
/**
* A class to handle accelerator keys. This is the Action we will
* perform when the accelerator key for this JMenuItem is pressed.
@@ -282,9 +282,9 @@ public class BasicMenuItemUI extends MenuItemUI
public void actionPerformed(ActionEvent event)
{
doClick(MenuSelectionManager.defaultManager());
- }
+ }
}
-
+
/**
* Creates a new BasicMenuItemUI object.
*/
@@ -308,7 +308,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Create MenuDragMouseListener to listen for mouse dragged events.
- *
+ *
* @param c
* menu item to listen to
* @return The MenuDragMouseListener
@@ -321,7 +321,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Creates MenuKeyListener to listen to key events occuring when menu item is
* visible on the screen.
- *
+ *
* @param c
* menu item to listen to
* @return The MenuKeyListener
@@ -333,7 +333,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Handles mouse input events occuring for this menu item
- *
+ *
* @param c
* menu item to listen to
* @return The MouseInputListener
@@ -346,7 +346,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Factory method to create a BasicMenuItemUI for the given {@link
* JComponent}, which should be a {@link JMenuItem}.
- *
+ *
* @param c
* The {@link JComponent} a UI is being created for.
* @return A BasicMenuItemUI for the {@link JComponent}.
@@ -358,7 +358,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Programatically clicks menu item.
- *
+ *
* @param msm
* MenuSelectionManager for the menu hierarchy
*/
@@ -370,7 +370,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Returns maximum size for the specified menu item
- *
+ *
* @param c
* component for which to get maximum size
* @return Maximum size for the specified menu item.
@@ -382,7 +382,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Returns minimum size for the specified menu item
- *
+ *
* @param c
* component for which to get minimum size
* @return Minimum size for the specified menu item.
@@ -394,7 +394,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Returns path to this menu item.
- *
+ *
* @return $MenuElement[]$ Returns array of menu elements that constitute a
* path to this menu item.
*/
@@ -420,7 +420,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Returns preferred size for the given menu item.
- *
+ *
* @param c
* menu item for which to get preferred size
* @param checkIcon
@@ -504,20 +504,20 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Returns preferred size of the given component
- *
+ *
* @param c
* component for which to return preferred size
* @return $Dimension$ preferred size for the given component
*/
public Dimension getPreferredSize(JComponent c)
{
- return getPreferredMenuItemSize(c, checkIcon, arrowIcon,
+ return getPreferredMenuItemSize(c, checkIcon, arrowIcon,
defaultTextIconGap);
}
/**
* Returns the prefix for entries in the {@link UIDefaults} table.
- *
+ *
* @return "MenuItem"
*/
protected String getPropertyPrefix()
@@ -527,7 +527,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* This method installs the components for this {@link JMenuItem}.
- *
+ *
* @param menuItem
* The {@link JMenuItem} to install components for.
*/
@@ -548,15 +548,15 @@ public class BasicMenuItemUI extends MenuItemUI
prefix + ".foreground", prefix + ".font");
menuItem.setMargin(UIManager.getInsets(prefix + ".margin"));
acceleratorFont = UIManager.getFont(prefix + ".acceleratorFont");
- acceleratorForeground = UIManager.getColor(prefix
+ acceleratorForeground = UIManager.getColor(prefix
+ ".acceleratorForeground");
- acceleratorSelectionForeground = UIManager.getColor(prefix
+ acceleratorSelectionForeground = UIManager.getColor(prefix
+ ".acceleratorSelectionForeground");
selectionBackground = UIManager.getColor(prefix + ".selectionBackground");
selectionForeground = UIManager.getColor(prefix + ".selectionForeground");
acceleratorDelimiter = UIManager.getString(prefix + ".acceleratorDelimiter");
checkIcon = UIManager.getIcon(prefix + ".checkIcon");
-
+
menuItem.setHorizontalTextPosition(SwingConstants.TRAILING);
menuItem.setHorizontalAlignment(SwingConstants.LEADING);
}
@@ -566,16 +566,16 @@ public class BasicMenuItemUI extends MenuItemUI
*/
protected void installKeyboardActions()
{
- InputMap focusedWindowMap = SwingUtilities.getUIInputMap(menuItem,
+ InputMap focusedWindowMap = SwingUtilities.getUIInputMap(menuItem,
JComponent.WHEN_IN_FOCUSED_WINDOW);
if (focusedWindowMap == null)
focusedWindowMap = new ComponentInputMapUIResource(menuItem);
KeyStroke accelerator = menuItem.getAccelerator();
if (accelerator != null)
focusedWindowMap.put(accelerator, "doClick");
- SwingUtilities.replaceUIInputMap(menuItem,
+ SwingUtilities.replaceUIInputMap(menuItem,
JComponent.WHEN_IN_FOCUSED_WINDOW, focusedWindowMap);
-
+
ActionMap UIActionMap = SwingUtilities.getUIActionMap(menuItem);
if (UIActionMap == null)
UIActionMap = new ActionMapUIResource();
@@ -605,7 +605,7 @@ public class BasicMenuItemUI extends MenuItemUI
* Installs and initializes all fields for this UI delegate. Any properties of
* the UI that need to be initialized and/or set to defaults will be done now.
* It will also install any listeners necessary.
- *
+ *
* @param c
* The {@link JComponent} that is having this UI installed.
*/
@@ -621,7 +621,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Paints given menu item using specified graphics context
- *
+ *
* @param g
* The graphics context used to paint this menu item
* @param c
@@ -635,7 +635,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Paints background of the menu item
- *
+ *
* @param g
* The graphics context used to paint this menu item
* @param menuItem
@@ -664,7 +664,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Paints specified menu item
- *
+ *
* @param g
* The graphics context used to paint this menu item
* @param c
@@ -808,7 +808,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Paints label for the given menu item
- *
+ *
* @param g
* The graphics context used to paint this menu item
* @param menuItem
@@ -864,7 +864,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* This method uninstalls the components for this {@link JMenuItem}.
- *
+ *
* @param menuItem
* The {@link JMenuItem} to uninstall components for.
*/
@@ -901,7 +901,7 @@ public class BasicMenuItemUI extends MenuItemUI
* Uninstalls any keyboard actions.
*/
protected void uninstallKeyboardActions()
- {
+ {
SwingUtilities.replaceUIInputMap(menuItem,
JComponent.WHEN_IN_FOCUSED_WINDOW, null);
}
@@ -922,7 +922,7 @@ public class BasicMenuItemUI extends MenuItemUI
* Performs the opposite of installUI. Any properties or resources that need
* to be cleaned up will be done now. It will also uninstall any listeners it
* has. In addition, any properties of this UI will be nulled.
- *
+ *
* @param c
* The {@link JComponent} that is having this UI uninstalled.
*/
@@ -937,7 +937,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* This method calls paint.
- *
+ *
* @param g
* The graphics context used to paint this menu item
* @param c
@@ -966,7 +966,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* This method is called when mouse is clicked on the menu item. It forwards
* this event to MenuSelectionManager.
- *
+ *
* @param e
* A {@link MouseEvent}.
*/
@@ -979,7 +979,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* This method is called when mouse is dragged inside the menu item. It
* forwards this event to MenuSelectionManager.
- *
+ *
* @param e
* A {@link MouseEvent}.
*/
@@ -994,7 +994,7 @@ public class BasicMenuItemUI extends MenuItemUI
* item is considered to be selected and selection path in
* MenuSelectionManager is set. This event is also forwarded to
* MenuSelection Manager for further processing.
- *
+ *
* @param e
* A {@link MouseEvent}.
*/
@@ -1012,7 +1012,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* This method is called when mouse exits menu item. The event is forwarded
* to MenuSelectionManager for processing.
- *
+ *
* @param e
* A {@link MouseEvent}.
*/
@@ -1025,7 +1025,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* This method is called when mouse is inside the menu item. This event is
* forwarder to MenuSelectionManager for further processing.
- *
+ *
* @param e
* A {@link MouseEvent}.
*/
@@ -1038,7 +1038,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* This method is called when mouse is pressed. This event is forwarded to
* MenuSelectionManager for further processing.
- *
+ *
* @param e
* A {@link MouseEvent}.
*/
@@ -1052,7 +1052,7 @@ public class BasicMenuItemUI extends MenuItemUI
* This method is called when mouse is released. If the mouse is released
* inside this menuItem, then this menu item is considered to be chosen and
* the menu hierarchy should be closed.
- *
+ *
* @param e
* A {@link MouseEvent}.
*/
@@ -1078,7 +1078,7 @@ public class BasicMenuItemUI extends MenuItemUI
{
/**
* Tbis method is invoked when mouse is dragged over the menu item.
- *
+ *
* @param e
* The MenuDragMouseEvent
*/
@@ -1091,7 +1091,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Tbis method is invoked when mouse enters the menu item while it is being
* dragged.
- *
+ *
* @param e
* The MenuDragMouseEvent
*/
@@ -1104,7 +1104,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Tbis method is invoked when mouse exits the menu item while it is being
* dragged
- *
+ *
* @param e the MenuDragMouseEvent
*/
public void menuDragMouseExited(MenuDragMouseEvent e)
@@ -1115,7 +1115,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* Tbis method is invoked when mouse was dragged and released inside the
* menu item.
- *
+ *
* @param e
* The MenuDragMouseEvent
*/
@@ -1140,7 +1140,7 @@ public class BasicMenuItemUI extends MenuItemUI
{
/**
* This method is invoked when key has been pressed
- *
+ *
* @param e
* A {@link MenuKeyEvent}.
*/
@@ -1151,7 +1151,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* This method is invoked when key has been pressed
- *
+ *
* @param e
* A {@link MenuKeyEvent}.
*/
@@ -1163,7 +1163,7 @@ public class BasicMenuItemUI extends MenuItemUI
/**
* This method is invoked when key has been typed It handles the mnemonic
* key for the menu item.
- *
+ *
* @param e
* A {@link MenuKeyEvent}.
*/
@@ -1172,7 +1172,7 @@ public class BasicMenuItemUI extends MenuItemUI
// TODO: What should be done here, if anything?
}
}
-
+
/**
* Helper class that listens for item changes to the properties of the {@link
* JMenuItem}.
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicMenuUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicMenuUI.java
index 355e043..4897ee4 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicMenuUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicMenuUI.java
@@ -98,7 +98,7 @@ public class BasicMenuUI extends BasicMenuItemUI
defaultManager.setSelectedPath(newPath);
}
}
-
+
}
protected ChangeListener changeListener;
@@ -233,7 +233,7 @@ public class BasicMenuUI extends BasicMenuItemUI
*/
protected void installDefaults()
{
-
+
LookAndFeel.installBorder(menuItem, "Menu.border");
LookAndFeel.installColorsAndFont(menuItem, "Menu.background",
"Menu.foreground", "Menu.font");
@@ -502,9 +502,9 @@ public class BasicMenuUI extends BasicMenuItemUI
{
JMenu menu = (JMenu) menuItem;
if (menu.isTopLevelMenu())
- ((JMenuBar) menu.getParent()).setSelected(menu);
+ ((JMenuBar) menu.getParent()).setSelected(menu);
else
- ((JPopupMenu) menu.getParent()).setSelected(menu);
+ ((JPopupMenu) menu.getParent()).setSelected(menu);
}
}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java
index e238085..a03d224 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java
@@ -100,7 +100,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
JOptionPane op = (JOptionPane) event.getSource();
op.setValue(new Integer(JOptionPane.CLOSED_OPTION));
}
-
+
}
/**
@@ -136,18 +136,18 @@ public class BasicOptionPaneUI extends OptionPaneUI
Object value = new Integer(JOptionPane.CLOSED_OPTION);
Object[] options = optionPane.getOptions();
if (options != null)
- value = new Integer(buttonIndex);
+ value = new Integer(buttonIndex);
else
{
- String text = ((JButton) e.getSource()).getText();
- if (text.equals(OK_STRING))
- value = new Integer(JOptionPane.OK_OPTION);
- if (text.equals(CANCEL_STRING))
- value = new Integer(JOptionPane.CANCEL_OPTION);
- if (text.equals(YES_STRING))
- value = new Integer(JOptionPane.YES_OPTION);
- if (text.equals(NO_STRING))
- value = new Integer(JOptionPane.NO_OPTION);
+ String text = ((JButton) e.getSource()).getText();
+ if (text.equals(OK_STRING))
+ value = new Integer(JOptionPane.OK_OPTION);
+ if (text.equals(CANCEL_STRING))
+ value = new Integer(JOptionPane.CANCEL_OPTION);
+ if (text.equals(YES_STRING))
+ value = new Integer(JOptionPane.YES_OPTION);
+ if (text.equals(NO_STRING))
+ value = new Integer(JOptionPane.NO_OPTION);
}
optionPane.setValue(value);
resetInputValue();
@@ -155,7 +155,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
Window owner = SwingUtilities.windowForComponent(optionPane);
if (owner instanceof JDialog)
- ((JDialog) owner).dispose();
+ ((JDialog) owner).dispose();
//else we probably have some kind of internal frame.
JInternalFrame inf = (JInternalFrame) SwingUtilities.getAncestorOfClass(
@@ -265,21 +265,21 @@ public class BasicOptionPaneUI extends OptionPaneUI
Component[] buttonList = container.getComponents();
int x = container.getInsets().left;
if (getCentersChildren())
- x += (int) ((double) (container.getSize().width) / 2
- - (double) (buttonRowLength(container)) / 2);
+ x += (int) ((double) (container.getSize().width) / 2
+ - (double) (buttonRowLength(container)) / 2);
for (int i = 0; i < buttonList.length; i++)
{
- Dimension dims = buttonList[i].getPreferredSize();
- if (syncAllWidths)
- {
- buttonList[i].setBounds(x, 0, widthOfWidestButton, dims.height);
- x += widthOfWidestButton + getPadding();
- }
- else
- {
- buttonList[i].setBounds(x, 0, dims.width, dims.height);
- x += dims.width + getPadding();
- }
+ Dimension dims = buttonList[i].getPreferredSize();
+ if (syncAllWidths)
+ {
+ buttonList[i].setBounds(x, 0, widthOfWidestButton, dims.height);
+ x += widthOfWidestButton + getPadding();
+ }
+ else
+ {
+ buttonList[i].setBounds(x, 0, dims.width, dims.height);
+ x += dims.width + getPadding();
+ }
}
}
@@ -301,10 +301,10 @@ public class BasicOptionPaneUI extends OptionPaneUI
for (int i = 0; i < buttonList.length; i++)
{
- Dimension dims = buttonList[i].getPreferredSize();
- buttonLength += dims.width + getPadding();
- widest = Math.max(widest, dims.width);
- tallest = Math.max(tallest, dims.height);
+ Dimension dims = buttonList[i].getPreferredSize();
+ buttonLength += dims.width + getPadding();
+ widest = Math.max(widest, dims.width);
+ tallest = Math.max(tallest, dims.height);
}
widthOfWidestButton = widest;
@@ -312,10 +312,10 @@ public class BasicOptionPaneUI extends OptionPaneUI
int width;
if (getSyncAllWidths())
- width = widest * buttonList.length
- + getPadding() * (buttonList.length - 1);
+ width = widest * buttonList.length
+ + getPadding() * (buttonList.length - 1);
else
- width = buttonLength;
+ width = buttonLength;
Insets insets = c.getInsets();
width += insets.left + insets.right;
@@ -438,10 +438,10 @@ public class BasicOptionPaneUI extends OptionPaneUI
/** Whether the JOptionPane contains custom components. */
protected boolean hasCustomComponents;
- // The initialFocusComponent seems to always be set to a button (even if
- // I try to set initialSelectionValue). This is different from what the
- // javadocs state (which should switch this reference to the input component
- // if one is present since that is what's going to get focus).
+ // The initialFocusComponent seems to always be set to a button (even if
+ // I try to set initialSelectionValue). This is different from what the
+ // javadocs state (which should switch this reference to the input component
+ // if one is present since that is what's going to get focus).
/**
* The button that will receive focus based on initialValue when no input
@@ -531,20 +531,20 @@ public class BasicOptionPaneUI extends OptionPaneUI
{
public void paintIcon(Component c, Graphics g, int x, int y)
{
- Polygon oct = new Polygon(new int[] { 0, 0, 9, 27, 36, 36, 27, 9 },
- new int[] { 9, 27, 36, 36, 27, 9, 0, 0 }, 8);
- g.translate(x, y);
+ Polygon oct = new Polygon(new int[] { 0, 0, 9, 27, 36, 36, 27, 9 },
+ new int[] { 9, 27, 36, 36, 27, 9, 0, 0 }, 8);
+ g.translate(x, y);
- Color saved = g.getColor();
- g.setColor(Color.RED);
+ Color saved = g.getColor();
+ g.setColor(Color.RED);
- g.fillPolygon(oct);
+ g.fillPolygon(oct);
- g.setColor(Color.BLACK);
- g.drawRect(13, 16, 10, 4);
+ g.setColor(Color.BLACK);
+ g.drawRect(13, 16, 10, 4);
- g.setColor(saved);
- g.translate(-x, -y);
+ g.setColor(saved);
+ g.translate(-x, -y);
}
};
@@ -553,24 +553,24 @@ public class BasicOptionPaneUI extends OptionPaneUI
{
public void paintIcon(Component c, Graphics g, int x, int y)
{
- g.translate(x, y);
- Color saved = g.getColor();
+ g.translate(x, y);
+ Color saved = g.getColor();
- // Should be purple.
- g.setColor(Color.RED);
+ // Should be purple.
+ g.setColor(Color.RED);
- g.fillOval(0, 0, ICON_SIZE, ICON_SIZE);
+ g.fillOval(0, 0, ICON_SIZE, ICON_SIZE);
- g.setColor(Color.BLACK);
- g.drawOval(16, 6, 4, 4);
+ g.setColor(Color.BLACK);
+ g.drawOval(16, 6, 4, 4);
- Polygon bottomI = new Polygon(new int[] { 15, 15, 13, 13, 23, 23, 21, 21 },
- new int[] { 12, 28, 28, 30, 30, 28, 28, 12 },
- 8);
- g.drawPolygon(bottomI);
+ Polygon bottomI = new Polygon(new int[] { 15, 15, 13, 13, 23, 23, 21, 21 },
+ new int[] { 12, 28, 28, 30, 30, 28, 28, 12 },
+ 8);
+ g.drawPolygon(bottomI);
- g.setColor(saved);
- g.translate(-x, -y);
+ g.setColor(saved);
+ g.translate(-x, -y);
}
};
@@ -579,23 +579,23 @@ public class BasicOptionPaneUI extends OptionPaneUI
{
public void paintIcon(Component c, Graphics g, int x, int y)
{
- g.translate(x, y);
- Color saved = g.getColor();
- g.setColor(Color.YELLOW);
+ g.translate(x, y);
+ Color saved = g.getColor();
+ g.setColor(Color.YELLOW);
- Polygon triangle = new Polygon(new int[] { 0, 18, 36 },
- new int[] { 36, 0, 36 }, 3);
- g.fillPolygon(triangle);
+ Polygon triangle = new Polygon(new int[] { 0, 18, 36 },
+ new int[] { 36, 0, 36 }, 3);
+ g.fillPolygon(triangle);
- g.setColor(Color.BLACK);
+ g.setColor(Color.BLACK);
- Polygon excl = new Polygon(new int[] { 15, 16, 20, 21 },
- new int[] { 8, 26, 26, 8 }, 4);
- g.drawPolygon(excl);
- g.drawOval(16, 30, 4, 4);
+ Polygon excl = new Polygon(new int[] { 15, 16, 20, 21 },
+ new int[] { 8, 26, 26, 8 }, 4);
+ g.drawPolygon(excl);
+ g.drawOval(16, 30, 4, 4);
- g.setColor(saved);
- g.translate(-x, -y);
+ g.setColor(saved);
+ g.translate(-x, -y);
}
};
@@ -604,32 +604,32 @@ public class BasicOptionPaneUI extends OptionPaneUI
{
public void paintIcon(Component c, Graphics g, int x, int y)
{
- g.translate(x, y);
- Color saved = g.getColor();
- g.setColor(Color.GREEN);
+ g.translate(x, y);
+ Color saved = g.getColor();
+ g.setColor(Color.GREEN);
- g.fillRect(0, 0, ICON_SIZE, ICON_SIZE);
+ g.fillRect(0, 0, ICON_SIZE, ICON_SIZE);
- g.setColor(Color.BLACK);
+ g.setColor(Color.BLACK);
- g.drawOval(11, 2, 16, 16);
- g.drawOval(14, 5, 10, 10);
+ g.drawOval(11, 2, 16, 16);
+ g.drawOval(14, 5, 10, 10);
- g.setColor(Color.GREEN);
- g.fillRect(0, 10, ICON_SIZE, ICON_SIZE - 10);
+ g.setColor(Color.GREEN);
+ g.fillRect(0, 10, ICON_SIZE, ICON_SIZE - 10);
- g.setColor(Color.BLACK);
+ g.setColor(Color.BLACK);
- g.drawLine(11, 10, 14, 10);
+ g.drawLine(11, 10, 14, 10);
- g.drawLine(24, 10, 17, 22);
- g.drawLine(27, 10, 20, 22);
- g.drawLine(17, 22, 20, 22);
+ g.drawLine(24, 10, 17, 22);
+ g.drawLine(27, 10, 20, 22);
+ g.drawLine(17, 22, 20, 22);
- g.drawOval(17, 25, 3, 3);
+ g.drawOval(17, 25, 3, 3);
- g.setColor(saved);
- g.translate(-x, -y);
+ g.setColor(saved);
+ g.translate(-x, -y);
}
};
@@ -659,25 +659,25 @@ public class BasicOptionPaneUI extends OptionPaneUI
return;
for (int i = 0; i < buttons.length; i++)
{
- if (buttons[i] != null)
- {
- Component toAdd;
- if (buttons[i] instanceof Component)
- toAdd = (Component) buttons[i];
- else
- {
- if (buttons[i] instanceof Icon)
- toAdd = new JButton((Icon) buttons[i]);
- else
- toAdd = new JButton(buttons[i].toString());
- hasCustomComponents = true;
- }
- if (toAdd instanceof JButton)
- ((JButton) toAdd).addActionListener(createButtonActionListener(i));
- if (i == initialIndex)
- initialFocusComponent = toAdd;
- container.add(toAdd);
- }
+ if (buttons[i] != null)
+ {
+ Component toAdd;
+ if (buttons[i] instanceof Component)
+ toAdd = (Component) buttons[i];
+ else
+ {
+ if (buttons[i] instanceof Icon)
+ toAdd = new JButton((Icon) buttons[i]);
+ else
+ toAdd = new JButton(buttons[i].toString());
+ hasCustomComponents = true;
+ }
+ if (toAdd instanceof JButton)
+ ((JButton) toAdd).addActionListener(createButtonActionListener(i));
+ if (i == initialIndex)
+ initialFocusComponent = toAdd;
+ container.add(toAdd);
+ }
}
selectInitialValue(optionPane);
}
@@ -693,9 +693,9 @@ public class BasicOptionPaneUI extends OptionPaneUI
Icon icon = getIcon();
if (icon != null)
{
- iconLabel = new JLabel(icon);
+ iconLabel = new JLabel(icon);
configureLabel(iconLabel);
- top.add(iconLabel, BorderLayout.WEST);
+ top.add(iconLabel, BorderLayout.WEST);
}
}
@@ -743,38 +743,38 @@ public class BasicOptionPaneUI extends OptionPaneUI
hasCustomComponents = internallyCreated;
if (msg instanceof Object[])
{
- Object[] arr = (Object[]) msg;
- for (int i = 0; i < arr.length; i++)
- addMessageComponents(container, cons, arr[i], maxll,
- internallyCreated);
- return;
+ Object[] arr = (Object[]) msg;
+ for (int i = 0; i < arr.length; i++)
+ addMessageComponents(container, cons, arr[i], maxll,
+ internallyCreated);
+ return;
}
else if (msg instanceof Component)
{
- container.add((Component) msg, cons);
- cons.gridy++;
+ container.add((Component) msg, cons);
+ cons.gridy++;
}
else if (msg instanceof Icon)
{
JLabel label = new JLabel((Icon) msg);
configureLabel(label);
- container.add(label, cons);
- cons.gridy++;
+ container.add(label, cons);
+ cons.gridy++;
}
else
{
- // Undocumented behaviour.
- // if msg.toString().length greater than maxll
- // it will create a box and burst the string.
- // otherwise, it will just create a label and re-call
- // this method with the label o.O
- if (msg.toString().length() > maxll || msg.toString().contains("\n"))
- {
- Box tmp = new Box(BoxLayout.Y_AXIS);
- burstStringInto(tmp, msg.toString(), maxll);
- addMessageComponents(container, cons, tmp, maxll, true);
- }
- else
+ // Undocumented behaviour.
+ // if msg.toString().length greater than maxll
+ // it will create a box and burst the string.
+ // otherwise, it will just create a label and re-call
+ // this method with the label o.O
+ if (msg.toString().length() > maxll || msg.toString().contains("\n"))
+ {
+ Box tmp = new Box(BoxLayout.Y_AXIS);
+ burstStringInto(tmp, msg.toString(), maxll);
+ addMessageComponents(container, cons, tmp, maxll, true);
+ }
+ else
{
JLabel label = new JLabel(msg.toString());
configureLabel(label);
@@ -817,7 +817,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
if (remainder.length() == 0)
return;
- // Recursively call ourselves to burst the remainder of the string,
+ // Recursively call ourselves to burst the remainder of the string,
if (remainder.length() > maxll || remainder.contains("\n"))
burstStringInto(c, remainder, maxll);
else
@@ -901,27 +901,27 @@ public class BasicOptionPaneUI extends OptionPaneUI
rightSide.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
rightSide.setLayout(new GridBagLayout());
GridBagConstraints con = createConstraints();
-
+
addMessageComponents(rightSide, con, getMessage(),
getMaxCharactersPerLineCount(), false);
if (optionPane.getWantsInput())
{
- Object[] selection = optionPane.getSelectionValues();
+ Object[] selection = optionPane.getSelectionValues();
- if (selection == null)
+ if (selection == null)
inputComponent = new JTextField(15);
- else if (selection.length < 20)
+ else if (selection.length < 20)
inputComponent = new JComboBox(selection);
- else
- inputComponent = new JList(selection);
- if (inputComponent != null)
- {
- addMessageComponents(rightSide, con, inputComponent,
+ else
+ inputComponent = new JList(selection);
+ if (inputComponent != null)
+ {
+ addMessageComponents(rightSide, con, inputComponent,
getMaxCharactersPerLineCount(), false);
- resetSelectedValue();
- selectInitialValue(optionPane);
- }
+ resetSelectedValue();
+ selectInitialValue(optionPane);
+ }
}
messageArea.add(rightSide, BorderLayout.CENTER);
@@ -979,11 +979,11 @@ public class BasicOptionPaneUI extends OptionPaneUI
switch (optionPane.getOptionType())
{
case JOptionPane.YES_NO_OPTION:
- return new Object[] { YES_STRING, NO_STRING };
+ return new Object[] { YES_STRING, NO_STRING };
case JOptionPane.YES_NO_CANCEL_OPTION:
- return new Object[] { YES_STRING, NO_STRING, CANCEL_STRING };
+ return new Object[] { YES_STRING, NO_STRING, CANCEL_STRING };
case JOptionPane.OK_CANCEL_OPTION:
- return new Object[] { OK_STRING, CANCEL_STRING };
+ return new Object[] { OK_STRING, CANCEL_STRING };
case JOptionPane.DEFAULT_OPTION:
return (optionPane.getWantsInput()) ?
new Object[] { OK_STRING, CANCEL_STRING } :
@@ -1022,17 +1022,17 @@ public class BasicOptionPaneUI extends OptionPaneUI
switch (messageType)
{
case JOptionPane.ERROR_MESSAGE:
- tmp = errorIcon;
- break;
+ tmp = errorIcon;
+ break;
case JOptionPane.INFORMATION_MESSAGE:
- tmp = infoIcon;
- break;
+ tmp = infoIcon;
+ break;
case JOptionPane.WARNING_MESSAGE:
- tmp = warningIcon;
- break;
+ tmp = warningIcon;
+ break;
case JOptionPane.QUESTION_MESSAGE:
- tmp = questionIcon;
- break;
+ tmp = questionIcon;
+ break;
}
return tmp;
// FIXME: Don't cast till the default icons are in.
@@ -1055,8 +1055,8 @@ public class BasicOptionPaneUI extends OptionPaneUI
for (int i = 0; i < buttons.length; i++)
{
- if (select == buttons[i])
- return i;
+ if (select == buttons[i])
+ return i;
}
return 0;
}
@@ -1251,12 +1251,12 @@ public class BasicOptionPaneUI extends OptionPaneUI
{
if (c instanceof JOptionPane)
{
- optionPane = (JOptionPane) c;
+ optionPane = (JOptionPane) c;
- installDefaults();
- installComponents();
- installListeners();
- installKeyboardActions();
+ installDefaults();
+ installComponents();
+ installListeners();
+ installKeyboardActions();
}
}
@@ -1268,16 +1268,16 @@ public class BasicOptionPaneUI extends OptionPaneUI
{
if (optionPane.getWantsInput() && inputComponent != null)
{
- Object output = null;
- if (inputComponent instanceof JTextField)
- output = ((JTextField) inputComponent).getText();
- else if (inputComponent instanceof JComboBox)
- output = ((JComboBox) inputComponent).getSelectedItem();
- else if (inputComponent instanceof JList)
- output = ((JList) inputComponent).getSelectedValue();
-
- if (output != null)
- optionPane.setInputValue(output);
+ Object output = null;
+ if (inputComponent instanceof JTextField)
+ output = ((JTextField) inputComponent).getText();
+ else if (inputComponent instanceof JComboBox)
+ output = ((JComboBox) inputComponent).getSelectedItem();
+ else if (inputComponent instanceof JList)
+ output = ((JList) inputComponent).getSelectedValue();
+
+ if (output != null)
+ optionPane.setInputValue(output);
}
}
@@ -1291,8 +1291,8 @@ public class BasicOptionPaneUI extends OptionPaneUI
{
if (inputComponent != null)
{
- inputComponent.requestFocus();
- return;
+ inputComponent.requestFocus();
+ return;
}
if (initialFocusComponent != null)
initialFocusComponent.requestFocus();
@@ -1307,17 +1307,17 @@ public class BasicOptionPaneUI extends OptionPaneUI
{
if (inputComponent != null)
{
- Object init = optionPane.getInitialSelectionValue();
- if (init == null)
- return;
- if (inputComponent instanceof JTextField)
- ((JTextField) inputComponent).setText((String) init);
- else if (inputComponent instanceof JComboBox)
- ((JComboBox) inputComponent).setSelectedItem(init);
- else if (inputComponent instanceof JList)
- {
- // ((JList) inputComponent).setSelectedValue(init, true);
- }
+ Object init = optionPane.getInitialSelectionValue();
+ if (init == null)
+ return;
+ if (inputComponent instanceof JTextField)
+ ((JTextField) inputComponent).setText((String) init);
+ else if (inputComponent instanceof JComboBox)
+ ((JComboBox) inputComponent).setSelectedItem(init);
+ else if (inputComponent instanceof JList)
+ {
+ // ((JList) inputComponent).setSelectedValue(init, true);
+ }
}
}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicPanelUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicPanelUI.java
index 458f102..959462a 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicPanelUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicPanelUI.java
@@ -54,13 +54,13 @@ public class BasicPanelUI extends PanelUI
* stateless).
*/
static BasicPanelUI sharedUI;
-
+
/**
* Returns a UI delegate for the specified component.
- *
+ *
* @param panel the panel.
*/
- public static ComponentUI createUI(JComponent panel)
+ public static ComponentUI createUI(JComponent panel)
{
if (sharedUI == null)
sharedUI = new BasicPanelUI();
@@ -69,7 +69,7 @@ public class BasicPanelUI extends PanelUI
/**
* Installs this UI delegate in the specified component.
- *
+ *
* @param c the component (should be a {@link JPanel}, <code>null</code> not
* permitted).
*/
@@ -85,19 +85,19 @@ public class BasicPanelUI extends PanelUI
/**
* Installs the defaults for this UI delegate in the specified panel.
- *
+ *
* @param p the panel (<code>null</code> not permitted).
*/
protected void installDefaults(JPanel p)
{
LookAndFeel.installColorsAndFont(p, "Panel.background", "Panel.foreground",
"Panel.font");
-
+
// A test against the reference implementation shows that this method will
// install a border if one is defined in the UIDefaults table (even though
// the BasicLookAndFeel doesn't actually define a "Panel.border"). This
- // test was written after discovering that a null argument to
- // uninstallDefaults throws a NullPointerException in
+ // test was written after discovering that a null argument to
+ // uninstallDefaults throws a NullPointerException in
// LookAndFeel.uninstallBorder()...
LookAndFeel.installBorder(p, "Panel.border");
}
@@ -123,10 +123,10 @@ public class BasicPanelUI extends PanelUI
// (1) doesn't actually remove the installed colors and font installed
// by installDefaults(), it isn't necessary;
// (2) throws a NullPointerException in LookAndFeel.uninstallBorder() if
- // p is null. Strangely, no border is installed by the
+ // p is null. Strangely, no border is installed by the
// BasicLookAndFeel - perhaps this is needed by another LAF?
-
+
LookAndFeel.uninstallBorder(p);
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicPasswordFieldUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicPasswordFieldUI.java
index 76dcfc4..cc83917 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicPasswordFieldUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicPasswordFieldUI.java
@@ -56,7 +56,7 @@ public class BasicPasswordFieldUI extends BasicTextFieldUI
{
return new PasswordView(elem);
}
-
+
public static ComponentUI createUI(JComponent c)
{
return new BasicPasswordFieldUI();
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java
index 8c0fe67..6cd433b 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java
@@ -255,7 +255,7 @@ public class BasicPopupMenuUI extends PopupMenuUI
/**
* Finds the next child element that is enabled and visible.
- *
+ *
* @param children the children to search through
* @param start the start index
* @param end the end index
@@ -282,7 +282,7 @@ public class BasicPopupMenuUI extends PopupMenuUI
/**
* Finds the previous child element that is enabled and visible.
- *
+ *
* @param children the children to search through
* @param start the start index
* @param end the end index
@@ -349,7 +349,7 @@ public class BasicPopupMenuUI extends PopupMenuUI
else
{
int popupIndex = len-1;
- if (len > 2
+ if (len > 2
&& (path[popupIndex] instanceof JPopupMenu
|| path[--popupIndex] instanceof JPopupMenu)
&& ! ((JMenu) path[popupIndex - 1]).isTopLevelMenu())
@@ -773,7 +773,7 @@ public class BasicPopupMenuUI extends PopupMenuUI
am.put(action.getValue(Action.NAME), action);
action = new NavigateAction("cancel");
am.put(action.getValue(Action.NAME), action);
-
+
return am;
}
@@ -916,7 +916,7 @@ public class BasicPopupMenuUI extends PopupMenuUI
*/
public void popupMenuWillBecomeInvisible(PopupMenuEvent event)
{
- // remove listener that listens to component events fired
+ // remove listener that listens to component events fired
// by the top - level window that this popup belongs to.
Component invoker = popupMenu.getInvoker();
Component rootContainer = SwingUtilities.getRoot(invoker);
@@ -931,30 +931,30 @@ public class BasicPopupMenuUI extends PopupMenuUI
*/
public void popupMenuWillBecomeVisible(PopupMenuEvent event)
{
- // Adds topWindowListener to top-level window to listener to
+ // Adds topWindowListener to top-level window to listener to
// ComponentEvents fired by it. We need to cancel this popup menu
// if topWindow to which this popup belongs was resized or moved.
- Component invoker = popupMenu.getInvoker();
+ Component invoker = popupMenu.getInvoker();
Component rootContainer = SwingUtilities.getRoot(invoker);
if (rootContainer != null)
rootContainer.addComponentListener(topWindowListener);
// if this popup menu is a free floating popup menu,
// then by default its first element should be always selected when
- // this popup menu becomes visible.
+ // this popup menu becomes visible.
MenuSelectionManager manager = MenuSelectionManager.defaultManager();
if (manager.getSelectedPath().length == 0)
{
- // Set selected path to point to the first item in the popup menu
- MenuElement[] path = new MenuElement[2];
- path[0] = popupMenu;
- Component[] comps = popupMenu.getComponents();
- if (comps.length != 0 && comps[0] instanceof MenuElement)
- {
- path[1] = (MenuElement) comps[0];
- manager.setSelectedPath(path);
- }
+ // Set selected path to point to the first item in the popup menu
+ MenuElement[] path = new MenuElement[2];
+ path[0] = popupMenu;
+ Component[] comps = popupMenu.getComponents();
+ if (comps.length != 0 && comps[0] instanceof MenuElement)
+ {
+ path[1] = (MenuElement) comps[0];
+ manager.setSelectedPath(path);
+ }
}
}
}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java
index 12bbe01..bff6385 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java
@@ -71,13 +71,13 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.ProgressBarUI;
/**
- * The Basic Look and Feel UI delegate for the
+ * The Basic Look and Feel UI delegate for the
* JProgressBar.
*/
public class BasicProgressBarUI extends ProgressBarUI
{
/**
- * A helper class that listens for ChangeEvents
+ * A helper class that listens for ChangeEvents
* from the progressBar's model.
*
* @specnote Apparently this class was intended to be protected,
@@ -99,13 +99,13 @@ public class BasicProgressBarUI extends ProgressBarUI
}
/**
- * This helper class is used to listen for
+ * This helper class is used to listen for
* PropertyChangeEvents from the progressBar.
*/
private class PropertyChangeHandler implements PropertyChangeListener
{
/**
- * Called every time the properties of the
+ * Called every time the properties of the
* progressBar change.
*
* @param e The PropertyChangeEvent given by the progressBar.
@@ -163,11 +163,11 @@ public class BasicProgressBarUI extends ProgressBarUI
{
// Nothing to do here.
}
-
+
}
/**
- * This helper class is used to listen for
+ * This helper class is used to listen for
* the animationTimer's intervals. On every interval,
* the bouncing box should move.
*/
@@ -215,7 +215,7 @@ public class BasicProgressBarUI extends ProgressBarUI
* Holds the value of the bouncing box that is returned by {@link #getBox}.
*
* @since 1.5
- */
+ */
protected Rectangle boxRect;
/** The timer used to move the bouncing box. */
@@ -230,7 +230,7 @@ public class BasicProgressBarUI extends ProgressBarUI
// | frame0 | frame1 | frame2 | frame 3 | frame 4 |
// | | frame7 | frame6 | frame 5 | |
// +-----------------------------------------------+
-
+
/** The current animation index. */
private transient int animationIndex;
@@ -260,7 +260,7 @@ public class BasicProgressBarUI extends ProgressBarUI
/**
* The size of the box returned by {@link #getBox} against the orientation
* direction of the progress bar. This is package private to avoid accessor
- * method.
+ * method.
*/
transient int boxIndependent = - 1;
@@ -346,7 +346,7 @@ public class BasicProgressBarUI extends ProgressBarUI
/**
* This method returns the size and position of the bouncing box
- * for the current animation index. It stores the values in the
+ * for the current animation index. It stores the values in the
* given rectangle and returns it. It returns null if no box should
* be drawn.
*
@@ -487,7 +487,7 @@ public class BasicProgressBarUI extends ProgressBarUI
* rectangle (the bounds without the insets) if the
* progressBar is horizontal.
*
- * @return The preferred size of the progressBar minus
+ * @return The preferred size of the progressBar minus
* insets if it's horizontal.
*/
protected Dimension getPreferredInnerHorizontal()
@@ -512,7 +512,7 @@ public class BasicProgressBarUI extends ProgressBarUI
/**
* This method returns the preferred size of the inner
- * rectangle (the bounds without insets) if the
+ * rectangle (the bounds without insets) if the
* progressBar is vertical.
*
* @return The preferred size of the progressBar minus
@@ -539,7 +539,7 @@ public class BasicProgressBarUI extends ProgressBarUI
}
/**
- * This method returns the preferred size of the
+ * This method returns the preferred size of the
* given JComponent. If it returns null, then it
* is up to the LayoutManager to give it a size.
*
@@ -585,7 +585,7 @@ public class BasicProgressBarUI extends ProgressBarUI
/**
* This method returns the point (the top left of the bounding box)
- * where the text should be painted.
+ * where the text should be painted.
*
* @param g The Graphics object to measure FontMetrics with.
* @param progressString The string to paint.
@@ -602,7 +602,7 @@ public class BasicProgressBarUI extends ProgressBarUI
Rectangle tr = new Rectangle();
Rectangle vr = new Rectangle();
Rectangle ir = new Rectangle();
-
+
if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
vr.setBounds(x, y, width, height);
else
@@ -616,7 +616,7 @@ public class BasicProgressBarUI extends ProgressBarUI
SwingConstants.CENTER,
SwingConstants.CENTER,
SwingConstants.CENTER, vr, ir, tr, 0);
-
+
if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
return new Point(tr.x, tr.y);
else
@@ -651,7 +651,7 @@ public class BasicProgressBarUI extends ProgressBarUI
}
/**
- * This method is called if the painting to be done is
+ * This method is called if the painting to be done is
* for a determinate progressBar.
*
* @param g The Graphics object to paint with.
@@ -672,17 +672,17 @@ public class BasicProgressBarUI extends ProgressBarUI
int amountFull = getAmountFull(insets, or.width, or.height);
- if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
- {
- g.setColor(c.getForeground());
- g.fillRect(vr.x, vr.y, amountFull, vr.height);
- }
- else
- {
- g.setColor(c.getForeground());
- g.fillRect(vr.x, vr.y + vr.height - amountFull, vr.width,
+ if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
+ {
+ g.setColor(c.getForeground());
+ g.fillRect(vr.x, vr.y, amountFull, vr.height);
+ }
+ else
+ {
+ g.setColor(c.getForeground());
+ g.fillRect(vr.x, vr.y + vr.height - amountFull, vr.width,
amountFull);
- }
+ }
if (progressBar.isStringPainted() && !progressBar.getString().equals(""))
paintString(g, 0, 0, or.width, or.height, amountFull, insets);
@@ -739,13 +739,13 @@ public class BasicProgressBarUI extends ProgressBarUI
String str = progressBar.getString();
int full = getAmountFull(b, width, height);
Point placement = getStringPlacement(g, progressBar.getString(),
- x + b.left, y + b.top,
+ x + b.left, y + b.top,
width - b.left - b.right,
height - b.top - b.bottom);
Color savedColor = g.getColor();
Shape savedClip = g.getClip();
FontMetrics fm = g.getFontMetrics(progressBar.getFont());
-
+
if (progressBar.getOrientation() == JProgressBar.VERTICAL)
{
AffineTransform rotate = AffineTransform.getRotateInstance(Math.PI / 2);
@@ -756,7 +756,7 @@ public class BasicProgressBarUI extends ProgressBarUI
{
placement.y += fm.getAscent();
}
-
+
g.setColor(getSelectionForeground());
g.setClip(0, 0, full + b.left, height);
g.drawString(str, placement.x, placement.y);
@@ -770,7 +770,7 @@ public class BasicProgressBarUI extends ProgressBarUI
/**
* This method sets the current animation index. If the index is greater than
* the number of frames, it resets to 0.
- *
+ *
* @param newValue The new animation index.
*/
protected void setAnimationIndex(int newValue)
@@ -849,10 +849,10 @@ public class BasicProgressBarUI extends ProgressBarUI
if (cycleTime % repaintInterval != 0
&& (cycleTime / repaintInterval) % 2 != 0)
{
- int div = (cycleTime / repaintInterval) + 2;
- div /= 2;
- div *= 2;
- cycleTime = div * repaintInterval;
+ int div = (cycleTime / repaintInterval) + 2;
+ div /= 2;
+ div *= 2;
+ cycleTime = div * repaintInterval;
}
setAnimationIndex(0);
numFrames = cycleTime / repaintInterval;
@@ -874,7 +874,7 @@ public class BasicProgressBarUI extends ProgressBarUI
}
/**
- * This method registers listeners to all the
+ * This method registers listeners to all the
* components that this UI delegate needs to listen to.
*/
protected void installListeners()
@@ -895,7 +895,7 @@ public class BasicProgressBarUI extends ProgressBarUI
}
/**
- * This method unregisters listeners to all the
+ * This method unregisters listeners to all the
* components that were listened to.
*/
protected void uninstallListeners()
@@ -930,13 +930,13 @@ public class BasicProgressBarUI extends ProgressBarUI
super.installUI(c);
if (c instanceof JProgressBar)
{
- progressBar = (JProgressBar) c;
+ progressBar = (JProgressBar) c;
- animationTimer = new Timer(200, null);
- animationTimer.setRepeats(true);
+ animationTimer = new Timer(200, null);
+ animationTimer.setRepeats(true);
- installDefaults();
- installListeners();
+ installDefaults();
+ installListeners();
}
if (progressBar.isIndeterminate())
startAnimationTimer();
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java
index 3cea0d9..ff374d1 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java
@@ -72,7 +72,7 @@ public class BasicRadioButtonUI extends BasicToggleButtonUI
*
* @return a new instance of <code>BasicRadioButtonUI</code>
*/
- public static ComponentUI createUI(final JComponent c)
+ public static ComponentUI createUI(final JComponent c)
{
return new BasicRadioButtonUI();
}
@@ -158,7 +158,7 @@ public class BasicRadioButtonUI extends BasicToggleButtonUI
Icon currentIcon = getCurrentIcon(b);
// Do the layout.
- String text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f),
+ String text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f),
b.getText(), currentIcon == null ? getDefaultIcon() : currentIcon,
b.getVerticalAlignment(), b.getHorizontalAlignment(),
b.getVerticalTextPosition(), b.getHorizontalTextPosition(),
@@ -184,13 +184,13 @@ public class BasicRadioButtonUI extends BasicToggleButtonUI
paintFocus(g, textR, size);
}
}
-
- /**
- * Determines the icon to be displayed for the specified radio button.
- *
- * @param b the radio button
- *
- * @return the icon
+
+ /**
+ * Determines the icon to be displayed for the specified radio button.
+ *
+ * @param b the radio button
+ *
+ * @return the icon
*/
private Icon getCurrentIcon(AbstractButton b)
{
@@ -246,14 +246,14 @@ public class BasicRadioButtonUI extends BasicToggleButtonUI
// one will be used for layout calculations and painting instead.
// The other icon properties are ignored.
AbstractButton b = (AbstractButton) c;
-
+
Insets insets = b.getInsets();
String text = b.getText();
Icon i = b.getIcon();
if (i == null)
- i = getDefaultIcon();
-
+ i = getDefaultIcon();
+
textR.x = 0;
textR.y = 0;
textR.width = 0;
@@ -269,7 +269,7 @@ public class BasicRadioButtonUI extends BasicToggleButtonUI
SwingUtilities.layoutCompoundLabel(b, // for the component orientation
b.getFontMetrics(b.getFont()),
- text, i, b.getVerticalAlignment(),
+ text, i, b.getVerticalAlignment(),
b.getHorizontalAlignment(),
b.getVerticalTextPosition(),
b.getHorizontalTextPosition(),
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicRootPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicRootPaneUI.java
index e20bc2b..26c7a53 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicRootPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicRootPaneUI.java
@@ -130,7 +130,7 @@ public class BasicRootPaneUI extends RootPaneUI
}
}
- public static ComponentUI createUI(JComponent x)
+ public static ComponentUI createUI(JComponent x)
{
return new BasicRootPaneUI();
}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java
index 400ede0..9f24f8a 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java
@@ -85,7 +85,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
*/
protected class ArrowButtonListener extends MouseAdapter
{
-
+
/**
* Move the thumb in the direction specified by the button's arrow. If
* this button is held down, then it should keep moving the thumb.
@@ -285,13 +285,13 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
currentMouseY = e.getY();
if (scrollbar.getValueIsAdjusting())
{
- int value;
- if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
- value = valueForXPosition(currentMouseX) - offset;
- else
- value = valueForYPosition(currentMouseY) - offset;
+ int value;
+ if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
+ value = valueForXPosition(currentMouseX) - offset;
+ else
+ value = valueForYPosition(currentMouseY) - offset;
- scrollbar.setValue(value);
+ scrollbar.setValue(value);
}
}
@@ -321,38 +321,38 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
int value;
if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
- value = valueForXPosition(currentMouseX);
+ value = valueForXPosition(currentMouseX);
else
- value = valueForYPosition(currentMouseY);
+ value = valueForYPosition(currentMouseY);
if (! thumbRect.contains(e.getPoint()))
{
- scrollTimer.stop();
- scrollListener.setScrollByBlock(true);
- if (value > scrollbar.getValue())
- {
- trackHighlight = INCREASE_HIGHLIGHT;
- scrollListener.setDirection(POSITIVE_SCROLL);
- }
- else
- {
- trackHighlight = DECREASE_HIGHLIGHT;
- scrollListener.setDirection(NEGATIVE_SCROLL);
- }
+ scrollTimer.stop();
+ scrollListener.setScrollByBlock(true);
+ if (value > scrollbar.getValue())
+ {
+ trackHighlight = INCREASE_HIGHLIGHT;
+ scrollListener.setDirection(POSITIVE_SCROLL);
+ }
+ else
+ {
+ trackHighlight = DECREASE_HIGHLIGHT;
+ scrollListener.setDirection(NEGATIVE_SCROLL);
+ }
scrollTimer.setDelay(100);
- scrollTimer.start();
+ scrollTimer.start();
}
else
{
- // We'd like to keep track of where the cursor
- // is inside the thumb.
- // This works because the scrollbar's value represents
- // "lower" edge of the thumb. The value at which
- // the cursor is at must be greater or equal
- // to that value.
+ // We'd like to keep track of where the cursor
+ // is inside the thumb.
+ // This works because the scrollbar's value represents
+ // "lower" edge of the thumb. The value at which
+ // the cursor is at must be greater or equal
+ // to that value.
scrollListener.setScrollByBlock(false);
- scrollbar.setValueIsAdjusting(true);
+ scrollbar.setValueIsAdjusting(true);
offset = value - scrollbar.getValue();
}
scrollbar.repaint();
@@ -394,17 +394,17 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
{
int value;
if (scrollbar.getOrientation() == HORIZONTAL)
- value = valueForXPosition(currentMouseX);
+ value = valueForXPosition(currentMouseX);
else
- value = valueForYPosition(currentMouseY);
+ value = valueForYPosition(currentMouseY);
if (thumbRect.contains(currentMouseX, currentMouseY))
return false;
-
+
if (direction == POSITIVE_SCROLL)
- return value > scrollbar.getValue();
+ return value > scrollbar.getValue();
else
- return value < scrollbar.getValue();
+ return value < scrollbar.getValue();
}
}
@@ -488,7 +488,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
/** The scrollbar this UI is acting for. */
protected JScrollBar scrollbar;
-
+
/** True if the mouse is over the thumb. */
boolean thumbRollover;
@@ -767,7 +767,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
}
/**
- * Installs the input map from the look and feel defaults, and a
+ * Installs the input map from the look and feel defaults, and a
* corresponding action map. Note the the keyboard bindings will only
* work when the {@link JScrollBar} component has the focus, which is rare.
*/
@@ -775,7 +775,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
{
InputMap keyMap = getInputMap(
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
- SwingUtilities.replaceUIInputMap(scrollbar,
+ SwingUtilities.replaceUIInputMap(scrollbar,
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, keyMap);
ActionMap map = getActionMap();
SwingUtilities.replaceUIActionMap(scrollbar, map);
@@ -788,25 +788,25 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
protected void uninstallKeyboardActions()
{
SwingUtilities.replaceUIActionMap(scrollbar, null);
- SwingUtilities.replaceUIInputMap(scrollbar,
+ SwingUtilities.replaceUIInputMap(scrollbar,
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, null);
}
- InputMap getInputMap(int condition)
+ InputMap getInputMap(int condition)
{
if (condition == JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
return (InputMap) UIManager.get("ScrollBar.focusInputMap");
return null;
}
-
+
/**
- * Returns the action map for the {@link JScrollBar}. All scroll bars
- * share a single action map which is created the first time this method is
+ * Returns the action map for the {@link JScrollBar}. All scroll bars
+ * share a single action map which is created the first time this method is
* called, then stored in the UIDefaults table for subsequent access.
- *
+ *
* @return The shared action map.
*/
- ActionMap getActionMap()
+ ActionMap getActionMap()
{
ActionMap map = (ActionMap) UIManager.get("ScrollBar.actionMap");
@@ -821,23 +821,23 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
/**
* Creates the action map shared by all {@link JSlider} instances.
- * This method is called once by {@link #getActionMap()} when it
- * finds no action map in the UIDefaults table...after the map is
- * created, it gets added to the defaults table so that subsequent
- * calls to {@link #getActionMap()} will return the same shared
+ * This method is called once by {@link #getActionMap()} when it
+ * finds no action map in the UIDefaults table...after the map is
+ * created, it gets added to the defaults table so that subsequent
+ * calls to {@link #getActionMap()} will return the same shared
* instance.
- *
+ *
* @return The action map.
*/
ActionMap createActionMap()
{
ActionMap map = new ActionMapUIResource();
- map.put("positiveUnitIncrement",
+ map.put("positiveUnitIncrement",
new AbstractAction("positiveUnitIncrement") {
public void actionPerformed(ActionEvent event)
{
JScrollBar sb = (JScrollBar) event.getSource();
- if (sb.isVisible())
+ if (sb.isVisible())
{
int delta = sb.getUnitIncrement(1);
sb.setValue(sb.getValue() + delta);
@@ -845,12 +845,12 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
}
}
);
- map.put("positiveBlockIncrement",
+ map.put("positiveBlockIncrement",
new AbstractAction("positiveBlockIncrement") {
public void actionPerformed(ActionEvent event)
{
JScrollBar sb = (JScrollBar) event.getSource();
- if (sb.isVisible())
+ if (sb.isVisible())
{
int delta = sb.getBlockIncrement(1);
sb.setValue(sb.getValue() + delta);
@@ -858,12 +858,12 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
}
}
);
- map.put("negativeUnitIncrement",
+ map.put("negativeUnitIncrement",
new AbstractAction("negativeUnitIncrement") {
public void actionPerformed(ActionEvent event)
{
JScrollBar sb = (JScrollBar) event.getSource();
- if (sb.isVisible())
+ if (sb.isVisible())
{
int delta = sb.getUnitIncrement(-1);
sb.setValue(sb.getValue() + delta);
@@ -871,12 +871,12 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
}
}
);
- map.put("negativeBlockIncrement",
+ map.put("negativeBlockIncrement",
new AbstractAction("negativeBlockIncrement") {
public void actionPerformed(ActionEvent event)
{
JScrollBar sb = (JScrollBar) event.getSource();
- if (sb.isVisible())
+ if (sb.isVisible())
{
int delta = sb.getBlockIncrement(-1);
sb.setValue(sb.getValue() + delta);
@@ -884,24 +884,24 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
}
}
);
- map.put("minScroll",
+ map.put("minScroll",
new AbstractAction("minScroll") {
public void actionPerformed(ActionEvent event)
{
JScrollBar sb = (JScrollBar) event.getSource();
- if (sb.isVisible())
+ if (sb.isVisible())
{
sb.setValue(sb.getMinimum());
}
}
}
);
- map.put("maxScroll",
+ map.put("maxScroll",
new AbstractAction("maxScroll") {
public void actionPerformed(ActionEvent event)
{
JScrollBar sb = (JScrollBar) event.getSource();
- if (sb.isVisible())
+ if (sb.isVisible())
{
sb.setValue(sb.getMaximum());
}
@@ -910,7 +910,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
);
return map;
}
-
+
/**
* This method installs any listeners for the scrollbar. This method also
* installs listeners for things such as the JButtons and the timer.
@@ -973,10 +973,10 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
{
if (scrollbarContainer instanceof JScrollBar)
{
- if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
- layoutHScrollbar((JScrollBar) scrollbarContainer);
- else
- layoutVScrollbar((JScrollBar) scrollbarContainer);
+ if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
+ layoutHScrollbar((JScrollBar) scrollbarContainer);
+ else
+ layoutVScrollbar((JScrollBar) scrollbarContainer);
}
}
@@ -992,7 +992,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
Dimension incrDims = incrButton.getPreferredSize();
Dimension decrDims = decrButton.getPreferredSize();
-
+
// calculate and update the track bounds
SwingUtilities.calculateInnerArea(scrollbar, trackRect);
trackRect.width -= incrDims.getWidth();
@@ -1000,7 +1000,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
trackRect.x += decrDims.getWidth();
updateThumbRect();
-
+
decrButton.setBounds(vr.x, vr.y, decrDims.width, trackRect.height);
incrButton.setBounds(trackRect.x + trackRect.width, vr.y, incrDims.width,
trackRect.height);
@@ -1018,13 +1018,13 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
Dimension incrDims = incrButton.getPreferredSize();
Dimension decrDims = decrButton.getPreferredSize();
-
+
// Update rectangles
SwingUtilities.calculateInnerArea(scrollbar, trackRect);
trackRect.height -= incrDims.getHeight();
trackRect.height -= decrDims.getHeight();
trackRect.y += decrDims.getHeight();
-
+
updateThumbRect();
decrButton.setBounds(vr.x, vr.y, trackRect.width, decrDims.height);
@@ -1076,14 +1076,14 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
thumbRect.height = Math.max(extent * trackRect.height / (max - min),
getMinimumThumbSize().height);
int availableHeight = trackRect.height - thumbRect.height;
- thumbRect.y = trackRect.y
+ thumbRect.y = trackRect.y
+ (value - min) * availableHeight / (max - min - extent);
thumbRect.width = trackRect.width;
}
}
}
-
+
/**
* This method returns the minimum size required for the layout.
*
@@ -1367,7 +1367,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
decrButton.removeMouseListener(buttonListener);
if (incrButton != null)
incrButton.removeMouseListener(buttonListener);
-
+
propertyChangeListener = null;
modelListener = null;
buttonListener = null;
@@ -1469,39 +1469,39 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
value = min;
return value;
}
-
+
/**
* Returns true if the mouse is over the thumb.
- *
+ *
* @return true if the mouse is over the thumb.
- *
+ *
* @since 1.5
*/
public boolean isThumbRollover()
{
- return thumbRollover;
+ return thumbRollover;
}
-
+
/**
* Set thumbRollover to active. This indicates
* whether or not the mouse is over the thumb.
- *
+ *
* @param active - true if the mouse is over the thumb.
- *
+ *
* @since 1.5
*/
protected void setThumbRollover(boolean active)
{
thumbRollover = active;
}
-
+
/**
- * Indicates whether the user can position the thumb with
+ * Indicates whether the user can position the thumb with
* a mouse click (i.e. middle button).
- *
+ *
* @return true if the user can position the thumb with a mouse
* click.
- *
+ *
* @since 1.5
*/
public boolean getSupportsAbsolutePositioning()
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java
index a719428..7123948 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java
@@ -127,7 +127,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
viewPosition.y = vsb.getValue();
vp.setViewPosition(viewPosition);
}
-
+
}
/**
@@ -144,7 +144,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
* changes. When the extents size has changed, this method calls
* {@link BasicScrollPaneUI#syncScrollPaneWithViewport()} to adjust the
* scrollbars extents as well.
- *
+ *
* @param event the change event
*/
public void stateChanged(ChangeEvent event)
@@ -221,7 +221,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
/**
* Scroll with the mouse wheel.
- *
+ *
* @author Audrius Meskauskas (audriusa@Bioinformatics.org)
*/
public void mouseWheelMoved(MouseWheelEvent e)
@@ -245,11 +245,11 @@ public class BasicScrollPaneUI extends ScrollPaneUI
}
}
}
-
+
/**
* Adds/removes the mouse wheel listener when the component is added/removed
* to/from the scroll pane view port.
- *
+ *
* @author Audrius Meskauskas (audriusa@bioinformatics.org)
*/
class ViewportContainerListener implements ContainerListener
@@ -261,7 +261,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
{
e.getChild().addMouseWheelListener(mouseWheelListener);
}
-
+
/**
* Remove the mouse wheel listener.
*/
@@ -270,18 +270,18 @@ public class BasicScrollPaneUI extends ScrollPaneUI
e.getChild().removeMouseWheelListener(mouseWheelListener);
}
}
-
+
/**
* The number of pixels by that we should scroll the content that does
* not implement Scrollable.
*/
static int SCROLL_NON_SCROLLABLES = 10;
-
+
/**
* The number of rows to scroll per mouse wheel click. From impression,
* Sun seems using the value 3.
*/
- static int ROWS_PER_WHEEL_CLICK = 3;
+ static int ROWS_PER_WHEEL_CLICK = 3;
/** The Scrollpane for which the UI is provided by this class. */
protected JScrollPane scrollpane;
@@ -310,14 +310,14 @@ public class BasicScrollPaneUI extends ScrollPaneUI
* The mousewheel listener for the scrollpane.
*/
MouseWheelListener mouseWheelListener;
-
+
/**
* The listener to add and remove the mouse wheel listener to/from
* the component container.
*/
ContainerListener containerListener;
- public static ComponentUI createUI(final JComponent c)
+ public static ComponentUI createUI(final JComponent c)
{
return new BasicScrollPaneUI();
}
@@ -348,8 +348,8 @@ public class BasicScrollPaneUI extends ScrollPaneUI
if (vpBorder != null && vpBorder instanceof UIResource)
p.setViewportBorder(null);
}
-
- public void installUI(final JComponent c)
+
+ public void installUI(final JComponent c)
{
super.installUI(c);
installDefaults((JScrollPane) c);
@@ -371,31 +371,31 @@ public class BasicScrollPaneUI extends ScrollPaneUI
if (hsbChangeListener == null)
hsbChangeListener = createHSBChangeListener();
sp.getHorizontalScrollBar().getModel().addChangeListener(hsbChangeListener);
-
+
if (vsbChangeListener == null)
vsbChangeListener = createVSBChangeListener();
sp.getVerticalScrollBar().getModel().addChangeListener(vsbChangeListener);
if (viewportChangeListener == null)
viewportChangeListener = createViewportChangeListener();
-
+
if (mouseWheelListener == null)
mouseWheelListener = createMouseWheelListener();
-
+
if (containerListener == null)
containerListener = new ViewportContainerListener();
-
+
JViewport v = sp.getViewport();
v.addChangeListener(viewportChangeListener);
v.addContainerListener(containerListener);
-
+
// Add mouse wheel listeners to the componets that are probably already
// in the view port.
for (int i = 0; i < v.getComponentCount(); i++)
v.getComponent(i).addMouseWheelListener(mouseWheelListener);
}
- InputMap getInputMap(int condition)
+ InputMap getInputMap(int condition)
{
if (condition == JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
return (InputMap) UIManager.get("ScrollPane.ancestorInputMap");
@@ -403,13 +403,13 @@ public class BasicScrollPaneUI extends ScrollPaneUI
}
/**
- * Returns the action map for the {@link JScrollPane}. All scroll panes
- * share a single action map which is created the first time this method is
+ * Returns the action map for the {@link JScrollPane}. All scroll panes
+ * share a single action map which is created the first time this method is
* called, then stored in the UIDefaults table for subsequent access.
- *
+ *
* @return The shared action map.
*/
- ActionMap getActionMap()
+ ActionMap getActionMap()
{
ActionMap map = (ActionMap) UIManager.get("ScrollPane.actionMap");
@@ -424,24 +424,24 @@ public class BasicScrollPaneUI extends ScrollPaneUI
/**
* Creates the action map shared by all {@link JSlider} instances.
- * This method is called once by {@link #getActionMap()} when it
- * finds no action map in the UIDefaults table...after the map is
- * created, it gets added to the defaults table so that subsequent
- * calls to {@link #getActionMap()} will return the same shared
+ * This method is called once by {@link #getActionMap()} when it
+ * finds no action map in the UIDefaults table...after the map is
+ * created, it gets added to the defaults table so that subsequent
+ * calls to {@link #getActionMap()} will return the same shared
* instance.
- *
+ *
* @return The action map.
*/
ActionMap createActionMap()
{
ActionMap map = new ActionMapUIResource();
- map.put("scrollLeft",
+ map.put("scrollLeft",
new AbstractAction("scrollLeft") {
public void actionPerformed(ActionEvent event)
{
JScrollPane sp = (JScrollPane) event.getSource();
JScrollBar sb = sp.getHorizontalScrollBar();
- if (sb.isVisible())
+ if (sb.isVisible())
{
int delta = sb.getBlockIncrement(-1);
sb.setValue(sb.getValue() + delta);
@@ -449,31 +449,31 @@ public class BasicScrollPaneUI extends ScrollPaneUI
}
}
);
- map.put("scrollEnd",
+ map.put("scrollEnd",
new AbstractAction("scrollEnd") {
public void actionPerformed(ActionEvent event)
{
JScrollPane sp = (JScrollPane) event.getSource();
JScrollBar sb1 = sp.getHorizontalScrollBar();
- if (sb1.isVisible())
+ if (sb1.isVisible())
{
sb1.setValue(sb1.getMaximum());
}
JScrollBar sb2 = sp.getVerticalScrollBar();
- if (sb2.isVisible())
+ if (sb2.isVisible())
{
sb2.setValue(sb2.getMaximum());
}
}
}
);
- map.put("unitScrollUp",
+ map.put("unitScrollUp",
new AbstractAction("unitScrollUp") {
public void actionPerformed(ActionEvent event)
{
JScrollPane sp = (JScrollPane) event.getSource();
JScrollBar sb = sp.getVerticalScrollBar();
- if (sb.isVisible())
+ if (sb.isVisible())
{
int delta = sb.getUnitIncrement(-1);
sb.setValue(sb.getValue() + delta);
@@ -481,13 +481,13 @@ public class BasicScrollPaneUI extends ScrollPaneUI
}
}
);
- map.put("unitScrollLeft",
+ map.put("unitScrollLeft",
new AbstractAction("unitScrollLeft") {
public void actionPerformed(ActionEvent event)
{
JScrollPane sp = (JScrollPane) event.getSource();
JScrollBar sb = sp.getHorizontalScrollBar();
- if (sb.isVisible())
+ if (sb.isVisible())
{
int delta = sb.getUnitIncrement(-1);
sb.setValue(sb.getValue() + delta);
@@ -495,13 +495,13 @@ public class BasicScrollPaneUI extends ScrollPaneUI
}
}
);
- map.put("scrollUp",
+ map.put("scrollUp",
new AbstractAction("scrollUp") {
public void actionPerformed(ActionEvent event)
{
JScrollPane sp = (JScrollPane) event.getSource();
JScrollBar sb = sp.getVerticalScrollBar();
- if (sb.isVisible())
+ if (sb.isVisible())
{
int delta = sb.getBlockIncrement(-1);
sb.setValue(sb.getValue() + delta);
@@ -509,13 +509,13 @@ public class BasicScrollPaneUI extends ScrollPaneUI
}
}
);
- map.put("scrollRight",
+ map.put("scrollRight",
new AbstractAction("scrollRight") {
public void actionPerformed(ActionEvent event)
{
JScrollPane sp = (JScrollPane) event.getSource();
JScrollBar sb = sp.getHorizontalScrollBar();
- if (sb.isVisible())
+ if (sb.isVisible())
{
int delta = sb.getBlockIncrement(1);
sb.setValue(sb.getValue() + delta);
@@ -523,31 +523,31 @@ public class BasicScrollPaneUI extends ScrollPaneUI
}
}
);
- map.put("scrollHome",
+ map.put("scrollHome",
new AbstractAction("scrollHome") {
public void actionPerformed(ActionEvent event)
{
JScrollPane sp = (JScrollPane) event.getSource();
JScrollBar sb1 = sp.getHorizontalScrollBar();
- if (sb1.isVisible())
+ if (sb1.isVisible())
{
sb1.setValue(sb1.getMinimum());
}
JScrollBar sb2 = sp.getVerticalScrollBar();
- if (sb2.isVisible())
+ if (sb2.isVisible())
{
sb2.setValue(sb2.getMinimum());
}
}
}
);
- map.put("scrollDown",
+ map.put("scrollDown",
new AbstractAction("scrollDown") {
public void actionPerformed(ActionEvent event)
{
JScrollPane sp = (JScrollPane) event.getSource();
JScrollBar sb = sp.getVerticalScrollBar();
- if (sb.isVisible())
+ if (sb.isVisible())
{
int delta = sb.getBlockIncrement(1);
sb.setValue(sb.getValue() + delta);
@@ -555,13 +555,13 @@ public class BasicScrollPaneUI extends ScrollPaneUI
}
}
);
- map.put("unitScrollDown",
+ map.put("unitScrollDown",
new AbstractAction("unitScrollDown") {
public void actionPerformed(ActionEvent event)
{
JScrollPane sp = (JScrollPane) event.getSource();
JScrollBar sb = sp.getVerticalScrollBar();
- if (sb.isVisible())
+ if (sb.isVisible())
{
int delta = sb.getUnitIncrement(1);
sb.setValue(sb.getValue() + delta);
@@ -569,13 +569,13 @@ public class BasicScrollPaneUI extends ScrollPaneUI
}
}
);
- map.put("unitScrollRight",
+ map.put("unitScrollRight",
new AbstractAction("unitScrollRight") {
public void actionPerformed(ActionEvent event)
{
JScrollPane sp = (JScrollPane) event.getSource();
JScrollBar sb = sp.getHorizontalScrollBar();
- if (sb.isVisible())
+ if (sb.isVisible())
{
int delta = sb.getUnitIncrement(1);
sb.setValue(sb.getValue() + delta);
@@ -585,7 +585,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
);
return map;
}
-
+
/**
* Installs additional keyboard actions on the scrollpane. This is a hook
* method provided to subclasses in order to install their own keyboard
@@ -597,7 +597,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
{
InputMap keyMap = getInputMap(
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
- SwingUtilities.replaceUIInputMap(sp,
+ SwingUtilities.replaceUIInputMap(sp,
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, keyMap);
ActionMap map = getActionMap();
SwingUtilities.replaceUIActionMap(sp, map);
@@ -613,10 +613,10 @@ public class BasicScrollPaneUI extends ScrollPaneUI
protected void uninstallKeyboardActions(JScrollPane sp)
{
SwingUtilities.replaceUIActionMap(sp, null);
- SwingUtilities.replaceUIInputMap(sp,
+ SwingUtilities.replaceUIInputMap(sp,
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, null);
}
-
+
/**
* Creates and returns the change listener for the horizontal scrollbar.
*
@@ -661,7 +661,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
* Creates and returns the mouse wheel listener for the scrollpane.
*
* @return the mouse wheel listener for the scrollpane
- *
+ *
* @since 1.4
*/
protected MouseWheelListener createMouseWheelListener()
@@ -669,7 +669,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
return new MouseWheelHandler();
}
- public void uninstallUI(final JComponent c)
+ public void uninstallUI(final JComponent c)
{
uninstallDefaults((JScrollPane) c);
uninstallListeners(c);
@@ -680,7 +680,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
* Uninstalls all the listeners that have been installed in
* {@link #installListeners(JScrollPane)}.
*
- * @param c the scrollpane from which to uninstall the listeners
+ * @param c the scrollpane from which to uninstall the listeners
*/
protected void uninstallListeners(JComponent c)
{
@@ -690,17 +690,17 @@ public class BasicScrollPaneUI extends ScrollPaneUI
.removeChangeListener(hsbChangeListener);
sp.getVerticalScrollBar().getModel()
.removeChangeListener(vsbChangeListener);
-
+
JViewport v = sp.getViewport();
v.removeChangeListener(viewportChangeListener);
v.removeContainerListener(containerListener);
-
+
for (int i = 0; i < v.getComponentCount(); i++)
v.getComponent(i).removeMouseWheelListener(mouseWheelListener);
}
- public Dimension getMinimumSize(JComponent c)
+ public Dimension getMinimumSize(JComponent c)
{
JScrollPane p = (JScrollPane) c;
ScrollPaneLayout sl = (ScrollPaneLayout) p.getLayout();
@@ -821,15 +821,3 @@ public class BasicScrollPaneUI extends ScrollPaneUI
syncScrollPaneWithViewport();
}
}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicSeparatorUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicSeparatorUI.java
index 97caa3a..2c80822 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicSeparatorUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicSeparatorUI.java
@@ -86,10 +86,10 @@ public class BasicSeparatorUI extends SeparatorUI
if (c instanceof JSeparator)
{
- JSeparator s = (JSeparator) c;
+ JSeparator s = (JSeparator) c;
- installDefaults(s);
- installListeners(s);
+ installDefaults(s);
+ installListeners(s);
}
}
@@ -104,10 +104,10 @@ public class BasicSeparatorUI extends SeparatorUI
{
if (c instanceof JSeparator)
{
- JSeparator s = (JSeparator) c;
+ JSeparator s = (JSeparator) c;
- uninstallListeners(s);
- uninstallDefaults(s);
+ uninstallListeners(s);
+ uninstallDefaults(s);
}
}
@@ -138,7 +138,7 @@ public class BasicSeparatorUI extends SeparatorUI
/**
* This method installs any listeners that need
- * to be attached to the JSeparator or any of its
+ * to be attached to the JSeparator or any of its
* components.
*
* @param s The JSeparator that is being installed.
@@ -156,15 +156,15 @@ public class BasicSeparatorUI extends SeparatorUI
*/
protected void uninstallListeners(JSeparator s)
{
- // Separators don't receive events.
+ // Separators don't receive events.
}
/**
- * The separator is made of two lines. The top line will be
- * the shadow color (or left line if it's vertical). The bottom
- * or right line will be the highlight color. The two lines will
- * be centered inside the bounds box. If the separator is horizontal,
- * then it will be vertically centered, or if it's vertical, it will
+ * The separator is made of two lines. The top line will be
+ * the shadow color (or left line if it's vertical). The bottom
+ * or right line will be the highlight color. The two lines will
+ * be centered inside the bounds box. If the separator is horizontal,
+ * then it will be vertically centered, or if it's vertical, it will
* be horizontally centered.
*
* @param g The Graphics object to paint with
@@ -175,15 +175,15 @@ public class BasicSeparatorUI extends SeparatorUI
Rectangle r = new Rectangle();
SwingUtilities.calculateInnerArea(c, r);
Color saved = g.getColor();
-
+
JSeparator s;
if (c instanceof JSeparator)
s = (JSeparator) c;
else
return;
-
+
if (s.getOrientation() == JSeparator.HORIZONTAL)
- {
+ {
int midAB = r.height / 2;
g.setColor(shadow);
g.drawLine(r.x, r.y + midAB - 1, r.x + r.width, r.y + midAB - 1);
@@ -204,7 +204,7 @@ public class BasicSeparatorUI extends SeparatorUI
}
/**
- * This method returns the preferred size of the
+ * This method returns the preferred size of the
* JComponent.
*
* @param c The JComponent to measure.
@@ -216,8 +216,8 @@ public class BasicSeparatorUI extends SeparatorUI
Dimension pref = new Dimension(2, 0);
if (c instanceof JSeparator)
{
- JSeparator s = (JSeparator) c;
- if (s.getOrientation() == JSeparator.HORIZONTAL)
+ JSeparator s = (JSeparator) c;
+ if (s.getOrientation() == JSeparator.HORIZONTAL)
pref = new Dimension(0, 2);
}
return pref;
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicSliderUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicSliderUI.java
index 474a422..b9d5643 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicSliderUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicSliderUI.java
@@ -81,12 +81,12 @@ import javax.swing.plaf.SliderUI;
* BasicSliderUI.java This is the UI delegate in the Basic look and feel that
* paints JSliders.
* </p>
- *
+ *
* <p>
* The UI delegate keeps track of 6 rectangles that place the various parts of
* the JSlider inside the component.
* </p>
- *
+ *
* <p>
* The rectangles are organized as follows:
* </p>
@@ -110,27 +110,27 @@ import javax.swing.plaf.SliderUI;
* | | | | | |
* | | | | |
* </pre>
- *
+ *
* <p>
* The space between the contentRect and the focusRect are the FocusInsets.
* </p>
- *
+ *
* <p>
* The space between the focusRect and the component bounds is the insetCache
* which are the component's insets.
* </p>
- *
+ *
* <p>
* The top of the thumb is the top of the contentRect. The trackRect has to be
* as tall as the thumb.
* </p>
- *
+ *
* <p>
* The trackRect and tickRect do not start from the left edge of the
* focusRect. They are trackBuffer away from each side of the focusRect. This
* is so that the thumb has room to move.
* </p>
- *
+ *
* <p>
* The labelRect does start right against the contentRect's left and right
* edges and it gets all remaining space.
@@ -420,8 +420,8 @@ public class BasicSliderUI extends SliderUI
if (slider.getSnapToTicks())
value = findClosestTick(value);
- // If the thumb is hit, then we don't need to set the timers to
- // move it.
+ // If the thumb is hit, then we don't need to set the timers to
+ // move it.
if (! thumbRect.contains(e.getPoint()))
{
// The mouse has hit some other part of the slider.
@@ -605,16 +605,16 @@ public class BasicSliderUI extends SliderUI
/**
* Returns true if the user is dragging the slider.
- *
+ *
* @return true if the slider is being dragged.
- *
+ *
* @since 1.5
*/
protected boolean isDragging()
{
return dragging;
}
-
+
/**
* Gets the shadow color to be used for this slider. The shadow color is the
* color used for drawing the top and left edges of the track.
@@ -1099,15 +1099,15 @@ public class BasicSliderUI extends SliderUI
}
/**
- * Updates the <code>contentRect</code> field to an area inside the
- * <code>focusRect</code>. This method does not need to be called if the
+ * Updates the <code>contentRect</code> field to an area inside the
+ * <code>focusRect</code>. This method does not need to be called if the
* orientation changes.
*/
protected void calculateContentRect()
{
contentRect.x = focusRect.x + focusInsets.left;
contentRect.y = focusRect.y + focusInsets.top;
-
+
contentRect.width = focusRect.width - focusInsets.left - focusInsets.right;
contentRect.height = focusRect.height - focusInsets.top
- focusInsets.bottom;
@@ -1134,9 +1134,9 @@ public class BasicSliderUI extends SliderUI
}
/**
- * Calculates the gap size between the edge of the <code>contentRect</code>
+ * Calculates the gap size between the edge of the <code>contentRect</code>
* and the edge of the <code>trackRect</code>, storing the result in the
- * <code>trackBuffer</code> field. Sufficient space needs to be reserved
+ * <code>trackBuffer</code> field. Sufficient space needs to be reserved
* for the slider thumb and/or the labels at each end of the slider track.
*/
protected void calculateTrackBuffer()
@@ -1145,11 +1145,11 @@ public class BasicSliderUI extends SliderUI
{
int w = Math.max(getWidthOfLowValueLabel(), getWidthOfHighValueLabel());
trackBuffer = Math.max(thumbRect.width / 2, w / 2);
-
+
}
else
{
- int h = Math.max(getHeightOfLowValueLabel(),
+ int h = Math.max(getHeightOfLowValueLabel(),
getHeightOfHighValueLabel());
trackBuffer = Math.max(thumbRect.height / 2, h / 2);
}
@@ -1157,10 +1157,10 @@ public class BasicSliderUI extends SliderUI
/**
* Returns the size of the slider's thumb. The size is hard coded to
- * <code>11 x 20</code> for horizontal sliders, and <code>20 x 11</code> for
- * vertical sliders. Note that a new instance of {@link Dimension} is
- * returned for every call to this method (this seems wasteful, but
- * {@link Dimension} instances are not immutable, so this is probably
+ * <code>11 x 20</code> for horizontal sliders, and <code>20 x 11</code> for
+ * vertical sliders. Note that a new instance of {@link Dimension} is
+ * returned for every call to this method (this seems wasteful, but
+ * {@link Dimension} instances are not immutable, so this is probably
* unavoidable).
*
* @return The size of the slider's thumb.
@@ -1232,7 +1232,7 @@ public class BasicSliderUI extends SliderUI
tickRect.y = trackRect.y + trackRect.height;
tickRect.width = trackRect.width;
tickRect.height = getTickLength();
-
+
// this makes our Mauve tests pass...can't explain it!
if (!slider.getPaintTicks())
{
@@ -1257,7 +1257,7 @@ public class BasicSliderUI extends SliderUI
}
/**
- * Calculates the <code>labelRect</code> field, taking into account the
+ * Calculates the <code>labelRect</code> field, taking into account the
* orientation of the slider.
*/
protected void calculateLabelRect()
@@ -1353,7 +1353,7 @@ public class BasicSliderUI extends SliderUI
* there are no labels.
*
* @return The width of the label whose key has the highest value.
- *
+ *
* @see #getHighestValueLabel()
*/
protected int getWidthOfHighValueLabel()
@@ -1370,7 +1370,7 @@ public class BasicSliderUI extends SliderUI
* there are no labels.
*
* @return The width of the label whose key has the lowest value.
- *
+ *
* @see #getLowestValueLabel()
*/
protected int getWidthOfLowValueLabel()
@@ -1455,7 +1455,7 @@ public class BasicSliderUI extends SliderUI
/**
* Returns the label whose key has the highest value.
*
- * @return The label whose key has the highest value or <code>null</code> if
+ * @return The label whose key has the highest value or <code>null</code> if
* no label table exists.
*/
protected Component getHighestValueLabel()
@@ -1527,7 +1527,7 @@ public class BasicSliderUI extends SliderUI
protected void recalculateIfOrientationChanged()
{
// Examining a test program shows that either Sun calls private
- // methods that we don't know about, or these don't do anything.
+ // methods that we don't know about, or these don't do anything.
calculateThumbSize();
calculateTrackBuffer();
calculateTrackRect();
@@ -1549,7 +1549,7 @@ public class BasicSliderUI extends SliderUI
Color saved_color = g.getColor();
g.setColor(getFocusColor());
-
+
g.drawRect(focusRect.x, focusRect.y, focusRect.width, focusRect.height);
g.setColor(saved_color);
@@ -1564,16 +1564,16 @@ public class BasicSliderUI extends SliderUI
* with the highlight color.
* </p>
* <pre>
- * a---d
- * | |
+ * a---d
+ * | |
* | | a------------------------d
* | | | |
* | | b------------------------c
* | |
- * | |
+ * | |
* b---c
* </pre>
- *
+ *
* <p>
* The b-a-d path needs to be drawn with the shadow color and the b-c-d path
* needs to be drawn with the highlight color.
@@ -1676,7 +1676,7 @@ public class BasicSliderUI extends SliderUI
}
}
- /* Minor ticks start at 1/4 of the height (or width) of the tickRect and
+ /* Minor ticks start at 1/4 of the height (or width) of the tickRect and
extend to 1/2 of the tickRect.
Major ticks start at 1/4 of the height and extend to 3/4.
@@ -1849,7 +1849,7 @@ public class BasicSliderUI extends SliderUI
* \ / | /
* d e-----d
* </pre>
- *
+ *
* <p>
* In the case of vertical thumbs, we highlight the path b-a-e-d and shadow
* the path b-c-d. In the case of horizontal thumbs, we highlight the path
@@ -1958,10 +1958,10 @@ public class BasicSliderUI extends SliderUI
/**
* Moves the thumb one block in the direction specified (a block is 1/10th
- * of the slider range). If the slider snaps to ticks, this method is
+ * of the slider range). If the slider snaps to ticks, this method is
* responsible for snapping it to a tick after the thumb has been moved.
*
- * @param direction the direction (positive values increment the thumb
+ * @param direction the direction (positive values increment the thumb
* position by one block, zero/negative values decrement the thumb position
* by one block).
*/
@@ -1981,11 +1981,11 @@ public class BasicSliderUI extends SliderUI
}
/**
- * Moves the thumb one unit in the specified direction. If the slider snaps
- * to ticks, this method is responsible for snapping it to a tick after the
+ * Moves the thumb one unit in the specified direction. If the slider snaps
+ * to ticks, this method is responsible for snapping it to a tick after the
* thumb has been moved.
*
- * @param direction the direction (positive values increment the thumb
+ * @param direction the direction (positive values increment the thumb
* position by one, zero/negative values decrement the thumb position by
* one).
*/
@@ -2021,7 +2021,7 @@ public class BasicSliderUI extends SliderUI
}
/**
- * Returns the x-coordinate (relative to the component) for the given slider
+ * Returns the x-coordinate (relative to the component) for the given slider
* value. This method assumes that the <code>trackRect</code> field is
* set up.
*
@@ -2049,8 +2049,8 @@ public class BasicSliderUI extends SliderUI
}
/**
- * Returns the y-coordinate (relative to the component) for the given slider
- * value. This method assumes that the <code>trackRect</code> field is
+ * Returns the y-coordinate (relative to the component) for the given slider
+ * value. This method assumes that the <code>trackRect</code> field is
* set up.
*
* @param value the slider value.
@@ -2093,8 +2093,8 @@ public class BasicSliderUI extends SliderUI
int value;
- // If the length is 0, you shouldn't be able to even see where the slider
- // is. This really shouldn't ever happen, but just in case, we'll return
+ // If the length is 0, you shouldn't be able to even see where the slider
+ // is. This really shouldn't ever happen, but just in case, we'll return
// the middle.
if (len == 0)
return (max - min) / 2;
@@ -2129,8 +2129,8 @@ public class BasicSliderUI extends SliderUI
int value;
- // If the length is 0, you shouldn't be able to even see where the slider
- // is. This really shouldn't ever happen, but just in case, we'll return
+ // If the length is 0, you shouldn't be able to even see where the slider
+ // is. This really shouldn't ever happen, but just in case, we'll return
// the middle.
if (len == 0)
return (max - min) / 2;
@@ -2164,14 +2164,14 @@ public class BasicSliderUI extends SliderUI
int minorSpace = slider.getMinorTickSpacing();
// The default value to return is value + minor or
- // value + major.
+ // value + major.
// Initializing at min - value leaves us with a default
// return value of min, which always has tick marks
// (if ticks are painted).
int minor = min - value;
int major = min - value;
- // If there are no major tick marks or minor tick marks
+ // If there are no major tick marks or minor tick marks
// e.g. snap is set to true but no ticks are set, then
// we can just return the value.
if (majorSpace <= 0 && minorSpace <= 0)
@@ -2208,8 +2208,8 @@ public class BasicSliderUI extends SliderUI
else
return value + minor;
}
-
- InputMap getInputMap(int condition)
+
+ InputMap getInputMap(int condition)
{
if (condition == JComponent.WHEN_FOCUSED)
return (InputMap) UIManager.get("Slider.focusInputMap");
@@ -2218,12 +2218,12 @@ public class BasicSliderUI extends SliderUI
/**
* Returns the action map for the {@link JSlider}. All sliders share
- * a single action map which is created the first time this method is
+ * a single action map which is created the first time this method is
* called, then stored in the UIDefaults table for subsequent access.
- *
+ *
* @return The shared action map.
*/
- ActionMap getActionMap()
+ ActionMap getActionMap()
{
ActionMap map = (ActionMap) UIManager.get("Slider.actionMap");
@@ -2238,18 +2238,18 @@ public class BasicSliderUI extends SliderUI
/**
* Creates the action map shared by all {@link JSlider} instances.
- * This method is called once by {@link #getActionMap()} when it
- * finds no action map in the UIDefaults table...after the map is
- * created, it gets added to the defaults table so that subsequent
- * calls to {@link #getActionMap()} will return the same shared
+ * This method is called once by {@link #getActionMap()} when it
+ * finds no action map in the UIDefaults table...after the map is
+ * created, it gets added to the defaults table so that subsequent
+ * calls to {@link #getActionMap()} will return the same shared
* instance.
- *
+ *
* @return The action map.
*/
ActionMap createActionMap()
{
ActionMap map = new ActionMapUIResource();
- map.put("positiveUnitIncrement",
+ map.put("positiveUnitIncrement",
new AbstractAction("positiveUnitIncrement") {
public void actionPerformed(ActionEvent event)
{
@@ -2262,7 +2262,7 @@ public class BasicSliderUI extends SliderUI
}
}
);
- map.put("negativeUnitIncrement",
+ map.put("negativeUnitIncrement",
new AbstractAction("negativeUnitIncrement") {
public void actionPerformed(ActionEvent event)
{
@@ -2275,7 +2275,7 @@ public class BasicSliderUI extends SliderUI
}
}
);
- map.put("positiveBlockIncrement",
+ map.put("positiveBlockIncrement",
new AbstractAction("positiveBlockIncrement") {
public void actionPerformed(ActionEvent event)
{
@@ -2288,7 +2288,7 @@ public class BasicSliderUI extends SliderUI
}
}
);
- map.put("negativeBlockIncrement",
+ map.put("negativeBlockIncrement",
new AbstractAction("negativeBlockIncrement") {
public void actionPerformed(ActionEvent event)
{
@@ -2301,7 +2301,7 @@ public class BasicSliderUI extends SliderUI
}
}
);
- map.put("minScroll",
+ map.put("minScroll",
new AbstractAction("minScroll") {
public void actionPerformed(ActionEvent event)
{
@@ -2309,11 +2309,11 @@ public class BasicSliderUI extends SliderUI
if (slider.getInverted())
slider.setValue(slider.getMaximum());
else
- slider.setValue(slider.getMinimum());
+ slider.setValue(slider.getMinimum());
}
}
);
- map.put("maxScroll",
+ map.put("maxScroll",
new AbstractAction("maxScroll") {
public void actionPerformed(ActionEvent event)
{
@@ -2321,7 +2321,7 @@ public class BasicSliderUI extends SliderUI
if (slider.getInverted())
slider.setValue(slider.getMinimum());
else
- slider.setValue(slider.getMaximum());
+ slider.setValue(slider.getMaximum());
}
}
);
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicSpinnerUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicSpinnerUI.java
index 254a9a4..00c8537 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicSpinnerUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicSpinnerUI.java
@@ -173,7 +173,7 @@ public class BasicSpinnerUI extends SpinnerUI
if (e instanceof JSpinner.DefaultEditor)
{
JSpinner.DefaultEditor de = (JSpinner.DefaultEditor) e;
- de.getTextField().setBorder(null);
+ de.getTextField().setBorder(null);
}
spinner.setLayout(createLayout());
spinner.setOpaque(true);
@@ -199,36 +199,36 @@ public class BasicSpinnerUI extends SpinnerUI
{
c.addMouseListener(new MouseAdapter()
{
- public void mousePressed(MouseEvent evt)
- {
- if (! spinner.isEnabled())
- return;
- increment();
- timer.setInitialDelay(500);
- timer.start();
- }
-
- public void mouseReleased(MouseEvent evt)
- {
- timer.stop();
- }
-
- void increment()
- {
- Object next = BasicSpinnerUI.this.spinner.getNextValue();
- if (next != null)
- BasicSpinnerUI.this.spinner.getModel().setValue(next);
- }
-
- volatile boolean mouseDown;
- Timer timer = new Timer(50,
- new ActionListener()
- {
- public void actionPerformed(ActionEvent event)
- {
- increment();
- }
- });
+ public void mousePressed(MouseEvent evt)
+ {
+ if (! spinner.isEnabled())
+ return;
+ increment();
+ timer.setInitialDelay(500);
+ timer.start();
+ }
+
+ public void mouseReleased(MouseEvent evt)
+ {
+ timer.stop();
+ }
+
+ void increment()
+ {
+ Object next = BasicSpinnerUI.this.spinner.getNextValue();
+ if (next != null)
+ BasicSpinnerUI.this.spinner.getModel().setValue(next);
+ }
+
+ volatile boolean mouseDown;
+ Timer timer = new Timer(50,
+ new ActionListener()
+ {
+ public void actionPerformed(ActionEvent event)
+ {
+ increment();
+ }
+ });
});
}
@@ -239,36 +239,36 @@ public class BasicSpinnerUI extends SpinnerUI
{
c.addMouseListener(new MouseAdapter()
{
- public void mousePressed(MouseEvent evt)
- {
- if (! spinner.isEnabled())
- return;
- decrement();
- timer.setInitialDelay(500);
- timer.start();
- }
-
- public void mouseReleased(MouseEvent evt)
- {
- timer.stop();
- }
-
- void decrement()
- {
- Object prev = BasicSpinnerUI.this.spinner.getPreviousValue();
- if (prev != null)
- BasicSpinnerUI.this.spinner.getModel().setValue(prev);
- }
-
- volatile boolean mouseDown;
- Timer timer = new Timer(50,
- new ActionListener()
- {
- public void actionPerformed(ActionEvent event)
- {
- decrement();
- }
- });
+ public void mousePressed(MouseEvent evt)
+ {
+ if (! spinner.isEnabled())
+ return;
+ decrement();
+ timer.setInitialDelay(500);
+ timer.start();
+ }
+
+ public void mouseReleased(MouseEvent evt)
+ {
+ timer.stop();
+ }
+
+ void decrement()
+ {
+ Object prev = BasicSpinnerUI.this.spinner.getPreviousValue();
+ if (prev != null)
+ BasicSpinnerUI.this.spinner.getModel().setValue(prev);
+ }
+
+ volatile boolean mouseDown;
+ Timer timer = new Timer(50,
+ new ActionListener()
+ {
+ public void actionPerformed(ActionEvent event)
+ {
+ decrement();
+ }
+ });
});
}
@@ -384,7 +384,7 @@ public class BasicSpinnerUI extends SpinnerUI
Dimension e = prefSize(editor);
Dimension n = prefSize(next);
Dimension p = prefSize(previous);
- Dimension s = parent.getSize();
+ Dimension s = parent.getSize();
int x = l2r ? i.left : i.right;
int y = i.top;
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneDivider.java b/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneDivider.java
index 95468ca..53f7db6 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneDivider.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneDivider.java
@@ -61,7 +61,7 @@ import javax.swing.border.Border;
/**
* The divider that separates the two parts of a JSplitPane in the Basic look
* and feel.
- *
+ *
* <p>
* Implementation status: We do not have a real implementation yet. Currently,
* it is mostly a stub to allow compiling other parts of the
@@ -138,62 +138,62 @@ public class BasicSplitPaneDivider extends Container
public void paint(Graphics g)
{
if (splitPane != null)
- {
- // Fill background.
- g.setColor(splitPane.getBackground());
- g.fillRect(0, 0, getWidth(), getHeight());
-
- // Draw arrow.
- int size;
- if (direction == LEFT)
- {
- if (orientation == JSplitPane.VERTICAL_SPLIT)
- {
- size = Math.min(getHeight(), ONE_TOUCH_SIZE);
- xpoints[0] = 0;
- xpoints[1] = size / 2;
- xpoints[2] = size;
- ypoints[0] = size;
- ypoints[1] = 0;
- ypoints[2] = size;
- }
- else
- {
- size = Math.min(getWidth(), ONE_TOUCH_SIZE);
- xpoints[0] = size;
- xpoints[1] = 0;
- xpoints[2] = size;
- ypoints[0] = 0;
- ypoints[1] = size / 2;
- ypoints[2] = size;
- }
- }
- else
- {
- if (orientation == JSplitPane.VERTICAL_SPLIT)
- {
- size = Math.min(getHeight(), ONE_TOUCH_SIZE);
- xpoints[0] = 0;
- xpoints[1] = size / 2;
- xpoints[2] = size;
- ypoints[0] = 0;
- ypoints[1] = size;
- ypoints[2] = 0;
- }
- else
- {
- size = Math.min(getWidth(), ONE_TOUCH_SIZE);
- xpoints[0] = 0;
- xpoints[1] = size;
- xpoints[2] = 0;
- ypoints[0] = 0;
- ypoints[1] = size / 2;
- ypoints[2] = size;
- }
- }
- g.setColor(Color.BLACK);
- g.fillPolygon(xpoints, ypoints, 3);
- }
+ {
+ // Fill background.
+ g.setColor(splitPane.getBackground());
+ g.fillRect(0, 0, getWidth(), getHeight());
+
+ // Draw arrow.
+ int size;
+ if (direction == LEFT)
+ {
+ if (orientation == JSplitPane.VERTICAL_SPLIT)
+ {
+ size = Math.min(getHeight(), ONE_TOUCH_SIZE);
+ xpoints[0] = 0;
+ xpoints[1] = size / 2;
+ xpoints[2] = size;
+ ypoints[0] = size;
+ ypoints[1] = 0;
+ ypoints[2] = size;
+ }
+ else
+ {
+ size = Math.min(getWidth(), ONE_TOUCH_SIZE);
+ xpoints[0] = size;
+ xpoints[1] = 0;
+ xpoints[2] = size;
+ ypoints[0] = 0;
+ ypoints[1] = size / 2;
+ ypoints[2] = size;
+ }
+ }
+ else
+ {
+ if (orientation == JSplitPane.VERTICAL_SPLIT)
+ {
+ size = Math.min(getHeight(), ONE_TOUCH_SIZE);
+ xpoints[0] = 0;
+ xpoints[1] = size / 2;
+ xpoints[2] = size;
+ ypoints[0] = 0;
+ ypoints[1] = size;
+ ypoints[2] = 0;
+ }
+ else
+ {
+ size = Math.min(getWidth(), ONE_TOUCH_SIZE);
+ xpoints[0] = 0;
+ xpoints[1] = size;
+ xpoints[2] = 0;
+ ypoints[0] = 0;
+ ypoints[1] = size / 2;
+ ypoints[2] = size;
+ }
+ }
+ g.setColor(Color.BLACK);
+ g.fillPolygon(xpoints, ypoints, 3);
+ }
}
}
@@ -212,66 +212,66 @@ public class BasicSplitPaneDivider extends Container
int newLoc;
if (ev.getSource() == leftButton)
- {
- if (orientation == JSplitPane.VERTICAL_SPLIT)
- {
- if (currentLoc
- >= splitPane.getHeight() - insets.bottom - getHeight())
- {
- newLoc = Math.min(splitPane.getMaximumDividerLocation(),
- lastLoc);
- }
- else
- {
- newLoc = insets.top;
- }
- }
- else
- {
- if (currentLoc
- >= splitPane.getWidth() - insets.right - getWidth())
- {
- newLoc = Math.min(splitPane.getMaximumDividerLocation(),
- lastLoc);
- }
- else
- {
- newLoc = insets.left;
- }
- }
- }
+ {
+ if (orientation == JSplitPane.VERTICAL_SPLIT)
+ {
+ if (currentLoc
+ >= splitPane.getHeight() - insets.bottom - getHeight())
+ {
+ newLoc = Math.min(splitPane.getMaximumDividerLocation(),
+ lastLoc);
+ }
+ else
+ {
+ newLoc = insets.top;
+ }
+ }
+ else
+ {
+ if (currentLoc
+ >= splitPane.getWidth() - insets.right - getWidth())
+ {
+ newLoc = Math.min(splitPane.getMaximumDividerLocation(),
+ lastLoc);
+ }
+ else
+ {
+ newLoc = insets.left;
+ }
+ }
+ }
else
- {
- if (orientation == JSplitPane.VERTICAL_SPLIT)
- {
- if (currentLoc == insets.top)
- {
- newLoc = Math.min(splitPane.getMaximumDividerLocation(),
- lastLoc);
- }
- else
- {
- newLoc = splitPane.getHeight() - insets.top - getHeight();
- }
- }
- else
- {
- if (currentLoc == insets.left)
- {
- newLoc = Math.min(splitPane.getMaximumDividerLocation(),
- lastLoc);
- }
- else
- {
- newLoc = splitPane.getWidth() - insets.left - getWidth();
- }
- }
- }
+ {
+ if (orientation == JSplitPane.VERTICAL_SPLIT)
+ {
+ if (currentLoc == insets.top)
+ {
+ newLoc = Math.min(splitPane.getMaximumDividerLocation(),
+ lastLoc);
+ }
+ else
+ {
+ newLoc = splitPane.getHeight() - insets.top - getHeight();
+ }
+ }
+ else
+ {
+ if (currentLoc == insets.left)
+ {
+ newLoc = Math.min(splitPane.getMaximumDividerLocation(),
+ lastLoc);
+ }
+ else
+ {
+ newLoc = splitPane.getWidth() - insets.left - getWidth();
+ }
+ }
+ }
if (currentLoc != newLoc)
- {
- splitPane.setDividerLocation(newLoc);
- splitPane.setLastDividerLocation(currentLoc);
- }
+ {
+ splitPane.setDividerLocation(newLoc);
+ splitPane.setLastDividerLocation(currentLoc);
+ }
}
}
@@ -315,7 +315,7 @@ public class BasicSplitPaneDivider extends Container
/**
* The listener for handling mouse events from both the divider and the
* containing <code>JSplitPane</code>.
- *
+ *
* <p>
* The reason for also handling MouseEvents from the containing
* <code>JSplitPane</code> is that users should be able to start a drag
@@ -398,11 +398,11 @@ public class BasicSplitPaneDivider extends Container
/* Remove the connection to the existing JSplitPane. */
if (splitPane != null)
{
- splitPane.removePropertyChangeListener(this);
- removeMouseListener(mouseHandler);
- removeMouseMotionListener(mouseHandler);
- splitPane = null;
- hiddenDivider = null;
+ splitPane.removePropertyChangeListener(this);
+ removeMouseListener(mouseHandler);
+ removeMouseMotionListener(mouseHandler);
+ splitPane = null;
+ hiddenDivider = null;
}
/* Establish the connection to the new JSplitPane. */
@@ -411,11 +411,11 @@ public class BasicSplitPaneDivider extends Container
splitPane = newUI.getSplitPane();
if (splitPane != null)
{
- splitPane.addPropertyChangeListener(this);
- addMouseListener(mouseHandler);
- addMouseMotionListener(mouseHandler);
- hiddenDivider = splitPaneUI.getNonContinuousLayoutDivider();
- orientation = splitPane.getOrientation();
+ splitPane.addPropertyChangeListener(this);
+ addMouseListener(mouseHandler);
+ addMouseMotionListener(mouseHandler);
+ hiddenDivider = splitPaneUI.getNonContinuousLayoutDivider();
+ orientation = splitPane.getOrientation();
if (splitPane.isOneTouchExpandable())
oneTouchExpandableChanged();
}
@@ -465,9 +465,9 @@ public class BasicSplitPaneDivider extends Container
{
if (border != this.border)
{
- Border oldValue = this.border;
- this.border = border;
- firePropertyChange("border", oldValue, border);
+ Border oldValue = this.border;
+ this.border = border;
+ firePropertyChange("border", oldValue, border);
}
}
@@ -539,7 +539,7 @@ public class BasicSplitPaneDivider extends Container
oneTouchExpandableChanged();
else if (e.getPropertyName().equals(JSplitPane.ORIENTATION_PROPERTY))
{
- orientation = splitPane.getOrientation();
+ orientation = splitPane.getOrientation();
invalidate();
if (splitPane != null)
splitPane.revalidate();
@@ -560,8 +560,8 @@ public class BasicSplitPaneDivider extends Container
super.paint(g);
if (border != null)
{
- dividerSize = getSize();
- border.paintBorder(this, g, 0, 0, dividerSize.width, dividerSize.height);
+ dividerSize = getSize();
+ border.paintBorder(this, g, 0, 0, dividerSize.width, dividerSize.height);
}
}
@@ -573,20 +573,20 @@ public class BasicSplitPaneDivider extends Container
{
if (splitPane.isOneTouchExpandable())
{
- leftButton = createLeftOneTouchButton();
- if (leftButton != null)
- leftButton.addActionListener(new OneTouchAction());
+ leftButton = createLeftOneTouchButton();
+ if (leftButton != null)
+ leftButton.addActionListener(new OneTouchAction());
- rightButton = createRightOneTouchButton();
- if (rightButton != null)
- rightButton.addActionListener(new OneTouchAction());
+ rightButton = createRightOneTouchButton();
+ if (rightButton != null)
+ rightButton.addActionListener(new OneTouchAction());
- // Only add them when both are non-null.
- if (leftButton != null && rightButton != null)
+ // Only add them when both are non-null.
+ if (leftButton != null && rightButton != null)
{
add(leftButton);
add(rightButton);
- }
+ }
}
invalidate();
if (splitPane != null)
@@ -678,28 +678,28 @@ public class BasicSplitPaneDivider extends Container
switch (locationIndex)
{
case 1:
- splitPane.setDividerLocation(splitPane.getLastDividerLocation());
- break;
+ splitPane.setDividerLocation(splitPane.getLastDividerLocation());
+ break;
case 0:
- int top = (orientation == JSplitPane.HORIZONTAL_SPLIT) ? insets.left
- : insets.top;
- splitPane.setDividerLocation(top);
- break;
+ int top = (orientation == JSplitPane.HORIZONTAL_SPLIT) ? insets.left
+ : insets.top;
+ splitPane.setDividerLocation(top);
+ break;
case 2:
- int bottom;
- if (orientation == JSplitPane.HORIZONTAL_SPLIT)
- bottom = splitPane.getBounds().width - insets.right - dividerSize;
- else
- bottom = splitPane.getBounds().height - insets.bottom - dividerSize;
- splitPane.setDividerLocation(bottom);
- break;
+ int bottom;
+ if (orientation == JSplitPane.HORIZONTAL_SPLIT)
+ bottom = splitPane.getBounds().width - insets.right - dividerSize;
+ else
+ bottom = splitPane.getBounds().height - insets.bottom - dividerSize;
+ splitPane.setDividerLocation(bottom);
+ break;
}
}
/**
* The listener for handling mouse events from both the divider and the
* containing <code>JSplitPane</code>.
- *
+ *
* <p>
* The reason for also handling MouseEvents from the containing
* <code>JSplitPane</code> is that users should be able to start a drag
@@ -724,9 +724,9 @@ public class BasicSplitPaneDivider extends Container
isDragging = true;
currentDividerLocation = 1;
if (orientation == JSplitPane.HORIZONTAL_SPLIT)
- dragger = new DragController(e);
+ dragger = new DragController(e);
else
- dragger = new VerticalDragController(e);
+ dragger = new VerticalDragController(e);
prepareForDragging();
}
@@ -836,7 +836,7 @@ public class BasicSplitPaneDivider extends Container
protected void continueDrag(int newX, int newY)
{
if (isValid())
- dragDividerTo(adjust(newX, newY));
+ dragDividerTo(adjust(newX, newY));
}
/**
@@ -848,7 +848,7 @@ public class BasicSplitPaneDivider extends Container
protected void continueDrag(MouseEvent e)
{
if (isValid())
- dragDividerTo(positionForMouseEvent(e));
+ dragDividerTo(positionForMouseEvent(e));
}
/**
@@ -1000,7 +1000,7 @@ public class BasicSplitPaneDivider extends Container
x = insets.left;
y = 0;
}
-
+
leftButton.setBounds(x, y + ONE_TOUCH_OFFSET, size,
size * 2);
rightButton.setBounds(x, y + ONE_TOUCH_OFFSET
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java
index b7cc425..ca96075 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java
@@ -89,7 +89,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
// 3 components at a time.
// LEFT/TOP = 0
// RIGHT/BOTTOM = 1
- // DIVIDER = 2
+ // DIVIDER = 2
/**
* This array contains the components in the JSplitPane. The left/top
@@ -338,7 +338,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
// Layout divider.
loc += sizes[0];
setComponentToSize(components[2], sizes[2], loc, insets, dims);
- // Layout component#2.
+ // Layout component#2.
loc += sizes[2];
setComponentToSize(components[1], sizes[1], loc, insets, dims);
}
@@ -483,7 +483,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
*/
protected void setComponentToSize(Component c, int size, int location,
Insets insets, Dimension containerSize)
- {
+ {
if (insets != null)
{
if (axis == SwingConstants.HORIZONTAL)
@@ -752,7 +752,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
tmpSizes[0] += newSpace / 2;
tmpSizes[1] += newSpace / 2;
-
+
layoutManager.setSizes(tmpSizes);
}
else if (e.getPropertyName().equals(JSplitPane.ORIENTATION_PROPERTY))
@@ -986,12 +986,12 @@ public class BasicSplitPaneUI extends SplitPaneUI
/**
* Returns the input map for the specified condition.
- *
+ *
* @param condition the condition.
- *
+ *
* @return The input map.
*/
- InputMap getInputMap(int condition)
+ InputMap getInputMap(int condition)
{
if (condition == JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
return (InputMap) UIManager.get("SplitPane.ancestorInputMap");
@@ -1000,12 +1000,12 @@ public class BasicSplitPaneUI extends SplitPaneUI
/**
* Returns the action map for the {@link JSplitPane}. All sliders share
- * a single action map which is created the first time this method is
+ * a single action map which is created the first time this method is
* called, then stored in the UIDefaults table for subsequent access.
- *
+ *
* @return The shared action map.
*/
- ActionMap getActionMap()
+ ActionMap getActionMap()
{
ActionMap map = (ActionMap) UIManager.get("SplitPane.actionMap");
@@ -1020,18 +1020,18 @@ public class BasicSplitPaneUI extends SplitPaneUI
/**
* Creates the action map shared by all {@link JSlider} instances.
- * This method is called once by {@link #getActionMap()} when it
- * finds no action map in the UIDefaults table...after the map is
- * created, it gets added to the defaults table so that subsequent
- * calls to {@link #getActionMap()} will return the same shared
+ * This method is called once by {@link #getActionMap()} when it
+ * finds no action map in the UIDefaults table...after the map is
+ * created, it gets added to the defaults table so that subsequent
+ * calls to {@link #getActionMap()} will return the same shared
* instance.
- *
+ *
* @return The action map.
*/
ActionMap createActionMap()
{
ActionMap map = new ActionMapUIResource();
- map.put("toggleFocus",
+ map.put("toggleFocus",
new AbstractAction("toggleFocus") {
public void actionPerformed(ActionEvent event)
{
@@ -1039,7 +1039,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
}
}
);
- map.put("startResize",
+ map.put("startResize",
new AbstractAction("startResize") {
public void actionPerformed(ActionEvent event)
{
@@ -1047,7 +1047,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
}
}
);
- map.put("selectMax",
+ map.put("selectMax",
new AbstractAction("selectMax") {
public void actionPerformed(ActionEvent event)
{
@@ -1055,7 +1055,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
}
}
);
- map.put("selectMin",
+ map.put("selectMin",
new AbstractAction("selectMin") {
public void actionPerformed(ActionEvent event)
{
@@ -1063,7 +1063,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
}
}
);
- map.put("negativeIncrement",
+ map.put("negativeIncrement",
new AbstractAction("negativeIncrement") {
public void actionPerformed(ActionEvent event)
{
@@ -1074,7 +1074,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
}
}
);
- map.put("positiveIncrement",
+ map.put("positiveIncrement",
new AbstractAction("positiveIncrement") {
public void actionPerformed(ActionEvent event)
{
@@ -1092,7 +1092,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
// FIXME: implement this
}
}
- );
+ );
map.put("focusOutForward",
new AbstractAction("focusOutForward") {
public void actionPerformed(ActionEvent event)
@@ -1100,7 +1100,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
// FIXME: implement this
}
}
- );
+ );
return map;
}
@@ -1112,7 +1112,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
{
InputMap keyMap = getInputMap(
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
- SwingUtilities.replaceUIInputMap(splitPane,
+ SwingUtilities.replaceUIInputMap(splitPane,
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, keyMap);
ActionMap map = getActionMap();
SwingUtilities.replaceUIActionMap(splitPane, map);
@@ -1124,7 +1124,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
protected void uninstallKeyboardActions()
{
SwingUtilities.replaceUIActionMap(splitPane, null);
- SwingUtilities.replaceUIInputMap(splitPane,
+ SwingUtilities.replaceUIInputMap(splitPane,
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, null);
}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java
index fe36021..c42f9ca 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java
@@ -82,7 +82,7 @@ import javax.swing.text.View;
/**
* This is the Basic Look and Feel's UI delegate for JTabbedPane.
- *
+ *
* @author Lillian Angel (langel@redhat.com)
* @author Kim Ho (kho@redhat.com)
* @author Roman Kennke (kennke@aicas.com)
@@ -90,11 +90,11 @@ import javax.swing.text.View;
*/
public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
{
-
+
static class NavigateAction extends AbstractAction
{
int direction;
-
+
NavigateAction(String name, int dir)
{
super(name);
@@ -108,9 +108,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
ui.navigateSelectedTab(direction);
}
-
+
}
-
+
static class NavigatePageDownAction extends AbstractAction
{
@@ -123,17 +123,17 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
{
JTabbedPane tp = (JTabbedPane) event.getSource();
BasicTabbedPaneUI ui = (BasicTabbedPaneUI) tp.getUI();
-
+
int i = tp.getSelectedIndex();
-
+
if (i < 0)
i = 0;
-
+
ui.selectNextTabInRun(i);
}
-
+
}
-
+
static class NavigatePageUpAction extends AbstractAction
{
@@ -146,17 +146,17 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
{
JTabbedPane tp = (JTabbedPane) event.getSource();
BasicTabbedPaneUI ui = (BasicTabbedPaneUI) tp.getUI();
-
+
int i = tp.getSelectedIndex();
-
+
if (i < 0)
i = 0;
-
+
ui.selectPreviousTabInRun(i);
- }
+ }
}
-
+
static class RequestFocusAction extends AbstractAction
{
@@ -169,7 +169,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
{
((JTabbedPane) event.getSource()).requestFocus();
}
-
+
}
static class RequestFocusForVisibleComponentAction extends AbstractAction
@@ -183,18 +183,18 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
public void actionPerformed(ActionEvent event)
{
JTabbedPane tp = (JTabbedPane) event.getSource();
-
+
// FIXME: This should select a suitable component within
// the tab content. However I dont know whether we have
// to search for this component or wether the called is
// supposed to do that.
tp.getSelectedComponent().requestFocus();
}
-
+
}
/**
- * A helper class that handles focus.
+ * A helper class that handles focus.
* <p>The purpose of this class is to implement a more flexible focus
* handling for the tabbed pane, which is used to determine whether the
* focus indicator should be painted or not. When in scrolling layout
@@ -262,7 +262,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
e.setSource(s);
}
}
-
+
/**
* This method is called when the mouse is pressed. The index cannot
* change to a tab that is not enabled.
@@ -281,9 +281,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
redispatchEvent(e);
e.setSource(s);
}
-
+
int placement = tabPane.getTabPlacement();
-
+
if (s == incrButton)
{
if(!incrButton.isEnabled())
@@ -294,7 +294,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
switch (placement)
{
case JTabbedPane.TOP:
- case JTabbedPane.BOTTOM:
+ case JTabbedPane.BOTTOM:
currentScrollOffset = getTabAreaInsets(placement).left;
for (int i = 0; i < currentScrollLocation; i++)
currentScrollOffset += rects[i].width;
@@ -305,30 +305,30 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
currentScrollOffset += rects[i].height;
break;
}
-
+
updateViewPosition();
updateButtons();
-
+
tabPane.repaint();
}
else if (s == decrButton)
{
if(!decrButton.isEnabled())
return;
-
+
// The scroll location may be zero but the offset
// greater than zero because of an adjustement to
// make a partially visible tab completely visible.
if (currentScrollLocation > 0)
currentScrollLocation--;
-
+
// Set the offset back to 0 and recompute it.
currentScrollOffset = 0;
switch (placement)
{
case JTabbedPane.TOP:
- case JTabbedPane.BOTTOM:
+ case JTabbedPane.BOTTOM:
// Take the tab area inset into account.
if (currentScrollLocation > 0)
currentScrollOffset = getTabAreaInsets(placement).left;
@@ -340,14 +340,14 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
// Take the tab area inset into account.
if (currentScrollLocation > 0)
currentScrollOffset = getTabAreaInsets(placement).top;
-
+
for (int i = 0; i < currentScrollLocation; i++)
currentScrollOffset += rects[i].height;
- }
-
+ }
+
updateViewPosition();
updateButtons();
-
+
tabPane.repaint();
}
else if (tabPane.isEnabled())
@@ -355,12 +355,12 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
int index = tabForCoordinate(tabPane, e.getX(), e.getY());
if (!tabPane.isEnabledAt(index))
return;
-
+
if (tabPane.getTabLayoutPolicy() == JTabbedPane.SCROLL_TAB_LAYOUT
&& s == panel)
{
scrollTab(index, placement);
-
+
tabPane.setSelectedIndex(index);
tabPane.repaint();
}
@@ -370,9 +370,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
tabPane.revalidate();
tabPane.repaint();
}
-
+
}
-
+
}
/**
@@ -393,7 +393,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
redispatchEvent(e);
e.setSource(s);
}
-
+
int tabIndex = tabForCoordinate(tabPane, e.getX(), e.getY());
setRolloverTab(tabIndex);
}
@@ -416,7 +416,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
redispatchEvent(e);
e.setSource(s);
}
-
+
setRolloverTab(-1);
}
@@ -434,17 +434,17 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
{
ev.setSource(tabPane);
tabPane.dispatchEvent(ev);
-
+
ev.setSource(s);
}
int tabIndex = tabForCoordinate(tabPane, ev.getX(), ev.getY());
setRolloverTab(tabIndex);
}
-
- /** Modifies the mouse event to originate from
+
+ /** Modifies the mouse event to originate from
* the tabbed pane and redispatches it.
- *
+ *
* @param me
*/
void redispatchEvent(MouseEvent me)
@@ -455,10 +455,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
viewPos.y -= viewport.getY();
me.translatePoint(-viewPos.x, -viewPos.y);
tabPane.dispatchEvent(me);
-
+
me.translatePoint(viewPos.x, viewPos.y);
}
-
+
}
/**
@@ -483,18 +483,18 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
if (e.getPropertyName().equals("tabLayoutPolicy"))
{
currentScrollLocation = currentScrollOffset = 0;
-
+
layoutManager = createLayoutManager();
-
+
tabPane.setLayout(layoutManager);
}
else if (e.getPropertyName().equals("tabPlacement")
- && tabPane.getTabLayoutPolicy()
+ && tabPane.getTabLayoutPolicy()
== JTabbedPane.SCROLL_TAB_LAYOUT)
{
incrButton = createIncreaseButton();
decrButton = createDecreaseButton();
-
+
// If the tab placement value was changed of a tabbed pane
// in SCROLL_TAB_LAYOUT mode we investigate the change to
// implement the following behavior which was observed in
@@ -502,7 +502,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
// The scrolling offset will be reset if we change to
// a direction which is orthogonal to the current
// direction and stays the same if it is parallel.
-
+
int oldPlacement = ((Integer) e.getOldValue()).intValue();
int newPlacement = ((Integer) e.getNewValue()).intValue();
switch (newPlacement)
@@ -512,22 +512,22 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
if (oldPlacement == JTabbedPane.TOP
|| oldPlacement == JTabbedPane.BOTTOM)
break out;
-
+
currentScrollOffset = getTabAreaInsets(newPlacement).left;
break;
default:
if (oldPlacement == JTabbedPane.LEFT
|| oldPlacement == JTabbedPane.RIGHT)
break out;
-
+
currentScrollOffset = getTabAreaInsets(newPlacement).top;
}
-
+
updateViewPosition();
updateButtons();
}
}
-
+
tabPane.revalidate();
tabPane.repaint();
}
@@ -592,7 +592,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
c = tabPane.getComponentAt(i);
if (c == null)
continue;
- dims = minimum ? c.getMinimumSize() : c.getPreferredSize();
+ dims = minimum ? c.getMinimumSize() : c.getPreferredSize();
if (dims != null)
{
height = Math.max(height, dims.height);
@@ -605,7 +605,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
|| tabPlacement == SwingConstants.BOTTOM)
{
width = Math.max(calculateMaxTabWidth(tabPlacement), width);
-
+
height += preferredTabAreaHeight(tabPlacement,
width - tabAreaInsets.left
- tabAreaInsets.right);
@@ -613,7 +613,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
else
{
height = Math.max(calculateMaxTabHeight(tabPlacement), height);
-
+
width += preferredTabAreaWidth(tabPlacement,
height - tabAreaInsets.top
- tabAreaInsets.bottom);
@@ -648,7 +648,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
Insets insets = tabPane.getInsets();
Insets tabAreaInsets = getTabAreaInsets(tabPlacement);
Dimension size = tabPane.getSize();
-
+
// The coordinates of the upper left corner of the tab area.
int x;
int y;
@@ -787,11 +787,11 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
rotateTabRuns(tabPlacement, selectedRun);
}
}
-
+
// Suppress padding if we have only one tab run.
if (runCount == 1)
return;
-
+
// Pad the runs.
int tabRunOverlay = getTabRunOverlay(tabPlacement);
for (int i = runCount - 1; i >= 0; --i)
@@ -838,7 +838,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
x -= maxTabWidth - tabRunOverlay;
else
x += maxTabWidth - tabRunOverlay;
-
+
}
}
padSelectedTab(tabPlacement, selectedIndex);
@@ -859,13 +859,13 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
Insets insets = tabPane.getInsets();
int selectedIndex = tabPane.getSelectedIndex();
-
+
Component selectedComponent = null;
if (selectedIndex >= 0)
selectedComponent = tabPane.getComponentAt(selectedIndex);
// The RI doesn't seem to change the component if the new selected
// component == null. This is probably so that applications can add
- // one single component for every tab.
+ // one single component for every tab.
if (selectedComponent != null)
{
setVisibleComponent(selectedComponent);
@@ -892,7 +892,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
compX = insets.left + contentBorderInsets.left;
compY = insets.top + contentBorderInsets.top;
break;
- case BOTTOM:
+ case BOTTOM:
tabAreaHeight = calculateTabAreaHeight(tabPlacement, runCount,
maxTabHeight);
compX = insets.left + contentBorderInsets.left;
@@ -902,7 +902,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
default:
tabAreaHeight = calculateTabAreaHeight(tabPlacement, runCount,
maxTabHeight);
-
+
compX = insets.left + contentBorderInsets.left;
compY = tabAreaHeight + insets.top + contentBorderInsets.top;
}
@@ -938,9 +938,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
// If there is more free space in an adjacent run AND the tab
// in the run can fit in the adjacent run, move it. This method
// is not perfect, it is merely an approximation.
- // If you play around with Sun's JTabbedPane, you'll see that
- // it does do some pretty strange things with regards to not moving tabs
- // that should be moved.
+ // If you play around with Sun's JTabbedPane, you'll see that
+ // it does do some pretty strange things with regards to not moving tabs
+ // that should be moved.
// start = the x position where the tabs will begin
// max = the maximum position of where the tabs can go to
// (tabAreaInsets.left + the width of the tab area)
@@ -1046,7 +1046,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
int runWidth = rects[end].x + rects[end].width;
int spaceRemaining = max - runWidth;
int numTabs = end - start + 1;
-
+
// now divvy up the space.
int spaceAllocated = spaceRemaining / numTabs;
int currX = rects[start].x;
@@ -1054,13 +1054,13 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
{
rects[i].x = currX;
rects[i].width += spaceAllocated;
-
+
currX += rects[i].width;
- // This is used because since the spaceAllocated
+ // This is used because since the spaceAllocated
// variable is an int, it rounds down. Sometimes,
// we don't fill an entire row, so we make it do
// so now.
-
+
if (i == end && rects[i].x + rects[i].width != max)
rects[i].width = max - rects[i].x;
}
@@ -1332,11 +1332,11 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
for (int i = 0; i < tabCount; i++)
{
width = calculateTabWidth(tabPlacement, i, fm);
-
+
// The proper instances should exists because
// assureRectsCreated() was being run already.
rects[i].setBounds(runWidth, top, width, maxHeight);
-
+
runWidth += width;
}
tabAreaRect.width = tabPane.getWidth() - insets.left - insets.right;
@@ -1396,7 +1396,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
tabAreaRect.x = contentRect.x + contentRect.width;
}
}
-
+
// Unlike the behavior in the WRAP_TAB_LAYOUT the selected
// tab is not padded specially.
}
@@ -1415,7 +1415,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
if (tabCount == 0)
return;
int tabPlacement = tabPane.getTabPlacement();
-
+
if (tabPlacement == SwingConstants.TOP
|| tabPlacement == SwingConstants.BOTTOM)
{
@@ -1452,11 +1452,11 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
- incrDims.height,
incrDims.width, incrDims.height);
}
-
+
tabAreaRect.width -= decrDims.width + incrDims.width;
-
+
updateButtons();
-
+
incrButton.setVisible(true);
decrButton.setVisible(true);
}
@@ -1464,7 +1464,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
{
incrButton.setVisible(false);
decrButton.setVisible(false);
-
+
currentScrollOffset = 0;
currentScrollLocation = 0;
}
@@ -1524,9 +1524,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
}
viewport.setBounds(tabAreaRect.x, tabAreaRect.y, tabAreaRect.width,
tabAreaRect.height);
-
+
updateViewPosition();
-
+
viewport.repaint();
}
}
@@ -1550,7 +1550,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
{
selectedRun = getRunForTab(tabPane.getTabCount(),
tabPane.getSelectedIndex());
-
+
if (tabPane.getTabLayoutPolicy() == JTabbedPane.WRAP_TAB_LAYOUT)
tabPane.revalidate();
tabPane.repaint();
@@ -1587,7 +1587,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
else
g.fillRect(0, currentScrollOffset,
tabAreaRect.width, tabAreaRect.height);
-
+
paintTabArea(g, placement, tabPane.getSelectedIndex());
}
}
@@ -1649,7 +1649,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
/** The starting visible tab in the run in SCROLL_TAB_MODE.
* This is package-private to avoid an accessor method. */
transient int currentScrollLocation;
-
+
transient int currentScrollOffset;
/** A reusable rectangle. */
@@ -1789,13 +1789,13 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
* The currently visible component.
*/
private Component visibleComponent;
-
+
private Color selectedColor;
-
+
private Rectangle tempTextRect = new Rectangle();
-
+
private Rectangle tempIconRect = new Rectangle();
-
+
/**
* Creates a new BasicTabbedPaneUI object.
*/
@@ -1884,10 +1884,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
Point p = new Point(w, h);
return p;
}
-
+
/** TabbedPanes in scrolling mode should use this method to
* scroll properly to the tab given by the index argument.
- *
+ *
* @param index The tab to scroll to.
* @param placement The tab's placement.
*/
@@ -1902,7 +1902,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
switch (placement)
{
case JTabbedPane.TOP:
- case JTabbedPane.BOTTOM:
+ case JTabbedPane.BOTTOM:
if ((diff = rects[index].x
+ rects[index].width
- decrButton.getX() - currentScrollOffset) > 0)
@@ -1930,17 +1930,17 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
else
currentScrollOffset += diff;
}
-
+
currentScrollLocation = tabForCoordinate(tabPane,
rects[index].x,
currentScrollOffset);
}
-
+
updateViewPosition();
updateButtons();
}
}
-
+
/** Sets the enabled state of the increase and decrease button
* according to the current scrolling offset and tab pane width
* (or height in TOP/BOTTOM placement).
@@ -1948,7 +1948,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
final void updateButtons()
{
int tc = tabPane.getTabCount();
-
+
// The increase button should be enabled as long as the
// right/bottom border of the last tab is under the left/top
// border of the decrease button.
@@ -1978,7 +1978,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
final void updateViewPosition()
{
Point p = viewport.getViewPosition();
-
+
// The unneeded coordinate must be set to zero
// in order to correctly handle placement changes.
switch (tabPane.getTabPlacement())
@@ -1992,10 +1992,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
p.x = currentScrollOffset;
p.y = 0;
}
-
+
viewport.setViewPosition(p);
}
-
+
/**
* This method creates a new BasicTabbedPaneUI.
*
@@ -2019,12 +2019,12 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
if (c instanceof JTabbedPane)
{
tabPane = (JTabbedPane) c;
-
+
installComponents();
installDefaults();
installListeners();
installKeyboardActions();
-
+
layoutManager = createLayoutManager();
tabPane.setLayout(layoutManager);
}
@@ -2063,7 +2063,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
{
runCount = 1;
tabRuns[0] = 0;
-
+
incrButton = createIncreaseButton();
incrButton.addMouseListener(mouseListener);
@@ -2075,16 +2075,16 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
panel.setSize(Integer.MAX_VALUE, Integer.MAX_VALUE);
panel.addMouseListener(mouseListener);
panel.addFocusListener(focusListener);
-
+
viewport = new ScrollingViewport();
viewport.setBackground(Color.LIGHT_GRAY);
viewport.setView(panel);
viewport.setLayout(null);
-
+
tabPane.add(incrButton);
tabPane.add(decrButton);
tabPane.add(viewport);
-
+
return new TabbedPaneScrollLayout();
}
}
@@ -2104,7 +2104,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
{
if (incrButton != null)
tabPane.remove(incrButton);
-
+
if (decrButton != null)
tabPane.remove(decrButton);
@@ -2140,7 +2140,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
contentBorderInsets
= UIManager.getInsets("TabbedPane.contentBorderInsets");
tabsOpaque = UIManager.getBoolean("TabbedPane.tabsOpaque");
-
+
// Although 'TabbedPane.contentAreaColor' is not defined in the defaults
// of BasicLookAndFeel it is used by this class.
selectedColor = UIManager.getColor("TabbedPane.contentAreaColor");
@@ -2162,7 +2162,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
tabAreaRect = null;
contentRect = null;
tabRuns = null;
-
+
tempIconRect = null;
tempTextRect = null;
@@ -2176,7 +2176,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
shadow = null;
lightHighlight = null;
highlight = null;
-
+
selectedColor = null;
}
@@ -2205,13 +2205,13 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
tabPane.removePropertyChangeListener(propertyChangeListener);
tabPane.removeChangeListener(tabChangeListener);
tabPane.removeMouseListener(mouseListener);
-
+
if (incrButton != null)
incrButton.removeMouseListener(mouseListener);
-
+
if (decrButton != null)
decrButton.removeMouseListener(mouseListener);
-
+
if (panel != null)
{
panel.removeMouseListener(mouseListener);
@@ -2277,7 +2277,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
.replaceUIInputMap(tabPane,
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT,
keyMap);
-
+
ActionMap map = getActionMap();
SwingUtilities.replaceUIActionMap(tabPane, map);
}
@@ -2332,11 +2332,11 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
if (tabPane.getTabCount() == 0)
return;
-
+
int index = tabPane.getSelectedIndex();
if (index < 0)
index = 0;
-
+
int tabPlacement = tabPane.getTabPlacement();
// Paint the tab area only in WRAP_TAB_LAYOUT Mode from this method
@@ -2349,7 +2349,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
tabAreaRect.width, tabAreaRect.height);
paintTabArea(g, tabPlacement, index);
}
-
+
paintContentBorder(g, tabPlacement, index);
}
@@ -2363,9 +2363,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
*/
protected void paintTabArea(Graphics g, int tabPlacement, int selectedIndex)
{
- // Please note: the ordering of the painting is important.
+ // Please note: the ordering of the painting is important.
// we WANT to paint the outermost run first and then work our way in.
-
+
// The following drawing code works for both tab layouts.
int tabCount = tabPane.getTabCount();
@@ -2387,7 +2387,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
}
}
}
-
+
// Paint selected tab in front of every other tab.
if (selectedIndex >= 0)
paintTab(g, tabPlacement, rects, selectedIndex,
@@ -2430,10 +2430,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
// Paint the text.
paintText(g, tabPlacement, tabPane.getFont(), fm, tabIndex, title,
textRect, isSelected);
-
+
// Paint icon if necessary.
paintIcon(g, tabPlacement, tabIndex, icon, iconRect, isSelected);
-
+
// Paint focus indicator.
paintFocusIndicator(g, tabPlacement, rects, tabIndex, iconRect, textRect,
isSelected);
@@ -2675,7 +2675,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
w = rect.width - 6;
h = rect.height - 5;
}
-
+
BasicGraphicsUtils.drawDashedRect(g, x, y, w, h);
}
}
@@ -2707,44 +2707,44 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
g.setColor(darkShadow);
// Outer right line.
g.drawLine(x + w - 1, y + 2, x + w - 1, y + h);
-
+
// Upper right corner.
g.drawLine(x + w - 2, y + 1, x + w - 1, y + 2);
-
+
g.setColor(lightHighlight);
-
+
// Left line.
g.drawLine(x, y + 3, x, y + h);
-
+
// Upper line.
g.drawLine(x + 3, y, x + w - 3, y);
-
+
// Upper left corner.
g.drawLine(x, y + 2, x + 2, y);
-
+
break;
case SwingConstants.LEFT:
g.setColor(lightHighlight);
// Top line.
g.drawLine(x + 3, y, x + w - 1, y);
-
+
// Top left border.
g.drawLine(x + 2, y, x, y + 2);
-
+
// Left line.
g.drawLine(x, y + 3, x, y + h - 4);
-
+
// Bottom left corner.
g.drawLine(x, y + h - 3, x + 1, y + h - 2);
-
+
g.setColor(darkShadow);
// Outer bottom line.
g.drawLine(x + 2, y + h - 1, x + w - 1, y + h - 1);
-
+
g.setColor(shadow);
// Inner bottom line.
g.drawLine(x + 2, y + h - 2, x + w - 1, y + h - 2);
-
+
break;
case SwingConstants.BOTTOM:
g.setColor(shadow);
@@ -2757,17 +2757,17 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
g.setColor(darkShadow);
// Outer right line.
g.drawLine(x + w - 1, y, x + w - 1, y + h - 3);
-
+
// Bottom right corner.
g.drawLine(x + w - 1, y + h - 2, x + w - 3, y + h);
-
+
// Bottom line.
g.drawLine(x + 2, y + h, x + w - 4, y + h);
-
+
g.setColor(lightHighlight);
// Left line.
g.drawLine(x, y, x, y + h - 3);
-
+
// Bottom left corner.
g.drawLine(x, y + h - 2, x + 1, y + h - 1);
break;
@@ -2775,31 +2775,31 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
g.setColor(lightHighlight);
// Top line.
g.drawLine(x, y, x + w - 3, y);
-
+
g.setColor(darkShadow);
// Top right corner.
g.drawLine(x + w - 2, y + 1, x + w - 1, y + 2);
-
+
// Outer right line.
g.drawLine(x + w - 1, y + 3, x + w - 1, y + h - 3);
-
+
// Bottom right corner.
g.drawLine(x + w - 2, y + h - 2, x + w - 3, y + h - 1);
-
+
// Bottom line.
g.drawLine(x, y + h - 1, x + w - 4, y + h - 1);
-
+
g.setColor(shadow);
-
+
// Inner right line.
g.drawLine(x + w - 2, y + 2, x + w - 2, y + h - 3);
-
+
// Inner bottom line.
g.drawLine(x, y + h - 2, x + w - 3, y + h - 2);
-
+
break;
}
-
+
g.setColor(saved);
}
@@ -2820,7 +2820,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
boolean isSelected)
{
Color saved = g.getColor();
-
+
if (isSelected)
g.setColor(selectedColor);
else
@@ -2931,17 +2931,17 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
{
g.drawLine(x, y, startgap, y);
g.drawLine(endgap, y, x + w - 1, y);
-
+
g.setColor(selectedColor);
g.drawLine(startgap, y, endgap - 1, y);
}
else
g.drawLine(x, y, x + w, y);
-
+
g.setColor(selectedColor);
g.drawLine(x, y + 1, x + w - 1, y + 1);
g.drawLine(x, y + 2, x + w - 1, y + 2);
-
+
g.setColor(saved);
}
@@ -2971,13 +2971,13 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
{
g.drawLine(x, y, x, startgap);
g.drawLine(x, endgap, x, y + h - 1);
-
+
g.setColor(selectedColor);
g.drawLine(x, startgap, x, endgap - 1);
}
else
g.drawLine(x, y, x, y + h - 1);
-
+
g.setColor(selectedColor);
g.drawLine(x + 1, y + 1, x + 1, y + h - 4);
@@ -3014,7 +3014,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
g.setColor(darkShadow);
g.drawLine(x, y + h - 1, startgap , y + h - 1);
g.drawLine(endgap, y + h - 1, x + w - 1, y + h - 1);
-
+
g.setColor(selectedColor);
g.drawLine(startgap, y + h - 1, endgap - 1, y + h - 1);
g.drawLine(startgap, y + h - 2, endgap - 1, y + h - 2);
@@ -3026,7 +3026,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
g.setColor(darkShadow);
g.drawLine(x, y + h - 1, x + w - 1, y + h - 1);
}
-
+
g.setColor(selectedColor);
g.drawLine(x + 1, y + h - 3, x + w - 2, y + h - 3);
@@ -3062,7 +3062,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
g.setColor(darkShadow);
g.drawLine(x + w - 1, y, x + w - 1, startgap);
g.drawLine(x + w - 1, endgap, x + w - 1, y + h - 2);
-
+
g.setColor(selectedColor);
g.drawLine(x + w - 2, startgap, x + w - 2, endgap - 1);
g.drawLine(x + w - 1, startgap, x + w - 1, endgap - 1);
@@ -3074,7 +3074,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
g.setColor(darkShadow);
g.drawLine(x + w - 1, y, x + w - 1, y + h - 2);
}
-
+
g.setColor(selectedColor);
g.drawLine(x + w - 3, y + 1, x + w - 3, y + h - 4);
@@ -3085,10 +3085,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
* <p>This method returns the bounds of a tab for the given index
* and shifts it by the current scrolling offset if the tabbed
* pane is in scrolling tab layout mode.</p>
- *
+ *
* <p>Subclassses should retrievs a tab's bounds by this method
* if they want to find out whether the tab is currently visible.</p>
- *
+ *
* @param pane The JTabbedPane.
* @param i The index to look for.
*
@@ -3099,13 +3099,13 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
// Need to re-layout container if tab does not exist.
if (i >= rects.length)
layoutManager.layoutContainer(pane);
-
+
// Properly shift coordinates if scrolling has taken
// place.
if (pane.getTabLayoutPolicy() == JTabbedPane.SCROLL_TAB_LAYOUT)
{
Rectangle r = new Rectangle(rects[i]);
-
+
switch(pane.getTabPlacement())
{
case SwingConstants.TOP:
@@ -3115,10 +3115,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
default:
r.y -= currentScrollOffset;
}
-
+
return r;
}
-
+
return rects[i];
}
@@ -3148,9 +3148,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
// Note: This code is tab layout mode agnostic.
if (! tabPane.isValid())
tabPane.validate();
-
+
int tabCount = tabPane.getTabCount();
-
+
// If the user clicked outside of any tab rect the
// selection should not change.
int index = tabPane.getSelectedIndex();
@@ -3168,7 +3168,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
/**
* <p>This method returns the tab bounds in the given rectangle.</p>
- *
+ *
* <p>The returned rectangle will be shifted by the current scroll
* offset if the tabbed pane is in scrolling tab layout mode.</p>.
*
@@ -3652,7 +3652,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
{
current = getNextTabIndexInRun(tabPane.getTabCount(),
current);
-
+
if (tabPane.getTabLayoutPolicy() == JTabbedPane.SCROLL_TAB_LAYOUT)
scrollTab(current, tabPane.getTabPlacement());
@@ -3668,7 +3668,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
{
current = getPreviousTabIndexInRun(tabPane.getTabCount(),
current);
-
+
if (tabPane.getTabLayoutPolicy() == JTabbedPane.SCROLL_TAB_LAYOUT)
scrollTab(current, tabPane.getTabPlacement());
@@ -3698,7 +3698,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
protected void selectPreviousTab(int current)
{
current = getPreviousTabIndex(current);
-
+
if (tabPane.getTabLayoutPolicy() == JTabbedPane.SCROLL_TAB_LAYOUT)
scrollTab(current, tabPane.getTabPlacement());
@@ -3825,10 +3825,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
int index = getNextTabIndex(base);
int run = getRunForTab(tabCount, base);
if (base == lastTabInRun(tabCount, run))
- index = (run > 0)
+ index = (run > 0)
? lastTabInRun(tabCount, getPreviousTabRun(run)) + 1
: 0;
-
+
return index;
}
@@ -3847,7 +3847,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
int run = getRunForTab(tabCount, base);
if (index == lastTabInRun(tabCount, getPreviousTabRun(run)))
index = lastTabInRun(tabCount, run);
-
+
return index;
}
@@ -3933,8 +3933,8 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
break;
}
}
-
- ActionMap getActionMap()
+
+ ActionMap getActionMap()
{
ActionMap map = (ActionMap) UIManager.get("TabbedPane.actionMap");
@@ -3950,25 +3950,25 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
ActionMap createActionMap()
{
ActionMap map = new ActionMapUIResource();
-
+
map.put("navigatePageDown", new NavigatePageDownAction());
map.put("navigatePageUp", new NavigatePageUpAction());
map.put("navigateDown",
new NavigateAction("navigateDown", SwingConstants.SOUTH));
-
+
map.put("navigateUp",
new NavigateAction("navigateUp", SwingConstants.NORTH));
-
+
map.put("navigateLeft",
new NavigateAction("navigateLeft", SwingConstants.WEST));
-
+
map.put("navigateRight",
new NavigateAction("navigateRight", SwingConstants.EAST));
-
+
map.put("requestFocusForVisibleComponent",
new RequestFocusForVisibleComponentAction());
map.put("requestFocus", new RequestFocusAction());
-
+
return map;
}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java
index 8a8eeb8..7ff234e 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java
@@ -71,28 +71,28 @@ public class BasicTableHeaderUI extends TableHeaderUI
* where mouse cursor changes shape into "resize"
*/
static int COLUMN_BOUNDARY_TOLERANCE = 3;
-
+
public static ComponentUI createUI(JComponent h)
{
return new BasicTableHeaderUI();
}
-
+
/**
* The table header that is using this interface.
*/
protected JTableHeader header;
-
+
/**
* The mouse input listener, responsible for mouse manipulations with
* the table header.
*/
protected MouseInputListener mouseInputListener;
-
+
/**
* Paint the header cell.
*/
protected CellRendererPane rendererPane;
-
+
/**
* The header cell border.
*/
@@ -102,12 +102,12 @@ public class BasicTableHeaderUI extends TableHeaderUI
* Original mouse cursor prior to resizing.
*/
private Cursor originalCursor;
-
+
/**
* If not null, one of the columns is currently being dragged.
*/
Rectangle draggingHeaderRect;
-
+
/**
* Handles column movement and rearrangement by mouse. The same instance works
* both as mouse listener and the mouse motion listner.
@@ -117,7 +117,7 @@ public class BasicTableHeaderUI extends TableHeaderUI
{
/**
* If true, the cursor is being already shown in the alternative "resize"
- * shape.
+ * shape.
*/
boolean showingResizeCursor;
@@ -127,11 +127,11 @@ public class BasicTableHeaderUI extends TableHeaderUI
* column dragging).
*/
int draggingFrom = - 1;
-
+
/**
* The number of the column being dragged.
*/
- int draggingColumnNumber;
+ int draggingColumnNumber;
/**
* The previous preferred width of the column.
@@ -245,7 +245,7 @@ public class BasicTableHeaderUI extends TableHeaderUI
if (onBoundary)
{
- originalCursor = header.getCursor();
+ originalCursor = header.getCursor();
if (p < x)
header.setCursor(Cursor.getPredefinedCursor(
Cursor.W_RESIZE_CURSOR));
@@ -351,7 +351,7 @@ public class BasicTableHeaderUI extends TableHeaderUI
/**
* Stop the dragging session.
- *
+ *
* @param e the "mouse release" mouse event, needed to determing the final
* location for the dragged column.
*/
@@ -365,11 +365,11 @@ public class BasicTableHeaderUI extends TableHeaderUI
// Find where have we dragged the column.
int x = e.getX();
int p = 0;
-
+
int col = model.getColumnCount() - 1;
int n = model.getColumnCount();
- // This loop does not find the column if the mouse if out of the
+ // This loop does not find the column if the mouse if out of the
// right boundary of the table header. Then we make this column the
// rightmost column.
Scan: for (int i = 0; i < n; i++)
@@ -385,17 +385,17 @@ public class BasicTableHeaderUI extends TableHeaderUI
header.getTable().moveColumn(draggingColumnNumber, col);
}
}
-
+
/**
* Create and return the mouse input listener.
- *
+ *
* @return the mouse listener ({@link MouseInputHandler}, if not overridden.
*/
protected MouseInputListener createMouseInputListener()
{
return new MouseInputHandler();
}
-
+
/**
* Construct a new BasicTableHeaderUI, create mouse listeners.
*/
@@ -448,7 +448,7 @@ public class BasicTableHeaderUI extends TableHeaderUI
{
// AFAICS, the RI does nothing here.
}
-
+
/**
* Remove the previously installed listeners.
*/
@@ -464,9 +464,9 @@ public class BasicTableHeaderUI extends TableHeaderUI
uninstallKeyboardActions();
uninstallDefaults();
}
-
+
/**
- * Repaint the table header.
+ * Repaint the table header.
*/
public void paint(Graphics gfx, JComponent c)
{
@@ -474,7 +474,7 @@ public class BasicTableHeaderUI extends TableHeaderUI
int ncols = cmod.getColumnCount();
if (ncols == 0)
return;
-
+
Rectangle clip = gfx.getClipBounds();
TableCellRenderer defaultRend = header.getDefaultRenderer();
@@ -505,38 +505,38 @@ public class BasicTableHeaderUI extends TableHeaderUI
bounds.width, bounds.height);
}
}
-
+
// This displays a running rectangle that is much simplier than the total
// animation, as it is seen in Sun's application.
// TODO animate the collumn dragging like in Sun's jre.
if (draggingHeaderRect != null)
{
- gfx.setColor(header.getForeground());
+ gfx.setColor(header.getForeground());
gfx.drawRect(draggingHeaderRect.x, draggingHeaderRect.y + 2,
draggingHeaderRect.width - 1, draggingHeaderRect.height - 6);
}
}
-
+
/**
* Get the preferred header size.
- *
+ *
* @param ignored unused
- *
+ *
* @return the preferred size of the associated header.
*/
public Dimension getPreferredSize(JComponent ignored)
{
TableColumnModel cmod = header.getColumnModel();
TableCellRenderer defaultRend = header.getDefaultRenderer();
- int ncols = cmod.getColumnCount();
+ int ncols = cmod.getColumnCount();
Dimension ret = new Dimension(0, 0);
int spacing = 0;
- if (header.getTable() != null
+ if (header.getTable() != null
&& header.getTable().getIntercellSpacing() != null)
spacing = header.getTable().getIntercellSpacing().width;
-
- for (int i = 0; i < ncols; ++i)
+
+ for (int i = 0; i < ncols; ++i)
{
TableColumn col = cmod.getColumn(i);
TableCellRenderer rend = col.getHeaderRenderer();
@@ -556,11 +556,11 @@ public class BasicTableHeaderUI extends TableHeaderUI
Dimension d = comp.getPreferredSize();
ret.width += spacing;
- ret.height = Math.max(d.height, ret.height);
+ ret.height = Math.max(d.height, ret.height);
}
ret.width = cmod.getTotalColumnWidth();
return ret;
}
-
-
+
+
}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTableUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTableUI.java
index a672173..f5a4bcb 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTableUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTableUI.java
@@ -82,15 +82,15 @@ import javax.swing.table.TableModel;
public class BasicTableUI extends TableUI
{
- public static ComponentUI createUI(JComponent comp)
+ public static ComponentUI createUI(JComponent comp)
{
return new BasicTableUI();
}
- protected FocusListener focusListener;
- protected KeyListener keyListener;
- protected MouseInputListener mouseInputListener;
- protected CellRendererPane rendererPane;
+ protected FocusListener focusListener;
+ protected KeyListener keyListener;
+ protected MouseInputListener mouseInputListener;
+ protected CellRendererPane rendererPane;
protected JTable table;
/** The normal cell border. */
@@ -108,7 +108,7 @@ public class BasicTableUI extends TableUI
* Handles key events for the JTable. Key events should be handled through
* the InputMap/ActionMap mechanism since JDK1.3. This class is only there
* for backwards compatibility.
- *
+ *
* @author Roman Kennke (kennke@aicas.com)
*/
public class KeyHandler implements KeyListener
@@ -125,7 +125,7 @@ public class BasicTableUI extends TableUI
{
// Key events should be handled through the InputMap/ActionMap mechanism
// since JDK1.3. This class is only there for backwards compatibility.
-
+
// Editor activation is a specific kind of response to ''any''
// character key. Hence it is handled here.
if (!table.isEditing() && table.isEnabled())
@@ -208,13 +208,13 @@ public class BasicTableUI extends TableUI
ListSelectionModel rowModel = table.getSelectionModel();
if (lo_row != -1 && hi_row != -1)
{
- if (controlPressed && rowModel.getSelectionMode()
+ if (controlPressed && rowModel.getSelectionMode()
!= ListSelectionModel.SINGLE_SELECTION)
rowModel.addSelectionInterval(lo_row, hi_row);
else
rowModel.setSelectionInterval(lo_row, hi_row);
}
-
+
// Update the columns
int lo_col = table.columnAtPoint(begin);
int hi_col = table.columnAtPoint(curr);
@@ -222,14 +222,14 @@ public class BasicTableUI extends TableUI
getSelectionModel();
if (lo_col != -1 && hi_col != -1)
{
- if (controlPressed && colModel.getSelectionMode() !=
+ if (controlPressed && colModel.getSelectionMode() !=
ListSelectionModel.SINGLE_SELECTION)
colModel.addSelectionInterval(lo_col, hi_col);
else
colModel.setSelectionInterval(lo_col, hi_col);
}
}
-
+
/**
* For the double click, start the cell editor.
*/
@@ -254,7 +254,7 @@ public class BasicTableUI extends TableUI
}
}
- public void mouseDragged(MouseEvent e)
+ public void mouseDragged(MouseEvent e)
{
if (table.isEnabled())
{
@@ -278,7 +278,7 @@ public class BasicTableUI extends TableUI
// Nothing to do here.
}
- public void mousePressed(MouseEvent e)
+ public void mousePressed(MouseEvent e)
{
if (table.isEnabled())
{
@@ -292,12 +292,12 @@ public class BasicTableUI extends TableUI
//if control is pressed and the cell is already selected, deselect it
if (e.isControlDown() && table.isCellSelected(
table.rowAtPoint(begin), table.columnAtPoint(begin)))
- {
+ {
table.getSelectionModel().
- removeSelectionInterval(table.rowAtPoint(begin),
+ removeSelectionInterval(table.rowAtPoint(begin),
table.rowAtPoint(begin));
table.getColumnModel().getSelectionModel().
- removeSelectionInterval(table.columnAtPoint(begin),
+ removeSelectionInterval(table.columnAtPoint(begin),
table.columnAtPoint(begin));
}
else
@@ -314,7 +314,7 @@ public class BasicTableUI extends TableUI
}
}
- public void mouseReleased(MouseEvent e)
+ public void mouseReleased(MouseEvent e)
{
if (table.isEnabled())
{
@@ -374,12 +374,12 @@ public class BasicTableUI extends TableUI
}
}
- protected FocusListener createFocusListener()
+ protected FocusListener createFocusListener()
{
return new FocusHandler();
}
- protected MouseInputListener createMouseInputListener()
+ protected MouseInputListener createMouseInputListener()
{
return new MouseInputHandler();
}
@@ -396,16 +396,16 @@ public class BasicTableUI extends TableUI
}
/**
- * Return the maximum size of the table. The maximum height is the row
- * height times the number of rows. The maximum width is the sum of
+ * Return the maximum size of the table. The maximum height is the row
+ * height times the number of rows. The maximum width is the sum of
* the maximum widths of each column.
- *
+ *
* @param comp the component whose maximum size is being queried,
* this is ignored.
* @return a Dimension object representing the maximum size of the table,
* or null if the table has no elements.
*/
- public Dimension getMaximumSize(JComponent comp)
+ public Dimension getMaximumSize(JComponent comp)
{
int maxTotalColumnWidth = 0;
for (int i = 0; i < table.getColumnCount(); i++)
@@ -415,16 +415,16 @@ public class BasicTableUI extends TableUI
}
/**
- * Return the minimum size of the table. The minimum height is the row
- * height times the number of rows. The minimum width is the sum of
+ * Return the minimum size of the table. The minimum height is the row
+ * height times the number of rows. The minimum width is the sum of
* the minimum widths of each column.
- *
+ *
* @param comp the component whose minimum size is being queried,
* this is ignored.
* @return a Dimension object representing the minimum size of the table,
* or null if the table has no elements.
*/
- public Dimension getMinimumSize(JComponent comp)
+ public Dimension getMinimumSize(JComponent comp)
{
int minTotalColumnWidth = 0;
for (int i = 0; i < table.getColumnCount(); i++)
@@ -440,7 +440,7 @@ public class BasicTableUI extends TableUI
*
* @return the preferred size for the table of that UI
*/
- public Dimension getPreferredSize(JComponent comp)
+ public Dimension getPreferredSize(JComponent comp)
{
int prefTotalColumnWidth = 0;
TableColumnModel tcm = table.getColumnModel();
@@ -458,13 +458,13 @@ public class BasicTableUI extends TableUI
* Returns the table height. This helper method is used by
* {@link #getMinimumSize(JComponent)}, {@link #getPreferredSize(JComponent)}
* and {@link #getMaximumSize(JComponent)} to determine the table height.
- *
+ *
* @return the table height
*/
private int getHeight()
{
int height = 0;
- int rowCount = table.getRowCount();
+ int rowCount = table.getRowCount();
if (rowCount > 0 && table.getColumnCount() > 0)
{
Rectangle r = table.getCellRect(rowCount - 1, 0, true);
@@ -473,7 +473,7 @@ public class BasicTableUI extends TableUI
return height;
}
- protected void installDefaults()
+ protected void installDefaults()
{
LookAndFeel.installColorsAndFont(table, "Table.background",
"Table.foreground", "Table.font");
@@ -486,7 +486,7 @@ public class BasicTableUI extends TableUI
/**
* Installs keyboard actions on the table.
*/
- protected void installKeyboardActions()
+ protected void installKeyboardActions()
{
// Install the input map.
InputMap inputMap =
@@ -597,14 +597,14 @@ public class BasicTableUI extends TableUI
{
JTable table = (JTable) e.getSource();
- DefaultListSelectionModel rowModel
+ DefaultListSelectionModel rowModel
= (DefaultListSelectionModel) table.getSelectionModel();
- DefaultListSelectionModel colModel
+ DefaultListSelectionModel colModel
= (DefaultListSelectionModel) table.getColumnModel().getSelectionModel();
int rowLead = rowModel.getLeadSelectionIndex();
int rowMax = table.getModel().getRowCount() - 1;
-
+
int colLead = colModel.getLeadSelectionIndex();
int colMax = table.getModel().getColumnCount() - 1;
@@ -626,7 +626,7 @@ public class BasicTableUI extends TableUI
table.editCellAt(rowLead, colLead);
}
else if (command.equals("selectFirstRowExtendSelection"))
- {
+ {
rowModel.setLeadSelectionIndex(0);
}
else if (command.equals("selectFirstColumn"))
@@ -636,7 +636,7 @@ public class BasicTableUI extends TableUI
else if (command.equals("selectFirstColumnExtendSelection"))
{
colModel.setLeadSelectionIndex(0);
- }
+ }
else if (command.equals("selectLastRow"))
{
rowModel.setSelectionInterval(rowMax, rowMax);
@@ -670,11 +670,11 @@ public class BasicTableUI extends TableUI
{
int target;
if (rowLead == getFirstVisibleRowIndex(table))
- target = Math.max(0, rowLead - (getLastVisibleRowIndex(table)
+ target = Math.max(0, rowLead - (getLastVisibleRowIndex(table)
- getFirstVisibleRowIndex(table) + 1));
else
target = getFirstVisibleRowIndex(table);
-
+
rowModel.setLeadSelectionIndex(target);
colModel.setLeadSelectionIndex(colLead);
}
@@ -692,7 +692,7 @@ public class BasicTableUI extends TableUI
- getFirstVisibleColumnIndex(table) + 1));
else
target = getLastVisibleColumnIndex(table);
-
+
colModel.setSelectionInterval(target, target);
rowModel.setSelectionInterval(rowLead, rowLead);
}
@@ -705,11 +705,11 @@ public class BasicTableUI extends TableUI
{
int target;
if (colLead == getFirstVisibleColumnIndex(table))
- target = Math.max(0, colLead - (getLastVisibleColumnIndex(table)
+ target = Math.max(0, colLead - (getLastVisibleColumnIndex(table)
- getFirstVisibleColumnIndex(table) + 1));
else
target = getFirstVisibleColumnIndex(table);
-
+
colModel.setSelectionInterval(target, target);
rowModel.setSelectionInterval(rowLead, rowLead);
}
@@ -731,71 +731,71 @@ public class BasicTableUI extends TableUI
|| command.equals("selectPreviousColumnCell"))
{
// If nothing is selected, select the first cell in the table
- if (table.getSelectedRowCount() == 0 &&
+ if (table.getSelectedRowCount() == 0 &&
table.getSelectedColumnCount() == 0)
{
rowModel.setSelectionInterval(0, 0);
colModel.setSelectionInterval(0, 0);
return;
}
-
+
// If the lead selection index isn't selected (ie a remove operation
// happened, then set the lead to the first selected cell in the
// table
if (!table.isCellSelected(rowLead, colLead))
{
- rowModel.addSelectionInterval(rowModel.getMinSelectionIndex(),
+ rowModel.addSelectionInterval(rowModel.getMinSelectionIndex(),
rowModel.getMinSelectionIndex());
- colModel.addSelectionInterval(colModel.getMinSelectionIndex(),
+ colModel.addSelectionInterval(colModel.getMinSelectionIndex(),
colModel.getMinSelectionIndex());
return;
}
-
+
// multRowsSelected and multColsSelected tell us if multiple rows or
// columns are selected, respectively
boolean multRowsSelected, multColsSelected;
multRowsSelected = table.getSelectedRowCount() > 1 &&
table.getRowSelectionAllowed();
-
+
multColsSelected = table.getSelectedColumnCount() > 1 &&
table.getColumnSelectionAllowed();
-
+
// If there is just one selection, select the next cell, and wrap
// when you get to the edges of the table.
if (!multColsSelected && !multRowsSelected)
{
- if (command.indexOf("Column") != -1)
- advanceSingleSelection(colModel, colMax, rowModel, rowMax,
+ if (command.indexOf("Column") != -1)
+ advanceSingleSelection(colModel, colMax, rowModel, rowMax,
command.equals("selectPreviousColumnCell"));
else
- advanceSingleSelection(rowModel, rowMax, colModel, colMax,
+ advanceSingleSelection(rowModel, rowMax, colModel, colMax,
command.equals("selectPreviousRowCell"));
return;
}
-
-
+
+
// rowMinSelected and rowMaxSelected are the minimum and maximum
// values respectively of selected cells in the row selection model
// Similarly for colMinSelected and colMaxSelected.
- int rowMaxSelected = table.getRowSelectionAllowed() ?
+ int rowMaxSelected = table.getRowSelectionAllowed() ?
rowModel.getMaxSelectionIndex() : table.getModel().getRowCount() - 1;
- int rowMinSelected = table.getRowSelectionAllowed() ?
- rowModel.getMinSelectionIndex() : 0;
- int colMaxSelected = table.getColumnSelectionAllowed() ?
- colModel.getMaxSelectionIndex() :
+ int rowMinSelected = table.getRowSelectionAllowed() ?
+ rowModel.getMinSelectionIndex() : 0;
+ int colMaxSelected = table.getColumnSelectionAllowed() ?
+ colModel.getMaxSelectionIndex() :
table.getModel().getColumnCount() - 1;
- int colMinSelected = table.getColumnSelectionAllowed() ?
+ int colMinSelected = table.getColumnSelectionAllowed() ?
colModel.getMinSelectionIndex() : 0;
-
+
// If there are multiple rows and columns selected, select the next
- // cell and wrap at the edges of the selection.
- if (command.indexOf("Column") != -1)
+ // cell and wrap at the edges of the selection.
+ if (command.indexOf("Column") != -1)
advanceMultipleSelection(table, colModel, colMinSelected,
colMaxSelected, rowModel, rowMinSelected,
rowMaxSelected,
command.equals("selectPreviousColumnCell"),
true);
-
+
else
advanceMultipleSelection(table, rowModel, rowMinSelected,
rowMaxSelected, colModel, colMinSelected,
@@ -812,11 +812,11 @@ public class BasicTableUI extends TableUI
{
int target;
if (colLead == getFirstVisibleColumnIndex(table))
- target = Math.max(0, colLead - (getLastVisibleColumnIndex(table)
+ target = Math.max(0, colLead - (getLastVisibleColumnIndex(table)
- getFirstVisibleColumnIndex(table) + 1));
else
target = getFirstVisibleColumnIndex(table);
-
+
colModel.setLeadSelectionIndex(target);
rowModel.setLeadSelectionIndex(rowLead);
}
@@ -828,7 +828,7 @@ public class BasicTableUI extends TableUI
- getFirstVisibleRowIndex(table) + 1));
else
target = getLastVisibleRowIndex(table);
-
+
rowModel.setSelectionInterval(target, target);
colModel.setSelectionInterval(colLead, colLead);
}
@@ -836,11 +836,11 @@ public class BasicTableUI extends TableUI
{
int target;
if (colLead == getLastVisibleColumnIndex(table))
- target = Math.min(colMax, colLead + (getLastVisibleColumnIndex(table)
+ target = Math.min(colMax, colLead + (getLastVisibleColumnIndex(table)
- getFirstVisibleColumnIndex(table) + 1));
else
target = getLastVisibleColumnIndex(table);
-
+
colModel.setLeadSelectionIndex(target);
rowModel.setLeadSelectionIndex(rowLead);
}
@@ -857,29 +857,29 @@ public class BasicTableUI extends TableUI
{
int target;
if (rowLead == getLastVisibleRowIndex(table))
- target = Math.min(rowMax, rowLead + (getLastVisibleRowIndex(table)
+ target = Math.min(rowMax, rowLead + (getLastVisibleRowIndex(table)
- getFirstVisibleRowIndex(table) + 1));
else
target = getLastVisibleRowIndex(table);
-
+
rowModel.setLeadSelectionIndex(target);
colModel.setLeadSelectionIndex(colLead);
- }
+ }
else if (command.equals("scrollUpChangeSelection"))
{
int target;
if (rowLead == getFirstVisibleRowIndex(table))
- target = Math.max(0, rowLead - (getLastVisibleRowIndex(table)
+ target = Math.max(0, rowLead - (getLastVisibleRowIndex(table)
- getFirstVisibleRowIndex(table) + 1));
else
target = getFirstVisibleRowIndex(table);
-
+
rowModel.setSelectionInterval(target, target);
colModel.setSelectionInterval(colLead, colLead);
}
else if (command.equals("selectNextRowChangeLead"))
{
- if (rowModel.getSelectionMode()
+ if (rowModel.getSelectionMode()
!= ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
{
// just "selectNextRow"
@@ -892,7 +892,7 @@ public class BasicTableUI extends TableUI
}
else if (command.equals("selectPreviousRowChangeLead"))
{
- if (rowModel.getSelectionMode()
+ if (rowModel.getSelectionMode()
!= ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
{
// just selectPreviousRow
@@ -905,8 +905,8 @@ public class BasicTableUI extends TableUI
}
else if (command.equals("selectNextColumnChangeLead"))
{
- if (colModel.getSelectionMode()
- != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
+ if (colModel.getSelectionMode()
+ != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
{
// just selectNextColumn
rowModel.setSelectionInterval(rowLead, rowLead);
@@ -918,14 +918,14 @@ public class BasicTableUI extends TableUI
}
else if (command.equals("selectPreviousColumnChangeLead"))
{
- if (colModel.getSelectionMode()
- != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
+ if (colModel.getSelectionMode()
+ != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
{
// just selectPreviousColumn
rowModel.setSelectionInterval(rowLead, rowLead);
colModel.setSelectionInterval(Math.max(colLead - 1, 0),
Math.max(colLead - 1, 0));
-
+
}
else
colModel.moveLeadSelectionIndex(Math.max(colLead - 1, 0));
@@ -955,12 +955,12 @@ public class BasicTableUI extends TableUI
rowModel.removeSelectionInterval(rowLead, rowLead);
else
rowModel.addSelectionInterval(rowLead, rowLead);
-
+
if (colModel.isSelectedIndex(colLead))
colModel.removeSelectionInterval(colLead, colLead);
else
colModel.addSelectionInterval(colLead, colLead);
-
+
rowModel.setAnchorSelectionIndex(rowLead);
colModel.setAnchorSelectionIndex(colLead);
}
@@ -968,31 +968,31 @@ public class BasicTableUI extends TableUI
{
table.editingStopped(new ChangeEvent(command));
}
- else
+ else
{
// If we're here that means we bound this TableAction class
// to a keyboard input but we either want to ignore that input
// or we just haven't implemented its action yet.
-
+
// Uncomment the following line to print the names of unused bindings
// when their keys are pressed
-
+
// System.out.println ("not implemented: "+e.getActionCommand());
}
// Any commands whose keyStrokes should be used by the Editor should not
- // cause editing to be stopped: ie, the SPACE sends "addToSelection" but
+ // cause editing to be stopped: ie, the SPACE sends "addToSelection" but
// if the table is in editing mode, the space should not cause us to stop
// editing because it should be used by the Editor.
if (table.isEditing() && command != "startEditing"
&& command != "addToSelection")
table.editingStopped(new ChangeEvent("update"));
-
+
table.scrollRectToVisible(table.getCellRect(
- rowModel.getLeadSelectionIndex(), colModel.getLeadSelectionIndex(),
+ rowModel.getLeadSelectionIndex(), colModel.getLeadSelectionIndex(),
false));
}
-
+
/**
* Returns the column index of the first visible column.
* @return the column index of the first visible column.
@@ -1005,7 +1005,7 @@ public class BasicTableUI extends TableUI
r.translate((int) r.getWidth() - 1, 0);
return table.columnAtPoint(r.getLocation());
}
-
+
/**
* Returns the column index of the last visible column.
*
@@ -1016,9 +1016,9 @@ public class BasicTableUI extends TableUI
Rectangle r = table.getVisibleRect();
if (or.isLeftToRight())
r.translate((int) r.getWidth() - 1, 0);
- return table.columnAtPoint(r.getLocation());
+ return table.columnAtPoint(r.getLocation());
}
-
+
/**
* Returns the row index of the first visible row.
*
@@ -1031,7 +1031,7 @@ public class BasicTableUI extends TableUI
r.translate((int) r.getWidth() - 1, 0);
return table.rowAtPoint(r.getLocation());
}
-
+
/**
* Returns the row index of the last visible row.
*
@@ -1067,7 +1067,7 @@ public class BasicTableUI extends TableUI
* rows (ENTER)
* @param firstMin the first selected index in firstModel
* @param firstMax the last selected index in firstModel
- * @param secondModel the ListSelectionModel for rows (TAB) or
+ * @param secondModel the ListSelectionModel for rows (TAB) or
* columns (ENTER)
* @param secondMin the first selected index in secondModel
* @param secondMax the last selected index in secondModel
@@ -1076,41 +1076,41 @@ public class BasicTableUI extends TableUI
*/
void advanceMultipleSelection(JTable table, ListSelectionModel firstModel,
int firstMin,
- int firstMax, ListSelectionModel secondModel,
+ int firstMax, ListSelectionModel secondModel,
int secondMin, int secondMax, boolean reverse,
boolean eventIsTab)
{
- // If eventIsTab, all the "firsts" correspond to columns, otherwise, to
+ // If eventIsTab, all the "firsts" correspond to columns, otherwise, to
// rows "seconds" correspond to the opposite
int firstLead = firstModel.getLeadSelectionIndex();
int secondLead = secondModel.getLeadSelectionIndex();
- int numFirsts = eventIsTab ?
+ int numFirsts = eventIsTab ?
table.getModel().getColumnCount() : table.getModel().getRowCount();
- int numSeconds = eventIsTab ?
+ int numSeconds = eventIsTab ?
table.getModel().getRowCount() : table.getModel().getColumnCount();
// check if we have to wrap the "firsts" around, going to the other side
- if ((firstLead == firstMax && !reverse) ||
+ if ((firstLead == firstMax && !reverse) ||
(reverse && firstLead == firstMin))
{
- firstModel.addSelectionInterval(reverse ? firstMax : firstMin,
+ firstModel.addSelectionInterval(reverse ? firstMax : firstMin,
reverse ? firstMax : firstMin);
-
+
// check if we have to wrap the "seconds"
- if ((secondLead == secondMax && !reverse) ||
+ if ((secondLead == secondMax && !reverse) ||
(reverse && secondLead == secondMin))
- secondModel.addSelectionInterval(reverse ? secondMax : secondMin,
+ secondModel.addSelectionInterval(reverse ? secondMax : secondMin,
reverse ? secondMax : secondMin);
// if we're not wrapping the seconds, we have to find out where we
- // are within the secondModel and advance to the next cell (or
+ // are within the secondModel and advance to the next cell (or
// go back to the previous cell if reverse == true)
else
{
int[] secondsSelected;
- if (eventIsTab && table.getRowSelectionAllowed() ||
+ if (eventIsTab && table.getRowSelectionAllowed() ||
!eventIsTab && table.getColumnSelectionAllowed())
- secondsSelected = eventIsTab ?
+ secondsSelected = eventIsTab ?
table.getSelectedRows() : table.getSelectedColumns();
else
{
@@ -1129,9 +1129,9 @@ public class BasicTableUI extends TableUI
else
while (secondsSelected[secondIndex] >= secondLead)
secondIndex--;
-
+
// and select it - updating the lead selection index
- secondModel.addSelectionInterval(secondsSelected[secondIndex],
+ secondModel.addSelectionInterval(secondsSelected[secondIndex],
secondsSelected[secondIndex]);
}
}
@@ -1140,9 +1140,9 @@ public class BasicTableUI extends TableUI
else
{
int[] firstsSelected;
- if (eventIsTab && table.getColumnSelectionAllowed() ||
+ if (eventIsTab && table.getColumnSelectionAllowed() ||
!eventIsTab && table.getRowSelectionAllowed())
- firstsSelected = eventIsTab ?
+ firstsSelected = eventIsTab ?
table.getSelectedColumns() : table.getSelectedRows();
else
{
@@ -1155,16 +1155,16 @@ public class BasicTableUI extends TableUI
if (!reverse)
while (firstsSelected[firstIndex] <= firstLead)
firstIndex++;
- else
+ else
while (firstsSelected[firstIndex] >= firstLead)
firstIndex--;
- firstModel.addSelectionInterval(firstsSelected[firstIndex],
+ firstModel.addSelectionInterval(firstsSelected[firstIndex],
firstsSelected[firstIndex]);
secondModel.addSelectionInterval(secondLead, secondLead);
}
}
-
- /**
+
+ /**
* A helper method for the key bindings. Used because the actions
* for TAB, SHIFT-TAB, ENTER, and SHIFT-ENTER are very similar.
*
@@ -1180,15 +1180,15 @@ public class BasicTableUI extends TableUI
* @param reverse true if SHIFT was pressed for the event
*/
- void advanceSingleSelection(ListSelectionModel firstModel, int firstMax,
- ListSelectionModel secondModel, int secondMax,
+ void advanceSingleSelection(ListSelectionModel firstModel, int firstMax,
+ ListSelectionModel secondModel, int secondMax,
boolean reverse)
{
// for TABs, "first" corresponds to columns and "seconds" to rows.
// the opposite is true for ENTERs
int firstLead = firstModel.getLeadSelectionIndex();
int secondLead = secondModel.getLeadSelectionIndex();
-
+
// if we are going backwards subtract 2 because we later add 1
// for a net change of -1
if (reverse && (firstLead == 0))
@@ -1198,15 +1198,15 @@ public class BasicTableUI extends TableUI
secondLead += secondMax + 1;
secondLead -= 2;
}
-
+
// do we have to wrap the "seconds"?
if (reverse && (firstLead == 0) || !reverse && (firstLead == firstMax))
- secondModel.setSelectionInterval((secondLead + 1) % (secondMax + 1),
+ secondModel.setSelectionInterval((secondLead + 1) % (secondMax + 1),
(secondLead + 1) % (secondMax + 1));
// if not, just reselect the current lead
else
secondModel.setSelectionInterval(secondLead, secondLead);
-
+
// if we are going backwards, subtract 2 because we add 1 later
// for net change of -1
if (reverse)
@@ -1217,12 +1217,12 @@ public class BasicTableUI extends TableUI
firstLead -= 2;
}
// select the next "first"
- firstModel.setSelectionInterval((firstLead + 1) % (firstMax + 1),
+ firstModel.setSelectionInterval((firstLead + 1) % (firstMax + 1),
(firstLead + 1) % (firstMax + 1));
}
}
- protected void installListeners()
+ protected void installListeners()
{
if (focusListener == null)
focusListener = createFocusListener();
@@ -1232,7 +1232,7 @@ public class BasicTableUI extends TableUI
table.addKeyListener(keyListener);
if (mouseInputListener == null)
mouseInputListener = createMouseInputListener();
- table.addMouseListener(mouseInputListener);
+ table.addMouseListener(mouseInputListener);
table.addMouseMotionListener(mouseInputListener);
if (propertyChangeListener == null)
propertyChangeListener = new PropertyChangeHandler();
@@ -1259,17 +1259,17 @@ public class BasicTableUI extends TableUI
SwingUtilities.replaceUIActionMap(table, null);
}
- protected void uninstallListeners()
+ protected void uninstallListeners()
{
- table.removeFocusListener(focusListener);
+ table.removeFocusListener(focusListener);
table.removeKeyListener(keyListener);
- table.removeMouseListener(mouseInputListener);
+ table.removeMouseListener(mouseInputListener);
table.removeMouseMotionListener(mouseInputListener);
table.removePropertyChangeListener(propertyChangeListener);
propertyChangeListener = null;
}
- public void installUI(JComponent comp)
+ public void installUI(JComponent comp)
{
table = (JTable) comp;
rendererPane = new CellRendererPane();
@@ -1280,11 +1280,11 @@ public class BasicTableUI extends TableUI
installListeners();
}
- public void uninstallUI(JComponent c)
+ public void uninstallUI(JComponent c)
{
uninstallListeners();
uninstallKeyboardActions();
- uninstallDefaults();
+ uninstallDefaults();
table.remove(rendererPane);
rendererPane = null;
@@ -1308,11 +1308,11 @@ public class BasicTableUI extends TableUI
Component comp = table.prepareRenderer(rend, row, col);
rendererPane.paintComponent(g, comp, table, bounds);
}
-
+
/**
* Paint the associated table.
*/
- public void paint(Graphics gfx, JComponent ignored)
+ public void paint(Graphics gfx, JComponent ignored)
{
int ncols = table.getColumnCount();
int nrows = table.getRowCount();
@@ -1346,19 +1346,19 @@ public class BasicTableUI extends TableUI
{
widths[i] = cmodel.getColumn(i).getWidth() - columnMargin;
}
-
+
Rectangle bounds = table.getCellRect(r0, c0, false);
// The left boundary of the area being repainted.
int left = bounds.x;
-
+
// The top boundary of the area being repainted.
int top = bounds.y;
-
+
// The bottom boundary of the area being repainted.
int bottom;
-
+
// paint the cell contents
- Color grid = table.getGridColor();
+ Color grid = table.getGridColor();
for (int r = r0; r <= rn; ++r)
{
for (int c = c0; c <= cn; ++c)
@@ -1372,18 +1372,18 @@ public class BasicTableUI extends TableUI
// Update row height for tables with custom heights.
bounds.height = table.getRowHeight(r + 1) - rowMargin;
}
-
+
bottom = bounds.y - rowMargin;
// paint vertical grid lines
if (grid != null && table.getShowVerticalLines())
- {
+ {
Color save = gfx.getColor();
gfx.setColor(grid);
int x = left - columnMargin;
for (int c = c0; c <= cn; ++c)
{
- // The vertical grid is draw right from the cells, so we
+ // The vertical grid is draw right from the cells, so we
// add before drawing.
x += widths[c] + columnMargin;
gfx.drawLine(x, top, x, bottom);
@@ -1391,15 +1391,15 @@ public class BasicTableUI extends TableUI
gfx.setColor(save);
}
- // paint horizontal grid lines
+ // paint horizontal grid lines
if (grid != null && table.getShowHorizontalLines())
- {
+ {
Color save = gfx.getColor();
gfx.setColor(grid);
int y = top - rowMargin;
for (int r = r0; r <= rn; ++r)
{
- // The horizontal grid is draw below the cells, so we
+ // The horizontal grid is draw below the cells, so we
// add before drawing.
y += table.getRowHeight(r);
gfx.drawLine(left, y, p2.x, y);
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTextAreaUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTextAreaUI.java
index 3f5aa27..b2541b4 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTextAreaUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTextAreaUI.java
@@ -1,4 +1,4 @@
-/* BasicTextAreaUI.java --
+/* BasicTextAreaUI.java --
Copyright (C) 2004, 2006, Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -65,9 +65,9 @@ public class BasicTextAreaUI extends BasicTextUI
/**
* Create the view. Returns a WrappedPlainView if the text area
* has lineWrap set to true, otherwise returns a PlainView. If
- * lineWrap is true has to check whether the wrap style is word
+ * lineWrap is true has to check whether the wrap style is word
* or character and return an appropriate WrappedPlainView.
- *
+ *
* @param elem the element to create a View for
* @return an appropriate View for the element
*/
@@ -94,11 +94,11 @@ public class BasicTextAreaUI extends BasicTextUI
{
return "TextArea";
}
-
+
/**
* Receives notification whenever one of the text component's bound
* properties changes. This changes the view to WrappedPlainView
- * if setLineWrap(true) is called, and back to PlainView if
+ * if setLineWrap(true) is called, and back to PlainView if
* setLineWrap(false) is called.
*
* @param ev the property change event
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTextFieldUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTextFieldUI.java
index 6792aa0..5f6a927 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTextFieldUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTextFieldUI.java
@@ -60,7 +60,7 @@ public class BasicTextFieldUI extends BasicTextUI
{
return new FieldView(elem);
}
-
+
public static ComponentUI createUI(JComponent c)
{
return new BasicTextFieldUI();
@@ -85,7 +85,7 @@ public class BasicTextFieldUI extends BasicTextUI
* Receives notification whenever one of the text component's bound
* properties changes. Here we check for the editable and enabled
* properties and adjust the background color accordingly.
- *
+ *
* <p>The colors are only changed if they are not a
* <code>ColorUIResource</code>.</p>
*
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTextPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTextPaneUI.java
index a988c5a6..507e0a1 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTextPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTextPaneUI.java
@@ -1,4 +1,4 @@
-/* BasicTextPaneUI.java --
+/* BasicTextPaneUI.java --
Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTextUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTextUI.java
index e152a30..bd7cc48 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTextUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTextUI.java
@@ -126,7 +126,7 @@ public abstract class BasicTextUI extends TextUI
private static class FocusHandler
implements FocusListener
{
- public void focusGained(FocusEvent e)
+ public void focusGained(FocusEvent e)
{
// Nothing to do here.
}
@@ -147,7 +147,7 @@ public abstract class BasicTextUI extends TextUI
{
if (sm != null)
sm.checkSystemClipboardAccess();
-
+
Clipboard cb = Toolkit.getDefaultToolkit().getSystemSelection();
if (cb != null)
{
@@ -291,7 +291,7 @@ public abstract class BasicTextUI extends TextUI
EditorKit editorKit = BasicTextUI.this.getEditorKit(getComponent());
factory = editorKit.getViewFactory();
if (factory == null)
- factory = BasicTextUI.this;
+ factory = BasicTextUI.this;
return factory;
}
@@ -317,7 +317,7 @@ public abstract class BasicTextUI extends TextUI
{
if (view != null)
view.setParent(null);
-
+
if (v != null)
v.setParent(this);
@@ -718,7 +718,7 @@ public abstract class BasicTextUI extends TextUI
if (color == null || color instanceof UIResource)
{
color = UIManager.getColor(prefix + ".selectionBackground");
- textComponent.setSelectionColor(color);
+ textComponent.setSelectionColor(color);
}
Insets margin = textComponent.getMargin();
@@ -756,7 +756,7 @@ public abstract class BasicTextUI extends TextUI
*/
protected void installListeners()
{
- //
+ //
if (SystemProperties.getProperty("gnu.swing.text.no-xlike-clipboard")
== null)
{
@@ -768,11 +768,11 @@ public abstract class BasicTextUI extends TextUI
/**
* Returns the name of the keymap for this type of TextUI.
- *
+ *
* This is implemented so that the classname of this TextUI
* without the package prefix is returned. This way subclasses
* don't have to override this method.
- *
+ *
* @return the name of the keymap for this TextUI
*/
protected String getKeymapName()
@@ -822,10 +822,10 @@ public abstract class BasicTextUI extends TextUI
getInputMap());
SwingUtilities.replaceUIActionMap(textComponent, getActionMap());
}
-
+
/**
* Creates an ActionMap to be installed on the text component.
- *
+ *
* @return an ActionMap to be installed on the text component
*/
private ActionMap getActionMap()
@@ -963,7 +963,7 @@ public abstract class BasicTextUI extends TextUI
*/
protected void uninstallKeyboardActions()
{
- SwingUtilities.replaceUIInputMap(textComponent, JComponent.WHEN_FOCUSED,
+ SwingUtilities.replaceUIInputMap(textComponent, JComponent.WHEN_FOCUSED,
null);
SwingUtilities.replaceUIActionMap(textComponent, null);
}
@@ -1150,7 +1150,7 @@ public abstract class BasicTextUI extends TextUI
highlighter.paint(g);
g.setColor(oldColor);
}
-
+
rootView.paint(g, getVisibleEditorRect());
if (caret != null && textComponent.hasFocus())
@@ -1482,11 +1482,11 @@ public abstract class BasicTextUI extends TextUI
// Return null if the component has no valid size.
if (width <= 0 || height <= 0)
return null;
-
+
Insets insets = textComponent.getInsets(cachedInsets);
return new Rectangle(insets.left, insets.top,
- width - insets.left - insets.right,
- height - insets.top - insets.bottom);
+ width - insets.left - insets.right,
+ height - insets.top - insets.bottom);
}
/**
@@ -1507,10 +1507,10 @@ public abstract class BasicTextUI extends TextUI
*/
protected void modelChanged()
{
- if (textComponent == null || rootView == null)
+ if (textComponent == null || rootView == null)
return;
ViewFactory factory = rootView.getViewFactory();
- if (factory == null)
+ if (factory == null)
return;
Document doc = textComponent.getDocument();
if (doc == null)
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java
index 9216486..4550f08 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java
@@ -54,22 +54,22 @@ import javax.swing.plaf.ComponentUI;
*/
public class BasicToggleButtonUI extends BasicButtonUI
{
-
+
/**
* Returns a UI delegate for the specified component.
- *
- * @param component the component (should be an instance of
+ *
+ * @param component the component (should be an instance of
* {@link JToggleButton}).
- *
+ *
* @return An instance of <code>BasicToggleButtonUI</code>.
*/
public static ComponentUI createUI(JComponent component)
{
return new BasicToggleButtonUI();
- }
+ }
/**
- * Returns the prefix for entries in the {@link UIManager} defaults table
+ * Returns the prefix for entries in the {@link UIManager} defaults table
* (<code>"ToggleButton."</code> in this case).
*
* @return <code>"ToggleButton."</code>
@@ -80,14 +80,14 @@ public class BasicToggleButtonUI extends BasicButtonUI
}
/**
- * Paint the component, which is an {@link AbstractButton}, according to
+ * Paint the component, which is an {@link AbstractButton}, according to
* its current state.
*
* @param g The graphics context to paint with
* @param c The component to paint the state of
*/
public void paint(Graphics g, JComponent c)
- {
+ {
AbstractButton b = (AbstractButton) c;
Rectangle tr = new Rectangle();
@@ -102,13 +102,13 @@ public class BasicToggleButtonUI extends BasicButtonUI
SwingUtilities.calculateInnerArea(b, vr);
else
vr = SwingUtilities.getLocalBounds(b);
- String text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f),
- b.getText(), currentIcon(b), b.getVerticalAlignment(),
- b.getHorizontalAlignment(), b.getVerticalTextPosition(),
- b.getHorizontalTextPosition(), vr, ir, tr, b.getIconTextGap()
+ String text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f),
+ b.getText(), currentIcon(b), b.getVerticalAlignment(),
+ b.getHorizontalAlignment(), b.getVerticalTextPosition(),
+ b.getHorizontalTextPosition(), vr, ir, tr, b.getIconTextGap()
+ defaultTextShiftOffset);
- if ((b.getModel().isArmed() && b.getModel().isPressed())
+ if ((b.getModel().isArmed() && b.getModel().isPressed())
|| b.isSelected())
paintButtonPressed(g, b);
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicToolBarUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicToolBarUI.java
index 7be69ec..f5b2b2d 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicToolBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicToolBarUI.java
@@ -345,7 +345,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
protected Border createNonRolloverBorder()
{
Border b = UIManager.getBorder("ToolBar.nonrolloverBorder");
-
+
if (b == null)
{
b = new CompoundBorder(
@@ -355,7 +355,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
UIManager.getColor("Button.highlight")),
BasicBorders.getMarginBorder());
}
-
+
return b; }
/**
@@ -377,7 +377,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
protected Border createRolloverBorder()
{
Border b = UIManager.getBorder("ToolBar.rolloverBorder");
-
+
if (b == null)
{
b = new CompoundBorder(
@@ -387,7 +387,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
UIManager.getColor("Button.highlight")),
BasicBorders.getMarginBorder());
}
-
+
return b;
}
@@ -438,13 +438,13 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
if (loc != -1)
{
- dragWindow.setBorderColor(dockingBorderColor);
- dragWindow.setBackground(dockingColor);
+ dragWindow.setBorderColor(dockingBorderColor);
+ dragWindow.setBackground(dockingColor);
}
else
{
- dragWindow.setBorderColor(floatingBorderColor);
- dragWindow.setBackground(floatingColor);
+ dragWindow.setBorderColor(floatingBorderColor);
+ dragWindow.setBackground(floatingColor);
}
int w = 0;
@@ -458,13 +458,13 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
if (((cachedOrientation == SwingConstants.HORIZONTAL) && tmp)
|| ((cachedOrientation == VERTICAL) && ! tmp))
{
- w = cachedBounds.width;
- h = cachedBounds.height;
+ w = cachedBounds.width;
+ h = cachedBounds.height;
}
else
{
- w = cachedBounds.height;
- h = cachedBounds.width;
+ w = cachedBounds.height;
+ h = cachedBounds.width;
}
Point p = dragWindow.getOffset();
@@ -507,28 +507,28 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
newParent = ((RootPaneContainer) floatFrame).getContentPane();
else
{
- floatFrame.hide();
- newParent = origParent;
+ floatFrame.hide();
+ newParent = origParent;
}
String constraint;
switch (aoc)
{
case SwingConstants.EAST:
- constraint = BorderLayout.EAST;
- break;
+ constraint = BorderLayout.EAST;
+ break;
case SwingConstants.NORTH:
- constraint = BorderLayout.NORTH;
- break;
+ constraint = BorderLayout.NORTH;
+ break;
case SwingConstants.SOUTH:
- constraint = BorderLayout.SOUTH;
- break;
+ constraint = BorderLayout.SOUTH;
+ break;
case SwingConstants.WEST:
- constraint = BorderLayout.WEST;
- break;
+ constraint = BorderLayout.WEST;
+ break;
default:
- constraint = BorderLayout.CENTER;
- break;
+ constraint = BorderLayout.CENTER;
+ break;
}
int newOrientation = SwingConstants.HORIZONTAL;
@@ -538,8 +538,8 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
if (aoc != -1)
{
- constraintBeforeFloating = constraint;
- lastGoodOrientation = newOrientation;
+ constraintBeforeFloating = constraint;
+ lastGoodOrientation = newOrientation;
}
newParent.add(toolBar, constraint);
@@ -557,10 +557,10 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
if (aoc == -1)
{
- floatFrame.pack();
- floatFrame.setSize(dims.width + insets.left + insets.right,
- dims.height + insets.top + insets.bottom);
- floatFrame.show();
+ floatFrame.pack();
+ floatFrame.setSize(dims.width + insets.left + insets.right,
+ dims.height + insets.top + insets.bottom);
+ floatFrame.show();
}
newParent.invalidate();
@@ -776,14 +776,14 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
for (int i = 0; i < c.length; i++)
{
- if (c[i] instanceof JButton)
- {
- // Don't really care about anything other than JButtons
- JButton b = (JButton) c[i];
-
- if (b.getBorder() != null)
- borders.put(b, b.getBorder());
- }
+ if (c[i] instanceof JButton)
+ {
+ // Don't really care about anything other than JButtons
+ JButton b = (JButton) c[i];
+
+ if (b.getBorder() != null)
+ borders.put(b, b.getBorder());
+ }
}
}
@@ -798,11 +798,11 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
if (c instanceof JToolBar)
{
- toolBar = (JToolBar) c;
+ toolBar = (JToolBar) c;
installDefaults();
installComponents();
- installListeners();
- installKeyboardActions();
+ installListeners();
+ installKeyboardActions();
}
}
@@ -894,14 +894,14 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
{
if (c instanceof AbstractButton)
{
- AbstractButton b = (AbstractButton) c;
- b.setRolloverEnabled(false);
+ AbstractButton b = (AbstractButton) c;
+ b.setRolloverEnabled(false);
// Save old border in hashtable.
- if (b.getBorder() != null)
+ if (b.getBorder() != null)
borders.put(b, b.getBorder());
-
- b.setBorder(nonRolloverBorder);
+
+ b.setBorder(nonRolloverBorder);
}
}
@@ -931,11 +931,11 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
{
AbstractButton b = (AbstractButton) c;
b.setRolloverEnabled(false);
-
+
// Save old border in hashtable.
if (b.getBorder() != null)
- borders.put(b, b.getBorder());
-
+ borders.put(b, b.getBorder());
+
b.setBorder(rolloverBorder);
}
}
@@ -1139,7 +1139,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
public void mouseDragged(MouseEvent e)
{
if (isDragging)
- dragTo(e.getPoint(), origin);
+ dragTo(e.getPoint(), origin);
}
/**
@@ -1182,7 +1182,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
public void mousePressed(MouseEvent e)
{
if (! toolBar.isFloatable())
- return;
+ return;
Point ssd = e.getPoint();
Insets insets = toolBar.getInsets();
@@ -1190,13 +1190,13 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
// Verify that this click occurs in the top inset.
if (toolBar.getOrientation() == SwingConstants.HORIZONTAL)
{
- if (e.getX() > insets.left)
- return;
+ if (e.getX() > insets.left)
+ return;
}
else
{
- if (e.getY() > insets.top)
- return;
+ if (e.getY() > insets.top)
+ return;
}
origin = new Point(0, 0);
@@ -1204,16 +1204,16 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
SwingUtilities.convertPointToScreen(ssd, toolBar);
if (! (SwingUtilities.getAncestorOfClass(Window.class, toolBar) instanceof UIResource))
- // Need to know who keeps the toolBar if it gets dragged back into it.
- origParent = toolBar.getParent();
-
+ // Need to know who keeps the toolBar if it gets dragged back into it.
+ origParent = toolBar.getParent();
+
if (toolBar.isShowing())
SwingUtilities.convertPointToScreen(origin, toolBar);
isDragging = true;
if (dragWindow != null)
- dragWindow.setOffset(new Point(cachedBounds.width / 2,
+ dragWindow.setOffset(new Point(cachedBounds.width / 2,
cachedBounds.height / 2));
dragTo(e.getPoint(), origin);
@@ -1227,7 +1227,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
public void mouseReleased(MouseEvent e)
{
if (! isDragging || ! toolBar.isFloatable())
- return;
+ return;
isDragging = false;
floatAt(e.getPoint(), origin);
@@ -1267,7 +1267,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
public Color getBorderColor()
{
if (borderColor == null)
- return Color.BLACK;
+ return Color.BLACK;
return borderColor;
}
@@ -1341,7 +1341,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
public void setOrientation(int o)
{
toolBar.setOrientation(o);
- if (dragWindow != null)
+ if (dragWindow != null)
dragWindow.setOrientation(o);
}
}
@@ -1364,10 +1364,10 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
if (origParent != null)
{
- origParent.add(toolBar,
- (constraintBeforeFloating != null)
- ? constraintBeforeFloating : BorderLayout.NORTH);
- toolBar.setOrientation(lastGoodOrientation);
+ origParent.add(toolBar,
+ (constraintBeforeFloating != null)
+ ? constraintBeforeFloating : BorderLayout.NORTH);
+ toolBar.setOrientation(lastGoodOrientation);
}
origParent.invalidate();
@@ -1410,16 +1410,16 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
{
if (e.getChild() instanceof JButton)
{
- JButton b = (JButton) e.getChild();
+ JButton b = (JButton) e.getChild();
- if (b.getBorder() != null)
- borders.put(b, b.getBorder());
+ if (b.getBorder() != null)
+ borders.put(b, b.getBorder());
}
if (isRolloverBorders())
- setBorderToRollover(e.getChild());
+ setBorderToRollover(e.getChild());
else
- setBorderToNonRollover(e.getChild());
+ setBorderToNonRollover(e.getChild());
cachedBounds = toolBar.getPreferredSize();
cachedOrientation = toolBar.getOrientation();
@@ -1479,7 +1479,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
/**
* Receives notification when the toolbar or one of it's component
* receives the keyboard input focus.
- *
+ *
* @param e the focus event
*/
public void focusGained(FocusEvent e)
@@ -1491,7 +1491,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
/**
* Receives notification when the toolbar or one of it's component
* looses the keyboard input focus.
- *
+ *
* @param e the focus event
*/
public void focusLost(FocusEvent e)
@@ -1522,15 +1522,15 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
{
if (c instanceof JToolBar)
{
- JToolBar tb = (JToolBar) c;
- int orientation = tb.getOrientation();
-
- if (! tb.isFloatable())
- return new Insets(regular, regular, regular, regular);
- else if (orientation == SwingConstants.HORIZONTAL)
- return new Insets(regular, offset, regular, regular);
- else
- return new Insets(offset, regular, regular, regular);
+ JToolBar tb = (JToolBar) c;
+ int orientation = tb.getOrientation();
+
+ if (! tb.isFloatable())
+ return new Insets(regular, regular, regular, regular);
+ else if (orientation == SwingConstants.HORIZONTAL)
+ return new Insets(regular, offset, regular, regular);
+ else
+ return new Insets(offset, regular, regular, regular);
}
return new Insets(0, 0, 0, 0);
@@ -1568,9 +1568,9 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
int count = 0;
for (int i = x; i < (w + x); i += hgap)
- for (int j = ((count++ % 2) == 0) ? y : (y + (2 * size)); j < (h + y);
- j += vgap)
- g.fillRect(i, j, size, size);
+ for (int j = ((count++ % 2) == 0) ? y : (y + (2 * size)); j < (h + y);
+ j += vgap)
+ g.fillRect(i, j, size, size);
g.setColor(saved);
}
@@ -1590,20 +1590,20 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
{
if (c instanceof JToolBar)
{
- JToolBar tb = (JToolBar) c;
-
- int orientation = tb.getOrientation();
-
- if (orientation == SwingConstants.HORIZONTAL)
- {
- paintBumps(g, x, y, offset, height, 1, Color.WHITE);
- paintBumps(g, x + 1, y + 1, offset - 1, height - 1, 1, Color.GRAY);
- }
- else
- {
- paintBumps(g, x, y, width, offset, 1, Color.WHITE);
- paintBumps(g, x + 1, y + 1, width - 1, offset - 1, 1, Color.GRAY);
- }
+ JToolBar tb = (JToolBar) c;
+
+ int orientation = tb.getOrientation();
+
+ if (orientation == SwingConstants.HORIZONTAL)
+ {
+ paintBumps(g, x, y, offset, height, 1, Color.WHITE);
+ paintBumps(g, x + 1, y + 1, offset - 1, height - 1, 1, Color.GRAY);
+ }
+ else
+ {
+ paintBumps(g, x, y, width, offset, 1, Color.WHITE);
+ paintBumps(g, x + 1, y + 1, width - 1, offset - 1, 1, Color.GRAY);
+ }
}
}
}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicToolTipUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicToolTipUI.java
index 94e7bc3..37c084b 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicToolTipUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicToolTipUI.java
@@ -80,7 +80,7 @@ public class BasicToolTipUI extends ToolTipUI
BasicHTML.updateRenderer(tip, text);
}
}
-
+
}
/** The shared instance of BasicToolTipUI used for all ToolTips. */
@@ -103,7 +103,7 @@ public class BasicToolTipUI extends ToolTipUI
}
/**
- * This method creates a new BasicToolTip UI for the given
+ * This method creates a new BasicToolTip UI for the given
* JComponent.
*
* @param c The JComponent to create a UI for.
@@ -245,10 +245,10 @@ public class BasicToolTipUI extends ToolTipUI
if (view != null)
view.paint(g, paintR);
else
- g.drawString(text, paintR.x + 3, paintR.y + ascent);
+ g.drawString(text, paintR.x + 3, paintR.y + ascent);
g.setFont(oldFont);
- g.setColor(saved);
+ g.setColor(saved);
}
/**
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTreeUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTreeUI.java
index 1c28a5f..af61a42 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTreeUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTreeUI.java
@@ -109,7 +109,7 @@ import javax.swing.tree.VariableHeightLayoutCache;
/**
* A delegate providing the user interface for <code>JTree</code> according to
* the Basic look and feel.
- *
+ *
* @see javax.swing.JTree
* @author Lillian Angel (langel@redhat.com)
* @author Sascha Brawer (brawer@dandelis.ch)
@@ -174,7 +174,7 @@ public class BasicTreeUI
* Set to false when editing and shouldSelectCall() returns true meaning the
* node should be selected before editing, used in completeEditing.
* GNU Classpath editing is implemented differently, so this value is not
- * actually read anywhere. However it is always set correctly to maintain
+ * actually read anywhere. However it is always set correctly to maintain
* interoperability with the derived classes that read this field.
*/
protected boolean stopEditingInCompleteEditing;
@@ -248,7 +248,7 @@ public class BasicTreeUI
/** The max height of the nodes in the tree. */
int maxHeight;
-
+
/** The hash color. */
Color hashColor;
@@ -294,7 +294,7 @@ public class BasicTreeUI
/**
* Returns an instance of the UI delegate for the specified component.
- *
+ *
* @param c the <code>JComponent</code> for which we need a UI delegate for.
* @return the <code>ComponentUI</code> for c.
*/
@@ -305,7 +305,7 @@ public class BasicTreeUI
/**
* Returns the Hash color.
- *
+ *
* @return the <code>Color</code> of the Hash.
*/
protected Color getHashColor()
@@ -315,7 +315,7 @@ public class BasicTreeUI
/**
* Sets the Hash color.
- *
+ *
* @param color the <code>Color</code> to set the Hash to.
*/
protected void setHashColor(Color color)
@@ -325,7 +325,7 @@ public class BasicTreeUI
/**
* Sets the left child's indent value.
- *
+ *
* @param newAmount is the new indent value for the left child.
*/
public void setLeftChildIndent(int newAmount)
@@ -335,7 +335,7 @@ public class BasicTreeUI
/**
* Returns the indent value for the left child.
- *
+ *
* @return the indent value for the left child.
*/
public int getLeftChildIndent()
@@ -345,7 +345,7 @@ public class BasicTreeUI
/**
* Sets the right child's indent value.
- *
+ *
* @param newAmount is the new indent value for the right child.
*/
public void setRightChildIndent(int newAmount)
@@ -355,7 +355,7 @@ public class BasicTreeUI
/**
* Returns the indent value for the right child.
- *
+ *
* @return the indent value for the right child.
*/
public int getRightChildIndent()
@@ -365,7 +365,7 @@ public class BasicTreeUI
/**
* Sets the expanded icon.
- *
+ *
* @param newG is the new expanded icon.
*/
public void setExpandedIcon(Icon newG)
@@ -375,7 +375,7 @@ public class BasicTreeUI
/**
* Returns the current expanded icon.
- *
+ *
* @return the current expanded icon.
*/
public Icon getExpandedIcon()
@@ -385,7 +385,7 @@ public class BasicTreeUI
/**
* Sets the collapsed icon.
- *
+ *
* @param newG is the new collapsed icon.
*/
public void setCollapsedIcon(Icon newG)
@@ -395,7 +395,7 @@ public class BasicTreeUI
/**
* Returns the current collapsed icon.
- *
+ *
* @return the current collapsed icon.
*/
public Icon getCollapsedIcon()
@@ -405,7 +405,7 @@ public class BasicTreeUI
/**
* Updates the componentListener, if necessary.
- *
+ *
* @param largeModel sets this.largeModel to it.
*/
protected void setLargeModel(boolean largeModel)
@@ -421,7 +421,7 @@ public class BasicTreeUI
/**
* Returns true if largeModel is set
- *
+ *
* @return true if largeModel is set, otherwise false.
*/
protected boolean isLargeModel()
@@ -431,7 +431,7 @@ public class BasicTreeUI
/**
* Sets the row height.
- *
+ *
* @param rowHeight is the height to set this.rowHeight to.
*/
protected void setRowHeight(int rowHeight)
@@ -444,7 +444,7 @@ public class BasicTreeUI
/**
* Returns the current row height.
- *
+ *
* @return current row height.
*/
protected int getRowHeight()
@@ -455,7 +455,7 @@ public class BasicTreeUI
/**
* Sets the TreeCellRenderer to <code>tcr</code>. This invokes
* <code>updateRenderer</code>.
- *
+ *
* @param tcr is the new TreeCellRenderer.
*/
protected void setCellRenderer(TreeCellRenderer tcr)
@@ -469,15 +469,15 @@ public class BasicTreeUI
// Refresh the layout if necessary.
if (treeState != null)
{
- treeState.invalidateSizes();
- updateSize();
+ treeState.invalidateSizes();
+ updateSize();
}
}
/**
* Return currentCellRenderer, which will either be the trees renderer, or
* defaultCellRenderer, which ever was not null.
- *
+ *
* @return the current Cell Renderer
*/
protected TreeCellRenderer getCellRenderer()
@@ -490,7 +490,7 @@ public class BasicTreeUI
/**
* Sets the tree's model.
- *
+ *
* @param model to set the treeModel to.
*/
protected void setModel(TreeModel model)
@@ -515,7 +515,7 @@ public class BasicTreeUI
/**
* Returns the tree's model
- *
+ *
* @return treeModel
*/
protected TreeModel getModel()
@@ -525,7 +525,7 @@ public class BasicTreeUI
/**
* Sets the root to being visible.
- *
+ *
* @param newValue sets the visibility of the root
*/
protected void setRootVisible(boolean newValue)
@@ -536,7 +536,7 @@ public class BasicTreeUI
/**
* Returns true if the root is visible.
- *
+ *
* @return true if the root is visible.
*/
protected boolean isRootVisible()
@@ -546,7 +546,7 @@ public class BasicTreeUI
/**
* Determines whether the node handles are to be displayed.
- *
+ *
* @param newValue sets whether or not node handles should be displayed.
*/
protected void setShowsRootHandles(boolean newValue)
@@ -562,7 +562,7 @@ public class BasicTreeUI
/**
* Returns true if the node handles are to be displayed.
- *
+ *
* @return true if the node handles are to be displayed.
*/
protected boolean getShowsRootHandles()
@@ -572,7 +572,7 @@ public class BasicTreeUI
/**
* Sets the cell editor.
- *
+ *
* @param editor to set the cellEditor to.
*/
protected void setCellEditor(TreeCellEditor editor)
@@ -582,7 +582,7 @@ public class BasicTreeUI
/**
* Returns the <code>TreeCellEditor</code> for this tree.
- *
+ *
* @return the cellEditor for this tree.
*/
protected TreeCellEditor getCellEditor()
@@ -592,7 +592,7 @@ public class BasicTreeUI
/**
* Configures the receiver to allow, or not allow, editing.
- *
+ *
* @param newValue sets the receiver to allow editing if true.
*/
protected void setEditable(boolean newValue)
@@ -602,7 +602,7 @@ public class BasicTreeUI
/**
* Returns true if the receiver allows editing.
- *
+ *
* @return true if the receiver allows editing.
*/
protected boolean isEditable()
@@ -613,7 +613,7 @@ public class BasicTreeUI
/**
* Resets the selection model. The appropriate listeners are installed on the
* model.
- *
+ *
* @param newLSM resets the selection model.
*/
protected void setSelectionModel(TreeSelectionModel newLSM)
@@ -628,7 +628,7 @@ public class BasicTreeUI
/**
* Returns the current selection model.
- *
+ *
* @return the current selection model.
*/
protected TreeSelectionModel getSelectionModel()
@@ -640,7 +640,7 @@ public class BasicTreeUI
* Returns the Rectangle enclosing the label portion that the last item in
* path will be drawn to. Will return null if any component in path is
* currently valid.
- *
+ *
* @param tree is the current tree the path will be drawn to.
* @param path is the current path the tree to draw to.
* @return the Rectangle enclosing the label portion that the last item in the
@@ -664,7 +664,7 @@ public class BasicTreeUI
/**
* Returns the max height of all the nodes in the tree.
- *
+ *
* @param tree - the current tree
* @return the max height.
*/
@@ -690,11 +690,11 @@ public class BasicTreeUI
maxHeight = Math.max(maxHeight, iconHeight + gap);
}
-
+
treeState.setRowHeight(maxHeight);
return maxHeight;
}
-
+
/**
* Get the tree node icon.
*/
@@ -711,7 +711,7 @@ public class BasicTreeUI
/**
* Returns the path for passed in row. If row is not visible null is returned.
- *
+ *
* @param tree is the current tree to return path for.
* @param row is the row number of the row to return.
* @return the path for passed in row. If row is not visible null is returned.
@@ -724,7 +724,7 @@ public class BasicTreeUI
/**
* Returns the row that the last item identified in path is visible at. Will
* return -1 if any of the elments in the path are not currently visible.
- *
+ *
* @param tree is the current tree to return the row for.
* @param path is the path used to find the row.
* @return the row that the last item identified in path is visible at. Will
@@ -738,7 +738,7 @@ public class BasicTreeUI
/**
* Returns the number of rows that are being displayed.
- *
+ *
* @param tree is the current tree to return the number of rows for.
* @return the number of rows being displayed.
*/
@@ -752,7 +752,7 @@ public class BasicTreeUI
* currently visible this will return null, otherwise it'll always return a
* valid path. If you need to test if the returned object is exactly at x,y
* you should get the bounds for the returned path and test x,y against that.
- *
+ *
* @param tree the tree to search for the closest path
* @param x is the x coordinate of the location to search
* @param y is the y coordinate of the location to search
@@ -766,7 +766,7 @@ public class BasicTreeUI
/**
* Returns true if the tree is being edited. The item that is being edited can
* be returned by getEditingPath().
- *
+ *
* @param tree is the tree to check for editing.
* @return true if the tree is being edited.
*/
@@ -779,7 +779,7 @@ public class BasicTreeUI
* Stops the current editing session. This has no effect if the tree is not
* being edited. Returns true if the editor allows the editing session to
* stop.
- *
+ *
* @param tree is the tree to stop the editing on
* @return true if the editor allows the editing session to stop.
*/
@@ -796,7 +796,7 @@ public class BasicTreeUI
/**
* Cancels the current editing session.
- *
+ *
* @param tree is the tree to cancel the editing session on.
*/
public void cancelEditing(JTree tree)
@@ -811,7 +811,7 @@ public class BasicTreeUI
/**
* Selects the last item in path and tries to edit it. Editing will fail if
* the CellEditor won't allow it for the selected item.
- *
+ *
* @param tree is the tree to edit on.
* @param path is the path in tree to edit on.
*/
@@ -824,7 +824,7 @@ public class BasicTreeUI
/**
* Returns the path to the element that is being editted.
- *
+ *
* @param tree is the tree to get the editing path from.
* @return the path that is being edited.
*/
@@ -858,7 +858,7 @@ public class BasicTreeUI
updateDepthOffset();
setSelectionModel(tree.getSelectionModel());
configureLayoutCache();
- treeState.setRootVisible(tree.isRootVisible());
+ treeState.setRootVisible(tree.isRootVisible());
treeSelectionModel.setRowMapper(treeState);
updateSize();
}
@@ -887,7 +887,7 @@ public class BasicTreeUI
* Creates an instance of NodeDimensions that is able to determine the size of
* a given node in the tree. The node dimensions must be created before
* configuring the layout cache.
- *
+ *
* @return the NodeDimensions of a given node in the tree
*/
protected AbstractLayoutCache.NodeDimensions createNodeDimensions()
@@ -898,7 +898,7 @@ public class BasicTreeUI
/**
* Creates a listener that is reponsible for the updates the UI based on how
* the tree changes.
- *
+ *
* @return the PropertyChangeListener that is reposnsible for the updates
*/
protected PropertyChangeListener createPropertyChangeListener()
@@ -909,7 +909,7 @@ public class BasicTreeUI
/**
* Creates the listener responsible for updating the selection based on mouse
* events.
- *
+ *
* @return the MouseListener responsible for updating.
*/
protected MouseListener createMouseListener()
@@ -920,7 +920,7 @@ public class BasicTreeUI
/**
* Creates the listener that is responsible for updating the display when
* focus is lost/grained.
- *
+ *
* @return the FocusListener responsible for updating.
*/
protected FocusListener createFocusListener()
@@ -930,7 +930,7 @@ public class BasicTreeUI
/**
* Creates the listener reponsible for getting key events from the tree.
- *
+ *
* @return the KeyListener responsible for getting key events.
*/
protected KeyListener createKeyListener()
@@ -941,7 +941,7 @@ public class BasicTreeUI
/**
* Creates the listener responsible for getting property change events from
* the selection model.
- *
+ *
* @returns the PropertyChangeListener reponsible for getting property change
* events from the selection model.
*/
@@ -953,7 +953,7 @@ public class BasicTreeUI
/**
* Creates the listener that updates the display based on selection change
* methods.
- *
+ *
* @return the TreeSelectionListener responsible for updating.
*/
protected TreeSelectionListener createTreeSelectionListener()
@@ -963,7 +963,7 @@ public class BasicTreeUI
/**
* Creates a listener to handle events from the current editor
- *
+ *
* @return the CellEditorListener that handles events from the current editor
*/
protected CellEditorListener createCellEditorListener()
@@ -975,7 +975,7 @@ public class BasicTreeUI
* Creates and returns a new ComponentHandler. This is used for the large
* model to mark the validCachedPreferredSize as invalid when the component
* moves.
- *
+ *
* @return a new ComponentHandler.
*/
protected ComponentListener createComponentListener()
@@ -986,7 +986,7 @@ public class BasicTreeUI
/**
* Creates and returns the object responsible for updating the treestate when
* a nodes expanded state changes.
- *
+ *
* @return the TreeExpansionListener responsible for updating the treestate
*/
protected TreeExpansionListener createTreeExpansionListener()
@@ -997,7 +997,7 @@ public class BasicTreeUI
/**
* Creates the object responsible for managing what is expanded, as well as
* the size of nodes.
- *
+ *
* @return the object responsible for managing what is expanded.
*/
protected AbstractLayoutCache createLayoutCache()
@@ -1007,7 +1007,7 @@ public class BasicTreeUI
/**
* Returns the renderer pane that renderer components are placed in.
- *
+ *
* @return the rendererpane that render components are placed in.
*/
protected CellRendererPane createCellRendererPane()
@@ -1017,7 +1017,7 @@ public class BasicTreeUI
/**
* Creates a default cell editor.
- *
+ *
* @return the default cell editor.
*/
protected TreeCellEditor createDefaultCellEditor()
@@ -1035,7 +1035,7 @@ public class BasicTreeUI
/**
* Returns the default cell renderer that is used to do the stamping of each
* node.
- *
+ *
* @return the default cell renderer that is used to do the stamping of each
* node.
*/
@@ -1046,7 +1046,7 @@ public class BasicTreeUI
/**
* Returns a listener that can update the tree when the model changes.
- *
+ *
* @return a listener that can update the tree when the model changes.
*/
protected TreeModelListener createTreeModelListener()
@@ -1099,7 +1099,7 @@ public class BasicTreeUI
/**
* The vertical element of legs between nodes starts at the bottom of the
* parent node by default. This method makes the leg start below that.
- *
+ *
* @return the vertical leg buffer
*/
protected int getVerticalLegBuffer()
@@ -1111,7 +1111,7 @@ public class BasicTreeUI
* The horizontal element of legs between nodes starts at the right of the
* left-hand side of the child node by default. This method makes the leg end
* before that.
- *
+ *
* @return the horizontal leg buffer
*/
protected int getHorizontalLegBuffer()
@@ -1133,7 +1133,7 @@ public class BasicTreeUI
* Updates the expanded state of all the descendants of the <code>path</code>
* by getting the expanded descendants from the tree and forwarding to the
* tree state.
- *
+ *
* @param path the path used to update the expanded states
*/
protected void updateExpandedDescendants(TreePath path)
@@ -1146,7 +1146,7 @@ public class BasicTreeUI
/**
* Returns a path to the last child of <code>parent</code>
- *
+ *
* @param parent is the topmost path to specified
* @return a path to the last child of parent
*/
@@ -1206,24 +1206,24 @@ public class BasicTreeUI
{
if (tree != null)
{
- TreeCellRenderer rend = tree.getCellRenderer();
- if (rend != null)
- {
- createdRenderer = false;
- currentCellRenderer = rend;
- if (createdCellEditor)
- tree.setCellEditor(null);
- }
- else
- {
- tree.setCellRenderer(createDefaultCellRenderer());
- createdRenderer = true;
- }
+ TreeCellRenderer rend = tree.getCellRenderer();
+ if (rend != null)
+ {
+ createdRenderer = false;
+ currentCellRenderer = rend;
+ if (createdCellEditor)
+ tree.setCellEditor(null);
+ }
+ else
+ {
+ tree.setCellRenderer(createDefaultCellRenderer());
+ createdRenderer = true;
+ }
}
else
{
- currentCellRenderer = null;
- createdRenderer = false;
+ currentCellRenderer = null;
+ createdRenderer = false;
}
updateCellEditor();
@@ -1262,7 +1262,7 @@ public class BasicTreeUI
/**
* Messaged from the VisibleTreeNode after it has been expanded.
- *
+ *
* @param path is the path that has been expanded.
*/
protected void pathWasExpanded(TreePath path)
@@ -1289,11 +1289,11 @@ public class BasicTreeUI
{
LookAndFeel.installColorsAndFont(tree, "Tree.background",
"Tree.foreground", "Tree.font");
-
+
hashColor = UIManager.getColor("Tree.hash");
if (hashColor == null)
hashColor = Color.black;
-
+
tree.setOpaque(true);
rightChildIndent = UIManager.getInt("Tree.rightChildIndent");
@@ -1383,7 +1383,7 @@ public class BasicTreeUI
am.put(action.getValue(Action.NAME), action);
action = new TreeTraverseAction(1, "selectChild");
am.put(action.getValue(Action.NAME), action);
-
+
// TreeToggleAction.
action = new TreeToggleAction("toggleAndAnchor");
am.put(action.getValue(Action.NAME), action);
@@ -1401,20 +1401,20 @@ public class BasicTreeUI
am.put(action.getValue(Action.NAME), action);
action = new TreePageAction(1, "scrollDownChangeLead");
am.put(action.getValue(Action.NAME), action);
-
+
// Tree editing actions
action = new TreeStartEditingAction("startEditing");
am.put(action.getValue(Action.NAME), action);
action = new TreeCancelEditingAction("cancel");
am.put(action.getValue(Action.NAME), action);
-
+
return am;
}
/**
* Converts the modifiers.
- *
+ *
* @param mod - modifier to convert
* @returns the new modifier
*/
@@ -1492,7 +1492,7 @@ public class BasicTreeUI
/**
* Install the UI for the component
- *
+ *
* @param c the component to install UI for
*/
public void installUI(JComponent c)
@@ -1506,7 +1506,7 @@ public class BasicTreeUI
installListeners();
completeUIInstall();
}
-
+
/**
* Uninstall the defaults for the tree
*/
@@ -1519,7 +1519,7 @@ public class BasicTreeUI
/**
* Uninstall the UI for the component
- *
+ *
* @param c the component to uninstall UI for
*/
public void uninstallUI(JComponent c)
@@ -1539,7 +1539,7 @@ public class BasicTreeUI
* method is invoked from the ComponentUI.update method when the specified
* component is being painted. Subclasses should override this method and use
* the specified Graphics object to render the content of the component.
- *
+ *
* @param g the Graphics context in which to paint
* @param c the component being painted; this argument is often ignored, but
* might be used if the UI object is stateless and shared by multiple
@@ -1548,9 +1548,9 @@ public class BasicTreeUI
public void paint(Graphics g, JComponent c)
{
JTree tree = (JTree) c;
-
+
int rows = treeState.getRowCount();
-
+
if (rows == 0)
// There is nothing to do if the tree is empty.
return;
@@ -1639,7 +1639,7 @@ public class BasicTreeUI
/**
* Ensures that the rows identified by beginRow through endRow are visible.
- *
+ *
* @param beginRow is the first row
* @param endRow is the last row
*/
@@ -1662,7 +1662,7 @@ public class BasicTreeUI
/**
* Sets the preferred minimum size.
- *
+ *
* @param newSize is the new preferred minimum size.
*/
public void setPreferredMinSize(Dimension newSize)
@@ -1672,7 +1672,7 @@ public class BasicTreeUI
/**
* Gets the preferred minimum size.
- *
+ *
* @returns the preferred minimum size.
*/
public Dimension getPreferredMinSize()
@@ -1686,7 +1686,7 @@ public class BasicTreeUI
/**
* Returns the preferred size to properly display the tree, this is a cover
* method for getPreferredSize(c, false).
- *
+ *
* @param c the component whose preferred size is being queried; this argument
* is often ignored but might be used if the UI object is stateless
* and shared by multiple components
@@ -1700,7 +1700,7 @@ public class BasicTreeUI
/**
* Returns the preferred size to represent the tree in c. If checkConsistancy
* is true, checkConsistancy is messaged first.
- *
+ *
* @param c the component whose preferred size is being queried.
* @param checkConsistancy if true must check consistancy
* @return the preferred size
@@ -1721,7 +1721,7 @@ public class BasicTreeUI
/**
* Returns the minimum size for this component. Which will be the min
* preferred size or (0,0).
- *
+ *
* @param c the component whose min size is being queried.
* @returns the preferred size or null
*/
@@ -1733,7 +1733,7 @@ public class BasicTreeUI
/**
* Returns the maximum size for the component, which will be the preferred
* size if the instance is currently in JTree or (0,0).
- *
+ *
* @param c the component whose preferred size is being queried
* @return the max size or null
*/
@@ -1763,7 +1763,7 @@ public class BasicTreeUI
* with stopEditing, if messageCancel is true the editor is messaged with
* cancelEditing. If messageTree is true, the treeModel is messaged with
* valueForPathChanged.
- *
+ *
* @param messageStop message to stop editing
* @param messageCancel message to cancel editing
* @param messageTree message to treeModel
@@ -1808,7 +1808,7 @@ public class BasicTreeUI
/**
* Will start editing for node if there is a cellEditor and shouldSelectCall
* returns true. This assumes that path is valid and visible.
- *
+ *
* @param path is the path to start editing
* @param event is the MouseEvent performed on the path
* @return true if successful
@@ -1826,7 +1826,7 @@ public class BasicTreeUI
{
if (ed.isCellEditable(event))
{
- editingRow = getRowForPath(tree, path);
+ editingRow = getRowForPath(tree, path);
Object value = path.getLastPathComponent();
boolean isSelected = tree.isPathSelected(path);
boolean isExpanded = tree.isExpanded(editingPath);
@@ -1852,7 +1852,7 @@ public class BasicTreeUI
}
else
editorHasDifferentSize = false;
-
+
// The editing component must be added to its container. We add the
// container, not the editing component itself.
tree.add(editingComponent);
@@ -1880,7 +1880,7 @@ public class BasicTreeUI
if (active != null)
{
MouseInputHandler ih = new MouseInputHandler(tree, active, event);
-
+
}
}
@@ -1910,13 +1910,13 @@ public class BasicTreeUI
}
else if (c.isFocusable())
c.requestFocus();
-
+
}
/**
* If the <code>mouseX</code> and <code>mouseY</code> are in the expand or
* collapse region of the row, this will toggle the row.
- *
+ *
* @param path the path we are concerned with
* @param mouseX is the cursor's x position
* @param mouseY is the cursor's y position
@@ -1932,7 +1932,7 @@ public class BasicTreeUI
* Returns true if the <code>mouseX</code> and <code>mouseY</code> fall in
* the area of row that is used to expand/collpse the node and the node at row
* does not represent a leaf.
- *
+ *
* @param path the path we are concerned with
* @param mouseX is the cursor's x position
* @param mouseY is the cursor's y position
@@ -1956,13 +1956,13 @@ public class BasicTreeUI
width = 18;
Insets i = tree.getInsets();
-
+
int depth;
if (isRootVisible())
depth = path.getPathCount()-1;
else
depth = path.getPathCount()-2;
-
+
int left = getRowX(tree.getRowForPath(path), depth)
- width + i.left;
cntlClick = mouseX >= left && mouseX <= left + width;
@@ -1973,7 +1973,7 @@ public class BasicTreeUI
/**
* Messaged when the user clicks the particular row, this invokes
* toggleExpandState.
- *
+ *
* @param path the path we are concerned with
* @param mouseX is the cursor's x position
* @param mouseY is the cursor's y position
@@ -1988,7 +1988,7 @@ public class BasicTreeUI
* expanding a path and JTree scroll on expand, ensureRowsAreVisible is
* invoked to scroll as many of the children to visible as possible (tries to
* scroll to last visible descendant of path).
- *
+ *
* @param path the path we are concerned with
*/
protected void toggleExpandState(TreePath path)
@@ -2006,17 +2006,17 @@ public class BasicTreeUI
* event as "toggle selection event" if the CTRL button was pressed while
* clicking. The event is not counted as toggle event if the associated
* tree does not support the multiple selection.
- *
+ *
* @param event is the MouseEvent performed on the row.
* @return true signifies a mouse event on the node should toggle the
* selection of only the row under the mouse.
*/
protected boolean isToggleSelectionEvent(MouseEvent event)
{
- return
- (tree.getSelectionModel().getSelectionMode() !=
+ return
+ (tree.getSelectionModel().getSelectionMode() !=
TreeSelectionModel.SINGLE_TREE_SELECTION) &&
- ((event.getModifiersEx() & InputEvent.CTRL_DOWN_MASK) != 0);
+ ((event.getModifiersEx() & InputEvent.CTRL_DOWN_MASK) != 0);
}
/**
@@ -2025,24 +2025,24 @@ public class BasicTreeUI
* event" if the SHIFT button was pressed while clicking. The event is not
* counted as multiple selection event if the associated tree does not support
* the multiple selection.
- *
+ *
* @param event is the MouseEvent performed on the node.
* @return true signifies a mouse event on the node should select from the
* anchor point.
*/
protected boolean isMultiSelectEvent(MouseEvent event)
{
- return
- (tree.getSelectionModel().getSelectionMode() !=
+ return
+ (tree.getSelectionModel().getSelectionMode() !=
TreeSelectionModel.SINGLE_TREE_SELECTION) &&
- ((event.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) != 0);
+ ((event.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) != 0);
}
/**
* Returning true indicates the row under the mouse should be toggled based on
* the event. This is invoked after checkForClickInExpandControl, implying the
* location is not in the expand (toggle) control.
- *
+ *
* @param event is the MouseEvent performed on the row.
* @return true indicates the row under the mouse should be toggled based on
* the event.
@@ -2065,10 +2065,10 @@ public class BasicTreeUI
* or deselected. If the event identifies a multi selection event, the
* selection is updated from the anchor point. Otherwise, the row is selected,
* and the previous selection is cleared.</p>
- *
+ *
* @param path is the path selected for an event
* @param event is the MouseEvent performed on the path.
- *
+ *
* @see #isToggleSelectionEvent(MouseEvent)
* @see #isMultiSelectEvent(MouseEvent)
*/
@@ -2108,7 +2108,7 @@ public class BasicTreeUI
/**
* Returns true if the node at <code>row</code> is a leaf.
- *
+ *
* @param row is the row we are concerned with.
* @return true if the node at <code>row</code> is a leaf.
*/
@@ -2121,7 +2121,7 @@ public class BasicTreeUI
Object node = pathForRow.getLastPathComponent();
return treeModel.isLeaf(node);
}
-
+
/**
* The action to start editing at the current lead selection path.
*/
@@ -2130,26 +2130,26 @@ public class BasicTreeUI
{
/**
* Creates the new tree cancel editing action.
- *
+ *
* @param name the name of the action (used in toString).
*/
public TreeStartEditingAction(String name)
{
super(name);
- }
-
+ }
+
/**
* Start editing at the current lead selection path.
- *
+ *
* @param e the ActionEvent that caused this action.
*/
public void actionPerformed(ActionEvent e)
{
TreePath lead = tree.getLeadSelectionPath();
- if (!tree.isEditing())
+ if (!tree.isEditing())
tree.startEditingAtPath(lead);
}
- }
+ }
/**
* Updates the preferred size when scrolling, if necessary.
@@ -2176,7 +2176,7 @@ public class BasicTreeUI
/**
* Invoked when the component's position changes.
- *
+ *
* @param e the event that occurs when moving the component
*/
public void componentMoved(ComponentEvent e)
@@ -2225,7 +2225,7 @@ public class BasicTreeUI
/**
* Returns the JScrollPane housing the JTree, or null if one isn't found.
- *
+ *
* @return JScrollPane housing the JTree, or null if one isn't found.
*/
protected JScrollPane getScrollPane()
@@ -2242,7 +2242,7 @@ public class BasicTreeUI
/**
* Public as a result of Timer. If the scrollBar is null, or not adjusting,
* this stops the timer and updates the sizing.
- *
+ *
* @param ae is the action performed
*/
public void actionPerformed(ActionEvent ae)
@@ -2276,7 +2276,7 @@ public class BasicTreeUI
/**
* Messaged when editing has stopped in the tree. Tells the listeners
* editing has stopped.
- *
+ *
* @param e is the notification event
*/
public void editingStopped(ChangeEvent e)
@@ -2287,7 +2287,7 @@ public class BasicTreeUI
/**
* Messaged when editing has been canceled in the tree. This tells the
* listeners the editor has canceled editing.
- *
+ *
* @param e is the notification event
*/
public void editingCanceled(ChangeEvent e)
@@ -2315,7 +2315,7 @@ public class BasicTreeUI
* row. Invoked when a component gains the keyboard focus. The method
* repaints the lead row that is shown differently when the tree is in
* focus.
- *
+ *
* @param e is the focus event that is activated
*/
public void focusGained(FocusEvent e)
@@ -2328,7 +2328,7 @@ public class BasicTreeUI
* row. Invoked when a component loses the keyboard focus. The method
* repaints the lead row that is shown differently when the tree is in
* focus.
- *
+ *
* @param e is the focus event that is deactivated
*/
public void focusLost(FocusEvent e)
@@ -2373,7 +2373,7 @@ public class BasicTreeUI
* element whose first letter matches the alphanumeric key pressed by the
* user. Subsequent same key presses move the keyboard focus to the next
* object that starts with the same letter.
- *
+ *
* @param e the key typed
*/
public void keyTyped(KeyEvent e)
@@ -2389,22 +2389,22 @@ public class BasicTreeUI
return;
}
}
-
+
// Not found below, search above:
for (int row = 0; row < tree.getLeadSelectionRow(); row++)
{
if (checkMatch(row, typed))
{
tree.setSelectionRow(row);
- tree.scrollRowToVisible(row);
+ tree.scrollRowToVisible(row);
return;
}
}
}
-
+
/**
* Check if the given tree row starts with this character
- *
+ *
* @param row the tree row
* @param typed the typed char, must be converted to lowercase
* @return true if the given tree row starts with this character
@@ -2424,7 +2424,7 @@ public class BasicTreeUI
/**
* Invoked when a key has been pressed.
- *
+ *
* @param e the key pressed
*/
public void keyPressed(KeyEvent e)
@@ -2434,7 +2434,7 @@ public class BasicTreeUI
/**
* Invoked when a key has been released
- *
+ *
* @param e the key released
*/
public void keyReleased(KeyEvent e)
@@ -2451,7 +2451,7 @@ public class BasicTreeUI
extends MouseAdapter
implements MouseMotionListener
{
-
+
/**
* If the cell has been selected on mouse press.
*/
@@ -2467,7 +2467,7 @@ public class BasicTreeUI
/**
* Invoked when a mouse button has been pressed on a component.
- *
+ *
* @param e is the mouse event that occured
*/
public void mousePressed(MouseEvent e)
@@ -2488,7 +2488,7 @@ public class BasicTreeUI
* MOUSE_DRAGGED events will continue to be delivered to the component where
* the drag originated until the mouse button is released (regardless of
* whether the mouse position is within the bounds of the component).
- *
+ *
* @param e is the mouse event that occured
*/
public void mouseDragged(MouseEvent e)
@@ -2499,7 +2499,7 @@ public class BasicTreeUI
/**
* Invoked when the mouse button has been moved on a component (with no
* buttons no down).
- *
+ *
* @param e the mouse event that occured
*/
public void mouseMoved(MouseEvent e)
@@ -2509,7 +2509,7 @@ public class BasicTreeUI
/**
* Invoked when a mouse button has been released on a component.
- *
+ *
* @param e is the mouse event that occured
*/
public void mouseReleased(MouseEvent e)
@@ -2572,7 +2572,7 @@ public class BasicTreeUI
/**
* Constructor
- *
+ *
* @param source that events are coming from
* @param destination that receives all events
* @param e is the event received
@@ -2590,7 +2590,7 @@ public class BasicTreeUI
/**
* Invoked when the mouse button has been clicked (pressed and released) on
* a component.
- *
+ *
* @param e mouse event that occured
*/
public void mouseClicked(MouseEvent e)
@@ -2600,7 +2600,7 @@ public class BasicTreeUI
/**
* Invoked when a mouse button has been pressed on a component.
- *
+ *
* @param e mouse event that occured
*/
public void mousePressed(MouseEvent e)
@@ -2610,7 +2610,7 @@ public class BasicTreeUI
/**
* Invoked when a mouse button has been released on a component.
- *
+ *
* @param e mouse event that occured
*/
public void mouseReleased(MouseEvent e)
@@ -2621,7 +2621,7 @@ public class BasicTreeUI
/**
* Invoked when the mouse enters a component.
- *
+ *
* @param e mouse event that occured
*/
public void mouseEntered(MouseEvent e)
@@ -2632,7 +2632,7 @@ public class BasicTreeUI
/**
* Invoked when the mouse exits a component.
- *
+ *
* @param e mouse event that occured
*/
public void mouseExited(MouseEvent e)
@@ -2646,7 +2646,7 @@ public class BasicTreeUI
* MOUSE_DRAGGED events will continue to be delivered to the component where
* the drag originated until the mouse button is released (regardless of
* whether the mouse position is within the bounds of the component).
- *
+ *
* @param e mouse event that occured
*/
public void mouseDragged(MouseEvent e)
@@ -2657,7 +2657,7 @@ public class BasicTreeUI
/**
* Invoked when the mouse cursor has been moved onto a component but no
* buttons have been pushed.
- *
+ *
* @param e mouse event that occured
*/
public void mouseMoved(MouseEvent e)
@@ -2716,7 +2716,7 @@ public class BasicTreeUI
* The calling method is responsible for determining the Y location. If
* bounds is null, a newly created Rectangle should be returned, otherwise
* the value should be placed in bounds and returned.
- *
+ *
* @param cell the value to be represented
* @param row row being queried
* @param depth the depth of the row
@@ -2762,13 +2762,13 @@ public class BasicTreeUI
// FIXME: The y should be handled by the layout cache.
size = new Rectangle(getRowX(row, depth), prefSize.height * row, prefSize.width,
prefSize.height);
-
+
return size;
}
/**
* Returns the amount to indent the given row
- *
+ *
* @return amount to indent the given row.
*/
protected int getRowX(int row, int depth)
@@ -2795,7 +2795,7 @@ public class BasicTreeUI
/**
* This method gets called when a bound property is changed.
- *
+ *
* @param event A PropertyChangeEvent object describing the event source and
* the property that has changed.
*/
@@ -2826,7 +2826,7 @@ public class BasicTreeUI
}
else if (property.equals(JTree.EDITABLE_PROPERTY))
setEditable(((Boolean) event.getNewValue()).booleanValue());
-
+
}
}
@@ -2848,7 +2848,7 @@ public class BasicTreeUI
/**
* This method gets called when a bound property is changed.
- *
+ *
* @param event A PropertyChangeEvent object describing the event source and
* the property that has changed.
*/
@@ -2866,7 +2866,7 @@ public class BasicTreeUI
{
/**
* Creates the new tree cancel editing action.
- *
+ *
* @param name the name of the action (used in toString).
*/
public TreeCancelEditingAction(String name)
@@ -2876,8 +2876,8 @@ public class BasicTreeUI
/**
* Invoked when an action occurs, cancels the cell editing (if the
- * tree cell is being edited).
- *
+ * tree cell is being edited).
+ *
* @param e event that occured
*/
public void actionPerformed(ActionEvent e)
@@ -2904,7 +2904,7 @@ public class BasicTreeUI
/**
* Called whenever an item in the tree has been expanded.
- *
+ *
* @param event is the event that occured
*/
public void treeExpanded(TreeExpansionEvent event)
@@ -2919,7 +2919,7 @@ public class BasicTreeUI
/**
* Called whenever an item in the tree has been collapsed.
- *
+ *
* @param event is the event that occured
*/
public void treeCollapsed(TreeExpansionEvent event)
@@ -2947,7 +2947,7 @@ public class BasicTreeUI
/**
* Creates a new TreeHomeAction instance.
- *
+ *
* @param dir the direction to go to, <code>-1</code> for home,
* <code>1</code> for end
* @param name the name of the action
@@ -2960,7 +2960,7 @@ public class BasicTreeUI
/**
* Invoked when an action occurs.
- *
+ *
* @param e is the event that occured
*/
public void actionPerformed(ActionEvent e)
@@ -3027,7 +3027,7 @@ public class BasicTreeUI
/**
* Returns true if the action is enabled.
- *
+ *
* @return true if the action is enabled.
*/
public boolean isEnabled()
@@ -3051,7 +3051,7 @@ public class BasicTreeUI
/**
* Creates a new TreeIncrementAction.
- *
+ *
* @param dir up or down, <code>-1</code> for up, <code>1</code> for down
* @param name is the name of the direction
*/
@@ -3063,7 +3063,7 @@ public class BasicTreeUI
/**
* Invoked when an action occurs.
- *
+ *
* @param e is the event that occured
*/
public void actionPerformed(ActionEvent e)
@@ -3138,14 +3138,14 @@ public class BasicTreeUI
tree.setAnchorSelectionPath(newPath);
tree.setLeadSelectionPath(newPath);
}
-
+
// Ensure that the lead path is visible after the increment action.
tree.scrollPathToVisible(tree.getLeadSelectionPath());
}
/**
* Returns true if the action is enabled.
- *
+ *
* @return true if the action is enabled.
*/
public boolean isEnabled()
@@ -3177,7 +3177,7 @@ public class BasicTreeUI
* children will be null. Use e.getPath() to get the parent of the changed
* node(s). e.getChildIndices() returns the index(es) of the changed
* node(s).
- *
+ *
* @param e is the event that occured
*/
public void treeNodesChanged(TreeModelEvent e)
@@ -3191,7 +3191,7 @@ public class BasicTreeUI
* Invoked after nodes have been inserted into the tree. Use e.getPath() to
* get the parent of the new node(s). e.getChildIndices() returns the
* index(es) of the new node(s) in ascending order.
- *
+ *
* @param e is the event that occured
*/
public void treeNodesInserted(TreeModelEvent e)
@@ -3208,7 +3208,7 @@ public class BasicTreeUI
* siblings removed. Use e.getPath() to get the former parent of the deleted
* node(s). e.getChildIndices() returns, in ascending order, the index(es)
* the node(s) had before being deleted.
- *
+ *
* @param e is the event that occured
*/
public void treeNodesRemoved(TreeModelEvent e)
@@ -3224,7 +3224,7 @@ public class BasicTreeUI
* first element does not identify the current root node the first element
* should become the new root of the tree. Use e.getPath() to get the path
* to the node. e.getChildIndices() returns null.
- *
+ *
* @param e is the event that occured
*/
public void treeStructureChanged(TreeModelEvent e)
@@ -3249,7 +3249,7 @@ public class BasicTreeUI
/**
* Constructor
- *
+ *
* @param direction up or down
* @param name is the name of the direction
*/
@@ -3261,7 +3261,7 @@ public class BasicTreeUI
/**
* Invoked when an action occurs.
- *
+ *
* @param e is the event that occured
*/
public void actionPerformed(ActionEvent e)
@@ -3358,7 +3358,7 @@ public class BasicTreeUI
/**
* Returns true if the action is enabled.
- *
+ *
* @return true if the action is enabled.
*/
public boolean isEnabled()
@@ -3385,7 +3385,7 @@ public class BasicTreeUI
/**
* Messaged when the selection changes in the tree we're displaying for.
* Stops editing, messages super and displays the changed paths.
- *
+ *
* @param event the event that characterizes the change.
*/
public void valueChanged(TreeSelectionEvent event)
@@ -3394,15 +3394,15 @@ public class BasicTreeUI
TreePath op = event.getOldLeadSelectionPath();
TreePath np = event.getNewLeadSelectionPath();
-
+
// Repaint of the changed lead selection path.
if (op != np)
{
- Rectangle o = treeState.getBounds(event.getOldLeadSelectionPath(),
+ Rectangle o = treeState.getBounds(event.getOldLeadSelectionPath(),
new Rectangle());
- Rectangle n = treeState.getBounds(event.getNewLeadSelectionPath(),
+ Rectangle n = treeState.getBounds(event.getNewLeadSelectionPath(),
new Rectangle());
-
+
if (o != null)
tree.repaint(o);
if (n != null)
@@ -3419,7 +3419,7 @@ public class BasicTreeUI
{
/**
* Creates a new TreeToggleAction.
- *
+ *
* @param name is the name of <code>Action</code> field
*/
public TreeToggleAction(String name)
@@ -3429,7 +3429,7 @@ public class BasicTreeUI
/**
* Invoked when an action occurs.
- *
+ *
* @param e the event that occured
*/
public void actionPerformed(ActionEvent e)
@@ -3452,7 +3452,7 @@ public class BasicTreeUI
/**
* Returns true if the action is enabled.
- *
+ *
* @return true if the action is enabled, false otherwise
*/
public boolean isEnabled()
@@ -3475,7 +3475,7 @@ public class BasicTreeUI
/**
* Constructor
- *
+ *
* @param direction to traverse
* @param name is the name of the direction
*/
@@ -3487,7 +3487,7 @@ public class BasicTreeUI
/**
* Invoked when an action occurs.
- *
+ *
* @param e the event that occured
*/
public void actionPerformed(ActionEvent e)
@@ -3512,7 +3512,7 @@ public class BasicTreeUI
// we just select the parent. We do not select the root if it
// is not visible.
TreePath parent = current.getParentPath();
- if (parent != null &&
+ if (parent != null &&
! (parent.getPathCount() == 1 && ! tree.isRootVisible()))
tree.setSelectionPath(parent);
}
@@ -3534,14 +3534,14 @@ public class BasicTreeUI
tree.expandPath(current);
}
}
-
+
// Ensure that the lead path is visible after the increment action.
tree.scrollPathToVisible(tree.getLeadSelectionPath());
}
/**
* Returns true if the action is enabled.
- *
+ *
* @return true if the action is enabled, false otherwise
*/
public boolean isEnabled()
@@ -3553,7 +3553,7 @@ public class BasicTreeUI
/**
* Returns true if the LookAndFeel implements the control icons. Package
* private for use in inner classes.
- *
+ *
* @returns true if there are control icons
*/
boolean hasControlIcons()
@@ -3566,7 +3566,7 @@ public class BasicTreeUI
/**
* Returns control icon. It is null if the LookAndFeel does not implements the
* control icons. Package private for use in inner classes.
- *
+ *
* @return control icon if it exists.
*/
Icon getCurrentControlIcon(TreePath path)
@@ -3604,7 +3604,7 @@ public class BasicTreeUI
/**
* Returns the parent of the current node
- *
+ *
* @param root is the root of the tree
* @param node is the current node
* @return is the parent of the current node
@@ -3621,7 +3621,7 @@ public class BasicTreeUI
/**
* Recursively checks the tree for the specified node, starting at the root.
- *
+ *
* @param root is starting node to start searching at.
* @param node is the node to search for
* @return the parent node of node
@@ -3648,7 +3648,7 @@ public class BasicTreeUI
/**
* Selects the specified path in the tree depending on modes. Package private
* for use in inner classes.
- *
+ *
* @param tree is the tree we are selecting the path in
* @param path is the path we are selecting
*/
@@ -3657,7 +3657,7 @@ public class BasicTreeUI
if (path != null)
{
tree.setSelectionPath(path);
- tree.setLeadSelectionPath(path);
+ tree.setLeadSelectionPath(path);
tree.makeVisible(path);
tree.scrollPathToVisible(path);
}
@@ -3666,7 +3666,7 @@ public class BasicTreeUI
/**
* Returns the path from node to the root. Package private for use in inner
* classes.
- *
+ *
* @param node the node to get the path to
* @param depth the depth of the tree to return a path for
* @return an array of tree nodes that represent the path to node.
@@ -3689,7 +3689,7 @@ public class BasicTreeUI
/**
* Draws a vertical line using the given graphic context
- *
+ *
* @param g is the graphic context
* @param c is the component the new line will belong to
* @param x is the horizonal position
@@ -3706,7 +3706,7 @@ public class BasicTreeUI
/**
* Draws a horizontal line using the given graphic context
- *
+ *
* @param g is the graphic context
* @param c is the component the new line will belong to
* @param y is the vertical position
@@ -3723,7 +3723,7 @@ public class BasicTreeUI
/**
* Draws an icon at around a specific position
- *
+ *
* @param c is the component the new line will belong to
* @param g is the graphic context
* @param icon is the icon which will be drawn
@@ -3745,7 +3745,7 @@ public class BasicTreeUI
/**
* Draws a dashed horizontal line.
- *
+ *
* @param g - the graphics configuration.
* @param y - the y location to start drawing at
* @param x1 - the x location to start drawing at
@@ -3760,7 +3760,7 @@ public class BasicTreeUI
/**
* Draws a dashed vertical line.
- *
+ *
* @param g - the graphics configuration.
* @param x - the x location to start drawing at
* @param y1 - the y location to start drawing at
@@ -3776,7 +3776,7 @@ public class BasicTreeUI
/**
* Paints the expand (toggle) part of a row. The receiver should NOT modify
* clipBounds, or insets.
- *
+ *
* @param g - the graphics configuration
* @param clipBounds -
* @param insets -
@@ -3806,7 +3806,7 @@ public class BasicTreeUI
* Paints the horizontal part of the leg. The receiver should NOT modify
* clipBounds, or insets. NOTE: parentRow can be -1 if the root is not
* visible.
- *
+ *
* @param g - the graphics configuration
* @param clipBounds -
* @param insets -
@@ -3834,7 +3834,7 @@ public class BasicTreeUI
/**
* Paints the vertical part of the leg. The receiver should NOT modify
* clipBounds, insets.
- *
+ *
* @param g - the graphics configuration.
* @param clipBounds -
* @param insets -
@@ -3845,7 +3845,7 @@ public class BasicTreeUI
{
Rectangle bounds = getPathBounds(tree, path);
TreePath parent = path.getParentPath();
-
+
boolean paintLine;
if (isRootVisible())
paintLine = parent != null;
@@ -3854,7 +3854,7 @@ public class BasicTreeUI
if (paintLine)
{
Rectangle parentBounds = getPathBounds(tree, parent);
- paintVerticalLine(g, tree, parentBounds.x + 2 * gap,
+ paintVerticalLine(g, tree, parentBounds.x + 2 * gap,
parentBounds.y + parentBounds.height / 2,
bounds.y + bounds.height / 2);
}
@@ -3863,7 +3863,7 @@ public class BasicTreeUI
/**
* Paints the renderer part of a row. The receiver should NOT modify
* clipBounds, or insets.
- *
+ *
* @param g - the graphics configuration
* @param clipBounds -
* @param insets -
@@ -3911,7 +3911,7 @@ public class BasicTreeUI
/**
* Returns true if the expand (toggle) control should be drawn for the
* specified row.
- *
+ *
* @param path - current path to check for.
* @param row - current row to check for.
* @param isExpanded - true if the path is expanded
@@ -3929,7 +3929,7 @@ public class BasicTreeUI
/**
* Returns the amount to indent the given row
- *
+ *
* @return amount to indent the given row.
*/
protected int getRowX(int row, int depth)
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicViewportUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicViewportUI.java
index 51b902d..11c7d63 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicViewportUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicViewportUI.java
@@ -43,7 +43,7 @@ import javax.swing.LookAndFeel;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.ViewportUI;
-public class BasicViewportUI extends ViewportUI
+public class BasicViewportUI extends ViewportUI
{
protected void installDefaults(JComponent c)
{
@@ -61,13 +61,13 @@ public class BasicViewportUI extends ViewportUI
return new BasicViewportUI();
}
- public void installUI(JComponent c)
+ public void installUI(JComponent c)
{
super.installUI(c);
installDefaults(c);
}
- public void uninstallUI(JComponent c)
+ public void uninstallUI(JComponent c)
{
super.uninstallUI(c);
uninstallDefaults(c);
diff --git a/libjava/classpath/javax/swing/plaf/metal/DefaultMetalTheme.java b/libjava/classpath/javax/swing/plaf/metal/DefaultMetalTheme.java
index 672676f..27c569f 100644
--- a/libjava/classpath/javax/swing/plaf/metal/DefaultMetalTheme.java
+++ b/libjava/classpath/javax/swing/plaf/metal/DefaultMetalTheme.java
@@ -48,7 +48,7 @@ import javax.swing.plaf.FontUIResource;
/**
* The default theme for the {@link MetalLookAndFeel}.
- *
+ *
* @see MetalLookAndFeel#setCurrentTheme(MetalTheme)
*/
public class DefaultMetalTheme extends MetalTheme
@@ -57,15 +57,15 @@ public class DefaultMetalTheme extends MetalTheme
new ColorUIResource(102, 102, 153);
private static final ColorUIResource PRIMARY2 =
new ColorUIResource(153, 153, 204);
- private static final ColorUIResource PRIMARY3 =
+ private static final ColorUIResource PRIMARY3 =
new ColorUIResource(204, 204, 255);
- private static final ColorUIResource SECONDARY1 =
+ private static final ColorUIResource SECONDARY1 =
new ColorUIResource(102, 102, 102);
- private static final ColorUIResource SECONDARY2 =
+ private static final ColorUIResource SECONDARY2 =
new ColorUIResource(153, 153, 153);
- private static final ColorUIResource SECONDARY3 =
+ private static final ColorUIResource SECONDARY3 =
new ColorUIResource(204, 204, 204);
-
+
private static final FontUIResource SUB_TEXT_FONT =
new FontUIResource("Dialog", Font.PLAIN, 10);
private static final FontUIResource SYSTEM_TEXT_FONT =
@@ -74,7 +74,7 @@ public class DefaultMetalTheme extends MetalTheme
new FontUIResource("Dialog", Font.PLAIN, 12);
private static final FontUIResource WINDOW_TITLE_FONT =
new FontUIResource("Dialog", Font.BOLD, 12);
-
+
/**
* The control text font for swing.boldMetal=false.
*/
@@ -108,7 +108,7 @@ public class DefaultMetalTheme extends MetalTheme
* Indicates the menu text font.
*/
static final int MENU_TEXT_FONT = 2;
-
+
/**
* Creates a new instance of this theme.
*/
@@ -119,7 +119,7 @@ public class DefaultMetalTheme extends MetalTheme
/**
* Returns the name of the theme.
- *
+ *
* @return <code>"Steel"</code>.
*/
public String getName()
@@ -129,7 +129,7 @@ public class DefaultMetalTheme extends MetalTheme
/**
* Returns the first primary color for this theme.
- *
+ *
* @return The first primary color.
*/
protected ColorUIResource getPrimary1()
@@ -139,7 +139,7 @@ public class DefaultMetalTheme extends MetalTheme
/**
* Returns the second primary color for this theme.
- *
+ *
* @return The second primary color.
*/
protected ColorUIResource getPrimary2()
@@ -149,7 +149,7 @@ public class DefaultMetalTheme extends MetalTheme
/**
* Returns the third primary color for this theme.
- *
+ *
* @return The third primary color.
*/
protected ColorUIResource getPrimary3()
@@ -159,7 +159,7 @@ public class DefaultMetalTheme extends MetalTheme
/**
* Returns the first secondary color for this theme.
- *
+ *
* @return The first secondary color.
*/
protected ColorUIResource getSecondary1()
@@ -169,7 +169,7 @@ public class DefaultMetalTheme extends MetalTheme
/**
* Returns the second secondary color for this theme.
- *
+ *
* @return The second secondary color.
*/
protected ColorUIResource getSecondary2()
@@ -179,7 +179,7 @@ public class DefaultMetalTheme extends MetalTheme
/**
* Returns the third secondary color for this theme.
- *
+ *
* @return The third secondary color.
*/
protected ColorUIResource getSecondary3()
@@ -190,66 +190,66 @@ public class DefaultMetalTheme extends MetalTheme
/**
* Returns the font used for text on controls. In this case, the font is
* <code>FontUIResource("Dialog", Font.BOLD, 12)</code>, unless the
- * <code>swing.boldMetal</code> UI default is set to {@link Boolean#FALSE}
+ * <code>swing.boldMetal</code> UI default is set to {@link Boolean#FALSE}
* in which case it is <code>FontUIResource("Dialog", Font.PLAIN, 12)</code>.
- *
+ *
* @return The font.
*/
public FontUIResource getControlTextFont()
{
return getFont(CONTROL_TEXT_FONT);
}
-
+
/**
* Returns the font used for text in menus. In this case, the font is
* <code>FontUIResource("Dialog", Font.BOLD, 12)</code>, unless the
- * <code>swing.boldMetal</code> UI default is set to {@link Boolean#FALSE}
+ * <code>swing.boldMetal</code> UI default is set to {@link Boolean#FALSE}
* in which case it is <code>FontUIResource("Dialog", Font.PLAIN, 12)</code>.
- *
+ *
* @return The font used for text in menus.
*/
public FontUIResource getMenuTextFont()
{
return getFont(MENU_TEXT_FONT);
}
-
+
/**
* Returns the font used for sub text. In this case, the font is
* <code>FontUIResource("Dialog", Font.PLAIN, 10)</code>.
- *
+ *
* @return The font used for sub text.
*/
public FontUIResource getSubTextFont()
{
return SUB_TEXT_FONT;
}
-
+
/**
* Returns the font used for system text. In this case, the font is
* <code>FontUIResource("Dialog", Font.PLAIN, 12)</code>.
- *
+ *
* @return The font used for system text.
*/
public FontUIResource getSystemTextFont()
{
return SYSTEM_TEXT_FONT;
}
-
+
/**
* Returns the font used for user text. In this case, the font is
* <code>FontUIResource("Dialog", Font.PLAIN, 12)</code>.
- *
- * @return The font used for user text.
+ *
+ * @return The font used for user text.
*/
public FontUIResource getUserTextFont()
{
return USER_TEXT_FONT;
}
-
+
/**
- * Returns the font used for window titles. In this case, the font is
+ * Returns the font used for window titles. In this case, the font is
* <code>FontUIResource("Dialog", Font.BOLD, 12)</code>.
- *
+ *
* @return The font used for window titles.
*/
public FontUIResource getWindowTitleFont()
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalBorders.java b/libjava/classpath/javax/swing/plaf/metal/MetalBorders.java
index d4e3a84..2536299 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalBorders.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalBorders.java
@@ -104,15 +104,15 @@ public class MetalBorders
/**
* <p>A border used for {@link JButton} components.</p>
- *
+ *
* <p>This {@link Border} implementation can handle only instances of
* {@link AbstractButton} and their subclasses.</p>
- *
+ *
* <p>If the Metal Look and Feel's current theme is 'Ocean' the border
* will be painted with a special highlight when the mouse cursor if
* over the button (ie. the property <code>rollover</code> of the
* button's model is <code>true</code>) and is not a <b>direct</b>
- * child of a {@link JToolBar}.</p>
+ * child of a {@link JToolBar}.</p>
*/
public static class ButtonBorder extends AbstractBorder implements UIResource
{
@@ -230,7 +230,7 @@ public class MetalBorders
g.setColor(middle);
g.drawLine(x + 1, y + 1, x + w - 2, y + 1);
g.drawLine(x + 1, y + 1, x + 1, y + h - 2);
-
+
// draw crossing pixels of both borders
g.setColor(shadow);
g.drawRect(x + 1, y + h - 2, 0, 0);
@@ -238,11 +238,11 @@ public class MetalBorders
}
}
}
- else
+ else
{
// draw disabled border
g.setColor(MetalLookAndFeel.getInactiveControlTextColor());
- g.drawRect(x, y, w - 2, h - 2);
+ g.drawRect(x, y, w - 2, h - 2);
}
}
@@ -260,7 +260,7 @@ public class MetalBorders
int y, int w, int h)
{
ButtonModel bmodel = null;
-
+
// The RI will fail with a ClassCastException in such a situation.
// This code tries to be more helpful.
if (c instanceof AbstractButton)
@@ -304,11 +304,11 @@ public class MetalBorders
g.drawRect(x, y, w - 1, h - 1);
}
}
- else
+ else
{
// draw disabled border
g.setColor(MetalLookAndFeel.getInactiveControlTextColor());
- g.drawRect(x, y, w - 2, h - 2);
+ g.drawRect(x, y, w - 2, h - 2);
}
}
@@ -325,7 +325,7 @@ public class MetalBorders
}
/**
- * Returns the insets of the <code>ButtonBorder</code> in the specified
+ * Returns the insets of the <code>ButtonBorder</code> in the specified
* <code>newInsets</code> object.
*
* @param c the component for which the border is used (ignored).
@@ -357,22 +357,22 @@ public class MetalBorders
{
// Nothing to do here.
}
-
+
/**
* Returns the border insets.
- *
+ *
* @param c the component (ignored).
- *
+ *
* @return The border insets.
*/
public Insets getBorderInsets(Component c)
{
return getBorderInsets(c, null);
}
-
+
/**
* Returns the border insets.
- *
+ *
* @param c the component (ignored).
* @return The border insets.
*/
@@ -387,12 +387,12 @@ public class MetalBorders
newInsets.bottom = 2;
newInsets.right = 3;
}
- return newInsets;
+ return newInsets;
}
-
+
/**
* Paints the border for the specified component.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x-coordinate.
@@ -400,13 +400,13 @@ public class MetalBorders
* @param w the width.
* @param h the height.
*/
- public void paintBorder(Component c, Graphics g, int x, int y, int w,
+ public void paintBorder(Component c, Graphics g, int x, int y, int w,
int h)
{
- g.setColor(MetalLookAndFeel.getControlDarkShadow());
- g.drawRect(x, y, w - 1, h - 1);
+ g.setColor(MetalLookAndFeel.getControlDarkShadow());
+ g.drawRect(x, y, w - 1, h - 1);
}
-
+
}
/**
@@ -416,7 +416,7 @@ public class MetalBorders
implements UIResource
{
private static final Insets borderInsets = new Insets(2, 2, 2, 2);
-
+
/**
* Creates a new border instance.
*/
@@ -424,27 +424,27 @@ public class MetalBorders
{
// Nothing to do here.
}
-
+
/**
* Returns the border insets.
- *
+ *
* @param c the component (ignored).
- *
+ *
* @return The border insets.
*/
public Insets getBorderInsets(Component c)
{
return borderInsets;
}
-
+
/**
* Returns the border insets.
- *
+ *
* @param c the component (ignored).
* @param newInsets an existing insets instance, that will be populated
* with the border insets and returned as the result
* (<code>null</code> not permitted).
- *
+ *
* @return The <code>newInsets</code> reference.
*/
public Insets getBorderInsets(Component c, Insets newInsets)
@@ -453,12 +453,12 @@ public class MetalBorders
newInsets.left = borderInsets.left;
newInsets.bottom = borderInsets.bottom;
newInsets.right = borderInsets.right;
- return newInsets;
+ return newInsets;
}
-
+
/**
* Paints the border for the specified component.
- *
+ *
* @param c the component (ignored).
* @param g the graphics device.
* @param x the x-coordinate.
@@ -466,9 +466,9 @@ public class MetalBorders
* @param w the width.
* @param h the height.
*/
- public void paintBorder(Component c, Graphics g, int x, int y, int w,
+ public void paintBorder(Component c, Graphics g, int x, int y, int w,
int h)
- {
+ {
Color savedColor = g.getColor();
g.setColor(MetalLookAndFeel.getControlDarkShadow());
g.drawRect(x, y, w - 2, h - 2);
@@ -479,13 +479,13 @@ public class MetalBorders
g.drawLine(x + w - 2, y + 1, x + w - 2, y + 1);
g.setColor(savedColor);
}
-
+
}
-
+
/**
- * A border used for a {@link JInternalFrame} when it is being used as a
+ * A border used for a {@link JInternalFrame} when it is being used as a
* palette.
- *
+ *
* @since 1.3
*/
public static class PaletteBorder extends AbstractBorder
@@ -500,12 +500,12 @@ public class MetalBorders
{
// Nothing to do here.
}
-
+
/**
* Returns the border insets.
- *
+ *
* @param c the component (ignored).
- *
+ *
* @return The border insets.
*/
public Insets getBorderInsets(Component c)
@@ -515,26 +515,26 @@ public class MetalBorders
/**
* Returns the border insets.
- *
+ *
* @param c the component (ignored).
* @param newInsets an existing insets instance, that will be populated
* with the border insets and returned as the result
* (<code>null</code> not permitted).
- *
+ *
* @return The <code>newInsets</code> reference.
*/
public Insets getBorderInsets(Component c, Insets newInsets)
- {
+ {
newInsets.top = borderInsets.top;
newInsets.left = borderInsets.left;
newInsets.bottom = borderInsets.bottom;
newInsets.right = borderInsets.right;
- return newInsets;
+ return newInsets;
}
-
+
/**
* Paints the border for the specified component.
- *
+ *
* @param c the component (ignored).
* @param g the graphics device.
* @param x the x-coordinate.
@@ -542,26 +542,26 @@ public class MetalBorders
* @param w the width.
* @param h the height.
*/
- public void paintBorder(Component c, Graphics g, int x, int y, int w,
+ public void paintBorder(Component c, Graphics g, int x, int y, int w,
int h)
{
Color savedColor = g.getColor();
-
+
// draw the outline
g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
g.drawRect(x, y, w - 1, h - 1);
-
+
// put a dot in each corner
g.setColor(MetalLookAndFeel.getControl());
g.fillRect(x, y, 1, 1);
g.fillRect(x + w - 1, y, 1, 1);
g.fillRect(x + w - 1, y + h - 1, 1, 1);
- g.fillRect(x, y + h - 1, 1, 1);
+ g.fillRect(x, y + h - 1, 1, 1);
g.setColor(savedColor);
}
}
-
+
/**
* A border used for the {@link JTextField} component.
*/
@@ -575,10 +575,10 @@ public class MetalBorders
{
// Nothing to do here.
}
-
+
/**
* Paints the border for the specified component.
- *
+ *
* @param c the component (ignored).
* @param g the graphics device.
* @param x the x-coordinate.
@@ -586,7 +586,7 @@ public class MetalBorders
* @param w the width.
* @param h the height.
*/
- public void paintBorder(Component c, Graphics g, int x, int y, int w,
+ public void paintBorder(Component c, Graphics g, int x, int y, int w,
int h)
{
boolean enabledTextBorder;
@@ -608,7 +608,7 @@ public class MetalBorders
g.setColor(savedColor);
}
}
-
+
}
/**
@@ -626,27 +626,27 @@ public class MetalBorders
{
// Nothing to do here.
}
-
+
/**
* Returns the border insets.
- *
+ *
* @param c the component (ignored).
- *
+ *
* @return The border insets.
*/
public Insets getBorderInsets(Component c)
{
return borderInsets;
}
-
+
/**
* Returns the border insets.
- *
+ *
* @param c the component (ignored).
* @param newInsets an existing insets instance, that will be populated
* with the border insets and returned as the result
* (<code>null</code> not permitted).
- *
+ *
* @return The <code>newInsets</code> reference.
*/
public Insets getBorderInsets(Component c, Insets newInsets)
@@ -655,12 +655,12 @@ public class MetalBorders
newInsets.left = borderInsets.left;
newInsets.bottom = borderInsets.bottom;
newInsets.right = borderInsets.right;
- return newInsets;
+ return newInsets;
}
-
+
/**
* Paints the border for the specified component.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x-coordinate.
@@ -668,47 +668,47 @@ public class MetalBorders
* @param w the width.
* @param h the height.
*/
- public void paintBorder(Component c, Graphics g, int x, int y, int w,
+ public void paintBorder(Component c, Graphics g, int x, int y, int w,
int h)
{
-
+
JInternalFrame f = (JInternalFrame) c;
if (f.isSelected())
g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
else
g.setColor(MetalLookAndFeel.getControlDarkShadow());
-
+
// fill the border background
g.fillRect(x, y, w, 5);
g.fillRect(x, y, 5, h);
g.fillRect(x + w - 5, y, 5, h);
g.fillRect(x, y + h - 5, w, 5);
-
+
// draw a dot in each corner
g.setColor(MetalLookAndFeel.getControl());
g.fillRect(x, y, 1, 1);
g.fillRect(x + w - 1, y, 1, 1);
g.fillRect(x + w - 1, y + h - 1, 1, 1);
g.fillRect(x, y + h - 1, 1, 1);
-
+
// draw the lines
g.setColor(MetalLookAndFeel.getBlack());
g.drawLine(x + 14, y + 2, x + w - 15, y + 2);
g.drawLine(x + 14, y + h - 3, x + w - 15, y + h - 3);
g.drawLine(x + 2, y + 14, x + 2, y + h - 15);
g.drawLine(x + w - 3, y + 14, x + w - 3, y + h - 15);
-
+
// draw the line highlights
if (f.isSelected())
g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
- else
+ else
g.setColor(MetalLookAndFeel.getControlShadow());
g.drawLine(x + 15, y + 3, x + w - 14, y + 3);
g.drawLine(x + 15, y + h - 2, x + w - 14, y + h - 2);
g.drawLine(x + 3, y + 15, x + 3, y + h - 14);
g.drawLine(x + w - 2, y + 15, x + w - 2, y + h - 14);
}
-
+
}
/**
@@ -718,7 +718,7 @@ public class MetalBorders
public static class OptionDialogBorder extends AbstractBorder
implements UIResource
{
-
+
/**
* Creates a new border instance.
*/
@@ -726,22 +726,22 @@ public class MetalBorders
{
// Nothing to do here.
}
-
+
/**
* Returns the border insets.
- *
+ *
* @param c the component (ignored).
- *
+ *
* @return The border insets.
*/
public Insets getBorderInsets(Component c)
{
return getBorderInsets(c, null);
}
-
+
/**
* Returns the border insets.
- *
+ *
* @param c the component (ignored).
* @return The border insets.
*/
@@ -756,12 +756,12 @@ public class MetalBorders
newInsets.bottom = 3;
newInsets.right = 3;
}
- return newInsets;
+ return newInsets;
}
-
+
/**
* Paints the border for the specified component.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x-coordinate.
@@ -769,10 +769,10 @@ public class MetalBorders
* @param w the width.
* @param h the height.
*/
- public void paintBorder(Component c, Graphics g, int x, int y, int w,
+ public void paintBorder(Component c, Graphics g, int x, int y, int w,
int h)
{
-
+
JInternalFrame f = (JInternalFrame) c;
g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
if (f.getContentPane() instanceof JOptionPane)
@@ -791,32 +791,32 @@ public class MetalBorders
Color bc = UIManager.getColor(
"OptionPane.warningDialog.border.background");
if (bc != null)
- g.setColor(bc);
+ g.setColor(bc);
}
else if (type == JOptionPane.ERROR_MESSAGE)
{
Color bc = UIManager.getColor(
"OptionPane.errorDialog.border.background");
if (bc != null)
- g.setColor(bc);
+ g.setColor(bc);
}
}
-
+
// fill the border background
g.fillRect(x, y, w, 3);
g.fillRect(x, y, 3, h);
g.fillRect(x + w - 3, y, 3, h);
g.fillRect(x, y + h - 3, w, 3);
-
+
// draw a dot in each corner
g.setColor(MetalLookAndFeel.getControl());
g.fillRect(x, y, 1, 1);
g.fillRect(x + w - 1, y, 1, 1);
g.fillRect(x + w - 1, y + h - 1, 1, 1);
g.fillRect(x, y + h - 1, 1, 1);
-
+
}
-
+
}
/**
@@ -827,7 +827,7 @@ public class MetalBorders
{
/** The border insets. */
protected static Insets borderInsets = new Insets(2, 2, 2, 2);
-
+
/**
* Creates a new border instance.
*/
@@ -835,11 +835,11 @@ public class MetalBorders
{
// Nothing to do here.
}
-
+
/**
* Paints the border for the component. A border is painted only if the
* component is a selected {@link JMenu} or an armed {@link JMenuItem}.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x-coordinate of the border area.
@@ -852,7 +852,7 @@ public class MetalBorders
{
Color dark = MetalLookAndFeel.getPrimaryControlDarkShadow();
Color light = MetalLookAndFeel.getPrimaryControlHighlight();
- if (c instanceof JMenu)
+ if (c instanceof JMenu)
{
JMenu menu = (JMenu) c;
if (menu.isSelected())
@@ -868,7 +868,7 @@ public class MetalBorders
else if (c instanceof JMenuItem)
{
JMenuItem item = (JMenuItem) c;
- if (item.isArmed())
+ if (item.isArmed())
{
g.setColor(dark);
g.drawLine(x, y, x + w, y);
@@ -883,27 +883,27 @@ public class MetalBorders
}
}
}
-
+
/**
* Returns the border insets.
- *
+ *
* @param c the component (ignored).
- *
+ *
* @return The border insets.
*/
public Insets getBorderInsets(Component c)
{
return borderInsets;
}
-
+
/**
* Populates <code>insets</code> with the border insets, then returns it.
- *
+ *
* @param c the component (ignored).
* @param insets the object to populate with the border insets.
- *
+ *
* @return The border insets.
- *
+ *
* @throws NullPointerException if <code>insets</code> is <code>null</code>.
*/
public Insets getBorderInsets(Component c, Insets insets)
@@ -925,18 +925,18 @@ public class MetalBorders
{
/** The border insets. */
protected static Insets borderInsets = new Insets(1, 0, 1, 0);
-
+
/**
* Creates a new border instance.
*/
public MenuBarBorder()
{
}
-
+
/**
* Paints the border for the component. A border is painted only if the
* component is a selected {@link JMenu} or an armed {@link JMenuItem}.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x-coordinate of the border area.
@@ -957,30 +957,30 @@ public class MetalBorders
g.setColor(UIManager.getColor("MenuBar.borderColor"));
else
g.setColor(MetalLookAndFeel.getControlShadow());
-
+
g.drawLine(x, y + h - 1, x + w, y + h - 1);
}
-
+
/**
* Returns the border insets.
- *
+ *
* @param c the component (ignored).
- *
+ *
* @return The border insets.
*/
public Insets getBorderInsets(Component c)
{
return borderInsets;
}
-
+
/**
* Populates <code>insets</code> with the border insets, then returns it.
- *
+ *
* @param c the component (ignored).
* @param insets the object to populate with the border insets.
- *
+ *
* @return The border insets.
- *
+ *
* @throws NullPointerException if <code>insets</code> is <code>null</code>.
*/
public Insets getBorderInsets(Component c, Insets insets)
@@ -1002,7 +1002,7 @@ public class MetalBorders
{
/** The border insets. */
private static Insets insets = new Insets(1, 1, 2, 2);
-
+
/**
* Constructs a new ScrollPaneBorder.
*/
@@ -1010,7 +1010,7 @@ public class MetalBorders
{
// Nothing to do here.
}
-
+
/**
* Returns the insets of the border for the Component <code>c</code>.
*
@@ -1045,7 +1045,7 @@ public class MetalBorders
// paint left border line
g.drawLine(x, y, x, y + h - 2);
-
+
// paint right inner border line
g.drawLine(x + w - 2, y, x + w - 2, y + h + 1);
@@ -1067,11 +1067,11 @@ public class MetalBorders
g.drawLine(x + 1, y + h - 2, x + 1, y + h - 2);
}
-
+
}
-
+
/**
- * A button border that is only visible when the mouse pointer is within
+ * A button border that is only visible when the mouse pointer is within
* the button's bounds.
*/
public static class RolloverButtonBorder
@@ -1084,10 +1084,10 @@ public class MetalBorders
{
// Nothing to do here.
}
-
+
/**
* Paints the border.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x-coordinate.
@@ -1095,7 +1095,7 @@ public class MetalBorders
* @param w the width.
* @param h the height.
*/
- public void paintBorder(Component c, Graphics g, int x, int y, int w,
+ public void paintBorder(Component c, Graphics g, int x, int y, int w,
int h)
{
// TODO: What should be done here? Obviously the ButtonBorder already
@@ -1104,7 +1104,7 @@ public class MetalBorders
super.paintBorder(c, g, x, y, w, h);
}
}
-
+
/**
* This border is used in Toolbar buttons as inner border.
*/
@@ -1120,7 +1120,7 @@ public class MetalBorders
{
// Nothing to do here.
}
-
+
/**
* Returns the insets of the RolloverBorder.
*
@@ -1175,7 +1175,7 @@ public class MetalBorders
{
// Nothing to do here.
}
-
+
/**
* Returns the insets of the border, creating a new Insets instance
* with each call.
@@ -1187,7 +1187,7 @@ public class MetalBorders
{
return getBorderInsets(c, null);
}
-
+
/**
* Returns the insets of the border, using the supplied Insets instance.
*
@@ -1209,7 +1209,7 @@ public class MetalBorders
insets.bottom = borderInsets.bottom;
insets.right = borderInsets.right;
}
-
+
return insets;
}
@@ -1234,21 +1234,21 @@ public class MetalBorders
// draw dark outer border
g.setColor(darkShadow);
g.drawRect(x, y, w - 1, h - 1);
-
+
// draw highlighted inner border (only top and left)
g.setColor(light);
g.drawLine(x + 1, y + 1, x + w - 2, y + 1);
}
-
+
}
/**
* A border used for the {@link JToggleButton} component.
- *
+ *
* @since 1.3
*/
public static class ToggleButtonBorder
- extends ButtonBorder
+ extends ButtonBorder
{
/**
* Creates a new border instance.
@@ -1257,7 +1257,7 @@ public class MetalBorders
{
// Nothing to do here.
}
-
+
/**
* Paints the toggle button border.
*
@@ -1272,7 +1272,7 @@ public class MetalBorders
int h)
{
ButtonModel bmodel = null;
-
+
if (c instanceof AbstractButton)
bmodel = ((AbstractButton) c).getModel();
@@ -1314,23 +1314,23 @@ public class MetalBorders
g.setColor(shadow);
g.drawLine(x + 1, y + 1, x + w - 2, y + 1);
g.drawLine(x + 1, y + 1, x + 1, y + h - 2);
-
+
// draw crossing pixels of both borders
g.setColor(shadow);
g.drawLine(x + 1, y + h - 2, x + 1, y + h - 2);
g.drawLine(x + w - 2, y + 1, x + w - 2, y + 1);
-
+
}
// draw corners
g.setColor(middle);
g.drawLine(x, y + h - 1, x, y + h - 1);
g.drawLine(x + w - 1, y, x + w - 1, y);
}
- else
+ else
{
// draw disabled border
g.setColor(MetalLookAndFeel.getControlDisabled());
- g.drawRect(x, y, w - 2, h - 2);
+ g.drawRect(x, y, w - 2, h - 2);
}
}
}
@@ -1348,22 +1348,22 @@ public class MetalBorders
{
// Nothing to do here.
}
-
+
/**
* Returns the border insets.
- *
+ *
* @param c the component (ignored).
- *
+ *
* @return The border insets.
*/
public Insets getBorderInsets(Component c)
{
return getBorderInsets(c, null);
}
-
+
/**
* Returns the border insets.
- *
+ *
* @param c the component (ignored).
* @return The border insets.
*/
@@ -1371,7 +1371,7 @@ public class MetalBorders
{
JToolBar tb = (JToolBar) c;
if (tb.getOrientation() == JToolBar.HORIZONTAL)
- {
+ {
if (newInsets == null)
newInsets = new Insets(2, 16, 2, 2);
else
@@ -1381,10 +1381,10 @@ public class MetalBorders
newInsets.bottom = 2;
newInsets.right = 2;
}
- return newInsets;
+ return newInsets;
}
else // assume JToolBar.VERTICAL
- {
+ {
if (newInsets == null)
newInsets = new Insets(16, 2, 2, 2);
else
@@ -1394,14 +1394,14 @@ public class MetalBorders
newInsets.bottom = 2;
newInsets.right = 2;
}
- return newInsets;
+ return newInsets;
}
}
-
+
/**
* Paints the border for the specified component.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x-coordinate.
@@ -1409,27 +1409,27 @@ public class MetalBorders
* @param w the width.
* @param h the height.
*/
- public void paintBorder(Component c, Graphics g, int x, int y, int w,
+ public void paintBorder(Component c, Graphics g, int x, int y, int w,
int h)
{
-
+
JToolBar tb = (JToolBar) c;
if (tb.getOrientation() == JToolBar.HORIZONTAL)
{
- MetalUtils.fillMetalPattern(tb, g, x + 2, y + 2, x + 11, y + h - 5,
- MetalLookAndFeel.getControlHighlight(),
+ MetalUtils.fillMetalPattern(tb, g, x + 2, y + 2, x + 11, y + h - 5,
+ MetalLookAndFeel.getControlHighlight(),
MetalLookAndFeel.getControlDarkShadow());
}
else
- {
- MetalUtils.fillMetalPattern(tb, g, x + 2, y + 2, x + w - 5, y + 11,
- MetalLookAndFeel.getControlHighlight(),
+ {
+ MetalUtils.fillMetalPattern(tb, g, x + 2, y + 2, x + w - 5, y + 11,
+ MetalLookAndFeel.getControlHighlight(),
MetalLookAndFeel.getControlDarkShadow());
}
}
-
+
}
-
+
/**
* A border for table header cells.
*
@@ -1499,17 +1499,17 @@ public class MetalBorders
{
Border outer = new ButtonBorder();
Border inner = getMarginBorder();
- buttonBorder = new BorderUIResource.CompoundBorderUIResource(outer,
+ buttonBorder = new BorderUIResource.CompoundBorderUIResource(outer,
inner);
}
return buttonBorder;
}
-
+
/**
* Returns a border for use with {@link JToggleButton} components.
*
* @return A border.
- *
+ *
* @since 1.3
*/
public static Border getToggleButtonBorder()
@@ -1527,23 +1527,23 @@ public class MetalBorders
/**
* Returns a border instance that is used with a {@link JInternalFrame} when
* it is in the iconified state.
- *
+ *
* @return A border.
- *
+ *
* @since 1.3
*/
public static Border getDesktopIconBorder()
{
if (desktopIconBorder == null)
desktopIconBorder = new DesktopIconBorder();
- return desktopIconBorder;
+ return desktopIconBorder;
}
/**
* Returns a border for use by the {@link JTextField} component.
- *
+ *
* @return A border.
- *
+ *
* @since 1.3
*/
public static Border getTextFieldBorder()
@@ -1608,7 +1608,7 @@ public class MetalBorders
/**
* Returns a shared instance of a compound border for rollover buttons.
- *
+ *
* @return A shared border instance.
*/
static Border getRolloverBorder()
@@ -1617,7 +1617,7 @@ public class MetalBorders
{
Border outer = new MetalBorders.RolloverButtonBorder();
Border inner = MetalBorders.getMarginBorder();
- rolloverBorder = new BorderUIResource.CompoundBorderUIResource(outer,
+ rolloverBorder = new BorderUIResource.CompoundBorderUIResource(outer,
inner);
}
return rolloverBorder;
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalButtonListener.java b/libjava/classpath/javax/swing/plaf/metal/MetalButtonListener.java
index f2f778f..7cf84e5 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalButtonListener.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalButtonListener.java
@@ -45,25 +45,25 @@ import javax.swing.plaf.basic.BasicButtonListener;
/**
* A listener for buttons under the {@link MetalLookAndFeel}.
- *
+ *
* @see MetalButtonUI#createButtonListener
*/
-class MetalButtonListener extends BasicButtonListener
+class MetalButtonListener extends BasicButtonListener
{
-
+
/**
* Creates a new instance.
- *
+ *
* @param button the button.
*/
public MetalButtonListener(AbstractButton button)
{
super(button);
}
-
+
/**
* Handles property change events.
- *
+ *
* @param e the event.
*/
public void propertyChange(PropertyChangeEvent e)
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalButtonUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalButtonUI.java
index 108b3b2..974f0a8 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalButtonUI.java
@@ -74,7 +74,7 @@ public class MetalButtonUI
* The color used to draw the focus rectangle around the text and/or icon.
*/
protected Color focusColor;
-
+
/**
* The background color for the button when it is pressed.
*/
@@ -87,12 +87,12 @@ public class MetalButtonUI
/**
* Returns a UI delegate for the specified component.
- *
+ *
* @param c the component (should be a subclass of {@link AbstractButton}).
- *
+ *
* @return A new instance of <code>MetalButtonUI</code>.
*/
- public static ComponentUI createUI(JComponent c)
+ public static ComponentUI createUI(JComponent c)
{
if (sharedUI == null)
sharedUI = new MetalButtonUI();
@@ -143,9 +143,9 @@ public class MetalButtonUI
/**
* Installs the default settings for the specified button.
- *
+ *
* @param button the button.
- *
+ *
* @see #uninstallDefaults(AbstractButton)
*/
public void installDefaults(AbstractButton button)
@@ -157,7 +157,7 @@ public class MetalButtonUI
/**
* Removes the defaults added by {@link #installDefaults(AbstractButton)}.
*/
- public void uninstallDefaults(AbstractButton button)
+ public void uninstallDefaults(AbstractButton button)
{
// This is overridden to be public, for whatever reason.
super.uninstallDefaults(button);
@@ -166,22 +166,22 @@ public class MetalButtonUI
/**
* Paints the background of the button to indicate that it is in the
* "pressed" state.
- *
+ *
* @param g the graphics context.
* @param b the button.
*/
- protected void paintButtonPressed(Graphics g, AbstractButton b)
- {
+ protected void paintButtonPressed(Graphics g, AbstractButton b)
+ {
if (b.isContentAreaFilled())
{
g.setColor(getSelectColor());
g.fillRect(0, 0, b.getWidth(), b.getHeight());
}
}
-
- /**
+
+ /**
* Paints the focus rectangle around the button text and/or icon.
- *
+ *
* @param g the graphics context.
* @param b the button.
* @param viewRect the button bounds.
@@ -189,7 +189,7 @@ public class MetalButtonUI
* @param iconRect the icon bounds.
*/
protected void paintFocus(Graphics g, AbstractButton b, Rectangle viewRect,
- Rectangle textRect, Rectangle iconRect)
+ Rectangle textRect, Rectangle iconRect)
{
if (b.isEnabled() && b.hasFocus() && b.isFocusPainted())
{
@@ -201,17 +201,17 @@ public class MetalButtonUI
g.setColor(savedColor);
}
}
-
+
/**
* Paints the button text.
- *
+ *
* @param g the graphics context.
* @param c the button.
* @param textRect the text bounds.
* @param text the text to display.
*/
protected void paintText(Graphics g, JComponent c, Rectangle textRect,
- String text)
+ String text)
{
AbstractButton b = (AbstractButton) c;
Font f = b.getFont();
@@ -227,7 +227,7 @@ public class MetalButtonUI
{
g.setColor(getDisabledTextColor());
g.drawString(text, textRect.x, textRect.y + fm.getAscent());
- }
+ }
}
/**
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxIcon.java b/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxIcon.java
index 30ee931..5e0ac06 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxIcon.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxIcon.java
@@ -134,7 +134,7 @@ public class MetalCheckBoxIcon
MetalUtils.paintGradient(g, x, y, getIconWidth(), getIconHeight(),
SwingConstants.VERTICAL, "CheckBox.gradient");
border.paintBorder(c, g, x, y, getIconWidth(), getIconHeight());
-
+
AbstractButton b = (AbstractButton) c;
if (b.isSelected())
drawCheck(b, g, x, y);
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java
index c794164..11979e1 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java
@@ -75,10 +75,10 @@ public class MetalCheckBoxUI
instance = new MetalCheckBoxUI();
return instance;
}
-
+
/**
* Returns the prefix for properties defined in the {@link UIDefaults} table.
- *
+ *
* @return The property prefix (<code>"CheckBox."</code>).
*/
public String getPropertyPrefix()
@@ -86,4 +86,3 @@ public class MetalCheckBoxUI
return "CheckBox.";
}
}
-
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxButton.java b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxButton.java
index 265ea7e..8ec8bad 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxButton.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxButton.java
@@ -63,22 +63,22 @@ public class MetalComboBoxButton
/** A reference to the JList. */
protected JList listBox;
-
+
/**
* Used for rendering the selected item.
*/
protected CellRendererPane rendererPane;
-
+
/** The button icon. */
protected Icon comboIcon;
-
+
/** Display just the icon, or the icon plus the label. */
protected boolean iconOnly;
-
+
/**
* Creates a new button.
- *
- * @param cb the combo that the button is used for (<code>null</code> not
+ *
+ * @param cb the combo that the button is used for (<code>null</code> not
* permitted).
* @param i the icon displayed on the button.
* @param pane the rendering pane.
@@ -87,13 +87,13 @@ public class MetalComboBoxButton
public MetalComboBoxButton(JComboBox cb, Icon i, CellRendererPane pane,
JList list)
{
- this(cb, i, cb.isEditable(), pane, list);
+ this(cb, i, cb.isEditable(), pane, list);
}
-
+
/**
* Creates a new button.
- *
- * @param cb the combo that the button is used for (<code>null</code> not
+ *
+ * @param cb the combo that the button is used for (<code>null</code> not
* permitted).
* @param i the icon displayed on the button.
* @param onlyIcon a flag that specifies whether the button displays only an
@@ -116,84 +116,84 @@ public class MetalComboBoxButton
setEnabled(comboBox.isEnabled());
setFocusable(comboBox.isEnabled());
}
-
+
/**
* Returns the combo box that the button is used with.
- *
+ *
* @return The combo box.
*/
public final JComboBox getComboBox()
{
return comboBox;
}
-
+
/**
* Sets the combo box that the button is used with.
- *
+ *
* @param cb the combo box.
*/
public final void setComboBox(JComboBox cb)
{
comboBox = cb;
}
-
+
/**
* Returns the icon displayed by the button. By default, this will be an
* instance of {@link MetalComboBoxIcon}.
- *
+ *
* @return The icon displayed by the button.
*/
public final Icon getComboIcon()
{
return comboIcon;
}
-
+
/**
* Sets the icon displayed by the button.
- *
+ *
* @param i the icon.
*/
public final void setComboIcon(Icon i)
{
comboIcon = i;
}
-
+
/**
* Returns a flag that controls whether the button displays an icon only,
* or text as well.
- *
+ *
* @return A boolean.
*/
public final boolean isIconOnly()
{
return iconOnly;
}
-
+
/**
* Sets the flag that controls whether the button displays an icon only,
* or text as well.
- *
+ *
* @param isIconOnly the flag.
*/
public final void setIconOnly(boolean isIconOnly)
{
iconOnly = isIconOnly;
}
-
+
/**
* Returns <code>false</code>, to indicate that this component is not part
* of the focus traversal group.
- *
+ *
* @return <code>false</code>
*/
public boolean isFocusTraversable()
{
return false;
}
-
+
/**
* Enables or disables the button.
- *
+ *
* @param enabled the new status.
*/
public void setEnabled(boolean enabled)
@@ -210,10 +210,10 @@ public class MetalComboBoxButton
setForeground(UIManager.getColor("ComboBox.disabledForeground"));
}
}
-
+
/**
* Paints the component.
- *
+ *
* @param g the graphics device.
*/
public void paintComponent(Graphics g)
@@ -259,7 +259,7 @@ public class MetalComboBoxButton
Component comp = renderer.getListCellRendererComponent(listBox,
comboBox.getSelectedItem(), -1, false, false);
comp.setFont(rendererPane.getFont());
-
+
if ((model.isArmed() && model.isPressed())
|| (comboBox.isFocusOwner() && !comboBox.isPopupVisible()))
{
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxEditor.java b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxEditor.java
index 11e4151..8872d74 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxEditor.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxEditor.java
@@ -65,10 +65,10 @@ public class MetalComboBoxEditor extends BasicComboBoxEditor
{
// Nothing to do here.
}
-
+
/**
* Paints the border for the specified component.
- *
+ *
* @param c the component (ignored).
* @param g the graphics device.
* @param x the x-coordinate.
@@ -76,7 +76,7 @@ public class MetalComboBoxEditor extends BasicComboBoxEditor
* @param w the width.
* @param h the height.
*/
- public void paintBorder(Component c, Graphics g, int x, int y, int w,
+ public void paintBorder(Component c, Graphics g, int x, int y, int w,
int h)
{
g.translate(x, y);
@@ -123,11 +123,11 @@ public class MetalComboBoxEditor extends BasicComboBoxEditor
public Insets getBorderInsets(Component c)
{
return editorBorderInsets;
- }
+ }
}
-
+
/**
- * A subclass of {@link MetalComboBoxEditor} that implements the
+ * A subclass of {@link MetalComboBoxEditor} that implements the
* {@link javax.swing.plaf.UIResource} interface.
*/
public static class UIResource extends MetalComboBoxEditor
@@ -177,7 +177,7 @@ public class MetalComboBoxEditor extends BasicComboBoxEditor
/** The editor's border insets. */
protected static Insets editorBorderInsets = new Insets(2, 2, 2, 0);
-
+
/**
* Creates a new editor.
*/
@@ -186,5 +186,5 @@ public class MetalComboBoxEditor extends BasicComboBoxEditor
editor = new EditorTextField("", 9);
editor.setBorder(new MetalComboBoxEditorBorder());
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java
index 944ce39..45c8ead 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java
@@ -48,20 +48,20 @@ import javax.swing.Icon;
/**
* An icon used by the {@link MetalComboBoxUI} class.
*/
-public class MetalComboBoxIcon implements Icon, Serializable
+public class MetalComboBoxIcon implements Icon, Serializable
{
-
+
/**
* Creates a new icon.
*/
- public MetalComboBoxIcon()
+ public MetalComboBoxIcon()
{
// nothing required.
}
-
+
/**
* Returns the icon width, which for this icon is 10 pixels.
- *
+ *
* @return <code>10</code>.
*/
public int getIconWidth()
@@ -71,7 +71,7 @@ public class MetalComboBoxIcon implements Icon, Serializable
/**
* Returns the icon height, which for this icon is 5 pixels.
- *
+ *
* @return <code>5</code>.
*/
public int getIconHeight()
@@ -81,7 +81,7 @@ public class MetalComboBoxIcon implements Icon, Serializable
/**
* Paints the icon at the location (x, y).
- *
+ *
* @param c the combo box (ignored here).
* @param g the graphics device.
* @param x the x coordinate.
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxUI.java
index 53d49c3..b9019b7 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxUI.java
@@ -78,22 +78,22 @@ public class MetalComboBoxUI extends BasicComboBoxUI
{
// Nothing to do here.
}
-
+
/**
* Arranges the editor (if visible) and button that comprise the combo
* box.
- *
+ *
* @param parent the parent.
*/
public void layoutContainer(Container parent)
{
layoutComboBox(parent, this);
}
-
+
/**
- * Calls the <code>layoutContainer(Container)</code> method in the super
+ * Calls the <code>layoutContainer(Container)</code> method in the super
* class.
- *
+ *
* @param parent the container.
*/
public void superLayout(Container parent)
@@ -101,9 +101,9 @@ public class MetalComboBoxUI extends BasicComboBoxUI
super.layoutContainer(parent);
}
}
-
+
/**
- * A listener used to handle property changes in the {@link JComboBox}
+ * A listener used to handle property changes in the {@link JComboBox}
* component, to ensure that the UI delegate accurately reflects the current
* state in the rendering onscreen.
*/
@@ -117,11 +117,11 @@ public class MetalComboBoxUI extends BasicComboBoxUI
{
// Nothing to do here.
}
-
+
/**
* Handles a property change event, updating the UI components as
* appropriate.
- *
+ *
* @param e the event.
*/
public void propertyChange(PropertyChangeEvent e)
@@ -156,7 +156,7 @@ public class MetalComboBoxUI extends BasicComboBoxUI
/**
* A popup menu for the combo-box.
- *
+ *
* @see #createPopup()
*
* @deprecated 1.4
@@ -165,20 +165,20 @@ public class MetalComboBoxUI extends BasicComboBoxUI
{
/**
* Creates a new popup.
- *
+ *
* @param cBox the combo box.
*/
public MetalComboPopup(JComboBox cBox)
{
- super(cBox);
+ super(cBox);
}
-
+
public void delegateFocus(MouseEvent e)
{
super.delegateFocus(e);
}
}
-
+
/**
* Constructs a new instance of MetalComboBoxUI.
*/
@@ -198,61 +198,61 @@ public class MetalComboBoxUI extends BasicComboBoxUI
{
return new MetalComboBoxUI();
}
-
+
/**
* Creates an editor for the combo box.
- *
+ *
* @return An editor.
*/
protected ComboBoxEditor createEditor()
{
- return new MetalComboBoxEditor.UIResource();
+ return new MetalComboBoxEditor.UIResource();
}
-
+
/**
* Creates a popup for the combo box.
- *
+ *
* @return A popup.
*/
protected ComboPopup createPopup()
{
return super.createPopup();
}
-
+
/**
* Creates a new button for use in rendering the JComboBox.
- *
+ *
* @return A button.
*/
protected JButton createArrowButton()
{
- JButton button = new MetalComboBoxButton(comboBox, new MetalComboBoxIcon(),
- currentValuePane, listBox);
+ JButton button = new MetalComboBoxButton(comboBox, new MetalComboBoxIcon(),
+ currentValuePane, listBox);
button.setMargin(new Insets(0, 1, 1, 3));
return button;
}
-
+
/**
* Creates a new property change listener.
- *
+ *
* @return A new property change listener.
*/
public PropertyChangeListener createPropertyChangeListener()
{
return new MetalPropertyChangeListener();
}
-
+
public void paint(Graphics g, JComponent c)
{
// do nothing, the button and text field are painted elsewhere
}
-
+
/**
* Updates the button and text field to reflect a change in the 'editable'
* property.
- *
+ *
* @param e the event.
- *
+ *
* @deprecated 1.4
*/
protected void editablePropertyChanged(PropertyChangeEvent e)
@@ -265,32 +265,32 @@ public class MetalComboBoxUI extends BasicComboBoxUI
comboBox.repaint();
}
}
-
+
/**
* Creates a new layout manager for the UI delegate.
- *
+ *
* @return A new layout manager.
*/
protected LayoutManager createLayoutManager()
{
return new MetalComboBoxLayoutManager();
}
-
+
/**
* Not used in Classpath.
- *
+ *
* @deprecated 1.4
*/
protected void removeListeners()
{
- // no longer used in JDK 1.4
+ // no longer used in JDK 1.4
}
-
+
/**
* Returns the minimum size for the combo.
- *
+ *
* @param c the component
- *
+ *
* @return The minimum size for the combo box.
*/
public Dimension getMinimumSize(JComponent c)
@@ -328,7 +328,7 @@ public class MetalComboBoxUI extends BasicComboBoxUI
isMinimumSizeDirty = false;
return new Dimension(cachedMinimumSize);
}
-
+
/**
* Configures the editor for this combo box.
*/
@@ -350,8 +350,8 @@ public class MetalComboBoxUI extends BasicComboBoxUI
if (focusListener != null)
editor.removeFocusListener(focusListener);
}
-
- /**
+
+ /**
* Lays out the ComboBox
*/
public void layoutComboBox(Container parent,
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalFileChooserUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalFileChooserUI.java
index 9bded82..df49edf 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalFileChooserUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalFileChooserUI.java
@@ -100,17 +100,17 @@ import javax.swing.table.DefaultTableModel;
* A UI delegate for the {@link JFileChooser} component. This class is only
* partially implemented and is not usable yet.
*/
-public class MetalFileChooserUI
+public class MetalFileChooserUI
extends BasicFileChooserUI
{
-
+
/**
* A renderer for the files and directories in the file chooser table.
*/
class TableFileRenderer
extends DefaultTableCellRenderer
{
-
+
/**
* Creates a new renderer.
*/
@@ -118,17 +118,17 @@ public class MetalFileChooserUI
{
super();
}
-
+
/**
* Returns a component that can render the specified value.
- *
+ *
* @param table the table
* @param value the string value of the cell
* @param isSelected is the item selected?
* @param hasFocus does the item have the focus?
* @param row the row
* @param column the column
- *
+ *
* @return The renderer.
*/
public Component getTableCellRendererComponent(JTable table, Object value,
@@ -143,12 +143,12 @@ public class MetalFileChooserUI
}
else
setIcon(null);
-
+
setText(value.toString());
setOpaque(true);
setEnabled(table.isEnabled());
setFont(fileList.getFont());
-
+
if (startEditing && column == 0 || !isSelected)
{
setBackground(table.getBackground());
@@ -164,20 +164,20 @@ public class MetalFileChooserUI
setBorder(UIManager.getBorder("Table.focusCellHighlightBorder"));
else
setBorder(noFocusBorder);
-
+
return this;
}
}
-
+
/**
* ActionListener for the list view.
*/
class ListViewActionListener implements ActionListener
{
-
+
/**
* This method is invoked when an action occurs.
- *
+ *
* @param e -
* the <code>ActionEvent</code> that occurred
*/
@@ -195,23 +195,23 @@ public class MetalFileChooserUI
if (index.length > 0)
for (int i = 0; i < index.length; i++)
fileList.getSelectionModel().addSelectionInterval(index[i], index[i]);
-
+
fc.add(fileListPanel, BorderLayout.CENTER);
fc.revalidate();
fc.repaint();
}
}
}
-
+
/**
* ActionListener for the details view.
*/
class DetailViewActionListener implements ActionListener
{
-
+
/**
* This method is invoked when an action occurs.
- *
+ *
* @param e -
* the <code>ActionEvent</code> that occurred
*/
@@ -223,7 +223,7 @@ public class MetalFileChooserUI
JFileChooser fc = getFileChooser();
listView = false;
fc.remove(fileListPanel);
-
+
if (fileTable == null)
createDetailsView(fc);
else
@@ -235,18 +235,18 @@ public class MetalFileChooserUI
for (int i = 0; i < index.length; i++)
fileTable.getSelectionModel().addSelectionInterval(index[i], index[i]);
}
-
+
fc.add(fileTablePanel, BorderLayout.CENTER);
fc.revalidate();
fc.repaint();
}
}
}
-
+
/**
* A property change listener.
*/
- class MetalFileChooserPropertyChangeListener
+ class MetalFileChooserPropertyChangeListener
implements PropertyChangeListener
{
/**
@@ -255,25 +255,25 @@ public class MetalFileChooserUI
public MetalFileChooserPropertyChangeListener()
{
}
-
+
/**
* Handles a property change event.
- *
+ *
* @param e the event.
*/
public void propertyChange(PropertyChangeEvent e)
{
JFileChooser filechooser = getFileChooser();
-
+
String n = e.getPropertyName();
if (n.equals(JFileChooser.MULTI_SELECTION_ENABLED_CHANGED_PROPERTY))
{
- int mode = -1;
+ int mode = -1;
if (filechooser.isMultiSelectionEnabled())
mode = ListSelectionModel.MULTIPLE_INTERVAL_SELECTION;
else
mode = ListSelectionModel.SINGLE_SELECTION;
-
+
if (listView)
fileList.setSelectionMode(mode);
else
@@ -282,7 +282,7 @@ public class MetalFileChooserUI
else if (n.equals(JFileChooser.SELECTED_FILE_CHANGED_PROPERTY))
{
File file = filechooser.getSelectedFile();
-
+
if (file != null
&& filechooser.getDialogType() == JFileChooser.SAVE_DIALOG)
{
@@ -301,12 +301,12 @@ public class MetalFileChooserUI
filechooser.setApproveButtonToolTipText(saveButtonToolTipText);
}
}
-
+
if (file == null)
setFileName(null);
- else if (file.isFile() || filechooser.getFileSelectionMode()
- != JFileChooser.FILES_ONLY)
- setFileName(file.getName());
+ else if (file.isFile() || filechooser.getFileSelectionMode()
+ != JFileChooser.FILES_ONLY)
+ setFileName(file.getName());
int index = -1;
index = getModel().indexOf(file);
if (index >= 0)
@@ -327,7 +327,7 @@ public class MetalFileChooserUI
}
}
}
-
+
else if (n.equals(JFileChooser.DIRECTORY_CHANGED_PROPERTY))
{
if (listView)
@@ -349,7 +349,7 @@ public class MetalFileChooserUI
boolean hasParent = currentDirectory.getParentFile() != null;
getChangeToParentDirectoryAction().setEnabled(hasParent);
}
-
+
else if (n.equals(JFileChooser.CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY))
{
filterModel.propertyChange(e);
@@ -369,14 +369,14 @@ public class MetalFileChooserUI
getApproveButtonToolTipText(filechooser));
approveButton.setMnemonic(getApproveButtonMnemonic(filechooser));
}
-
+
else if (n.equals(JFileChooser.APPROVE_BUTTON_TEXT_CHANGED_PROPERTY))
approveButton.setText(getApproveButtonText(filechooser));
-
+
else if (n.equals(
JFileChooser.APPROVE_BUTTON_TOOL_TIP_TEXT_CHANGED_PROPERTY))
approveButton.setToolTipText(getApproveButtonToolTipText(filechooser));
-
+
else if (n.equals(JFileChooser.APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY))
approveButton.setMnemonic(getApproveButtonMnemonic(filechooser));
@@ -393,7 +393,7 @@ public class MetalFileChooserUI
topPanel.repaint();
topPanel.doLayout();
}
-
+
else if (n.equals(
JFileChooser.ACCEPT_ALL_FILE_FILTER_USED_CHANGED_PROPERTY))
{
@@ -404,7 +404,7 @@ public class MetalFileChooserUI
filechooser.removeChoosableFileFilter(
getAcceptAllFileFilter(filechooser));
}
-
+
else if (n.equals(JFileChooser.ACCESSORY_CHANGED_PROPERTY))
{
JComponent old = (JComponent) e.getOldValue();
@@ -414,7 +414,7 @@ public class MetalFileChooserUI
if (newval != null)
getAccessoryPanel().add(newval);
}
-
+
if (n.equals(JFileChooser.DIRECTORY_CHANGED_PROPERTY)
|| n.equals(JFileChooser.FILE_FILTER_CHANGED_PROPERTY)
|| n.equals(JFileChooser.FILE_HIDING_CHANGED_PROPERTY))
@@ -425,7 +425,7 @@ public class MetalFileChooserUI
if (fileList != null)
fileList.removeAll();
startEditing = false;
-
+
// Set text on button back to original.
if (filechooser.getDialogType() == JFileChooser.SAVE_DIALOG)
{
@@ -434,16 +434,16 @@ public class MetalFileChooserUI
filechooser.setApproveButtonText(saveButtonText);
filechooser.setApproveButtonToolTipText(saveButtonToolTipText);
}
-
+
rescanCurrentDirectory(filechooser);
}
-
+
filechooser.revalidate();
filechooser.repaint();
}
}
-
- /**
+
+ /**
* A combo box model containing the selected directory and all its parent
* directories.
*/
@@ -453,46 +453,46 @@ public class MetalFileChooserUI
{
/** Storage for the items in the model. */
private List items;
-
+
/** The index of the selected item. */
private int selectedIndex;
-
+
/**
* Creates a new model.
*/
- public DirectoryComboBoxModel()
+ public DirectoryComboBoxModel()
{
items = new java.util.ArrayList();
selectedIndex = -1;
}
-
+
/**
* Returns the number of items in the model.
- *
+ *
* @return The number of items in the model.
*/
public int getSize()
{
return items.size();
}
-
+
/**
* Returns the item at the specified index.
- *
+ *
* @param index the item index.
- *
+ *
* @return The item.
*/
public Object getElementAt(int index)
{
return items.get(index);
}
-
+
/**
* Returns the depth of the item at the given <code>index</code>.
- *
+ *
* @param index the item index.
- *
+ *
* @return The depth.
*/
public int getDepth(int index)
@@ -502,22 +502,22 @@ public class MetalFileChooserUI
/**
* Returns the selected item, or <code>null</code> if no item is selected.
- *
+ *
* @return The selected item, or <code>null</code>.
*/
public Object getSelectedItem()
{
- if (selectedIndex >= 0)
+ if (selectedIndex >= 0)
return items.get(selectedIndex);
else
return null;
}
-
+
/**
* Sets the selected item. This clears all the directories from the
* existing list, and repopulates it with the new selected directory
* and all its parent directories.
- *
+ *
* @param selectedDirectory the selected directory.
*/
public void setSelectedItem(Object selectedDirectory)
@@ -533,7 +533,7 @@ public class MetalFileChooserUI
selectedIndex = items.indexOf(selectedDirectory);
fireContentsChanged(this, 0, items.size() - 1);
}
-
+
}
/**
@@ -549,10 +549,10 @@ public class MetalFileChooserUI
{
// Nothing to do here.
}
-
+
/**
* Handles the action event.
- *
+ *
* @param e the event.
*/
public void actionPerformed(ActionEvent e)
@@ -581,17 +581,17 @@ public class MetalFileChooserUI
{
indentIcon = new IndentIcon();
}
-
+
/**
- * Returns a component that can be used to paint the given value within
+ * Returns a component that can be used to paint the given value within
* the list.
- *
+ *
* @param list the list.
* @param value the value (a {@link File}).
* @param index the item index.
* @param isSelected is the item selected?
* @param cellHasFocus does the list cell have focus?
- *
+ *
* @return The list cell renderer.
*/
public Component getListCellRendererComponent(JList list, Object value,
@@ -671,7 +671,7 @@ public class MetalFileChooserUI
{
icon.paintIcon(c, g, x + depth * INDENT, y);
}
-
+
}
/**
@@ -680,7 +680,7 @@ public class MetalFileChooserUI
protected class FileRenderer
extends DefaultListCellRenderer
{
-
+
/**
* Creates a new renderer.
*/
@@ -688,16 +688,16 @@ public class MetalFileChooserUI
{
// Nothing to do here.
}
-
+
/**
* Returns a component that can render the specified value.
- *
+ *
* @param list the list.
* @param value the value (a {@link File}).
* @param index the index.
* @param isSelected is the item selected?
* @param cellHasFocus does the item have the focus?
- *
+ *
* @return The renderer.
*/
public Component getListCellRendererComponent(JList list, Object value,
@@ -751,7 +751,7 @@ public class MetalFileChooserUI
/** The index of the selected file filter. */
private Object selected;
-
+
/**
* Creates a new model.
*/
@@ -761,10 +761,10 @@ public class MetalFileChooserUI
filters[0] = getAcceptAllFileFilter(getFileChooser());
selected = filters[0];
}
-
+
/**
* Handles property changes.
- *
+ *
* @param e the property change event.
*/
public void propertyChange(PropertyChangeEvent e)
@@ -788,10 +788,10 @@ public class MetalFileChooserUI
fireContentsChanged(this, 0, filters.length);
}
}
-
+
/**
* Sets the selected filter.
- *
+ *
* @param filter the filter (<code>null</code> ignored).
*/
public void setSelectedItem(Object filter)
@@ -802,39 +802,39 @@ public class MetalFileChooserUI
fireContentsChanged(this, -1, -1);
}
}
-
+
/**
* Returns the selected file filter.
- *
+ *
* @return The selected file filter.
*/
public Object getSelectedItem()
{
return selected;
}
-
+
/**
* Returns the number of items in the model.
- *
+ *
* @return The number of items in the model.
*/
public int getSize()
{
return filters.length;
}
-
+
/**
* Returns the item at the specified index.
- *
+ *
* @param index the item index.
- *
+ *
* @return The item at the specified index.
*/
public Object getElementAt(int index)
{
return filters[index];
}
-
+
}
/**
@@ -850,23 +850,23 @@ public class MetalFileChooserUI
{
// Nothing to do here.
}
-
+
/**
- * Returns a component that can be used to paint the given value within
+ * Returns a component that can be used to paint the given value within
* the list.
- *
+ *
* @param list the list.
* @param value the value (a {@link FileFilter}).
* @param index the item index.
* @param isSelected is the item selected?
* @param cellHasFocus does the list cell have focus?
- *
+ *
* @return This component as the renderer.
*/
public Component getListCellRendererComponent(JList list, Object value,
int index, boolean isSelected, boolean cellHasFocus)
{
- super.getListCellRendererComponent(list, value, index, isSelected,
+ super.getListCellRendererComponent(list, value, index, isSelected,
cellHasFocus);
FileFilter filter = (FileFilter) value;
setText(filter.getDescription());
@@ -876,10 +876,10 @@ public class MetalFileChooserUI
/**
* A listener for selection events in the file list.
- *
+ *
* @see #createListSelectionListener(JFileChooser)
*/
- class MetalFileChooserSelectionListener
+ class MetalFileChooserSelectionListener
implements ListSelectionListener
{
/**
@@ -916,28 +916,28 @@ public class MetalFileChooserUI
protected class SingleClickListener
extends MouseAdapter
{
-
+
/** Stores instance of the list */
JList list;
-
- /**
+
+ /**
* Stores the current file that is being edited.
* It is null if nothing is currently being edited.
*/
File editFile;
-
+
/** The current file chooser. */
JFileChooser fc;
-
+
/** The last file selected. */
Object lastSelected;
-
+
/** The textfield used for editing. */
JTextField editField;
-
+
/**
* Creates a new listener.
- *
+ *
* @param list the directory/file list.
*/
public SingleClickListener(JList list)
@@ -948,10 +948,10 @@ public class MetalFileChooserUI
lastSelected = null;
startEditing = false;
}
-
+
/**
* Receives notification of a mouse click event.
- *
+ *
* @param e the event.
*/
public void mouseClicked(MouseEvent e)
@@ -974,10 +974,10 @@ public class MetalFileChooserUI
else
completeEditing();
}
-
+
/**
* Sets up the text editor for the current file.
- *
+ *
* @param index -
* the current index of the item in the list to be edited.
*/
@@ -991,7 +991,7 @@ public class MetalFileChooserUI
startEditing = true;
editField = new JTextField(editFile.getName());
editField.addActionListener(new EditingActionListener());
-
+
Icon icon = getFileView(fc).getIcon(editFile);
if (icon != null)
{
@@ -1000,9 +1000,9 @@ public class MetalFileChooserUI
bounds.width -= padding;
}
editField.setBounds(bounds);
-
+
list.add(editField);
-
+
editField.requestFocus();
editField.selectAll();
}
@@ -1010,8 +1010,8 @@ public class MetalFileChooserUI
completeEditing();
list.repaint();
}
-
- /**
+
+ /**
* Completes the editing.
*/
void completeEditing()
@@ -1020,12 +1020,12 @@ public class MetalFileChooserUI
{
String text = editField.getText();
if (text != null && text != "" && !text.equals(fc.getName(editFile)))
- {
- File f = fc.getFileSystemView().
- createFileObject(fc.getCurrentDirectory(), text);
+ {
+ File f = fc.getFileSystemView().
+ createFileObject(fc.getCurrentDirectory(), text);
if ( editFile.renameTo(f) )
rescanCurrentDirectory(fc);
- }
+ }
list.remove(editField);
}
startEditing = false;
@@ -1034,22 +1034,22 @@ public class MetalFileChooserUI
editField = null;
list.repaint();
}
-
+
/**
* ActionListener for the editing text field.
*/
class EditingActionListener implements ActionListener
{
-
+
/**
* This method is invoked when an action occurs.
- *
+ *
* @param e -
* the <code>ActionEvent</code> that occurred
*/
public void actionPerformed(ActionEvent e)
{
- if (editField != null)
+ if (editField != null)
completeEditing();
}
}
@@ -1070,19 +1070,19 @@ public class MetalFileChooserUI
/** The last selected file. */
Object lastSelected;
-
- /**
+
+ /**
* Stores the current file that is being edited.
* It is null if nothing is currently being edited.
*/
File editFile;
-
+
/** The textfield used for editing. */
JTextField editField;
/**
* Creates a new listener.
- *
+ *
* @param table the directory/file table
* @param fc the JFileChooser
*/
@@ -1099,7 +1099,7 @@ public class MetalFileChooserUI
/**
* Receives notification of a mouse click event.
- *
+ *
* @param e the event.
*/
public void mouseClicked(MouseEvent e)
@@ -1167,7 +1167,7 @@ public class MetalFileChooserUI
/**
* Sets up the text editor for the current file.
- *
+ *
* @param row -
* the current row of the item in the list to be edited.
*/
@@ -1184,9 +1184,9 @@ public class MetalFileChooserUI
// Need to adjust y pos
bounds.y = row * table.getRowHeight();
editField.setBounds(bounds);
-
+
table.add(editField);
-
+
editField.requestFocus();
editField.selectAll();
}
@@ -1194,8 +1194,8 @@ public class MetalFileChooserUI
completeEditing();
table.repaint();
}
-
- /**
+
+ /**
* Completes the editing.
*/
void completeEditing()
@@ -1214,26 +1214,26 @@ public class MetalFileChooserUI
editField = null;
table.repaint();
}
-
+
/**
* ActionListener for the editing text field.
*/
class EditingActionListener implements ActionListener
{
-
+
/**
* This method is invoked when an action occurs.
- *
+ *
* @param e -
* the <code>ActionEvent</code> that occurred
*/
public void actionPerformed(ActionEvent e)
{
- if (editField != null)
+ if (editField != null)
completeEditing();
}
}
-
+
/**
* Closes the dialog.
*/
@@ -1243,91 +1243,91 @@ public class MetalFileChooserUI
if (owner instanceof JDialog)
((JDialog) owner).dispose();
}
- }
-
+ }
+
/** The text for a label describing the directory combo box. */
private String directoryLabel;
-
+
private JComboBox directoryComboBox;
-
+
/** The model for the directory combo box. */
DirectoryComboBoxModel directoryModel;
-
+
/** The text for a label describing the file text field. */
private String fileLabel;
-
+
/** The file name text field. */
private JTextField fileTextField;
-
+
/** The text for a label describing the filter combo box. */
private String filterLabel;
- /**
- * The top panel (contains the directory combo box and the control buttons).
+ /**
+ * The top panel (contains the directory combo box and the control buttons).
*/
private JPanel topPanel;
-
+
/** A panel containing the control buttons ('up', 'home' etc.). */
private JPanel controls;
- /**
- * The panel that contains the filename field and the filter combobox.
+ /**
+ * The panel that contains the filename field and the filter combobox.
*/
private JPanel bottomPanel;
- /**
- * The panel that contains the 'Open' (or 'Save') and 'Cancel' buttons.
+ /**
+ * The panel that contains the 'Open' (or 'Save') and 'Cancel' buttons.
*/
private JPanel buttonPanel;
-
+
private JButton approveButton;
-
+
/** The file list. */
JList fileList;
-
+
/** The file table. */
JTable fileTable;
-
+
/** The panel containing the file list. */
JPanel fileListPanel;
-
+
/** The panel containing the file table. */
JPanel fileTablePanel;
-
+
/** The filter combo box model. */
private FilterComboBoxModel filterModel;
/** The action map. */
private ActionMap actionMap;
-
+
/** True if currently in list view. */
boolean listView;
-
+
/** True if we can or have started editing a cell. */
boolean startEditing;
-
+
/** The scrollpane used for the table and list. */
JScrollPane scrollPane;
-
+
/** The text for the label when saving. */
String save;
-
+
/** The text for the label when opening a directory. */
String look;
-
+
/** The label for the file combo box. */
JLabel dirLabel;
-
+
/** Listeners. */
ListSelectionListener listSelList;
MouseListener doubleClickList;
SingleClickListener singleClickList;
TableClickListener tableClickList;
-
+
/**
* A factory method that returns a UI delegate for the specified
* component.
- *
+ *
* @param c the component (which should be a {@link JFileChooser}).
*/
public static ComponentUI createUI(JComponent c)
@@ -1338,7 +1338,7 @@ public class MetalFileChooserUI
/**
* Creates a new instance of this UI delegate.
- *
+ *
* @param filechooser the file chooser component.
*/
public MetalFileChooserUI(JFileChooser filechooser)
@@ -1353,16 +1353,16 @@ public class MetalFileChooserUI
super.installUI(c);
actionMap = createActionMap();
}
-
+
public void uninstallUI(JComponent c)
{
super.uninstallUI(c);
actionMap = null;
}
-
+
/**
* Installs the sub-components of the file chooser.
- *
+ *
* @param fc the file chooser component.
*/
public void installComponents(JFileChooser fc)
@@ -1373,7 +1373,7 @@ public class MetalFileChooserUI
topPanel.add(dirLabel, BorderLayout.WEST);
this.controls = new JPanel();
addControlButtons();
-
+
JPanel dirPanel = new JPanel(new VerticalMidLayout());
directoryModel = createDirectoryComboBoxModel(fc);
directoryComboBox = new JComboBox(directoryModel);
@@ -1383,16 +1383,16 @@ public class MetalFileChooserUI
topPanel.add(controls, BorderLayout.EAST);
topPanel.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 8));
fc.add(topPanel, BorderLayout.NORTH);
-
+
JPanel list = createList(fc);
list.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8));
fc.add(list, BorderLayout.CENTER);
-
+
JPanel bottomPanel = getBottomPanel();
filterModel = createFilterComboBoxModel();
JComboBox fileFilterCombo = new JComboBox(filterModel);
fileFilterCombo.setRenderer(createFilterComboBoxRenderer());
-
+
fileTextField = new JTextField();
JPanel fileNamePanel = new JPanel(new VerticalMidLayout());
fileNamePanel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 5));
@@ -1401,21 +1401,21 @@ public class MetalFileChooserUI
row1.add(new JLabel(this.fileLabel), BorderLayout.WEST);
row1.add(fileNamePanel);
bottomPanel.add(row1);
-
+
JPanel row2 = new JPanel(new BorderLayout());
row2.add(new JLabel(this.filterLabel), BorderLayout.WEST);
row2.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
row2.add(fileFilterCombo);
bottomPanel.add(row2);
JPanel buttonPanel = new JPanel(new ButtonLayout());
-
+
approveButton = new JButton(getApproveSelectionAction());
approveButton.setText(getApproveButtonText(fc));
approveButton.setToolTipText(getApproveButtonToolTipText(fc));
approveButton.setMnemonic(getApproveButtonMnemonic(fc));
buttonPanel.add(approveButton);
buttonPanel.setBorder(BorderFactory.createEmptyBorder(8, 0, 0, 0));
-
+
JButton cancelButton = new JButton(getCancelSelectionAction());
cancelButton.setText(cancelButtonText);
cancelButton.setToolTipText(cancelButtonToolTipText);
@@ -1424,14 +1424,14 @@ public class MetalFileChooserUI
bottomPanel.add(buttonPanel, BorderLayout.SOUTH);
bottomPanel.setBorder(BorderFactory.createEmptyBorder(0, 8, 8, 8));
fc.add(bottomPanel, BorderLayout.SOUTH);
-
+
fc.add(getAccessoryPanel(), BorderLayout.EAST);
}
-
+
/**
- * Uninstalls the components added by
+ * Uninstalls the components added by
* {@link #installComponents(JFileChooser)}.
- *
+ *
* @param fc the file chooser.
*/
public void uninstallComponents(JFileChooser fc)
@@ -1444,27 +1444,27 @@ public class MetalFileChooserUI
fileListPanel = null;
fc.remove(topPanel);
topPanel = null;
-
+
directoryModel = null;
fileTextField = null;
directoryComboBox = null;
}
-
+
/**
- * Returns the panel that contains the 'Open' (or 'Save') and 'Cancel'
+ * Returns the panel that contains the 'Open' (or 'Save') and 'Cancel'
* buttons.
- *
+ *
* @return The panel.
*/
protected JPanel getButtonPanel()
{
- return buttonPanel;
+ return buttonPanel;
}
-
+
/**
* Creates and returns a new panel that will be used for the controls at
* the bottom of the file chooser.
- *
+ *
* @return A new panel.
*/
protected JPanel getBottomPanel()
@@ -1473,15 +1473,15 @@ public class MetalFileChooserUI
bottomPanel = new JPanel(new GridLayout(3, 2));
return bottomPanel;
}
-
+
/**
* Fetches localised strings for use by the labels and buttons on the
* file chooser.
- *
+ *
* @param fc the file chooser.
*/
protected void installStrings(JFileChooser fc)
- {
+ {
super.installStrings(fc);
look = "Look In: ";
save = "Save In: ";
@@ -1489,38 +1489,38 @@ public class MetalFileChooserUI
directoryLabel = save;
else
directoryLabel = look;
-
+
fileLabel = "File Name: ";
filterLabel = "Files of Type: ";
-
+
this.cancelButtonMnemonic = 0;
this.cancelButtonText = "Cancel";
this.cancelButtonToolTipText = "Abort file chooser dialog";
-
+
this.directoryOpenButtonMnemonic = 0;
this.directoryOpenButtonText = "Open";
this.directoryOpenButtonToolTipText = "Open selected directory";
-
+
this.helpButtonMnemonic = 0;
this.helpButtonText = "Help";
this.helpButtonToolTipText = "Filechooser help";
-
+
this.openButtonMnemonic = 0;
this.openButtonText = "Open";
this.openButtonToolTipText = "Open selected file";
-
+
this.saveButtonMnemonic = 0;
this.saveButtonText = "Save";
this.saveButtonToolTipText = "Save selected file";
-
+
this.updateButtonMnemonic = 0;
this.updateButtonText = "Update";
- this.updateButtonToolTipText = "Update directory listing";
+ this.updateButtonToolTipText = "Update directory listing";
}
-
+
/**
* Installs the listeners required.
- *
+ *
* @param fc the file chooser.
*/
protected void installListeners(JFileChooser fc)
@@ -1535,8 +1535,8 @@ public class MetalFileChooserUI
fileList.addMouseListener(singleClickList);
super.installListeners(fc);
}
-
- protected void uninstallListeners(JFileChooser fc)
+
+ protected void uninstallListeners(JFileChooser fc)
{
super.uninstallListeners(fc);
fc.removePropertyChangeListener(filterModel);
@@ -1544,21 +1544,21 @@ public class MetalFileChooserUI
fileList.removeListSelectionListener(listSelList);
fileList.removeMouseListener(doubleClickList);
fileList.removeMouseListener(singleClickList);
-
+
if (fileTable != null)
fileTable.removeMouseListener(tableClickList);
}
-
+
protected ActionMap getActionMap()
{
if (actionMap == null)
actionMap = createActionMap();
return actionMap;
}
-
+
/**
* Creates and returns an action map.
- *
+ *
* @return The action map.
*/
protected ActionMap createActionMap()
@@ -1572,9 +1572,9 @@ public class MetalFileChooserUI
/**
* Creates a panel containing a list of files.
- *
+ *
* @param fc the file chooser.
- *
+ *
* @return A panel.
*/
protected JPanel createList(JFileChooser fc)
@@ -1600,41 +1600,41 @@ public class MetalFileChooserUI
fileListPanel.setPreferredSize(new Dimension(405, 135));
return fileListPanel;
}
-
+
/**
* Creates a panel containing a table within a scroll pane.
- *
+ *
* @param fc the file chooser.
- *
+ *
* @return The details view.
*/
protected JPanel createDetailsView(JFileChooser fc)
{
fileTablePanel = new JPanel(new BorderLayout());
-
+
Object[] cols = new Object[] {"Name", "Size", "Modified"};
Object[][] rows = new Object[fileList.getModel().getSize()][3];
-
+
fileTable = new JTable(new DefaultTableModel(rows, cols));
-
+
if (fc.isMultiSelectionEnabled())
fileTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
else
fileTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-
+
fileTable.setShowGrid(false);
fileTable.setColumnSelectionAllowed(false);
fileTable.setDefaultRenderer(Object.class, new TableFileRenderer());
tableClickList = new TableClickListener(fileTable, fc);
fileTable.addMouseListener(tableClickList);
-
- return updateTable();
+
+ return updateTable();
}
-
+
/**
* Sets the values in the table, and puts it in the panel.
- *
+ *
* @return the panel containing the table.
*/
JPanel updateTable()
@@ -1671,10 +1671,10 @@ public class MetalFileChooserUI
return fileTablePanel;
}
-
+
/**
* Formats bytes into the appropriate size.
- *
+ *
* @param bytes the number of bytes to convert
* @return a string representation of the size
*/
@@ -1686,7 +1686,7 @@ public class MetalFileChooserUI
long gb = (long) Math.pow(2, 30);
double size = 0;
String id = "";
-
+
if ((bytes / gb) >= 1)
{
size = (double) bytes / (double) gb;
@@ -1707,27 +1707,27 @@ public class MetalFileChooserUI
size = bytes;
id = "Bytes";
}
-
+
return nf.format(size) + " " + id;
}
/**
* Creates a listener that monitors selections in the directory/file list
* and keeps the {@link JFileChooser} component up to date.
- *
+ *
* @param fc the file chooser.
- *
+ *
* @return The listener.
- *
+ *
* @see #installListeners(JFileChooser)
*/
public ListSelectionListener createListSelectionListener(JFileChooser fc)
{
return new MetalFileChooserSelectionListener();
}
-
+
/**
* Returns the preferred size for the file chooser component.
- *
+ *
* @return The preferred size.
*/
public Dimension getPreferredSize(JComponent c)
@@ -1740,7 +1740,7 @@ public class MetalFileChooserUI
/**
* Returns the minimum size for the file chooser component.
- *
+ *
* @return The minimum size.
*/
public Dimension getMinimumSize(JComponent c)
@@ -1750,25 +1750,25 @@ public class MetalFileChooserUI
Dimension fl = fileListPanel.getMinimumSize();
return new Dimension(fl.width, tp.height + bp.height + fl.height);
}
-
+
/**
* Returns the maximum size for the file chooser component.
- *
+ *
* @return The maximum size.
*/
public Dimension getMaximumSize(JComponent c)
{
return new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE);
}
-
+
/**
* Creates a property change listener that monitors the {@link JFileChooser}
* for property change events and updates the component display accordingly.
- *
+ *
* @param fc the file chooser.
- *
+ *
* @return The property change listener.
- *
+ *
* @see #installListeners(JFileChooser)
*/
public PropertyChangeListener createPropertyChangeListener(JFileChooser fc)
@@ -1778,10 +1778,10 @@ public class MetalFileChooserUI
/**
* Creates and returns a new instance of {@link DirectoryComboBoxModel}.
- *
+ *
* @return A new instance of {@link DirectoryComboBoxModel}.
*/
- protected MetalFileChooserUI.DirectoryComboBoxModel
+ protected MetalFileChooserUI.DirectoryComboBoxModel
createDirectoryComboBoxModel(JFileChooser fc)
{
return new DirectoryComboBoxModel();
@@ -1790,9 +1790,9 @@ public class MetalFileChooserUI
/**
* Creates a new instance of the renderer used in the directory
* combo box.
- *
+ *
* @param fc the file chooser.
- *
+ *
* @return The renderer.
*/
protected DirectoryComboBoxRenderer createDirectoryComboBoxRenderer(
@@ -1803,23 +1803,23 @@ public class MetalFileChooserUI
/**
* Creates and returns a new instance of {@link FilterComboBoxModel}.
- *
+ *
* @return A new instance of {@link FilterComboBoxModel}.
*/
protected FilterComboBoxModel createFilterComboBoxModel()
{
- return new FilterComboBoxModel();
+ return new FilterComboBoxModel();
}
/**
* Creates and returns a new instance of {@link FilterComboBoxRenderer}.
- *
+ *
* @return A new instance of {@link FilterComboBoxRenderer}.
*/
- protected MetalFileChooserUI.FilterComboBoxRenderer
+ protected MetalFileChooserUI.FilterComboBoxRenderer
createFilterComboBoxRenderer()
{
- return new FilterComboBoxRenderer();
+ return new FilterComboBoxRenderer();
}
/**
@@ -1832,26 +1832,26 @@ public class MetalFileChooserUI
upButton.setIcon(this.upFolderIcon);
upButton.setMargin(new Insets(0, 0, 0, 0));
controls.add(upButton);
-
+
JButton homeButton = new JButton(getGoHomeAction());
homeButton.setText(null);
homeButton.setIcon(this.homeFolderIcon);
homeButton.setMargin(new Insets(0, 0, 0, 0));
controls.add(homeButton);
-
+
JButton newFolderButton = new JButton(getNewFolderAction());
newFolderButton.setText(null);
newFolderButton.setIcon(this.newFolderIcon);
newFolderButton.setMargin(new Insets(0, 0, 0, 0));
controls.add(newFolderButton);
-
+
JToggleButton listButton = new JToggleButton(this.listViewIcon);
listButton.setMargin(new Insets(0, 0, 0, 0));
listButton.addActionListener(new ListViewActionListener());
listButton.setSelected(true);
- listView = true;
+ listView = true;
controls.add(listButton);
-
+
JToggleButton detailButton = new JToggleButton(this.detailsViewIcon);
detailButton.setMargin(new Insets(0, 0, 0, 0));
detailButton.addActionListener(new DetailViewActionListener());
@@ -1862,7 +1862,7 @@ public class MetalFileChooserUI
buttonGroup.add(listButton);
buttonGroup.add(detailButton);
}
-
+
/**
* Removes all the buttons from the control panel.
*/
@@ -1872,10 +1872,10 @@ public class MetalFileChooserUI
controls.revalidate();
controls.repaint();
}
-
+
/**
* Updates the current directory.
- *
+ *
* @param fc the file chooser to update.
*/
public void rescanCurrentDirectory(JFileChooser fc)
@@ -1887,43 +1887,43 @@ public class MetalFileChooserUI
else
createList(fc);
}
-
+
/**
* Returns the file name in the text field.
- *
+ *
* @return The file name.
*/
public String getFileName()
{
String result = null;
- if (fileTextField != null)
+ if (fileTextField != null)
result = fileTextField.getText();
return result;
}
-
+
/**
* Sets the file name in the text field.
- *
+ *
* @param filename the file name.
*/
public void setFileName(String filename)
{
fileTextField.setText(filename);
}
-
+
/**
* DOCUMENT ME!!
- *
+ *
* @param e - DOCUMENT ME!
*/
public void valueChanged(ListSelectionEvent e)
{
// FIXME: Not sure what we should be doing here, if anything.
}
-
+
/**
* Returns the approve button.
- *
+ *
* @return The approve button.
*/
protected JButton getApproveButton(JFileChooser fc)
@@ -1939,10 +1939,10 @@ public class MetalFileChooserUI
{
/**
* Performs the layout.
- *
+ *
* @param parent the container.
*/
- public void layoutContainer(Container parent)
+ public void layoutContainer(Container parent)
{
int count = parent.getComponentCount();
if (count > 0)
@@ -1952,32 +1952,32 @@ public class MetalFileChooserUI
Dimension prefSize = c.getPreferredSize();
int h = parent.getHeight() - insets.top - insets.bottom;
int adj = Math.max(0, (h - prefSize.height) / 2);
- c.setBounds(insets.left, insets.top + adj, parent.getWidth()
- - insets.left - insets.right,
+ c.setBounds(insets.left, insets.top + adj, parent.getWidth()
+ - insets.left - insets.right,
(int) Math.min(prefSize.getHeight(), h));
}
}
-
+
/**
* Returns the minimum layout size.
- *
+ *
* @param parent the container.
- *
+ *
* @return The minimum layout size.
*/
- public Dimension minimumLayoutSize(Container parent)
+ public Dimension minimumLayoutSize(Container parent)
{
return preferredLayoutSize(parent);
}
-
+
/**
* Returns the preferred layout size.
- *
+ *
* @param parent the container.
- *
+ *
* @return The preferred layout size.
*/
- public Dimension preferredLayoutSize(Container parent)
+ public Dimension preferredLayoutSize(Container parent)
{
if (parent.getComponentCount() > 0)
{
@@ -1985,26 +1985,26 @@ public class MetalFileChooserUI
}
else return null;
}
-
+
/**
- * This layout manager does not need to track components, so this
+ * This layout manager does not need to track components, so this
* method does nothing.
- *
+ *
* @param name the name the component is associated with.
* @param component the component.
*/
- public void addLayoutComponent(String name, Component component)
+ public void addLayoutComponent(String name, Component component)
{
// do nothing
}
-
+
/**
- * This layout manager does not need to track components, so this
+ * This layout manager does not need to track components, so this
* method does nothing.
- *
+ *
* @param component the component.
*/
- public void removeLayoutComponent(Component component)
+ public void removeLayoutComponent(Component component)
{
// do nothing
}
@@ -2017,13 +2017,13 @@ public class MetalFileChooserUI
class ButtonLayout implements LayoutManager
{
static final int GAP = 4;
-
+
/**
* Performs the layout.
- *
+ *
* @param parent the container.
*/
- public void layoutContainer(Container parent)
+ public void layoutContainer(Container parent)
{
int count = parent.getComponentCount();
if (count > 0)
@@ -2036,7 +2036,7 @@ public class MetalFileChooserUI
Dimension prefSize = c.getPreferredSize();
maxW = Math.max(prefSize.width, maxW);
}
-
+
// then position the buttons
Insets insets = parent.getInsets();
int availableH = parent.getHeight() - insets.top - insets.bottom;
@@ -2044,42 +2044,42 @@ public class MetalFileChooserUI
for (int i = count - 1; i >= 0; i--)
{
Component c = parent.getComponent(i);
- Dimension prefSize = c.getPreferredSize();
+ Dimension prefSize = c.getPreferredSize();
int adj = Math.max(0, (availableH - prefSize.height) / 2);
currentX = currentX - prefSize.width;
- c.setBounds(currentX, insets.top + adj, prefSize.width,
+ c.setBounds(currentX, insets.top + adj, prefSize.width,
(int) Math.min(prefSize.getHeight(), availableH));
currentX = currentX - GAP;
}
}
}
-
+
/**
* Returns the minimum layout size.
- *
+ *
* @param parent the container.
- *
+ *
* @return The minimum layout size.
*/
- public Dimension minimumLayoutSize(Container parent)
+ public Dimension minimumLayoutSize(Container parent)
{
return preferredLayoutSize(parent);
}
-
+
/**
* Returns the preferred layout size.
- *
+ *
* @param parent the container.
- *
+ *
* @return The preferred layout size.
*/
- public Dimension preferredLayoutSize(Container parent)
+ public Dimension preferredLayoutSize(Container parent)
{
Insets insets = parent.getInsets();
int maxW = 0;
int maxH = 0;
int count = parent.getComponentCount();
- if (count > 0)
+ if (count > 0)
{
for (int i = 0; i < count; i++)
{
@@ -2089,29 +2089,29 @@ public class MetalFileChooserUI
maxH = Math.max(d.height, maxH);
}
}
- return new Dimension(maxW * count + GAP * (count - 1) + insets.left
+ return new Dimension(maxW * count + GAP * (count - 1) + insets.left
+ insets.right, maxH + insets.top + insets.bottom);
}
-
+
/**
- * This layout manager does not need to track components, so this
+ * This layout manager does not need to track components, so this
* method does nothing.
- *
+ *
* @param name the name the component is associated with.
* @param component the component.
*/
- public void addLayoutComponent(String name, Component component)
+ public void addLayoutComponent(String name, Component component)
{
// do nothing
}
-
+
/**
- * This layout manager does not need to track components, so this
+ * This layout manager does not need to track components, so this
* method does nothing.
- *
+ *
* @param component the component.
*/
- public void removeLayoutComponent(Component component)
+ public void removeLayoutComponent(Component component)
{
// do nothing
}
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalIconFactory.java b/libjava/classpath/javax/swing/plaf/metal/MetalIconFactory.java
index 2817336..5382577 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalIconFactory.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalIconFactory.java
@@ -60,67 +60,67 @@ import javax.swing.plaf.UIResource;
/**
* Creates icons for the {@link MetalLookAndFeel}.
*/
-public class MetalIconFactory implements Serializable
+public class MetalIconFactory implements Serializable
{
/** A constant representing "dark". */
public static final boolean DARK = false;
-
+
/** A constant representing "light". */
public static final boolean LIGHT = true;
-
+
/** A shared instance of the MenuArrowIcon. */
private static Icon menuArrow;
-
+
/** A shared instance of the MenuItemArrowIcon. */
private static Icon menuItemArrow;
-
+
/**
* An icon displayed for {@link JCheckBoxMenuItem} components.
*/
- private static class CheckBoxMenuItemIcon
- implements Icon, UIResource, Serializable
+ private static class CheckBoxMenuItemIcon
+ implements Icon, UIResource, Serializable
{
/**
* Creates a new icon instance.
*/
- public CheckBoxMenuItemIcon()
+ public CheckBoxMenuItemIcon()
{
// Nothing to do here.
}
-
+
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon (10 pixels).
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 10;
}
-
+
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon (10 pixels).
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 10;
}
-
+
/**
* Paints the icon.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x-coordinate.
* @param y the y-coordinate.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
JCheckBoxMenuItem item = (JCheckBoxMenuItem) c;
-
+
if (item.isArmed())
g.setColor(MetalLookAndFeel.getBlack());
else
@@ -129,7 +129,7 @@ public class MetalIconFactory implements Serializable
g.drawLine(x, y + 1, x, y + 8);
g.drawLine(x + 2, y + 8, x + 8, y + 8);
g.drawLine(x + 8, y + 2, x + 8, y + 7);
-
+
g.setColor(MetalLookAndFeel.getWhite());
g.drawLine(x + 1, y + 1, x + 7, y + 1);
g.drawLine(x + 1, y + 2, x + 1, y + 7);
@@ -145,56 +145,56 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 8 - i, y + i, x + 9 - i, y + i);
}
- }
+ }
}
/**
* An icon used for the "detail view" button on a {@link JFileChooser} under
* the {@link MetalLookAndFeel}.
- *
+ *
* @see MetalIconFactory#getFileChooserDetailViewIcon()
*/
- private static class FileChooserDetailViewIcon
+ private static class FileChooserDetailViewIcon
implements Icon, UIResource, Serializable
{
/**
* Creates a new icon.
*/
- public FileChooserDetailViewIcon()
+ public FileChooserDetailViewIcon()
{
// Nothing to do here.
}
-
+
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 18;
}
-
+
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 18;
}
-
+
/**
* Paints the icon using colors from the {@link MetalLookAndFeel}.
- *
+ *
* @param c the component (ignored).
* @param g the graphics device.
* @param x the x-coordinate for the top-left of the icon.
* @param y the y-coordinate for the top-left of the icon.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
Color savedColor = g.getColor();
g.setColor(MetalLookAndFeel.getBlack());
@@ -204,7 +204,7 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 6, y + 3, x + 6, y + 7);
g.drawLine(x + 2, y + 7, x + 6, y + 7);
g.drawLine(x + 2, y + 2, x + 2, y + 7);
-
+
// file 2 outline
g.drawLine(x + 2, y + 10, x + 5, y + 10);
g.drawLine(x + 6, y + 11, x + 6, y + 15);
@@ -214,157 +214,157 @@ public class MetalIconFactory implements Serializable
// detail lines
g.drawLine(x + 8, y + 5, x + 15, y + 5);
g.drawLine(x + 8, y + 13, x + 15, y + 13);
-
+
// fill files
g.setColor(MetalLookAndFeel.getPrimaryControl());
g.fillRect(x + 3, y + 3, 3, 4);
g.fillRect(x + 3, y + 11, 3, 4);
-
+
// highlight files
g.setColor(MetalLookAndFeel.getPrimaryControlHighlight());
g.drawLine(x + 4, y + 4, x + 4, y + 5);
g.drawLine(x + 4, y + 12, x + 4, y + 13);
-
+
g.setColor(savedColor);
- }
+ }
}
/**
* An icon used for the "home folder" button on a {@link JFileChooser} under
* the {@link MetalLookAndFeel}.
- *
+ *
* @see MetalIconFactory#getFileChooserHomeFolderIcon()
*/
- private static class FileChooserHomeFolderIcon
+ private static class FileChooserHomeFolderIcon
implements Icon, UIResource, Serializable
{
/**
* Creates a new icon.
*/
- public FileChooserHomeFolderIcon()
+ public FileChooserHomeFolderIcon()
{
// Nothing to do here.
}
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 18;
}
-
+
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 18;
}
-
+
/**
* Paints the icon using colors from the {@link MetalLookAndFeel}.
- *
+ *
* @param c the component (ignored).
* @param g the graphics device.
* @param x the x-coordinate for the top-left of the icon.
* @param y the y-coordinate for the top-left of the icon.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
- {
+ public void paintIcon(Component c, Graphics g, int x, int y)
+ {
Color savedColor = g.getColor();
g.setColor(MetalLookAndFeel.getBlack());
-
+
// roof
g.drawLine(x + 1, y + 8, x + 8, y + 1);
g.drawLine(x + 8, y + 1, x + 15, y + 8);
-
+
// base of house
g.drawLine(x + 3, y + 6, x + 3, y + 15);
g.drawLine(x + 3, y + 15, x + 13, y + 15);
g.drawLine(x + 13, y + 6, x + 13, y + 15);
-
+
// door frame
g.drawLine(x + 6, y + 9, x + 6, y + 15);
g.drawLine(x + 6, y + 9, x + 10, y + 9);
g.drawLine(x + 10, y + 9, x + 10, y + 15);
-
+
// chimney
g.drawLine(x + 11, y + 2, x + 11, y + 4);
g.drawLine(x + 12, y + 2, x + 12, y + 5);
-
+
g.setColor(MetalLookAndFeel.getControlDarkShadow());
-
+
// roof paint
int xx = x + 8;
for (int i = 0; i < 4; i++)
g.drawLine(xx - i, y + 2 + i, xx + i, y + 2 + i);
g.fillRect(x + 4, y + 6, 9, 2);
-
+
// door knob
g.drawLine(x + 9, y + 12, x + 9, y + 12);
-
+
// house paint
g.setColor(MetalLookAndFeel.getPrimaryControl());
g.drawLine(x + 4, y + 8, x + 12, y + 8);
g.fillRect(x + 4, y + 9, 2, 6);
g.fillRect(x + 11, y + 9, 2, 6);
-
+
g.setColor(savedColor);
- }
+ }
}
-
+
/**
* An icon used for the "list view" button on a {@link JFileChooser} under
* the {@link MetalLookAndFeel}.
- *
+ *
* @see MetalIconFactory#getFileChooserListViewIcon()
*/
- private static class FileChooserListViewIcon
- implements Icon, UIResource, Serializable
+ private static class FileChooserListViewIcon
+ implements Icon, UIResource, Serializable
{
/**
* Creates a new icon.
*/
- public FileChooserListViewIcon()
+ public FileChooserListViewIcon()
{
// Nothing to do here.
}
-
+
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 18;
}
-
+
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 18;
}
-
+
/**
* Paints the icon using colors from the {@link MetalLookAndFeel}.
- *
+ *
* @param c the component (ignored).
* @param g the graphics device.
* @param x the x-coordinate for the top-left of the icon.
* @param y the y-coordinate for the top-left of the icon.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
Color savedColor = g.getColor();
g.setColor(MetalLookAndFeel.getBlack());
@@ -374,37 +374,37 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 6, y + 3, x + 6, y + 7);
g.drawLine(x + 2, y + 7, x + 6, y + 7);
g.drawLine(x + 2, y + 2, x + 2, y + 7);
-
+
// file 2 outline
g.drawLine(x + 2, y + 10, x + 5, y + 10);
g.drawLine(x + 6, y + 11, x + 6, y + 15);
g.drawLine(x + 2, y + 15, x + 6, y + 15);
g.drawLine(x + 2, y + 10, x + 2, y + 15);
-
+
// file 3 outline
g.drawLine(x + 10, y + 2, x + 13, y + 2);
g.drawLine(x + 14, y + 3, x + 14, y + 7);
g.drawLine(x + 10, y + 7, x + 14, y + 7);
g.drawLine(x + 10, y + 2, x + 10, y + 7);
-
+
// file 4 outline
g.drawLine(x + 10, y + 10, x + 13, y + 10);
g.drawLine(x + 14, y + 11, x + 14, y + 15);
g.drawLine(x + 10, y + 15, x + 14, y + 15);
g.drawLine(x + 10, y + 10, x + 10, y + 15);
-
+
g.drawLine(x + 8, y + 5, x + 8, y + 5);
g.drawLine(x + 8, y + 13, x + 8, y + 13);
g.drawLine(x + 16, y + 5, x + 16, y + 5);
g.drawLine(x + 16, y + 13, x + 16, y + 13);
-
+
// fill files
g.setColor(MetalLookAndFeel.getPrimaryControl());
g.fillRect(x + 3, y + 3, 3, 4);
g.fillRect(x + 3, y + 11, 3, 4);
g.fillRect(x + 11, y + 3, 3, 4);
g.fillRect(x + 11, y + 11, 3, 4);
-
+
// highlight files
g.setColor(MetalLookAndFeel.getPrimaryControlHighlight());
g.drawLine(x + 4, y + 4, x + 4, y + 5);
@@ -413,113 +413,113 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 12, y + 12, x + 12, y + 13);
g.setColor(savedColor);
- }
+ }
}
-
+
/**
* An icon used for the "new folder" button on a {@link JFileChooser} under
* the {@link MetalLookAndFeel}.
- *
+ *
* @see MetalIconFactory#getFileChooserNewFolderIcon()
*/
- private static class FileChooserNewFolderIcon
+ private static class FileChooserNewFolderIcon
implements Icon, UIResource, Serializable
{
- /**
+ /**
* Creates a new icon.
*/
- public FileChooserNewFolderIcon()
+ public FileChooserNewFolderIcon()
{
// Nothing to do here.
}
-
+
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 18;
}
-
+
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 18;
}
-
+
/**
* Paints the icon using colors from the {@link MetalLookAndFeel}.
- *
+ *
* @param c the component (ignored).
* @param g the graphics device.
* @param x the x-coordinate for the top-left of the icon.
* @param y the y-coordinate for the top-left of the icon.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
- {
+ public void paintIcon(Component c, Graphics g, int x, int y)
+ {
Color savedColor = g.getColor();
g.setColor(MetalLookAndFeel.getBlack());
-
+
g.drawLine(x + 2, y + 5, x + 9, y + 5);
g.drawLine(x + 10, y + 6, x + 15, y + 6);
g.drawLine(x + 15, y + 5, x + 15, y + 14);
g.drawLine(x + 2, y + 14, x + 15, y + 14);
g.drawLine(x + 1, y + 6, x + 1, y + 14);
-
+
g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
g.drawLine(x + 11, y + 3, x + 15, y + 3);
g.drawLine(x + 10, y + 4, x + 15, y + 4);
-
+
g.setColor(MetalLookAndFeel.getPrimaryControl());
g.fillRect(x + 3, y + 7, 7, 7);
g.fillRect(x + 10, y + 8, 5, 6);
g.drawLine(x + 10, y + 5, x + 14, y + 5);
-
+
g.setColor(MetalLookAndFeel.getPrimaryControlHighlight());
g.drawLine(x + 10, y + 7, x + 14, y + 7);
g.drawLine(x + 2, y + 6, x + 9, y + 6);
g.drawLine(x + 2, y + 6, x + 2, y + 13);
g.setColor(savedColor);
- }
+ }
}
/**
* An icon used for the "up folder" button on a {@link JFileChooser} under
* the {@link MetalLookAndFeel}.
- *
+ *
* @see MetalIconFactory#getFileChooserNewFolderIcon()
*/
- private static class FileChooserUpFolderIcon extends FileChooserNewFolderIcon
+ private static class FileChooserUpFolderIcon extends FileChooserNewFolderIcon
{
/**
* Creates a new icon.
*/
- public FileChooserUpFolderIcon()
+ public FileChooserUpFolderIcon()
{
// Nothing to do here.
}
-
+
/**
* Paints the icon using colors from the {@link MetalLookAndFeel}.
- *
+ *
* @param c the component (ignored).
* @param g the graphics device.
* @param x the x-coordinate for the top-left of the icon.
* @param y the y-coordinate for the top-left of the icon.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
Color savedColor = g.getColor();
// draw the folder
super.paintIcon(c, g, x, y);
-
+
// now draw the up arrow
g.setColor(MetalLookAndFeel.getBlack());
g.drawLine(x + 8, y + 9, x + 8, y + 16);
@@ -527,128 +527,128 @@ public class MetalIconFactory implements Serializable
for (int i = 0; i < 4; i++)
g.drawLine(xx - i, y + 9 + i, xx + i, y + 9 + i);
g.setColor(savedColor);
- }
+ }
}
/**
* An icon representing a file (drawn as a piece of paper with the top-right
* corner turned down).
*/
- public static class FileIcon16 implements Icon, Serializable
+ public static class FileIcon16 implements Icon, Serializable
{
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 16;
}
/**
- * Returns the height of the icon, in pixels. The height returned is
- * <code>16</code> plus the value returned by
+ * Returns the height of the icon, in pixels. The height returned is
+ * <code>16</code> plus the value returned by
* {@link #getAdditionalHeight()}.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 16 + getAdditionalHeight();
}
-
+
/**
* Paints the icon at the location (x, y).
- *
+ *
* @param c the component.
* @param g the graphics context.
* @param x the x coordinate.
* @param y the y coordinate.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
y = y + getShift();
g.setColor(MetalLookAndFeel.getBlack());
- g.drawLine(x, y, x + 9, y);
- g.drawLine(x, y + 1, x, y + 15);
- g.drawLine(x, y + 15, x + 12, y + 15);
- g.drawLine(x + 12, y + 15, x + 12, y + 6);
- g.drawLine(x + 12, y + 6, x + 9, y);
+ g.drawLine(x, y, x + 9, y);
+ g.drawLine(x, y + 1, x, y + 15);
+ g.drawLine(x, y + 15, x + 12, y + 15);
+ g.drawLine(x + 12, y + 15, x + 12, y + 6);
+ g.drawLine(x + 12, y + 6, x + 9, y);
g.drawLine(x + 7, y + 2, x + 11, y + 6);
g.drawLine(x + 8, y + 1, x + 9, y + 1);
g.setColor(MetalLookAndFeel.getPrimaryControl());
- g.drawLine(x + 1, y + 1, x + 7, y + 1);
- g.drawLine(x + 1, y + 1, x + 1, y + 14);
- g.drawLine(x + 1, y + 14, x + 11, y + 14);
- g.drawLine(x + 11, y + 14, x + 11, y + 7);
+ g.drawLine(x + 1, y + 1, x + 7, y + 1);
+ g.drawLine(x + 1, y + 1, x + 1, y + 14);
+ g.drawLine(x + 1, y + 14, x + 11, y + 14);
+ g.drawLine(x + 11, y + 14, x + 11, y + 7);
g.drawLine(x + 8, y + 2, x + 10, y + 4);
}
-
+
/**
- * Returns the additional height for the icon. The
+ * Returns the additional height for the icon. The
* {@link #getIconHeight()} method adds this value to the icon height it
* returns. Subclasses can override this method to adjust the icon height.
- *
+ *
* @return The additional height (<code>0</code> unless overridden).
*/
- public int getAdditionalHeight()
+ public int getAdditionalHeight()
{
return 0;
}
-
+
/**
- * Returns the vertical shift, in pixels, applied when painting the icon.
- * The default value is zero, but subclasses may override this (for
+ * Returns the vertical shift, in pixels, applied when painting the icon.
+ * The default value is zero, but subclasses may override this (for
* example, see {@link TreeLeafIcon}).
- *
+ *
* @return The shift.
*/
- public int getShift()
+ public int getShift()
{
return 0;
}
-
+
}
-
+
/**
* An icon representing a folder.
*/
- public static class FolderIcon16 implements Icon, Serializable
+ public static class FolderIcon16 implements Icon, Serializable
{
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 16;
}
-
+
/**
- * Returns the height of the icon, in pixels. The height returned is
- * <code>16</code> plus the value returned by
+ * Returns the height of the icon, in pixels. The height returned is
+ * <code>16</code> plus the value returned by
* {@link #getAdditionalHeight()}.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 16 + getAdditionalHeight();
}
/**
* Paints the icon at the location (x, y).
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x coordinate.
* @param y the y coordinate.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
y = y + getShift();
g.setColor(MetalLookAndFeel.getBlack());
@@ -666,37 +666,37 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 9, y + 4, x + 15, y + 4);
g.drawLine(x + 10, y + 3, x + 15, y + 3);
}
-
+
/**
- * Returns the additional height for the icon. The
+ * Returns the additional height for the icon. The
* {@link #getIconHeight()} method adds this value to the icon height it
* returns. Subclasses can override this method to adjust the icon height.
- *
+ *
* @return The additional height (<code>0</code> unless overridden).
*/
- public int getAdditionalHeight()
+ public int getAdditionalHeight()
{
return 0;
}
-
+
/**
- * Returns the vertical shift, in pixels, applied when painting the icon.
- * The default value is zero, but subclasses may override this (for
+ * Returns the vertical shift, in pixels, applied when painting the icon.
+ * The default value is zero, but subclasses may override this (for
* example, see {@link TreeFolderIcon}).
- *
+ *
* @return The shift.
*/
- public int getShift()
+ public int getShift()
{
return 0;
}
-
+
}
/**
* An icon used by the {@link MetalInternalFrameUI} class when the frame
* is displayed as a palette.
- *
+ *
* @since 1.3
*/
public static class PaletteCloseIcon
@@ -704,33 +704,33 @@ public class MetalIconFactory implements Serializable
{
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 7;
}
-
+
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 7;
}
-
+
/**
* Paints the icon using colors from the {@link MetalLookAndFeel}.
- *
+ *
* @param c the component (ignored).
* @param g the graphics device.
* @param x the x-coordinate for the top-left of the icon.
* @param y the y-coordinate for the top-left of the icon.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
Color savedColor = g.getColor();
AbstractButton button = (AbstractButton) c;
@@ -752,9 +752,9 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 5, y + 3, x + 6, y + 2);
g.drawLine(x + 6, y + 6, x + 6, y + 6);
g.setColor(savedColor);
- }
+ }
}
-
+
/**
* An {@link Icon} implementation for {@link JCheckBox}es in the
* Metal Look &amp; Feel.
@@ -799,13 +799,13 @@ public class MetalIconFactory implements Serializable
* Paints the icon, taking into account whether or not the component is
* enabled, selected and/or armed.
*
- * @param c the Component to draw on (must be an instance of
+ * @param c the Component to draw on (must be an instance of
* {@link JRadioButton})
* @param g the Graphics context to draw with
* @param x the X position
* @param y the Y position
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
if (UIManager.get("RadioButton.gradient") != null)
MetalUtils.paintGradient(g, x + 2, y + 2, 8, 8,
@@ -842,13 +842,13 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 10, y + 4, x + 10, y + 7);
g.fillRect(x + 2, y + 2, 8, 8);
}
- else
+ else
{
// only draw inner highlight if not filled
if (b.isEnabled())
{
g.setColor(MetalLookAndFeel.getWhite());
-
+
g.drawLine(x + 2, y + 8, x + 2, y + 9);
g.drawLine(x + 1, y + 4, x + 1, y + 7);
g.drawLine(x + 2, y + 2, x + 2, y + 3);
@@ -862,7 +862,7 @@ public class MetalIconFactory implements Serializable
if (b.isEnabled())
{
g.setColor(MetalLookAndFeel.getWhite());
-
+
// outer
g.drawLine(x + 10, y + 1, x + 10, y + 1);
g.drawLine(x + 11, y + 2, x + 11, y + 3);
@@ -873,7 +873,7 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 4, y + 12, x + 7, y + 12);
g.drawLine(x + 2, y + 11, x + 3, y + 11);
}
-
+
if (b.isSelected())
{
if (b.isEnabled())
@@ -885,52 +885,52 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 4, y + 8, x + 7, y + 8);
}
g.setColor(savedColor);
- }
+ }
}
/**
* An icon displayed for {@link JRadioButtonMenuItem} components.
*/
- private static class RadioButtonMenuItemIcon
- implements Icon, UIResource, Serializable
+ private static class RadioButtonMenuItemIcon
+ implements Icon, UIResource, Serializable
{
/**
* Creates a new icon instance.
*/
- public RadioButtonMenuItemIcon()
+ public RadioButtonMenuItemIcon()
{
// Nothing to do here.
}
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 10;
}
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 10;
}
/**
* Paints the icon.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x-coordinate.
* @param y the y-coordinate.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
Color savedColor = g.getColor();
JRadioButtonMenuItem item = (JRadioButtonMenuItem) c;
@@ -943,7 +943,7 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 1, y + 7, x + 1, y + 7);
g.drawLine(x, y + 2, x, y + 6);
g.drawLine(x + 1, y + 1, x + 1, y + 1);
-
+
if (item.isSelected())
{
g.drawLine(x + 3, y + 2, x + 5, y + 2);
@@ -962,14 +962,14 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 1, y + 3, x + 1, y + 6);
g.drawLine(x + 2, y + 2, x + 2, y + 2);
g.setColor(savedColor);
- }
+ }
}
/**
* The icon used to display the thumb control on a horizontally oriented
* {@link JSlider} component.
*/
- private static class HorizontalSliderThumbIcon
+ private static class HorizontalSliderThumbIcon
implements Icon, UIResource, Serializable
{
@@ -984,52 +984,52 @@ public class MetalIconFactory implements Serializable
/**
* Creates a new instance.
*/
- public HorizontalSliderThumbIcon()
+ public HorizontalSliderThumbIcon()
{
// Nothing to do here.
}
-
+
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 15;
}
-
+
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 16;
}
-
+
/**
- * Paints the icon, taking into account whether or not the component has
+ * Paints the icon, taking into account whether or not the component has
* the focus.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x-coordinate.
* @param y the y-coordinate.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
boolean enabled = false;
boolean focus = false;
if (c != null)
{
enabled = c.isEnabled();
- focus = c.hasFocus();
+ focus = c.hasFocus();
}
-
+
// draw the outline
- if (enabled)
+ if (enabled)
g.setColor(MetalLookAndFeel.getBlack());
else
g.setColor(MetalLookAndFeel.getControlDarkShadow());
@@ -1038,8 +1038,8 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 14, y + 8, x + 7, y + 15);
g.drawLine(x + 6, y + 14, x, y + 8);
g.drawLine(x, y + 7, x, y + 1);
-
-// The following is commented out until the masking for the gradient painting
+
+// The following is commented out until the masking for the gradient painting
// is working correctly
// // Fill the icon.
// if (MetalLookAndFeel.getCurrentTheme() instanceof OceanTheme
@@ -1098,7 +1098,7 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 2, y + 2, x + 2, y + 2);
g.drawLine(x + 6, y + 2, x + 6, y + 2);
g.drawLine(x + 10, y + 2, x + 10, y + 2);
-
+
g.drawLine(x + 4, y + 4, x + 4, y + 4);
g.drawLine(x + 8, y + 4, x + 8, y + 4);
@@ -1107,62 +1107,62 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 10, y + 6, x + 10, y + 6);
}
- }
+ }
}
-
+
/**
- * An icon used for the 'close' button in the title frame of a
+ * An icon used for the 'close' button in the title frame of a
* {@link JInternalFrame}.
*/
- private static class InternalFrameCloseIcon
+ private static class InternalFrameCloseIcon
implements Icon, UIResource, Serializable
{
/** The icon size in pixels. */
private int size;
-
+
/**
* Creates a new icon.
- *
+ *
* @param size the icon size (width and height) in pixels.
*/
- public InternalFrameCloseIcon(int size)
+ public InternalFrameCloseIcon(int size)
{
this.size = size;
}
-
+
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return size;
}
-
+
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return size;
}
-
+
/**
* Paints the icon.
- *
+ *
* @param c the component (an {@link JInternalFrame} is expected).
* @param g the graphics device.
* @param x the x-coordinate.
* @param y the y-coordinate.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
Color savedColor = g.getColor();
AbstractButton b = (AbstractButton) c;
-
+
// fill the interior
if (b.getModel().isPressed())
// FIXME: also need to take into account whether the internal frame is
@@ -1171,7 +1171,7 @@ public class MetalIconFactory implements Serializable
else
g.setColor(MetalLookAndFeel.getPrimaryControl());
g.fillRect(x + 2, y + 2, 10, 10);
-
+
// draw the outline box and the cross
if (b.getModel().isPressed())
g.setColor(MetalLookAndFeel.getBlack());
@@ -1191,7 +1191,7 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 13, y + 2, x + 13, y + 12);
g.drawLine(x + 2, y + 12, x + 2, y + 12);
g.drawLine(x + 12, y + 2, x + 12, y + 2);
-
+
g.fillRect(x + 4, y + 4, 2, 2);
g.fillRect(x + 5, y + 5, 4, 4);
g.drawLine(x + 9, y + 4, x + 10, y + 4);
@@ -1200,21 +1200,21 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 4, y + 9, x + 5, y + 9);
g.drawLine(x + 9, y + 8, x + 9, y + 10);
g.drawLine(x + 8, y + 9, x + 10, y + 9);
-
+
g.setColor(MetalLookAndFeel.getBlack());
g.drawLine(x, y, x + 13, y);
g.drawLine(x, y + 1, x, y + 13);
g.drawLine(x + 3, y + 4, x + 4, y + 3);
g.drawLine(x + 3, y + 9, x + 5, y + 7);
g.drawLine(x + 7, y + 5, x + 9, y + 3);
-
+
g.drawLine(x + 12, y + 3, x + 12, y + 11);
g.drawLine(x + 3, y + 12, x + 12, y + 12);
-
+
g.setColor(MetalLookAndFeel.getWhite());
g.drawLine(x + 1, y + 14, x + 14, y + 14);
g.drawLine(x + 14, y + 1, x + 14, y + 14);
-
+
if (!b.getModel().isPressed())
{
g.drawLine(x + 5, y + 10, x + 5, y + 10);
@@ -1225,53 +1225,53 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 10, y + 11, x + 10, y + 11);
}
g.setColor(savedColor);
- }
+ }
}
/**
* The icon displayed at the top-left corner of a {@link JInternalFrame}.
*/
private static class InternalFrameDefaultMenuIcon
- implements Icon, UIResource, Serializable
+ implements Icon, UIResource, Serializable
{
-
+
/**
* Creates a new instance.
*/
- public InternalFrameDefaultMenuIcon()
+ public InternalFrameDefaultMenuIcon()
{
// Nothing to do here.
}
-
+
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 16;
}
-
+
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 16;
}
-
+
/**
* Paints the icon at the specified location.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x coordinate.
* @param y the y coordinate.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
g.fillRect(x + 1, y, 14, 2);
@@ -1279,10 +1279,10 @@ public class MetalIconFactory implements Serializable
g.fillRect(x + 1, y + 14, 14, 2);
g.fillRect(x + 14, y + 1, 2, 14);
g.drawLine(x + 2, y + 5, x + 14, y + 5);
-
+
g.setColor(MetalLookAndFeel.getPrimaryControl());
g.fillRect(x + 2, y + 2, 12, 3);
-
+
g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
g.drawLine(x + 3, y + 3, x + 3, y + 3);
g.drawLine(x + 6, y + 3, x + 6, y + 3);
@@ -1295,59 +1295,59 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 5, y + 2, x + 5, y + 2);
g.drawLine(x + 8, y + 2, x + 8, y + 2);
g.drawLine(x + 11, y + 2, x + 11, y + 2);
- }
+ }
}
/**
- * An icon used in the title frame of a {@link JInternalFrame}. When you
+ * An icon used in the title frame of a {@link JInternalFrame}. When you
* maximise an internal frame, this icon will replace the 'maximise' icon to
* provide a 'restore' option.
*/
private static class InternalFrameAltMaximizeIcon
- implements Icon, UIResource, Serializable
+ implements Icon, UIResource, Serializable
{
/** The icon size in pixels. */
private int size;
-
+
/**
* Creates a new icon.
- *
+ *
* @param size the icon size in pixels.
*/
- public InternalFrameAltMaximizeIcon(int size)
+ public InternalFrameAltMaximizeIcon(int size)
{
this.size = size;
}
-
+
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return size;
}
-
+
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return size;
}
-
+
/**
* Paints the icon at the specified location.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x coordinate.
* @param y the y coordinate.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
Color savedColor = g.getColor();
@@ -1359,27 +1359,27 @@ public class MetalIconFactory implements Serializable
else
g.setColor(MetalLookAndFeel.getPrimaryControl());
g.fillRect(x + 2, y + 6, 7, 7);
-
-
+
+
if (b.getModel().isPressed())
g.setColor(MetalLookAndFeel.getBlack());
else
g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
-
+
g.drawLine(x + 12, y + 1, x + 13, y + 1);
g.drawLine(x + 11, y + 2, x + 12, y + 2);
g.drawLine(x + 10, y + 3, x + 11, y + 3);
g.drawLine(x + 8, y + 2, x + 8, y + 3);
g.fillRect(x + 8, y + 4, 3, 3);
g.drawLine(x + 11, y + 6, x + 12, y + 6);
-
+
g.drawLine(x + 1, y + 5, x + 5, y + 5);
g.drawLine(x + 1, y + 6, x + 1, y + 12);
g.drawLine(x + 9, y + 9, x + 9, y + 12);
g.drawLine(x + 1, y + 13, x + 9, y + 13);
-
+
g.drawLine(x + 2, y + 12, x + 2, y + 12);
-
+
g.setColor(MetalLookAndFeel.getBlack());
g.drawLine(x + 12, y, x + 9, y + 3);
g.drawLine(x + 7, y + 1, x + 8, y + 1);
@@ -1390,7 +1390,7 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 3, y + 12, x + 8, y + 12);
g.drawLine(x + 8, y + 8, x + 8, y + 11);
g.drawLine(x + 9, y + 8, x + 9, y + 8);
-
+
g.setColor(MetalLookAndFeel.getWhite());
g.drawLine(x + 9, y + 2, x + 9, y + 2);
g.drawLine(x + 11, y + 4, x + 13, y + 2);
@@ -1399,67 +1399,67 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 6, y + 5, x + 6, y + 5);
g.drawLine(x + 10, y + 8, x + 10, y + 13);
g.drawLine(x + 1, y + 14, x + 10, y + 14);
-
+
if (!b.getModel().isPressed())
{
g.drawLine(x + 2, y + 6, x + 6, y + 6);
g.drawLine(x + 2, y + 6, x + 2, y + 11);
}
-
+
g.setColor(savedColor);
- }
+ }
}
-
+
/**
- * An icon used for the 'maximize' button in the title frame of a
+ * An icon used for the 'maximize' button in the title frame of a
* {@link JInternalFrame}.
*/
- private static class InternalFrameMaximizeIcon
+ private static class InternalFrameMaximizeIcon
implements Icon, UIResource, Serializable
{
-
+
/**
* Creates a new instance.
*/
- public InternalFrameMaximizeIcon()
+ public InternalFrameMaximizeIcon()
{
// Nothing to do here.
}
-
+
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 16;
}
-
+
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 16;
}
-
+
/**
* Paints the icon at the specified location.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x coordinate.
* @param y the y coordinate.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
Color savedColor = g.getColor();
-
+
AbstractButton b = (AbstractButton) c;
-
+
// fill the interior
if (b.getModel().isPressed())
g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
@@ -1471,7 +1471,7 @@ public class MetalIconFactory implements Serializable
g.setColor(MetalLookAndFeel.getBlack());
else
g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
-
+
g.drawLine(x + 9, y + 1, x + 10, y + 1);
g.fillRect(x + 11, y + 1, 3, 3);
g.fillRect(x + 12, y + 4, 2, 2);
@@ -1481,7 +1481,7 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 1, y + 6, x + 1, y + 12);
g.drawLine(x + 9, y + 6, x + 9, y + 12);
g.drawLine(x + 1, y + 13, x + 9, y + 13);
-
+
// fill
g.drawLine(x + 7, y + 6, x + 8, y + 6);
g.drawLine(x + 6, y + 7, x + 8, y + 7);
@@ -1491,7 +1491,7 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 2, y + 11, x + 3, y + 11);
g.drawLine(x + 2, y + 12, x + 4, y + 12);
g.drawLine(x + 8, y + 8, x + 8, y + 8);
-
+
// draw black
g.setColor(MetalLookAndFeel.getBlack());
g.drawLine(x + 8, y, x + 13, y);
@@ -1499,11 +1499,11 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 10, y + 2, x + 9, y + 3);
g.drawLine(x, y + 4, x + 8, y + 4);
g.drawLine(x, y + 5, x, y + 13);
-
+
g.drawLine(x + 2, y + 10, x + 6, y + 6);
g.drawLine(x + 8, y + 9, x + 8, y + 11);
g.drawLine(x + 5, y + 12, x + 8, y + 12);
-
+
// draw white
g.setColor(MetalLookAndFeel.getWhite());
if (!b.getModel().isPressed())
@@ -1512,89 +1512,89 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 2, y + 7, x + 2, y + 9);
g.drawLine(x + 4, y + 11, x + 7, y + 8);
}
-
+
g.drawLine(x + 1, y + 14, x + 10, y + 14);
g.drawLine(x + 10, y + 5, x + 10, y + 13);
-
+
g.drawLine(x + 9, y + 2, x + 9, y + 2);
g.drawLine(x + 11, y + 4, x + 11, y + 5);
g.drawLine(x + 13, y + 6, x + 14, y + 6);
g.drawLine(x + 14, y + 1, x + 14, y + 5);
g.setColor(savedColor);
- }
+ }
}
/**
* An icon used in the title frame of a {@link JInternalFrame}.
*/
- private static class InternalFrameMinimizeIcon
+ private static class InternalFrameMinimizeIcon
implements Icon, UIResource, Serializable
{
-
+
/**
* Creates a new instance.
*/
- public InternalFrameMinimizeIcon()
+ public InternalFrameMinimizeIcon()
{
// Nothing to do here.
}
-
+
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 16;
}
-
+
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 16;
}
-
+
/**
* Paints the icon at the specified location.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x coordinate.
* @param y the y coordinate.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
Color savedColor = g.getColor();
-
+
AbstractButton b = (AbstractButton) c;
-
+
if (b.getModel().isPressed())
g.setColor(MetalLookAndFeel.getBlack());
else
- // FIXME: here the color depends on whether or not the internal frame
- // is selected
+ // FIXME: here the color depends on whether or not the internal frame
+ // is selected
g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
-
+
g.drawLine(x + 12, y + 1, x + 13, y + 1);
g.drawLine(x + 11, y + 2, x + 12, y + 2);
g.drawLine(x + 10, y + 3, x + 11, y + 3);
g.drawLine(x + 8, y + 2, x + 8, y + 3);
g.fillRect(x + 8, y + 4, 3, 3);
g.drawLine(x + 11, y + 6, x + 12, y + 6);
-
+
g.drawLine(x + 1, y + 8, x + 6, y + 8);
g.drawLine(x + 1, y + 9, x + 1, y + 12);
g.drawLine(x + 6, y + 9, x + 6, y + 12);
g.drawLine(x + 1, y + 13, x + 6, y + 13);
-
+
g.drawLine(x + 5, y + 9, x + 5, y + 9);
g.drawLine(x + 2, y + 12, x + 2, y + 12);
-
+
g.setColor(MetalLookAndFeel.getBlack());
g.drawLine(x + 12, y, x + 9, y + 3);
g.drawLine(x + 7, y + 1, x + 8, y + 1);
@@ -1604,7 +1604,7 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 3, y + 12, x + 5, y + 12);
g.drawLine(x + 5, y + 10, x + 5, y + 11);
g.drawLine(x + 11, y + 5, x + 12, y + 5);
-
+
g.setColor(MetalLookAndFeel.getWhite());
g.drawLine(x + 9, y + 2, x + 9, y + 2);
g.drawLine(x + 11, y + 4, x + 13, y + 2);
@@ -1625,14 +1625,14 @@ public class MetalIconFactory implements Serializable
}
g.setColor(savedColor);
- }
+ }
}
/**
* The icon used to display the thumb control on a horizontally oriented
* {@link JSlider} component.
*/
- private static class VerticalSliderThumbIcon
+ private static class VerticalSliderThumbIcon
implements Icon, UIResource, Serializable
{
/**
@@ -1646,53 +1646,53 @@ public class MetalIconFactory implements Serializable
/**
* Creates a new instance.
*/
- public VerticalSliderThumbIcon()
+ public VerticalSliderThumbIcon()
{
// Nothing to do here.
}
-
+
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 16;
}
-
+
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 15;
}
-
+
/**
* Paints the icon taking into account whether the slider control has the
* focus or not.
- *
+ *
* @param c the slider (must be a non-<code>null</code> instance of
* {@link JSlider}.
* @param g the graphics device.
* @param x the x-coordinate.
* @param y the y-coordinate.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
boolean enabled = false;
boolean focus = false;
if (c != null)
{
enabled = c.isEnabled();
- focus = c.hasFocus();
+ focus = c.hasFocus();
}
-
+
// draw the outline
- if (enabled)
+ if (enabled)
g.setColor(MetalLookAndFeel.getBlack());
else
g.setColor(MetalLookAndFeel.getControlDarkShadow());
@@ -1701,8 +1701,8 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 14, y + 8, x + 8, y + 14);
g.drawLine(x + 8, y + 14, x + 1, y + 14);
g.drawLine(x, y + 13, x, y + 1);
-
-// The following is commented out until the masking for the gradient painting
+
+// The following is commented out until the masking for the gradient painting
// is working correctly
// // Fill the icon.
// if (MetalLookAndFeel.getCurrentTheme() instanceof OceanTheme
@@ -1768,57 +1768,57 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 6, y + 2, x + 6, y + 2);
g.drawLine(x + 6, y + 6, x + 6, y + 6);
g.drawLine(x + 6, y + 10, x + 6, y + 10);
-
+
}
- }
+ }
}
-
+
/**
* A tree control icon. This icon can be in one of two states: expanded and
* collapsed.
*/
public static class TreeControlIcon implements Icon, Serializable
{
-
+
/** ???. */
protected boolean isLight;
-
+
/** A flag that controls whether or not the icon is collapsed. */
private boolean collapsed;
-
+
/**
* Creates a new icon.
- *
+ *
* @param isCollapsed a flag that controls whether the icon is in the
* collapsed state or the expanded state.
*/
- public TreeControlIcon(boolean isCollapsed)
+ public TreeControlIcon(boolean isCollapsed)
{
collapsed = isCollapsed;
}
-
+
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return The width of the icon.
*/
- public int getIconWidth()
+ public int getIconWidth()
{
return 18;
}
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return The height of the icon.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 18;
}
-
+
/**
* Paints the icon at the location (x, y).
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x coordinate.
@@ -1840,31 +1840,31 @@ public class MetalIconFactory implements Serializable
g.drawOval(x, y, w, w);
g.setColor(dark);
g.fillOval(x + 1, y + 1, w - 1, w - 1);
-
+
if (collapsed)
g.fillRect(x + w, y + wHalf + 1, w, 2);
else
g.fillRect(x + wHalf + 1, y + w, 2, w);
-
+
g.setColor(white);
g.fillRect(x + wHalf + 1, y + wHalf + 1, 2, 2);
- }
-
+ }
+
/**
* Simply calls {@link #paintIcon(Component, Graphics, int, int)}.
- *
+ *
* @param c the component.
* @param g the graphics device.
* @param x the x coordinate.
* @param y the y coordinate.
*/
- public void paintMe(Component c, Graphics g, int x, int y)
+ public void paintMe(Component c, Graphics g, int x, int y)
{
- paintIcon(c, g, x, y);
+ paintIcon(c, g, x, y);
}
}
-
+
/**
* A tree folder icon.
*/
@@ -1873,34 +1873,34 @@ public class MetalIconFactory implements Serializable
/**
* Creates a new instance.
*/
- public TreeFolderIcon()
+ public TreeFolderIcon()
{
// Nothing to do here.
}
-
+
/**
* Returns the additional height for this icon, in this case <code>2</code>
* pixels.
- *
+ *
* @return <code>2</code>.
*/
- public int getAdditionalHeight()
+ public int getAdditionalHeight()
{
return 2;
}
-
+
/**
- * Returns the vertical shift, in pixels, applied when painting the icon.
+ * Returns the vertical shift, in pixels, applied when painting the icon.
* This overridden method returns <code>-1</code>.
- *
+ *
* @return The shift.
*/
- public int getShift()
+ public int getShift()
{
return -1;
}
}
-
+
/**
* A tree leaf icon.
*/
@@ -1909,29 +1909,29 @@ public class MetalIconFactory implements Serializable
/**
* Creates a new instance.
*/
- public TreeLeafIcon()
+ public TreeLeafIcon()
{
// Nothing to do here.
}
-
+
/**
* Returns the additional height for this icon, in this case <code>4</code>
* pixels.
- *
+ *
* @return <code>4</code>.
*/
- public int getAdditionalHeight()
+ public int getAdditionalHeight()
{
return 4;
}
-
+
/**
- * Returns the vertical shift, in pixels, applied when painting the icon.
+ * Returns the vertical shift, in pixels, applied when painting the icon.
* This overridden method returns <code>2</code>.
- *
+ *
* @return The shift.
*/
- public int getShift()
+ public int getShift()
{
return 2;
}
@@ -1939,51 +1939,51 @@ public class MetalIconFactory implements Serializable
/**
* An icon representing a hard disk.
- *
+ *
* @see MetalIconFactory#getTreeHardDriveIcon()
*/
- private static class TreeHardDriveIcon
+ private static class TreeHardDriveIcon
implements Icon, UIResource, Serializable
{
/**
* Creates a new icon instance.
*/
- public TreeHardDriveIcon()
+ public TreeHardDriveIcon()
{
// Nothing to do here.
}
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return <code>16</code>.
*/
- public int getIconWidth()
- {
+ public int getIconWidth()
+ {
return 16;
}
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return <code>16</code>.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 16;
}
/**
- * Paints the icon at the specified location, using colors from the
+ * Paints the icon at the specified location, using colors from the
* current theme.
- *
+ *
* @param c the component (ignored).
* @param g the graphics device.
* @param x the x-coordinate for the top-left of the icon.
* @param y the y-coordinate for the top-left of the icon.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
Color saved = g.getColor();
g.setColor(MetalLookAndFeel.getBlack());
@@ -1993,7 +1993,7 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 14, y + 7, x + 14, y + 8);
g.drawLine(x + 1, y + 10, x + 1, y + 11);
g.drawLine(x + 14, y + 10, x + 14, y + 11);
-
+
g.drawLine(x + 2, y + 3, x + 3, y + 3);
g.drawLine(x + 12, y + 3, x + 13, y + 3);
g.drawLine(x + 2, y + 6, x + 3, y + 6);
@@ -2002,25 +2002,25 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 12, y + 9, x + 13, y + 9);
g.drawLine(x + 2, y + 12, x + 3, y + 12);
g.drawLine(x + 12, y + 12, x + 13, y + 12);
-
+
g.drawLine(x + 4, y + 2, x + 11, y + 2);
g.drawLine(x + 4, y + 7, x + 11, y + 7);
g.drawLine(x + 4, y + 10, x + 11, y + 10);
g.drawLine(x + 4, y + 13, x + 11, y + 13);
-
+
g.setColor(MetalLookAndFeel.getWhite());
g.fillRect(x + 4, y + 3, 2, 2);
g.drawLine(x + 6, y + 4, x + 6, y + 4);
g.drawLine(x + 7, y + 3, x + 9, y + 3);
g.drawLine(x + 8, y + 4, x + 8, y + 4);
g.drawLine(x + 11, y + 3, x + 11, y + 3);
- g.fillRect(x + 2, y + 4, 2, 2);
- g.fillRect(x + 2, y + 7, 2, 2);
- g.fillRect(x + 2, y + 10, 2, 2);
+ g.fillRect(x + 2, y + 4, 2, 2);
+ g.fillRect(x + 2, y + 7, 2, 2);
+ g.fillRect(x + 2, y + 10, 2, 2);
g.drawLine(x + 4, y + 6, x + 4, y + 6);
g.drawLine(x + 4, y + 9, x + 4, y + 9);
g.drawLine(x + 4, y + 12, x + 4, y + 12);
-
+
g.setColor(MetalLookAndFeel.getControlShadow());
g.drawLine(x + 13, y + 4, x + 13, y + 4);
g.drawLine(x + 12, y + 5, x + 13, y + 5);
@@ -2028,7 +2028,7 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 12, y + 8, x + 13, y + 8);
g.drawLine(x + 13, y + 10, x + 13, y + 10);
g.drawLine(x + 12, y + 11, x + 13, y + 11);
-
+
g.drawLine(x + 10, y + 5, x + 10, y + 5);
g.drawLine(x + 7, y + 6, x + 7, y + 6);
g.drawLine(x + 9, y + 6, x + 9, y + 6);
@@ -2045,136 +2045,136 @@ public class MetalIconFactory implements Serializable
g.drawLine(x + 11, y + 12, x + 11, y + 12);
g.setColor(saved);
- }
- }
-
+ }
+ }
+
/**
* An icon representing a floppy disk.
- *
+ *
* @see MetalIconFactory#getTreeFloppyDriveIcon()
*/
- private static class TreeFloppyDriveIcon
+ private static class TreeFloppyDriveIcon
implements Icon, UIResource, Serializable
{
/**
* Creates a new icon instance.
*/
- public TreeFloppyDriveIcon()
+ public TreeFloppyDriveIcon()
{
// Nothing to do here.
}
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return <code>16</code>.
*/
- public int getIconWidth()
- {
+ public int getIconWidth()
+ {
return 16;
}
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return <code>16</code>.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 16;
}
/**
- * Paints the icon at the specified location, using colors from the
+ * Paints the icon at the specified location, using colors from the
* current theme.
- *
+ *
* @param c the component (ignored).
* @param g the graphics device.
* @param x the x-coordinate for the top-left of the icon.
* @param y the y-coordinate for the top-left of the icon.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
Color saved = g.getColor();
-
+
g.setColor(MetalLookAndFeel.getBlack());
g.drawLine(x + 1, y + 1, x + 13, y + 1);
g.drawLine(x + 1, y + 1, x + 1, y + 14);
g.drawLine(x + 1, y + 14, x + 14, y + 14);
g.drawLine(x + 14, y + 2, x + 14, y + 14);
-
+
g.setColor(MetalLookAndFeel.getPrimaryControl());
g.fillRect(x + 2, y + 2, 12, 12);
-
+
g.setColor(MetalLookAndFeel.getControlShadow());
g.fillRect(x + 5, y + 2, 6, 5);
g.drawLine(x + 4, y + 8, x + 11, y + 8);
g.drawLine(x + 3, y + 9, x + 3, y + 13);
g.drawLine(x + 12, y + 9, x + 12, y + 13);
-
+
g.setColor(MetalLookAndFeel.getWhite());
g.fillRect(x + 8, y + 3, 2, 3);
g.fillRect(x + 4, y + 9, 8, 5);
-
+
g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
g.drawLine(x + 5, y + 10, x + 9, y + 10);
g.drawLine(x + 5, y + 12, x + 8, y + 12);
g.setColor(saved);
- }
- }
+ }
+ }
/**
* An icon representing a computer.
- *
+ *
* @see MetalIconFactory#getTreeComputerIcon()
*/
- private static class TreeComputerIcon
+ private static class TreeComputerIcon
implements Icon, UIResource, Serializable
{
/**
* Creates a new icon instance.
*/
- public TreeComputerIcon()
+ public TreeComputerIcon()
{
// Nothing to do here.
}
/**
* Returns the width of the icon, in pixels.
- *
+ *
* @return <code>16</code>.
*/
- public int getIconWidth()
- {
+ public int getIconWidth()
+ {
return 16;
}
/**
* Returns the height of the icon, in pixels.
- *
+ *
* @return <code>16</code>.
*/
- public int getIconHeight()
+ public int getIconHeight()
{
return 16;
}
/**
- * Paints the icon at the specified location, using colors from the
+ * Paints the icon at the specified location, using colors from the
* current theme.
- *
+ *
* @param c the component (ignored).
* @param g the graphics device.
* @param x the x-coordinate for the top-left of the icon.
* @param y the y-coordinate for the top-left of the icon.
*/
- public void paintIcon(Component c, Graphics g, int x, int y)
+ public void paintIcon(Component c, Graphics g, int x, int y)
{
Color saved = g.getColor();
-
+
g.setColor(MetalLookAndFeel.getBlack());
g.drawLine(x + 3, y + 1, x + 12, y + 1);
g.drawLine(x + 2, y + 2, x + 2, y + 8);
@@ -2189,20 +2189,20 @@ public class MetalIconFactory implements Serializable
g.setColor(MetalLookAndFeel.getPrimaryControl());
g.fillRect(x + 5, y + 4, 6, 4);
-
+
g.setColor(MetalLookAndFeel.getControlShadow());
g.drawLine(x + 6, y + 12, x + 8, y + 12);
g.drawLine(x + 10, y + 12, x + 12, y + 12);
g.setColor(saved);
- }
- }
-
+ }
+ }
+
/** The icon returned by {@link #getCheckBoxIcon()}. */
private static Icon checkBoxIcon;
-
+
/** The icon returned by {@link #getCheckBoxMenuItemIcon()}. */
private static Icon checkBoxMenuItemIcon;
-
+
/** The icon returned by {@link #getFileChooserDetailViewIcon()}. */
private static Icon fileChooserDetailViewIcon;
@@ -2229,49 +2229,49 @@ public class MetalIconFactory implements Serializable
/** The icon returned by {@link #getTreeComputerIcon()}. */
private static Icon treeComputerIcon;
-
+
/** The icon instance returned by {@link #getTreeFloppyDriveIcon()}. */
private static Icon treeFloppyDriveIcon;
-
+
/** The icon instance returned by {@link #getTreeHardDriveIcon()}. */
private static Icon treeHardDriveIcon;
-
+
/** The icon instance returned by {@link #getHorizontalSliderThumbIcon()}. */
private static Icon horizontalSliderThumbIcon;
/** The icon instance returned by {@link #getVerticalSliderThumbIcon()}. */
private static Icon verticalSliderThumbIcon;
-
+
/**
- * Creates a new instance. All the methods are static, so creating an
+ * Creates a new instance. All the methods are static, so creating an
* instance isn't necessary.
*/
- public MetalIconFactory()
+ public MetalIconFactory()
{
// Nothing to do here.
}
/**
* Returns an icon for use when rendering the {@link JCheckBox} component.
- *
+ *
* @return A check box icon.
- *
+ *
* @since 1.3
*/
- public static Icon getCheckBoxIcon()
+ public static Icon getCheckBoxIcon()
{
if (checkBoxIcon == null)
checkBoxIcon = new MetalCheckBoxIcon();
return checkBoxIcon;
}
-
+
/**
- * Returns an icon for use when rendering the {@link JCheckBoxMenuItem}
+ * Returns an icon for use when rendering the {@link JCheckBoxMenuItem}
* component.
- *
+ *
* @return An icon.
*/
- public static Icon getCheckBoxMenuItemIcon()
+ public static Icon getCheckBoxMenuItemIcon()
{
if (checkBoxMenuItemIcon == null)
checkBoxMenuItemIcon = new CheckBoxMenuItemIcon();
@@ -2280,58 +2280,58 @@ public class MetalIconFactory implements Serializable
/**
* Returns an icon for use by the {@link JFileChooser} component.
- *
+ *
* @return An icon.
*/
- public static Icon getFileChooserDetailViewIcon()
+ public static Icon getFileChooserDetailViewIcon()
{
if (fileChooserDetailViewIcon == null)
fileChooserDetailViewIcon = new FileChooserDetailViewIcon();
return fileChooserDetailViewIcon;
}
-
+
/**
* Returns an icon for use by the {@link JFileChooser} component.
- *
+ *
* @return An icon.
*/
- public static Icon getFileChooserHomeFolderIcon()
+ public static Icon getFileChooserHomeFolderIcon()
{
if (fileChooserHomeFolderIcon == null)
fileChooserHomeFolderIcon = new FileChooserHomeFolderIcon();
- return fileChooserHomeFolderIcon;
+ return fileChooserHomeFolderIcon;
}
-
+
/**
* Returns an icon for use by the {@link JFileChooser} component.
- *
+ *
* @return An icon.
*/
- public static Icon getFileChooserListViewIcon()
+ public static Icon getFileChooserListViewIcon()
{
if (fileChooserListViewIcon == null)
fileChooserListViewIcon = new FileChooserListViewIcon();
return fileChooserListViewIcon;
}
-
+
/**
* Returns an icon for use by the {@link JFileChooser} component.
- *
+ *
* @return An icon.
*/
- public static Icon getFileChooserNewFolderIcon()
+ public static Icon getFileChooserNewFolderIcon()
{
if (fileChooserNewFolderIcon == null)
fileChooserNewFolderIcon = new FileChooserNewFolderIcon();
return fileChooserNewFolderIcon;
}
-
+
/**
* Returns an icon for use by the {@link JFileChooser} component.
- *
+ *
* @return An icon.
*/
- public static Icon getFileChooserUpFolderIcon()
+ public static Icon getFileChooserUpFolderIcon()
{
if (fileChooserUpFolderIcon == null)
fileChooserUpFolderIcon = new FileChooserUpFolderIcon();
@@ -2352,10 +2352,10 @@ public class MetalIconFactory implements Serializable
/**
* Creates a new instance of the icon used in a {@link JRadioButtonMenuItem}.
- *
+ *
* @return A new icon instance.
*/
- public static Icon getRadioButtonMenuItemIcon()
+ public static Icon getRadioButtonMenuItemIcon()
{
if (radioButtonMenuItemIcon == null)
radioButtonMenuItemIcon = new RadioButtonMenuItemIcon();
@@ -2365,25 +2365,25 @@ public class MetalIconFactory implements Serializable
/**
* Returns the icon used to display the thumb for a horizontally oriented
* {@link JSlider}.
- *
+ *
* @return The icon.
*/
- public static Icon getHorizontalSliderThumbIcon()
+ public static Icon getHorizontalSliderThumbIcon()
{
if (horizontalSliderThumbIcon == null)
horizontalSliderThumbIcon = new HorizontalSliderThumbIcon();
return horizontalSliderThumbIcon;
}
-
+
/**
* Creates a new icon used to represent the 'close' button in the title
* pane of a {@link JInternalFrame}.
- *
+ *
* @param size the icon size.
- *
+ *
* @return A close icon.
*/
- public static Icon getInternalFrameCloseIcon(int size)
+ public static Icon getInternalFrameCloseIcon(int size)
{
return new InternalFrameCloseIcon(size);
}
@@ -2391,39 +2391,39 @@ public class MetalIconFactory implements Serializable
/**
* Creates a new icon for the menu in a {@link JInternalFrame}. This is the
* icon displayed at the top left of the frame.
- *
+ *
* @return A menu icon.
*/
- public static Icon getInternalFrameDefaultMenuIcon()
+ public static Icon getInternalFrameDefaultMenuIcon()
{
if (internalFrameDefaultMenuIcon == null)
internalFrameDefaultMenuIcon = new InternalFrameDefaultMenuIcon();
return internalFrameDefaultMenuIcon;
}
-
+
/**
* Creates a new icon for the 'maximize' button in a {@link JInternalFrame}.
- *
+ *
* @param size the icon size in pixels.
- *
+ *
* @return The icon.
- *
+ *
* @see #getInternalFrameAltMaximizeIcon(int)
*/
- public static Icon getInternalFrameMaximizeIcon(int size)
+ public static Icon getInternalFrameMaximizeIcon(int size)
{
return new InternalFrameMaximizeIcon();
}
-
+
/**
* Returns the icon used for the minimize button in the frame title for a
* {@link JInternalFrame}.
- *
+ *
* @param size the icon size in pixels (ignored by this implementation).
- *
+ *
* @return The icon.
*/
- public static Icon getInternalFrameMinimizeIcon(int size)
+ public static Icon getInternalFrameMinimizeIcon(int size)
{
return new InternalFrameMinimizeIcon();
}
@@ -2431,94 +2431,94 @@ public class MetalIconFactory implements Serializable
/**
* Creates a new icon for the 'restore' button in a {@link JInternalFrame}
* that has been maximised.
- *
+ *
* @param size the icon size in pixels.
- *
+ *
* @return The icon.
- *
+ *
* @see #getInternalFrameMaximizeIcon(int)
*/
- public static Icon getInternalFrameAltMaximizeIcon(int size)
+ public static Icon getInternalFrameAltMaximizeIcon(int size)
{
return new InternalFrameAltMaximizeIcon(size);
}
-
+
/**
* Returns the icon used to display the thumb for a vertically oriented
* {@link JSlider}.
- *
+ *
* @return The icon.
*/
- public static Icon getVerticalSliderThumbIcon()
+ public static Icon getVerticalSliderThumbIcon()
{
if (verticalSliderThumbIcon == null)
verticalSliderThumbIcon = new VerticalSliderThumbIcon();
return verticalSliderThumbIcon;
}
-
+
/**
* Creates and returns a new tree folder icon.
- *
+ *
* @return A new tree folder icon.
- */
- public static Icon getTreeFolderIcon()
+ */
+ public static Icon getTreeFolderIcon()
{
return new TreeFolderIcon();
}
-
+
/**
* Creates and returns a new tree leaf icon.
- *
+ *
* @return A new tree leaf icon.
*/
- public static Icon getTreeLeafIcon()
+ public static Icon getTreeLeafIcon()
{
return new TreeLeafIcon();
}
-
+
/**
* Creates and returns a tree control icon.
- *
- * @param isCollapsed a flag that controls whether the icon is in the
+ *
+ * @param isCollapsed a flag that controls whether the icon is in the
* collapsed or expanded state.
- *
+ *
* @return A tree control icon.
*/
- public static Icon getTreeControlIcon(boolean isCollapsed)
+ public static Icon getTreeControlIcon(boolean isCollapsed)
{
return new TreeControlIcon(isCollapsed);
}
/**
* Returns a <code>16x16</code> icon representing a computer.
- *
+ *
* @return The icon.
*/
- public static Icon getTreeComputerIcon()
+ public static Icon getTreeComputerIcon()
{
if (treeComputerIcon == null)
treeComputerIcon = new TreeComputerIcon();
- return treeComputerIcon;
+ return treeComputerIcon;
}
-
+
/**
* Returns a <code>16x16</code> icon representing a floppy disk.
- *
+ *
* @return The icon.
*/
- public static Icon getTreeFloppyDriveIcon()
+ public static Icon getTreeFloppyDriveIcon()
{
if (treeFloppyDriveIcon == null)
treeFloppyDriveIcon = new TreeFloppyDriveIcon();
return treeFloppyDriveIcon;
}
-
+
/**
* Returns a <code>16x16</code> icon representing a hard disk.
- *
+ *
* @return The icon.
*/
- public static Icon getTreeHardDriveIcon()
+ public static Icon getTreeHardDriveIcon()
{
if (treeHardDriveIcon == null)
treeHardDriveIcon = new TreeHardDriveIcon();
@@ -2527,9 +2527,9 @@ public class MetalIconFactory implements Serializable
/**
* Returns a new instance of a 4 x 8 icon showing a small black triangle that
- * points to the right. This is displayed in menu items that have a
+ * points to the right. This is displayed in menu items that have a
* sub menu.
- *
+ *
* @return The icon.
*/
public static Icon getMenuArrowIcon()
@@ -2558,11 +2558,11 @@ public class MetalIconFactory implements Serializable
};
return menuArrow;
}
-
+
/**
* Returns a new instance of a 4 x 8 icon showing a small black triangle that
* points to the right. This is displayed in menu items that have a sub menu.
- *
+ *
* @return The icon.
*/
public static Icon getMenuItemArrowIcon()
@@ -2591,10 +2591,10 @@ public class MetalIconFactory implements Serializable
};
return menuItemArrow;
}
-
+
/**
* Returns a new instance of a 13 x 13 icon showing a small black check mark.
- *
+ *
* @return The icon.
*/
public static Icon getMenuItemCheckIcon()
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java b/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java
index dd0c486..08de774 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java
@@ -60,16 +60,16 @@ import javax.swing.plaf.basic.BasicInternalFrameTitlePane;
/**
- * The title pane for a {@link JInternalFrame} (see
- * {@link MetalInternalFrameUI#createNorthPane(JInternalFrame)}). This can
- * be displayed in two styles: one for regular internal frames, and the other
+ * The title pane for a {@link JInternalFrame} (see
+ * {@link MetalInternalFrameUI#createNorthPane(JInternalFrame)}). This can
+ * be displayed in two styles: one for regular internal frames, and the other
* for "palette" style internal frames.
*/
-public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
+public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
{
-
+
/**
- * A property change handler that listens for changes to the
+ * A property change handler that listens for changes to the
* <code>JInternalFrame.isPalette</code> property and updates the title
* pane as appropriate.
*/
@@ -83,11 +83,11 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
{
super();
}
-
+
/**
* Handles <code>JInternalFrame.isPalette</code> property changes, with all
* other property changes being passed to the superclass.
- *
+ *
* @param e the event.
*/
public void propertyChange(PropertyChangeEvent e)
@@ -111,7 +111,7 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
/**
* A layout manager for the title pane.
- *
+ *
* @see #createLayout()
*/
private class MetalTitlePaneLayout implements LayoutManager
@@ -176,8 +176,8 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
}
Dimension titlePreferredSize = title.getPreferredSize();
- title.setBounds(insets.left + 5, insets.top,
- Math.min(titlePreferredSize.width, loc - insets.left - 10),
+ title.setBounds(insets.left + 5, insets.top,
+ Math.min(titlePreferredSize.width, loc - insets.left - 10),
height);
}
@@ -224,26 +224,26 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
/** A flag indicating whether the title pane uses the palette style. */
protected boolean isPalette;
-
- /**
+
+ /**
* The icon used for the close button - this is fetched from the look and
- * feel defaults using the key <code>InternalFrame.paletteCloseIcon</code>.
+ * feel defaults using the key <code>InternalFrame.paletteCloseIcon</code>.
*/
protected Icon paletteCloseIcon;
-
+
/**
- * The height of the title pane when <code>isPalette</code> is
- * <code>true</code>. This value is fetched from the look and feel defaults
+ * The height of the title pane when <code>isPalette</code> is
+ * <code>true</code>. This value is fetched from the look and feel defaults
* using the key <code>InternalFrame.paletteTitleHeight</code>.
*/
protected int paletteTitleHeight;
-
+
/** The label used to display the title for the internal frame. */
JLabel title;
-
+
/**
* Creates a new title pane for the specified frame.
- *
+ *
* @param f the internal frame.
*/
public MetalInternalFrameTitlePane(JInternalFrame f)
@@ -251,7 +251,7 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
super(f);
isPalette = false;
}
-
+
/**
* Fetches the colors used in the title pane.
*/
@@ -262,21 +262,21 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
selectedTitleColor = MetalLookAndFeel.getWindowTitleBackground();
notSelectedTextColor = MetalLookAndFeel.getInactiveControlTextColor();
notSelectedTitleColor = MetalLookAndFeel.getWindowTitleInactiveBackground();
-
+
paletteTitleHeight = UIManager.getInt("InternalFrame.paletteTitleHeight");
paletteCloseIcon = UIManager.getIcon("InternalFrame.paletteCloseIcon");
minIcon = MetalIconFactory.getInternalFrameAltMaximizeIcon(16);
- title = new JLabel(frame.getTitle(),
- MetalIconFactory.getInternalFrameDefaultMenuIcon(),
+ title = new JLabel(frame.getTitle(),
+ MetalIconFactory.getInternalFrameDefaultMenuIcon(),
SwingConstants.LEFT);
}
-
+
/**
* Clears the colors used for the title pane.
*/
protected void uninstallDefaults()
- {
+ {
super.uninstallDefaults();
selectedTextColor = null;
selectedTitleColor = null;
@@ -286,14 +286,14 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
minIcon = null;
title = null;
}
-
+
/**
* Calls the super class to create the buttons, then calls
- * <code>setBorderPainted(false)</code> and
+ * <code>setBorderPainted(false)</code> and
* <code>setContentAreaFilled(false)</code> for each button.
*/
protected void createButtons()
- {
+ {
super.createButtons();
closeButton.setBorderPainted(false);
closeButton.setContentAreaFilled(false);
@@ -302,7 +302,7 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
maxButton.setBorderPainted(false);
maxButton.setContentAreaFilled(false);
}
-
+
/**
* Overridden to do nothing.
*/
@@ -310,21 +310,21 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
{
// do nothing
}
-
+
/**
* Overridden to do nothing.
*/
protected void showSystemMenu()
{
- // do nothing
+ // do nothing
}
-
+
/**
* Adds the sub components of the title pane.
*/
protected void addSubComponents()
{
- // FIXME: this method is probably overridden to only add the required
+ // FIXME: this method is probably overridden to only add the required
// buttons
add(title);
add(closeButton);
@@ -335,19 +335,19 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
/**
* Creates a new instance of <code>MetalTitlePaneLayout</code> (not part of
* the public API).
- *
+ *
* @return A new instance of <code>MetalTitlePaneLayout</code>.
*/
protected LayoutManager createLayout()
{
return new MetalTitlePaneLayout();
}
-
+
/**
* Draws the title pane in the palette style.
- *
+ *
* @param g the graphics device.
- *
+ *
* @see #paintComponent(Graphics)
*/
public void paintPalette(Graphics g)
@@ -362,22 +362,22 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
SwingConstants.VERTICAL,
"InternalFrame.activeTitleGradient");
}
- MetalUtils.fillMetalPattern(this, g, b.x + 4, b.y + 2, b.width
+ MetalUtils.fillMetalPattern(this, g, b.x + 4, b.y + 2, b.width
- paletteCloseIcon.getIconWidth() - 13, b.height - 5,
- MetalLookAndFeel.getPrimaryControlHighlight(),
+ MetalLookAndFeel.getPrimaryControlHighlight(),
MetalLookAndFeel.getBlack());
-
+
// draw a line separating the title pane from the frame content
Dimension d = getSize();
g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
g.drawLine(0, d.height - 1, d.width - 1, d.height - 1);
-
+
g.setColor(savedColor);
}
/**
* Paints a representation of the current state of the internal frame.
- *
+ *
* @param g the graphics device.
*/
public void paintComponent(Graphics g)
@@ -394,13 +394,13 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
else
g.setColor(MetalLookAndFeel.getControlDarkShadow());
-
+
// put a dot in each of the top corners
g.drawLine(0, 0, 0, 0);
g.drawLine(d.width - 1, 0, d.width - 1, 0);
-
+
g.drawLine(0, d.height - 1, d.width - 1, d.height - 1);
-
+
// draw the metal pattern
if (UIManager.get("InternalFrame.activeTitleGradient") != null
&& frame.isSelected())
@@ -415,22 +415,22 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
int endX = startX;
if (iconButton.isVisible())
endX = Math.max(iconButton.getX(), endX);
- else if (maxButton.isVisible())
+ else if (maxButton.isVisible())
endX = Math.max(maxButton.getX(), endX);
else if (closeButton.isVisible())
endX = Math.max(closeButton.getX(), endX);
endX -= 7;
if (endX > startX)
- MetalUtils.fillMetalPattern(this, g, startX, 3, endX - startX,
+ MetalUtils.fillMetalPattern(this, g, startX, 3, endX - startX,
getHeight() - 6, Color.white, Color.gray);
}
g.setColor(savedColor);
}
-
+
/**
- * Sets the flag that controls whether the title pane is drawn in the
+ * Sets the flag that controls whether the title pane is drawn in the
* palette style or the regular style.
- *
+ *
* @param b the new value of the flag.
*/
public void setPalette(boolean b)
@@ -444,15 +444,14 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
else
closeButton.setIcon(closeIcon);
}
-
+
/**
* Creates and returns a property change handler for the title pane.
- *
+ *
* @return The property change handler.
*/
protected PropertyChangeListener createPropertyChangeListener()
{
- return new MetalInternalFrameTitlePanePropertyChangeHandler();
+ return new MetalInternalFrameTitlePanePropertyChangeHandler();
}
}
-
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java
index abe6a28..5eda2ff 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java
@@ -54,16 +54,16 @@ import javax.swing.plaf.basic.BasicInternalFrameUI;
public class MetalInternalFrameUI
extends BasicInternalFrameUI
{
- /**
- * The key (<code>JInternalFrame.isPalette</code>) for the client property
- * that controls whether the internal frame is displayed using the palette
- * style.
+ /**
+ * The key (<code>JInternalFrame.isPalette</code>) for the client property
+ * that controls whether the internal frame is displayed using the palette
+ * style.
*/
protected static String IS_PALETTE = "JInternalFrame.isPalette";
/**
* Constructs a new instance of <code>MetalInternalFrameUI</code>.
- *
+ *
* @param frame the frame.
*/
public MetalInternalFrameUI(JInternalFrame frame)
@@ -82,10 +82,10 @@ public class MetalInternalFrameUI
{
return new MetalInternalFrameUI((JInternalFrame) component);
}
-
+
/**
* Sets the fields and properties for the component.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -101,23 +101,23 @@ public class MetalInternalFrameUI
/**
* Creates and returns the component that will be used for the north pane
- * of the {@link JInternalFrame}.
- *
+ * of the {@link JInternalFrame}.
+ *
* @param w the internal frame.
- *
+ *
* @return A new instance of {@link MetalInternalFrameTitlePane}.
*/
protected JComponent createNorthPane(JInternalFrame w)
{
titlePane = new MetalInternalFrameTitlePane(w);
- return titlePane;
+ return titlePane;
}
-
+
/**
* Sets the state of the {@link JInternalFrame} to reflect whether or not
* it is using the palette style. When a frame is displayed as a palette,
* it uses a different border and the title pane is drawn differently.
- *
+ *
* @param isPalette use the palette style?
*/
public void setPalette(boolean isPalette)
@@ -129,17 +129,17 @@ public class MetalInternalFrameUI
else
frame.setBorder(new MetalBorders.InternalFrameBorder());
}
-
+
/** A listener that is used to handle IS_PALETTE property changes. */
private PropertyChangeListener paletteListener;
-
+
/**
* Adds the required listeners.
*/
protected void installListeners()
{
- super.installListeners();
- paletteListener = new PropertyChangeListener()
+ super.installListeners();
+ paletteListener = new PropertyChangeListener()
{
public void propertyChange(PropertyChangeEvent e)
{
@@ -154,7 +154,7 @@ public class MetalInternalFrameUI
};
frame.addPropertyChangeListener(paletteListener);
}
-
+
/**
* Removes the listeners used.
*/
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalLabelUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalLabelUI.java
index 12b858e..915e501 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalLabelUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalLabelUI.java
@@ -79,12 +79,12 @@ public class MetalLabelUI
metalLabelUI = new MetalLabelUI();
return metalLabelUI;
}
-
+
/**
- * Draws the text for a disabled label, using the color defined in the
+ * Draws the text for a disabled label, using the color defined in the
* {@link UIManager} defaults with the key
* <code>Label.disabledForeground</code>.
- *
+ *
* @param l the label.
* @param g the graphics device.
* @param s the label text.
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java b/libjava/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java
index 25c624b..acc3fed 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java
@@ -56,7 +56,7 @@ import javax.swing.plaf.basic.BasicLookAndFeel;
/**
* A custom look and feel that is designed to look similar across different
- * operating systems. To install this look and feel, add the following code
+ * operating systems. To install this look and feel, add the following code
* (or something similar) near the start of your application:</p>
* <pre>
* try
@@ -69,12 +69,12 @@ import javax.swing.plaf.basic.BasicLookAndFeel;
* }</pre>
*/
public class MetalLookAndFeel extends BasicLookAndFeel
-{
+{
private static final long serialVersionUID = 6680646159193457980L;
-
+
/** The current theme. */
private static MetalTheme theme;
-
+
/**
* Creates a new instance of the Metal look and feel.
*/
@@ -95,7 +95,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
* Returns <code>false</code> to indicate that this look and feel does not
* attempt to emulate the look and feel of native applications on the host
* platform.
- *
+ *
* @return <code>false</code>.
*/
public boolean isNativeLookAndFeel()
@@ -106,7 +106,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns <code>true</code> to indicate that this look and feel is supported
* on all platforms.
- *
+ *
* @return <code>true</code>.
*/
public boolean isSupportedLookAndFeel()
@@ -117,7 +117,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns a string describing the look and feel. In this case, the method
* returns "Metal look and feel".
- *
+ *
* @return A string describing the look and feel.
*/
public String getDescription()
@@ -127,7 +127,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the look and feel identifier.
- *
+ *
* @return "MetalLookAndFeel".
*/
public String getID()
@@ -137,7 +137,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the look and feel name.
- *
+ *
* @return "MetalLookAndFeel".
*/
public String getName()
@@ -156,7 +156,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the accelerator foreground color from the installed theme.
- *
+ *
* @return The accelerator foreground color.
*/
public static ColorUIResource getAcceleratorForeground()
@@ -167,9 +167,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
}
/**
- * Returns the accelerator selected foreground color from the installed
+ * Returns the accelerator selected foreground color from the installed
* theme.
- *
+ *
* @return The accelerator selected foreground color.
*/
public static ColorUIResource getAcceleratorSelectedForeground()
@@ -181,7 +181,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the color black from the installed theme.
- *
+ *
* @return The color black.
*/
public static ColorUIResource getBlack()
@@ -193,7 +193,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the control color from the installed theme.
- *
+ *
* @return The control color.
*/
public static ColorUIResource getControl()
@@ -206,7 +206,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the color used for dark shadows on controls, from the installed
* theme.
- *
+ *
* @return The color used for dark shadows on controls.
*/
public static ColorUIResource getControlDarkShadow()
@@ -218,7 +218,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the color used for disabled controls, from the installed theme.
- *
+ *
* @return The color used for disabled controls.
*/
public static ColorUIResource getControlDisabled()
@@ -231,7 +231,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the color used to draw highlights for controls, from the installed
* theme.
- *
+ *
* @return The color used to draw highlights for controls.
*/
public static ColorUIResource getControlHighlight()
@@ -242,9 +242,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
}
/**
- * Returns the color used to display control info, from the installed
+ * Returns the color used to display control info, from the installed
* theme.
- *
+ *
* @return The color used to display control info.
*/
public static ColorUIResource getControlInfo()
@@ -257,7 +257,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the color used to draw shadows for controls, from the installed
* theme.
- *
+ *
* @return The color used to draw shadows for controls.
*/
public static ColorUIResource getControlShadow()
@@ -269,7 +269,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the color used for text on controls, from the installed theme.
- *
+ *
* @return The color used for text on controls.
*/
public static ColorUIResource getControlTextColor()
@@ -281,7 +281,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the font used for text on controls, from the installed theme.
- *
+ *
* @return The font used for text on controls.
*/
public static FontUIResource getControlTextFont()
@@ -292,9 +292,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
}
/**
- * Returns the color used for the desktop background, from the installed
+ * Returns the color used for the desktop background, from the installed
* theme.
- *
+ *
* @return The color used for the desktop background.
*/
public static ColorUIResource getDesktopColor()
@@ -305,9 +305,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
}
/**
- * Returns the color used to draw focus highlights, from the installed
+ * Returns the color used to draw focus highlights, from the installed
* theme.
- *
+ *
* @return The color used to draw focus highlights.
*/
public static ColorUIResource getFocusColor()
@@ -320,7 +320,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the color used to draw highlighted text, from the installed
* theme.
- *
+ *
* @return The color used to draw highlighted text.
*/
public static ColorUIResource getHighlightedTextColor()
@@ -333,7 +333,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the color used to draw text on inactive controls, from the
* installed theme.
- *
+ *
* @return The color used to draw text on inactive controls.
*/
public static ColorUIResource getInactiveControlTextColor()
@@ -346,7 +346,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the color used to draw inactive system text, from the installed
* theme.
- *
+ *
* @return The color used to draw inactive system text.
*/
public static ColorUIResource getInactiveSystemTextColor()
@@ -358,9 +358,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the background color for menu items, from the installed theme.
- *
+ *
* @return The background color for menu items.
- *
+ *
* @see #getMenuSelectedBackground()
*/
public static ColorUIResource getMenuBackground()
@@ -373,9 +373,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the foreground color for disabled menu items, from the installed
* theme.
- *
+ *
* @return The foreground color for disabled menu items.
- *
+ *
* @see #getMenuForeground()
*/
public static ColorUIResource getMenuDisabledForeground()
@@ -387,9 +387,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the foreground color for menu items, from the installed theme.
- *
+ *
* @return The foreground color for menu items.
- *
+ *
* @see #getMenuDisabledForeground()
* @see #getMenuSelectedForeground()
*/
@@ -403,9 +403,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the background color for selected menu items, from the installed
* theme.
- *
+ *
* @return The background color for selected menu items.
- *
+ *
* @see #getMenuBackground()
*/
public static ColorUIResource getMenuSelectedBackground()
@@ -418,9 +418,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the foreground color for selected menu items, from the installed
* theme.
- *
+ *
* @return The foreground color for selected menu items.
- *
+ *
* @see #getMenuForeground()
*/
public static ColorUIResource getMenuSelectedForeground()
@@ -432,7 +432,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the font used for text in menus, from the installed theme.
- *
+ *
* @return The font used for text in menus.
*/
public static FontUIResource getMenuTextFont()
@@ -444,7 +444,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the primary color for controls, from the installed theme.
- *
+ *
* @return The primary color for controls.
*/
public static ColorUIResource getPrimaryControl()
@@ -455,9 +455,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
}
/**
- * Returns the primary color for the dark shadow on controls, from the
+ * Returns the primary color for the dark shadow on controls, from the
* installed theme.
- *
+ *
* @return The primary color for the dark shadow on controls.
*/
public static ColorUIResource getPrimaryControlDarkShadow()
@@ -468,9 +468,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
}
/**
- * Returns the primary color for the highlight on controls, from the
+ * Returns the primary color for the highlight on controls, from the
* installed theme.
- *
+ *
* @return The primary color for the highlight on controls.
*/
public static ColorUIResource getPrimaryControlHighlight()
@@ -481,9 +481,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
}
/**
- * Returns the primary color for the information on controls, from the
+ * Returns the primary color for the information on controls, from the
* installed theme.
- *
+ *
* @return The primary color for the information on controls.
*/
public static ColorUIResource getPrimaryControlInfo()
@@ -496,7 +496,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the primary color for the shadow on controls, from the installed
* theme.
- *
+ *
* @return The primary color for the shadow on controls.
*/
public static ColorUIResource getPrimaryControlShadow()
@@ -508,7 +508,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the background color for separators, from the installed theme.
- *
+ *
* @return The background color for separators.
*/
public static ColorUIResource getSeparatorBackground()
@@ -520,7 +520,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the foreground color for separators, from the installed theme.
- *
+ *
* @return The foreground color for separators.
*/
public static ColorUIResource getSeparatorForeground()
@@ -532,7 +532,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the font used for sub text, from the installed theme.
- *
+ *
* @return The font used for sub text.
*/
public static FontUIResource getSubTextFont()
@@ -544,7 +544,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the color used for system text, from the installed theme.
- *
+ *
* @return The color used for system text.
*/
public static ColorUIResource getSystemTextColor()
@@ -556,7 +556,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the font used for system text, from the installed theme.
- *
+ *
* @return The font used for system text.
*/
public static FontUIResource getSystemTextFont()
@@ -568,7 +568,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the color used to highlight text, from the installed theme.
- *
+ *
* @return The color used to highlight text.
*/
public static ColorUIResource getTextHighlightColor()
@@ -580,7 +580,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the color used to display user text, from the installed theme.
- *
+ *
* @return The color used to display user text.
*/
public static ColorUIResource getUserTextColor()
@@ -592,7 +592,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the font used for user text, obtained from the current theme.
- *
+ *
* @return The font used for user text.
*/
public static FontUIResource getUserTextFont()
@@ -604,7 +604,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the color used for white, from the installed theme.
- *
+ *
* @return The color used for white.
*/
public static ColorUIResource getWhite()
@@ -616,7 +616,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the window background color, from the installed theme.
- *
+ *
* @return The window background color.
*/
public static ColorUIResource getWindowBackground()
@@ -628,7 +628,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the window title background color, from the installed theme.
- *
+ *
* @return The window title background color.
*/
public static ColorUIResource getWindowTitleBackground()
@@ -640,9 +640,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the window title font from the current theme.
- *
+ *
* @return The window title font.
- *
+ *
* @see MetalTheme
*/
public static FontUIResource getWindowTitleFont()
@@ -654,7 +654,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
/**
* Returns the window title foreground color, from the installed theme.
- *
+ *
* @return The window title foreground color.
*/
public static ColorUIResource getWindowTitleForeground()
@@ -665,9 +665,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
}
/**
- * Returns the background color for an inactive window title, from the
+ * Returns the background color for an inactive window title, from the
* installed theme.
- *
+ *
* @return The background color for an inactive window title.
*/
public static ColorUIResource getWindowTitleInactiveBackground()
@@ -678,9 +678,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
}
/**
- * Returns the foreground color for an inactive window title, from the
+ * Returns the foreground color for an inactive window title, from the
* installed theme.
- *
+ *
* @return The foreground color for an inactive window title.
*/
public static ColorUIResource getWindowTitleInactiveForeground()
@@ -691,17 +691,17 @@ public class MetalLookAndFeel extends BasicLookAndFeel
}
/**
- * Sets the current theme for the look and feel. Note that the theme must be
- * set <em>before</em> the look and feel is installed. To change the theme
- * for an already running application that is using the
- * {@link MetalLookAndFeel}, first set the theme with this method, then
- * create a new instance of {@link MetalLookAndFeel} and install it in the
+ * Sets the current theme for the look and feel. Note that the theme must be
+ * set <em>before</em> the look and feel is installed. To change the theme
+ * for an already running application that is using the
+ * {@link MetalLookAndFeel}, first set the theme with this method, then
+ * create a new instance of {@link MetalLookAndFeel} and install it in the
* usual way (see {@link UIManager#setLookAndFeel(LookAndFeel)}).
- *
+ *
* @param theme the theme (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if <code>theme</code> is <code>null</code>.
- *
+ *
* @see #getCurrentTheme()
*/
public static void setCurrentTheme(MetalTheme theme)
@@ -934,7 +934,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
"EditorPane.inactiveForeground", getInactiveSystemTextColor(),
"EditorPane.selectionBackground", getTextHighlightColor(),
"EditorPane.selectionForeground", getHighlightedTextColor(),
-
+
"FormattedTextField.background", getWindowBackground(),
"FormattedTextField.border",
new BorderUIResource(MetalBorders.getTextFieldBorder()),
@@ -946,15 +946,15 @@ public class MetalLookAndFeel extends BasicLookAndFeel
"FormattedTextField.selectionBackground", getTextHighlightColor(),
"FormattedTextField.selectionForeground", getHighlightedTextColor(),
- "FileChooser.upFolderIcon",
+ "FileChooser.upFolderIcon",
MetalIconFactory.getFileChooserUpFolderIcon(),
- "FileChooser.listViewIcon",
+ "FileChooser.listViewIcon",
MetalIconFactory.getFileChooserListViewIcon(),
- "FileChooser.newFolderIcon",
+ "FileChooser.newFolderIcon",
MetalIconFactory.getFileChooserNewFolderIcon(),
- "FileChooser.homeFolderIcon",
+ "FileChooser.homeFolderIcon",
MetalIconFactory.getFileChooserHomeFolderIcon(),
- "FileChooser.detailsViewIcon",
+ "FileChooser.detailsViewIcon",
MetalIconFactory.getFileChooserDetailViewIcon(),
"FileChooser.fileNameLabelMnemonic", new Integer(78),
"FileChooser.filesOfTypeLabelMnemonic", new Integer(84),
@@ -974,15 +974,15 @@ public class MetalLookAndFeel extends BasicLookAndFeel
"InternalFrame.borderLight", getControlHighlight(),
"InternalFrame.borderShadow", getControlShadow(),
"InternalFrame.icon", MetalIconFactory.getInternalFrameDefaultMenuIcon(),
- "InternalFrame.closeIcon",
+ "InternalFrame.closeIcon",
MetalIconFactory.getInternalFrameCloseIcon(16),
"InternalFrame.closeSound", "sounds/FrameClose.wav",
"InternalFrame.inactiveTitleBackground", getWindowTitleInactiveBackground(),
"InternalFrame.inactiveTitleForeground", getWindowTitleInactiveForeground(),
- "InternalFrame.maximizeIcon",
+ "InternalFrame.maximizeIcon",
MetalIconFactory.getInternalFrameMaximizeIcon(16),
"InternalFrame.maximizeSound", "sounds/FrameMaximize.wav",
- "InternalFrame.iconifyIcon",
+ "InternalFrame.iconifyIcon",
MetalIconFactory.getInternalFrameMinimizeIcon(16),
"InternalFrame.minimizeSound", "sounds/FrameMinimize.wav",
"InternalFrame.paletteBorder", new MetalBorders.PaletteBorder(),
@@ -1002,7 +1002,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
"List.foreground", getUserTextColor(),
"List.selectionBackground", getTextHighlightColor(),
"List.selectionForeground", getHighlightedTextColor(),
- "List.focusCellHighlightBorder",
+ "List.focusCellHighlightBorder",
new LineBorderUIResource(MetalLookAndFeel.getFocusColor()),
"Menu.acceleratorFont", new FontUIResource("Dialog", Font.PLAIN, 10),
@@ -1047,7 +1047,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
"OptionPane.informationSound", "sounds/OptionPaneInformation.wav",
"OptionPane.questionSound", "sounds/OptionPaneQuestion.wav",
"OptionPane.warningSound", "sounds/OptionPaneWarning.wav",
- "OptionPane.errorDialog.border.background", new ColorUIResource(153, 51, 51),
+ "OptionPane.errorDialog.border.background", new ColorUIResource(153, 51, 51),
"OptionPane.errorDialog.titlePane.background", new ColorUIResource(255, 153, 153),
"OptionPane.errorDialog.titlePane.foreground", new ColorUIResource(51, 0, 0),
"OptionPane.errorDialog.titlePane.shadow", new ColorUIResource(204, 102, 102),
@@ -1114,16 +1114,16 @@ public class MetalLookAndFeel extends BasicLookAndFeel
"RadioButtonMenuItem.background", getMenuBackground(),
"RadioButtonMenuItem.border", new MetalBorders.MenuItemBorder(),
"RadioButtonMenuItem.borderPainted", Boolean.TRUE,
- "RadioButtonMenuItem.checkIcon",
+ "RadioButtonMenuItem.checkIcon",
MetalIconFactory.getRadioButtonMenuItemIcon(),
"RadioButtonMenuItem.commandSound", "sounds/MenuItemCommand.wav",
"RadioButtonMenuItem.disabledForeground", getMenuDisabledForeground(),
"RadioButtonMenuItem.font", getMenuTextFont(),
"RadioButtonMenuItem.foreground", getMenuForeground(),
"RadioButtonMenuItem.margin", new InsetsUIResource(2, 2, 2, 2),
- "RadioButtonMenuItem.selectionBackground",
+ "RadioButtonMenuItem.selectionBackground",
MetalLookAndFeel.getMenuSelectedBackground(),
- "RadioButtonMenuItem.selectionForeground",
+ "RadioButtonMenuItem.selectionForeground",
MetalLookAndFeel.getMenuSelectedForeground(),
"ScrollBar.allowsAbsolutePositioning", Boolean.TRUE,
@@ -1154,12 +1154,12 @@ public class MetalLookAndFeel extends BasicLookAndFeel
"Slider.focusInsets", new InsetsUIResource(0, 0, 0, 0),
"Slider.foreground", getPrimaryControlShadow(),
"Slider.highlight", getControlHighlight(),
- "Slider.horizontalThumbIcon",
+ "Slider.horizontalThumbIcon",
MetalIconFactory.getHorizontalSliderThumbIcon(),
"Slider.majorTickLength", new Integer(6),
"Slider.shadow", getControlShadow(),
"Slider.trackWidth", new Integer(7),
- "Slider.verticalThumbIcon",
+ "Slider.verticalThumbIcon",
MetalIconFactory.getVerticalSliderThumbIcon(),
"Spinner.arrowButtonInsets", new InsetsUIResource(0, 0, 0, 0),
@@ -1197,7 +1197,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
// new properties in OceanTheme:
// TabbedPane.contentAreaColor
// TabbedPane.unselectedBackground
-
+
"Table.background", getWindowBackground(),
"Table.focusCellBackground", getWindowBackground(),
"Table.focusCellForeground", getControlTextColor(),
@@ -1235,7 +1235,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
"TextField.selectionBackground", getTextHighlightColor(),
"TextField.selectionForeground", getHighlightedTextColor(),
"TextField.shadow", getControlShadow(),
-
+
"TextPane.background", getWindowBackground(),
"TextPane.caretForeground", getUserTextColor(),
"TextPane.font", new FontUIResource("Dialog", Font.PLAIN, 12),
@@ -1341,7 +1341,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
* an instance of {@link OceanTheme}.
*
* @return The current theme (never <code>null</code>).
- *
+ *
* @see #setCurrentTheme(MetalTheme)
*/
public static MetalTheme getCurrentTheme()
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalMenuBarUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalMenuBarUI.java
index 2cc52ed..35f2b05 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalMenuBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalMenuBarUI.java
@@ -49,7 +49,7 @@ import javax.swing.plaf.basic.BasicMenuBarUI;
/**
* A UI implementation for MenuBar in the Metal Look &amp; Feel.
- *
+ *
* @author Roman Kennke (kennke@aicas.com)
*
* @since 1.5
@@ -84,7 +84,7 @@ public class MetalMenuBarUI extends BasicMenuBarUI
{
MetalUtils.paintGradient(g, 0, 0, c.getWidth(), height,
SwingConstants.VERTICAL, "MenuBar.gradient");
-
+
paint(g, c);
}
else
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalProgressBarUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalProgressBarUI.java
index 0f28818..005c5f0 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalProgressBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalProgressBarUI.java
@@ -51,7 +51,7 @@ import javax.swing.plaf.basic.BasicProgressBarUI;
* A UI delegate for the {@link JProgressBar} component.
*/
public class MetalProgressBarUI extends BasicProgressBarUI
-{
+{
/**
* Constructs a new instance of <code>MetalProgressBarUI</code>.
*/
@@ -88,7 +88,7 @@ public class MetalProgressBarUI extends BasicProgressBarUI
int w = progressBar.getWidth();
int h = progressBar.getHeight();
int orientation = progressBar.getOrientation();
-
+
Color shadow = MetalLookAndFeel.getControlShadow();
g.setColor(shadow);
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java
index 57f5bbe..0f7f3b1 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java
@@ -60,13 +60,13 @@ public class MetalRadioButtonUI
/** Used to draw the focus rectangle. */
protected Color focusColor;
-
+
/** Used to fill the icon when the button is pressed. */
protected Color selectColor;
-
+
/** Used to draw disabled text. */
protected Color disabledTextColor;
-
+
/**
* Constructs a new instance of <code>MetalRadioButtonUI</code>.
*/
@@ -86,10 +86,10 @@ public class MetalRadioButtonUI
{
return new MetalRadioButtonUI();
}
-
+
/**
* Sets the default values for the specified button.
- *
+ *
* @param b the button.
*/
public void installDefaults(AbstractButton b)
@@ -100,10 +100,10 @@ public class MetalRadioButtonUI
focusColor = UIManager.getColor(prefix + "focus");
selectColor = UIManager.getColor(prefix + "select");
}
-
+
/**
* Clears any defaults set in the installDefaults() method.
- *
+ *
* @param b the {@link JRadioButton}.
*/
protected void uninstallDefaults(AbstractButton b)
@@ -113,50 +113,50 @@ public class MetalRadioButtonUI
focusColor = null;
selectColor = null;
}
-
+
/**
* Returns the color used to fill the {@link JRadioButton}'s icon when the
- * button is pressed. The default color is obtained from the
- * {@link UIManager} defaults via an entry with the key
+ * button is pressed. The default color is obtained from the
+ * {@link UIManager} defaults via an entry with the key
* <code>RadioButton.select</code>.
- *
+ *
* @return The select color.
*/
protected Color getSelectColor()
{
- return selectColor;
+ return selectColor;
}
-
+
/**
* Returns the color for the {@link JRadioButton}'s text when the button is
* disabled. The default color is obtained from the {@link UIManager}
* defaults via an entry with the key <code>RadioButton.disabledText</code>.
- *
+ *
* @return The disabled text color.
*/
protected Color getDisabledTextColor()
{
return disabledTextColor;
}
-
+
/**
- * Returns the color used to draw the focus rectangle when the
- * {@link JRadioButton} has the focus. The default color is obtained from
- * the {@link UIManager} defaults via an entry with the key
+ * Returns the color used to draw the focus rectangle when the
+ * {@link JRadioButton} has the focus. The default color is obtained from
+ * the {@link UIManager} defaults via an entry with the key
* <code>RadioButton.focus</code>.
- *
+ *
* @return The color used to draw the focus rectangle.
- *
+ *
* @see #paintFocus(Graphics, Rectangle, Dimension)
*/
protected Color getFocusColor()
{
return focusColor;
}
-
+
/**
* Paints the {@link JRadioButton}.
- *
+ *
* @param g the graphics device.
* @param c the component (an instance of {@link JRadioButton}).
*/
@@ -166,10 +166,10 @@ public class MetalRadioButtonUI
// FIXME: disabled text isn't being drawn correctly, it's possible that
// it could be done here...
}
-
+
/**
* Paints the focus rectangle for the {@link JRadioButton}.
- *
+ *
* @param g the graphics device.
* @param t the bounding rectangle for the text.
* @param d ???
@@ -179,5 +179,5 @@ public class MetalRadioButtonUI
g.setColor(focusColor);
g.drawRect(t.x - 1, t.y - 1, t.width + 1, t.height + 1);
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalRootPaneUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalRootPaneUI.java
index eaee5bf..84f1303 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalRootPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalRootPaneUI.java
@@ -76,8 +76,8 @@ import javax.swing.plaf.basic.BasicRootPaneUI;
/**
* A UI delegate for the {@link JRootPane} component. This implementation
- * supports the JRootPane <code>windowDecorationStyle</code> property.
- *
+ * supports the JRootPane <code>windowDecorationStyle</code> property.
+ *
* @author Roman Kennke (kennke@aicas.com)
*
* @since 1.4
@@ -115,7 +115,7 @@ public class MetalRootPaneUI
newInsets.bottom = 5;
newInsets.right = 5;
}
- return newInsets;
+ return newInsets;
}
/**
@@ -132,7 +132,7 @@ public class MetalRootPaneUI
/**
* Paints the border for the specified component.
- *
+ *
* @param c the component
* @param g the graphics device
* @param x the x-coordinate
@@ -140,7 +140,7 @@ public class MetalRootPaneUI
* @param w the width
* @param h the height
*/
- public void paintBorder(Component c, Graphics g, int x, int y, int w,
+ public void paintBorder(Component c, Graphics g, int x, int y, int w,
int h)
{
JRootPane f = (JRootPane) c;
@@ -149,31 +149,31 @@ public class MetalRootPaneUI
g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
else
g.setColor(MetalLookAndFeel.getControlDarkShadow());
-
+
// Fill the border background.
g.fillRect(x, y, w, 5);
g.fillRect(x, y, 5, h);
g.fillRect(x + w - 5, y, 5, h);
g.fillRect(x, y + h - 5, w, 5);
-
+
// Draw a dot in each corner.
g.setColor(MetalLookAndFeel.getControl());
g.fillRect(x, y, 1, 1);
g.fillRect(x + w - 1, y, 1, 1);
g.fillRect(x + w - 1, y + h - 1, 1, 1);
g.fillRect(x, y + h - 1, 1, 1);
-
+
// Draw the lines.
g.setColor(MetalLookAndFeel.getBlack());
g.drawLine(x + 14, y + 2, x + w - 15, y + 2);
g.drawLine(x + 14, y + h - 3, x + w - 15, y + h - 3);
g.drawLine(x + 2, y + 14, x + 2, y + h - 15);
g.drawLine(x + w - 3, y + 14, x + w - 3, y + h - 15);
-
+
// Draw the line highlights.
if (frame.isActive())
g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
- else
+ else
g.setColor(MetalLookAndFeel.getControlShadow());
g.drawLine(x + 15, y + 3, x + w - 14, y + 3);
g.drawLine(x + 15, y + h - 2, x + w - 14, y + h - 2);
@@ -248,7 +248,7 @@ public class MetalRootPaneUI
{
super("Close");
}
-
+
/**
* This method is called when something closes the frame.
*
@@ -316,7 +316,7 @@ public class MetalRootPaneUI
f.setExtendedState(Frame.ICONIFIED);
}
}
-
+
}
/**
@@ -437,8 +437,8 @@ public class MetalRootPaneUI
}
Dimension titlePreferredSize = title.getPreferredSize();
- title.setBounds(insets.left + 5, insets.top,
- Math.min(titlePreferredSize.width, loc - insets.left - 10),
+ title.setBounds(insets.left + 5, insets.top,
+ Math.min(titlePreferredSize.width, loc - insets.left - 10),
height);
}
@@ -501,7 +501,7 @@ public class MetalRootPaneUI
/** The icon displayed in the close button. */
Icon closeIcon;
-
+
/**
* The background color of the TitlePane when the JInternalFrame is not
* selected.
@@ -653,7 +653,7 @@ public class MetalRootPaneUI
/**
* Paints a representation of the current state of the internal frame.
- *
+ *
* @param g the graphics device.
*/
public void paintComponent(Graphics g)
@@ -667,13 +667,13 @@ public class MetalRootPaneUI
g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
else
g.setColor(MetalLookAndFeel.getControlDarkShadow());
-
+
// put a dot in each of the top corners
g.drawLine(0, 0, 0, 0);
g.drawLine(d.width - 1, 0, d.width - 1, 0);
-
+
g.drawLine(0, d.height - 1, d.width - 1, d.height - 1);
-
+
// draw the metal pattern
if (UIManager.get("InternalFrame.activeTitleGradient") != null
&& frame.isActive())
@@ -688,7 +688,7 @@ public class MetalRootPaneUI
int endX = startX;
if (iconButton.isVisible())
endX = Math.max(iconButton.getX(), endX);
- else if (maxButton.isVisible())
+ else if (maxButton.isVisible())
endX = Math.max(maxButton.getX(), endX);
else if (closeButton.isVisible())
endX = Math.max(closeButton.getX(), endX);
@@ -709,10 +709,10 @@ public class MetalRootPaneUI
if (!isOpaque())
return;
-
+
Color saved = g.getColor();
Dimension dims = getSize();
-
+
Color bg = getBackground();
if (frame.isActive())
bg = selectedTitleColor;
@@ -736,8 +736,8 @@ public class MetalRootPaneUI
maxIcon = UIManager.getIcon("InternalFrame.maximizeIcon");
minIcon = MetalIconFactory.getInternalFrameAltMaximizeIcon(16);
Frame frame = (Frame) SwingUtilities.getWindowAncestor(rootPane);
- title = new JLabel(frame.getTitle(),
- MetalIconFactory.getInternalFrameDefaultMenuIcon(),
+ title = new JLabel(frame.getTitle(),
+ MetalIconFactory.getInternalFrameDefaultMenuIcon(),
SwingConstants.LEFT);
}
}
@@ -770,7 +770,7 @@ public class MetalRootPaneUI
* The cached layout info for the title pane.
*/
private Rectangle titlePaneBounds;
-
+
/**
* The cached preferred size.
*/
@@ -832,7 +832,7 @@ public class MetalRootPaneUI
public void removeLayoutComponent(Component component)
{
// TODO Auto-generated method stub
-
+
}
public Dimension preferredLayoutSize(Container parent)
@@ -894,7 +894,7 @@ public class MetalRootPaneUI
// 4. The menuBar is positioned at the upper edge of layeredPane.
// 5. The contentPane fills viewable region minus menuBar minus
// titlePane, if present.
-
+
// +-------------------------------+
// | JLayeredPane |
// | +--------------------------+ |
@@ -952,7 +952,7 @@ public class MetalRootPaneUI
contentPane.setBounds(contentPaneBounds);
titlePane.setBounds(titlePaneBounds);
}
-
+
}
/**
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalScrollBarUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalScrollBarUI.java
index 4c75fcb..5f0cbe4 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalScrollBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalScrollBarUI.java
@@ -59,30 +59,30 @@ import javax.swing.plaf.basic.BasicScrollBarUI;
*/
public class MetalScrollBarUI extends BasicScrollBarUI
{
-
+
/**
* A property change handler for the UI delegate that monitors for
* changes to the "JScrollBar.isFreeStanding" property, and updates
* the buttons and track rendering as appropriate.
*/
- class MetalScrollBarPropertyChangeHandler
+ class MetalScrollBarPropertyChangeHandler
extends BasicScrollBarUI.PropertyChangeHandler
{
/**
* Creates a new handler.
- *
+ *
* @see #createPropertyChangeListener()
*/
public MetalScrollBarPropertyChangeHandler()
{
// Nothing to do here.
}
-
+
/**
* Handles a property change event. If the event name is
- * <code>JSlider.isFreeStanding</code>, this method updates the
+ * <code>JSlider.isFreeStanding</code>, this method updates the
* delegate, otherwise the event is passed up to the super class.
- *
+ *
* @param e the property change event.
*/
public void propertyChange(PropertyChangeEvent e)
@@ -100,7 +100,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
super.propertyChange(e);
}
}
-
+
/** The name for the 'free standing' property. */
public static final String FREE_STANDING_PROP = "JScrollBar.isFreeStanding";
@@ -108,34 +108,34 @@ public class MetalScrollBarUI extends BasicScrollBarUI
private static final Dimension MIN_THUMB_SIZE = new Dimension(15, 15);
/** The minimum thumb size for a scroll bar that is free standing. */
- private static final Dimension MIN_THUMB_SIZE_FREE_STANDING
+ private static final Dimension MIN_THUMB_SIZE_FREE_STANDING
= new Dimension(17, 17);
-
+
/** The button that increases the value in the scroll bar. */
protected MetalScrollButton increaseButton;
-
+
/** The button that decreases the value in the scroll bar. */
protected MetalScrollButton decreaseButton;
-
- /**
- * The scroll bar width.
+
+ /**
+ * The scroll bar width.
*/
protected int scrollBarWidth;
-
- /**
- * A flag that indicates whether the scroll bar is "free standing", which
- * means it has complete borders and can be used anywhere in the UI. A
+
+ /**
+ * A flag that indicates whether the scroll bar is "free standing", which
+ * means it has complete borders and can be used anywhere in the UI. A
* scroll bar which is not free standing has borders missing from one
* side, and relies on being part of another container with its own borders
* to look right visually. */
protected boolean isFreeStanding = true;
-
- /**
- * The color for the scroll bar shadow (this is read from the UIDefaults in
+
+ /**
+ * The color for the scroll bar shadow (this is read from the UIDefaults in
* the installDefaults() method).
*/
Color scrollBarShadowColor;
-
+
/**
* Constructs a new instance of <code>MetalScrollBarUI</code>, with no
* specific initialisation.
@@ -161,9 +161,9 @@ public class MetalScrollBarUI extends BasicScrollBarUI
* Installs the defaults.
*/
protected void installDefaults()
- {
- // need to initialise isFreeStanding before calling the super class,
- // so that the value is set when createIncreaseButton() and
+ {
+ // need to initialise isFreeStanding before calling the super class,
+ // so that the value is set when createIncreaseButton() and
// createDecreaseButton() are called (unless there is somewhere earlier
// that we can do this).
Boolean prop = (Boolean) scrollbar.getClientProperty(FREE_STANDING_PROP);
@@ -172,35 +172,35 @@ public class MetalScrollBarUI extends BasicScrollBarUI
scrollBarWidth = UIManager.getInt("ScrollBar.width");
super.installDefaults();
}
-
+
/**
* Creates a property change listener for the delegate to use. This
- * overrides the method to provide a custom listener for the
- * {@link MetalLookAndFeel} that can handle the
+ * overrides the method to provide a custom listener for the
+ * {@link MetalLookAndFeel} that can handle the
* <code>JScrollBar.isFreeStanding</code> property.
- *
+ *
* @return A property change listener.
*/
protected PropertyChangeListener createPropertyChangeListener()
{
return new MetalScrollBarPropertyChangeHandler();
}
-
+
/**
* Creates a new button to use as the control at the lower end of the
* {@link JScrollBar}. This method assigns the new button (an instance of
- * {@link MetalScrollButton} to the {@link #decreaseButton} field, and also
- * returns the button. The button width is determined by the
+ * {@link MetalScrollButton} to the {@link #decreaseButton} field, and also
+ * returns the button. The button width is determined by the
* <code>ScrollBar.width</code> setting in the UI defaults.
- *
+ *
* @param orientation the orientation of the button ({@link #NORTH},
* {@link #SOUTH}, {@link #EAST} or {@link #WEST}).
- *
+ *
* @return The button.
*/
protected JButton createDecreaseButton(int orientation)
{
- decreaseButton = new MetalScrollButton(orientation, scrollBarWidth,
+ decreaseButton = new MetalScrollButton(orientation, scrollBarWidth,
isFreeStanding);
return decreaseButton;
}
@@ -208,25 +208,25 @@ public class MetalScrollBarUI extends BasicScrollBarUI
/**
* Creates a new button to use as the control at the upper end of the
* {@link JScrollBar}. This method assigns the new button (an instance of
- * {@link MetalScrollButton} to the {@link #increaseButton} field, and also
- * returns the button. The button width is determined by the
+ * {@link MetalScrollButton} to the {@link #increaseButton} field, and also
+ * returns the button. The button width is determined by the
* <code>ScrollBar.width</code> setting in the UI defaults.
- *
+ *
* @param orientation the orientation of the button ({@link #NORTH},
* {@link #SOUTH}, {@link #EAST} or {@link #WEST}).
- *
+ *
* @return The button.
*/
protected JButton createIncreaseButton(int orientation)
{
- increaseButton = new MetalScrollButton(orientation, scrollBarWidth,
+ increaseButton = new MetalScrollButton(orientation, scrollBarWidth,
isFreeStanding);
return increaseButton;
}
-
+
/**
* Paints the track for the scrollbar.
- *
+ *
* @param g the graphics device.
* @param c the component.
* @param trackBounds the track bounds.
@@ -234,20 +234,20 @@ public class MetalScrollBarUI extends BasicScrollBarUI
protected void paintTrack(Graphics g, JComponent c, Rectangle trackBounds)
{
g.setColor(MetalLookAndFeel.getControl());
- g.fillRect(trackBounds.x, trackBounds.y, trackBounds.width,
+ g.fillRect(trackBounds.x, trackBounds.y, trackBounds.width,
trackBounds.height);
- if (scrollbar.getOrientation() == HORIZONTAL)
- paintTrackHorizontal(g, c, trackBounds.x, trackBounds.y,
+ if (scrollbar.getOrientation() == HORIZONTAL)
+ paintTrackHorizontal(g, c, trackBounds.x, trackBounds.y,
trackBounds.width, trackBounds.height);
- else
- paintTrackVertical(g, c, trackBounds.x, trackBounds.y,
+ else
+ paintTrackVertical(g, c, trackBounds.x, trackBounds.y,
trackBounds.width, trackBounds.height);
-
+
}
-
+
/**
* Paints the track for a horizontal scrollbar.
- *
+ *
* @param g the graphics device.
* @param c the component.
* @param x the x-coordinate for the track bounds.
@@ -255,7 +255,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
* @param w the width for the track bounds.
* @param h the height for the track bounds.
*/
- private void paintTrackHorizontal(Graphics g, JComponent c,
+ private void paintTrackHorizontal(Graphics g, JComponent c,
int x, int y, int w, int h)
{
if (c.isEnabled())
@@ -264,12 +264,12 @@ public class MetalScrollBarUI extends BasicScrollBarUI
g.drawLine(x, y, x, y + h - 1);
g.drawLine(x, y, x + w - 1, y);
g.drawLine(x + w - 1, y, x + w - 1, y + h - 1);
-
+
g.setColor(scrollBarShadowColor);
g.drawLine(x + 1, y + 1, x + 1, y + h - 1);
g.drawLine(x + 1, y + 1, x + w - 2, y + 1);
-
- if (isFreeStanding)
+
+ if (isFreeStanding)
{
g.setColor(MetalLookAndFeel.getControlDarkShadow());
g.drawLine(x, y + h - 2, x + w - 1, y + h - 2);
@@ -290,10 +290,10 @@ public class MetalScrollBarUI extends BasicScrollBarUI
}
}
}
-
+
/**
* Paints the track for a vertical scrollbar.
- *
+ *
* @param g the graphics device.
* @param c the component.
* @param x the x-coordinate for the track bounds.
@@ -301,7 +301,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
* @param w the width for the track bounds.
* @param h the height for the track bounds.
*/
- private void paintTrackVertical(Graphics g, JComponent c,
+ private void paintTrackVertical(Graphics g, JComponent c,
int x, int y, int w, int h)
{
if (c.isEnabled())
@@ -310,12 +310,12 @@ public class MetalScrollBarUI extends BasicScrollBarUI
g.drawLine(x, y, x, y + h - 1);
g.drawLine(x, y, x + w - 1, y);
g.drawLine(x, y + h - 1, x + w - 1, y + h - 1);
-
+
g.setColor(scrollBarShadowColor);
g.drawLine(x + 1, y + 1, x + w - 1, y + 1);
g.drawLine(x + 1, y + 1, x + 1, y + h - 2);
-
- if (isFreeStanding)
+
+ if (isFreeStanding)
{
g.setColor(MetalLookAndFeel.getControlDarkShadow());
g.drawLine(x + w - 2, y, x + w - 2, y + h - 1);
@@ -351,7 +351,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
return;
if (scrollbar.getOrientation() == HORIZONTAL)
paintThumbHorizontal(g, c, thumbBounds);
- else
+ else
paintThumbVertical(g, c, thumbBounds);
// Draw the pattern when the theme is not Ocean.
@@ -367,19 +367,19 @@ public class MetalScrollBarUI extends BasicScrollBarUI
/**
* Paints the thumb for a horizontal scroll bar.
- *
+ *
* @param g the graphics device.
* @param c the scroll bar component.
* @param thumbBounds the thumb bounds.
*/
- private void paintThumbHorizontal(Graphics g, JComponent c,
- Rectangle thumbBounds)
+ private void paintThumbHorizontal(Graphics g, JComponent c,
+ Rectangle thumbBounds)
{
int x = thumbBounds.x;
int y = thumbBounds.y;
int w = thumbBounds.width;
int h = thumbBounds.height;
-
+
// First we fill the background.
MetalTheme theme = MetalLookAndFeel.getCurrentTheme();
if (theme instanceof OceanTheme
@@ -408,7 +408,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
g.drawLine(x, y, x, y + h - 1);
g.drawLine(x + w - 1, y, x + w - 1, y + h - 1);
}
-
+
// then the highlight
g.setColor(thumbHighlightColor);
if (isFreeStanding)
@@ -421,7 +421,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
g.drawLine(x + 1, y + 1, x + w - 3, y + 1);
g.drawLine(x + 1, y + 1, x + 1, y + h - 1);
}
-
+
// draw the shadow line
g.setColor(UIManager.getColor("ScrollBar.shadow"));
g.drawLine(x + w, y + 1, x + w, y + h - 1);
@@ -440,22 +440,22 @@ public class MetalScrollBarUI extends BasicScrollBarUI
g.drawLine(middle + 3, y + 5, middle + 3, y + h - 4);
}
}
-
+
/**
* Paints the thumb for a vertical scroll bar.
- *
+ *
* @param g the graphics device.
* @param c the scroll bar component.
* @param thumbBounds the thumb bounds.
*/
- private void paintThumbVertical(Graphics g, JComponent c,
+ private void paintThumbVertical(Graphics g, JComponent c,
Rectangle thumbBounds)
{
int x = thumbBounds.x;
int y = thumbBounds.y;
int w = thumbBounds.width;
int h = thumbBounds.height;
-
+
// First we fill the background.
MetalTheme theme = MetalLookAndFeel.getCurrentTheme();
if (theme instanceof OceanTheme
@@ -484,7 +484,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
g.drawLine(x, y, x, y + h - 1);
g.drawLine(x, y + h - 1, x + w - 1, y + h - 1);
}
-
+
// then the highlight
g.setColor(thumbHighlightColor);
if (isFreeStanding)
@@ -497,7 +497,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
g.drawLine(x + 1, y + 1, x + w - 1, y + 1);
g.drawLine(x + 1, y + 1, x + 1, y + h - 3);
}
-
+
// draw the shadow line
g.setColor(UIManager.getColor("ScrollBar.shadow"));
g.drawLine(x + 1, y + h, x + w - 2, y + h);
@@ -516,10 +516,10 @@ public class MetalScrollBarUI extends BasicScrollBarUI
g.drawLine(x + 5, middle + 3, x + w - 4, middle + 3);
}
}
-
+
/**
- * Returns the minimum thumb size. For a free standing scroll bar the
- * minimum size is <code>17 x 17</code> pixels, whereas for a non free
+ * Returns the minimum thumb size. For a free standing scroll bar the
+ * minimum size is <code>17 x 17</code> pixels, whereas for a non free
* standing scroll bar the minimum size is <code>15 x 15</code> pixels.
*
* @return The minimum thumb size.
@@ -580,6 +580,5 @@ public class MetalScrollBarUI extends BasicScrollBarUI
width += insets.left + insets.right;
return new Dimension(width, height);
- }
+ }
}
-
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalScrollButton.java b/libjava/classpath/javax/swing/plaf/metal/MetalScrollButton.java
index 8678f68..3273908 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalScrollButton.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalScrollButton.java
@@ -47,32 +47,32 @@ import javax.swing.plaf.basic.BasicArrowButton;
/**
* A button used by the {@link MetalScrollBarUI}. The button appearance
- * varies according to the button direction, whether or not it is part of a
- * "free standing" scroll bar, and the current state of the button.
+ * varies according to the button direction, whether or not it is part of a
+ * "free standing" scroll bar, and the current state of the button.
*/
-public class MetalScrollButton extends BasicArrowButton
+public class MetalScrollButton extends BasicArrowButton
{
-
- /**
+
+ /**
* The maximum size for buttons.
* @see #getMaximumSize()
*/
- private static Dimension maximumSize;
-
+ private static Dimension maximumSize;
+
/** The width of the button. */
private int buttonWidth;
-
- /**
- * A flag that indicates whether the button is part of a free standing
+
+ /**
+ * A flag that indicates whether the button is part of a free standing
* scroll bar. This affects how the border is drawn.
*/
private boolean freeStanding;
-
+
/**
* Creates a new button.
- *
- * @param direction the direction (this should be one of {@link #NORTH},
- * {@link #SOUTH}, {@link #EAST} and {@link #WEST}, but
+ *
+ * @param direction the direction (this should be one of {@link #NORTH},
+ * {@link #SOUTH}, {@link #EAST} and {@link #WEST}, but
* this is not enforced).
* @param width the button width.
* @param freeStanding a flag indicating whether the scroll button is free
@@ -85,31 +85,31 @@ public class MetalScrollButton extends BasicArrowButton
this.freeStanding = freeStanding;
setFocusable(false);
}
-
+
/**
* Returns the button width.
- *
+ *
* @return The button width.
*/
public int getButtonWidth()
{
- return buttonWidth;
+ return buttonWidth;
}
/**
* Sets the free standing flag. This controls how the button border is
* drawn.
- *
+ *
* @param freeStanding the new value of the flag.
*/
public void setFreeStanding(boolean freeStanding)
{
this.freeStanding = freeStanding;
}
-
+
/**
* Paints the button.
- *
+ *
* @param g the graphics device.
*/
public void paint(Graphics g)
@@ -122,16 +122,16 @@ public class MetalScrollButton extends BasicArrowButton
else
g.setColor(MetalLookAndFeel.getControl());
g.fillRect(0, 0, bounds.width, bounds.height);
-
+
paintArrow(g, bounds.width, bounds.height);
-
+
// paint a border manually - I tried using a real (custom) Border
- // but couldn't get it to stay set for the button, something was
+ // but couldn't get it to stay set for the button, something was
// overwriting it...
- if (freeStanding)
+ if (freeStanding)
{
if (direction == WEST)
- paintWestBorderFreeStanding(g, bounds.width, bounds.height);
+ paintWestBorderFreeStanding(g, bounds.width, bounds.height);
else if (direction == EAST)
paintEastBorderFreeStanding(g, bounds.width, bounds.height);
else if (direction == SOUTH)
@@ -142,7 +142,7 @@ public class MetalScrollButton extends BasicArrowButton
else
{
if (direction == WEST)
- paintWestBorder(g, bounds.width, bounds.height);
+ paintWestBorder(g, bounds.width, bounds.height);
else if (direction == EAST)
paintEastBorder(g, bounds.width, bounds.height);
else if (direction == SOUTH)
@@ -151,14 +151,14 @@ public class MetalScrollButton extends BasicArrowButton
paintNorthBorder(g, bounds.width, bounds.height);
}
}
-
+
private void paintArrow(Graphics g, int w, int h)
{
if (isEnabled())
g.setColor(MetalLookAndFeel.getBlack());
else
g.setColor(MetalLookAndFeel.getControlDisabled());
-
+
if (direction == SOUTH)
{
int x = w / 2;
@@ -178,7 +178,7 @@ public class MetalScrollButton extends BasicArrowButton
int x = w / 2 - 3;
int y = h / 2;
for (int i = 1; i < 5; i++)
- g.drawLine(x + i, y - i, x + i, y + i - 1);
+ g.drawLine(x + i, y - i, x + i, y + i - 1);
}
else // assume NORTH
{
@@ -191,12 +191,12 @@ public class MetalScrollButton extends BasicArrowButton
/**
* Paints the border for a button with a {@link #NORTH} direction that
* belongs to a free standing scroll bar.
- *
+ *
* @param g the graphics device.
* @param w the button width.
* @param h the button height.
*/
- private void paintNorthBorderFreeStanding(Graphics g, int w, int h)
+ private void paintNorthBorderFreeStanding(Graphics g, int w, int h)
{
if (isEnabled())
{
@@ -205,12 +205,12 @@ public class MetalScrollButton extends BasicArrowButton
g.drawLine(0, 0, 0, h - 1);
g.drawLine(2, h - 1, w - 2, h - 1);
g.drawLine(w - 2, 2, w - 2, h - 1);
-
+
g.setColor(MetalLookAndFeel.getControlHighlight());
g.drawLine(1, 1, 1, h - 2);
g.drawLine(1, 1, w - 3, 1);
g.drawLine(w - 1, 1, w - 1, h - 1);
-
+
g.setColor(MetalLookAndFeel.getControl());
g.drawLine(1, h - 1, 1, h - 1);
g.drawLine(w - 2, 1, w - 2, 1);
@@ -223,11 +223,11 @@ public class MetalScrollButton extends BasicArrowButton
g.drawLine(0, 0, 0, h - 1);
}
}
-
+
/**
* Paints the border for a button with a {@link #SOUTH} direction that
* belongs to a free standing scroll bar.
- *
+ *
* @param g the graphics device.
* @param w the button width.
* @param h the button height.
@@ -241,12 +241,12 @@ public class MetalScrollButton extends BasicArrowButton
g.drawLine(0, 0, 0, h - 1);
g.drawLine(2, h - 1, w - 2, h - 1);
g.drawLine(w - 2, 2, w - 2, h - 1);
-
+
g.setColor(MetalLookAndFeel.getControlHighlight());
g.drawLine(1, 1, 1, h - 1);
g.drawLine(1, 1, w - 1, 1);
g.drawLine(w - 1, 1, w - 1, h - 1);
-
+
g.setColor(MetalLookAndFeel.getControl());
g.drawLine(1, h - 1, 1, h - 1);
g.drawLine(w - 1, 1, w - 1, 1);
@@ -259,11 +259,11 @@ public class MetalScrollButton extends BasicArrowButton
g.drawLine(0, 0, 0, h - 1);
}
}
-
+
/**
* Paints the border for a button with an {@link #EAST} direction that
* belongs to a free standing scroll bar.
- *
+ *
* @param g the graphics device.
* @param w the button width.
* @param h the button height.
@@ -276,12 +276,12 @@ public class MetalScrollButton extends BasicArrowButton
g.drawLine(0, 0, w - 2, 0);
g.drawLine(w - 2, 0, w - 2, h - 2);
g.drawLine(0, h - 2, w - 2, h - 2);
-
+
g.setColor(MetalLookAndFeel.getControlHighlight());
g.drawLine(0, 1, w - 1, 1);
g.drawLine(w - 1, 1, w - 1, h - 1);
g.drawLine(0, h - 1, w - 1, h - 1);
-
+
g.setColor(MetalLookAndFeel.getControl());
g.drawLine(w - 2, 1, w - 2, 1);
}
@@ -293,11 +293,11 @@ public class MetalScrollButton extends BasicArrowButton
g.drawLine(0, h - 1, w - 1, h - 1);
}
}
-
+
/**
* Paints the border for a button with a {@link #WEST} direction that
* belongs to a free standing scroll bar.
- *
+ *
* @param g the graphics device.
* @param w the button width.
* @param h the button height.
@@ -310,12 +310,12 @@ public class MetalScrollButton extends BasicArrowButton
g.drawLine(0, 0, w - 1, 0);
g.drawLine(0, 0, 0, h - 2);
g.drawLine(0, h - 2, w - 1, h - 2);
-
+
g.setColor(MetalLookAndFeel.getControlHighlight());
g.drawLine(1, 1, w - 1, 1);
g.drawLine(1, 1, 1, h - 1);
g.drawLine(1, h - 1, w - 1, h - 1);
-
+
g.setColor(MetalLookAndFeel.getControl());
g.drawLine(1, h - 2, 1, h - 2);
}
@@ -327,22 +327,22 @@ public class MetalScrollButton extends BasicArrowButton
g.drawLine(0, h - 1, w - 1, h - 1);
}
}
-
+
/**
* Paints the border for a button with a {@link #NORTH} direction that
* belongs to a scroll bar that is not free standing.
- *
+ *
* @param g the graphics device.
* @param w the button width.
* @param h the button height.
*/
- private void paintNorthBorder(Graphics g, int w, int h)
+ private void paintNorthBorder(Graphics g, int w, int h)
{
if (isEnabled())
{
g.setColor(MetalLookAndFeel.getControlDarkShadow());
g.drawLine(0, 0, 0, h - 1);
-
+
g.setColor(MetalLookAndFeel.getControlHighlight());
g.drawLine(1, 0, 1, h - 1);
g.drawLine(1, 0, w - 1, 0);
@@ -353,11 +353,11 @@ public class MetalScrollButton extends BasicArrowButton
g.drawLine(0, 0, 0, h - 1);
}
}
-
+
/**
* Paints the border for a button with a {@link #SOUTH} direction that
* belongs to a scroll bar that is not free standing.
- *
+ *
* @param g the graphics device.
* @param w the button width.
* @param h the button height.
@@ -369,11 +369,11 @@ public class MetalScrollButton extends BasicArrowButton
g.setColor(MetalLookAndFeel.getControlDarkShadow());
g.drawLine(0, 0, 0, h - 1);
g.drawLine(0, h - 1, w - 1, h - 1);
-
+
g.setColor(MetalLookAndFeel.getControlHighlight());
g.drawLine(1, 0, 1, h - 1);
g.drawLine(1, 0, w - 1, 0);
-
+
g.setColor(MetalLookAndFeel.getControl());
g.drawLine(1, h - 1, 1, h - 1);
}
@@ -387,7 +387,7 @@ public class MetalScrollButton extends BasicArrowButton
/**
* Paints the border for a button with an {@link #EAST} direction that
* belongs to a scroll bar that is not free standing.
- *
+ *
* @param g the graphics device.
* @param w the button width.
* @param h the button height.
@@ -409,11 +409,11 @@ public class MetalScrollButton extends BasicArrowButton
g.drawLine(0, 0, w - 1, 0);
}
}
-
+
/**
* Paints the border for a button with a {@link #WEST} direction that
* belongs to a scroll bar that is not free standing.
- *
+ *
* @param g the graphics device.
* @param w the button width.
* @param h the button height.
@@ -435,11 +435,11 @@ public class MetalScrollButton extends BasicArrowButton
g.drawLine(0, 0, bounds.width - 1, 0);
}
}
-
+
/**
- * Returns the preferred size for the button, which varies depending on
+ * Returns the preferred size for the button, which varies depending on
* the direction of the button and whether or not it is free standing.
- *
+ *
* @return The preferred size.
*/
public Dimension getPreferredSize()
@@ -447,9 +447,9 @@ public class MetalScrollButton extends BasicArrowButton
int adj = 1;
if (!freeStanding)
adj = 2;
-
+
if (direction == EAST)
- return new Dimension(buttonWidth - adj, buttonWidth);
+ return new Dimension(buttonWidth - adj, buttonWidth);
else if (direction == WEST)
return new Dimension(buttonWidth - 2, buttonWidth);
else if (direction == SOUTH)
@@ -457,27 +457,27 @@ public class MetalScrollButton extends BasicArrowButton
else // assume NORTH
return new Dimension(buttonWidth, buttonWidth - 2);
}
-
+
/**
* Returns the minimum size for the button.
- *
+ *
* @return The minimum size for the button.
*/
public Dimension getMinimumSize()
{
return getPreferredSize();
}
-
+
/**
* Returns the maximum size for the button.
- *
+ *
* @return <code>Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE)</code>.
*/
public Dimension getMaximumSize()
{
if (maximumSize == null)
maximumSize = new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE);
- return maximumSize;
+ return maximumSize;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalScrollPaneUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalScrollPaneUI.java
index ae14af3..09a47c3 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalScrollPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalScrollPaneUI.java
@@ -71,12 +71,12 @@ public class MetalScrollPaneUI
{
return new MetalScrollPaneUI();
}
-
+
/**
- * Configures the specified component appropriate for the look and feel.
- * This method is invoked when the ComponentUI instance is being installed
- * as the UI delegate on the specified component. This method should
- * completely configure the component for the look and feel,
+ * Configures the specified component appropriate for the look and feel.
+ * This method is invoked when the ComponentUI instance is being installed
+ * as the UI delegate on the specified component. This method should
+ * completely configure the component for the look and feel,
* including the following:
* 1. Install any default property values for color, fonts, borders,
* icons, opacity, etc. on the component. Whenever possible, property
@@ -87,8 +87,8 @@ public class MetalScrollPaneUI
* 5. Create/install a PropertyChangeListener on the component in order
* to detect and respond to component property changes appropriately.
* 6. Install keyboard UI (mnemonics, traversal, etc.) on the component.
- * 7. Initialize any appropriate instance data.
- *
+ * 7. Initialize any appropriate instance data.
+ *
* @param c - the component to install the ui on
*/
public void installUI(JComponent c)
@@ -101,11 +101,11 @@ public class MetalScrollPaneUI
}
/**
- * Reverses configuration which was done on the specified component
- * during installUI. This method is invoked when this UIComponent
- * instance is being removed as the UI delegate for the specified
- * component. This method should undo the configuration performed in
- * installUI, being careful to leave the JComponent instance in a
+ * Reverses configuration which was done on the specified component
+ * during installUI. This method is invoked when this UIComponent
+ * instance is being removed as the UI delegate for the specified
+ * component. This method should undo the configuration performed in
+ * installUI, being careful to leave the JComponent instance in a
* clean state (no extraneous listeners, look-and-feel-specific property
* objects, etc.). This should include the following:
* 1. Remove any UI-set borders from the component.
@@ -113,8 +113,8 @@ public class MetalScrollPaneUI
* 3. Remove any UI-added sub-components from the component.
* 4. Remove any UI-added event/property listeners from the component.
* 5. Remove any UI-installed keyboard UI from the component.
- * 6. Nullify any allocated instance data objects to allow for GC.
- *
+ * 6. Nullify any allocated instance data objects to allow for GC.
+ *
* @param c - the component to uninstall the ui on
*/
public void uninstallUI(JComponent c)
@@ -128,17 +128,17 @@ public class MetalScrollPaneUI
/**
* Installs listeners on scrollPane
- *
+ *
* @param scrollPane - the component to install the listeners on
*/
public void installListeners(JScrollPane scrollPane)
{
super.installListeners(scrollPane);
}
-
+
/**
* Uninstalls listeners on scrollPane
- *
+ *
* @param scrollPane - the component to uninstall the listeners on
*/
public void uninstallListeners(JScrollPane scrollPane)
@@ -148,7 +148,7 @@ public class MetalScrollPaneUI
/**
* TODO
- *
+ *
* @return TODO
*/
protected PropertyChangeListener createScrollBarSwapListener()
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalSeparatorUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalSeparatorUI.java
index 6d7818f..8afa98c 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalSeparatorUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalSeparatorUI.java
@@ -83,13 +83,13 @@ public class MetalSeparatorUI
}
/**
- * The separator is made of two lines. The top line will be
+ * The separator is made of two lines. The top line will be
* the Metal theme color separatorForeground (or left line if it's vertical).
* The bottom or right line will be the Metal theme color
* separatorBackground.
- * The two lines will
- * be centered inside the bounds box. If the separator is horizontal,
- * then it will be vertically centered, or if it's vertical, it will
+ * The two lines will
+ * be centered inside the bounds box. If the separator is horizontal,
+ * then it will be vertically centered, or if it's vertical, it will
* be horizontally centered.
*
* @param g The Graphics object to paint with
@@ -107,9 +107,9 @@ public class MetalSeparatorUI
s = (JSeparator) c;
else
return;
-
+
if (s.getOrientation() == JSeparator.HORIZONTAL)
- {
+ {
int midAB = r.height / 2;
g.setColor(c1);
g.drawLine(r.x, r.y + midAB - 1, r.x + r.width, r.y + midAB - 1);
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalSliderUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalSliderUI.java
index b3e8707..e85c324 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalSliderUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalSliderUI.java
@@ -74,11 +74,11 @@ public class MetalSliderUI extends BasicSliderUI
{
// Nothing to do here.
}
-
+
/**
* Handles property change events. Events with the name "JSlider.isFilled"
* are handled here, and other events are passed to the superclass.
- *
+ *
* @param e the property change event.
*/
public void propertyChange(PropertyChangeEvent e)
@@ -89,38 +89,38 @@ public class MetalSliderUI extends BasicSliderUI
if (b == null)
filledSlider = false;
else
- filledSlider = b.booleanValue();
+ filledSlider = b.booleanValue();
}
else
super.propertyChange(e);
}
}
-
+
/** The thumb color (unused, because an icon is used to draw the thumb). */
protected static Color thumbColor;
-
- /**
+
+ /**
* The highlight color used for drawing the track rect when the slider is
* enabled.
*/
protected static Color highlightColor;
-
+
/**
* The shadow color used for drawing the track rect when the slider is
* enabled.
*/
protected static Color darkShadowColor;
-
+
/** The track width. */
protected static int trackWidth = UIManager.getInt("Slider.trackWidth");
-
+
/** The length of the major tick marks. */
protected static int tickLength = UIManager.getInt("Slider.majorTickLength");
-
+
/** The icon used for the thumb control of horizontally oriented sliders. */
protected static Icon horizThumbIcon = UIManager.getIcon(
"Slider.horizontalThumbIcon");
-
+
/** The icon used for the thumb control of vertically oriented sliders. */
protected static Icon vertThumbIcon = UIManager.getIcon(
"Slider.verticalThumbIcon");
@@ -130,8 +130,8 @@ public class MetalSliderUI extends BasicSliderUI
/** A key to look up the filledSlider setting in the {@link UIManager}. */
protected final String SLIDER_FILL = "JSlider.isFilled";
-
- /**
+
+ /**
* A flag that controls whether or not the track is filled up to the value
* of the slider.
*/
@@ -159,38 +159,38 @@ public class MetalSliderUI extends BasicSliderUI
{
return new MetalSliderUI();
}
-
+
/**
* Installs the default for this UI delegate in the supplied component.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
{
super.installUI(c);
Boolean b = (Boolean) c.getClientProperty(SLIDER_FILL);
- if (b != null)
+ if (b != null)
filledSlider = b.booleanValue();
}
/**
- * Creates a property change listener for the slider.
- *
+ * Creates a property change listener for the slider.
+ *
* @param slider the slider.
- *
+ *
* @return A new instance of {@link MetalPropertyListener}.
*/
protected PropertyChangeListener createPropertyChangeListener(JSlider slider)
{
- return new MetalPropertyListener();
+ return new MetalPropertyListener();
}
-
+
/**
* Paints the thumb icon for the slider.
- *
+ *
* @param g the graphics device.
*/
- public void paintThumb(Graphics g)
+ public void paintThumb(Graphics g)
{
Color save = g.getColor();
g.setColor(thumbColor);
@@ -200,10 +200,10 @@ public class MetalSliderUI extends BasicSliderUI
vertThumbIcon.paintIcon(slider, g, thumbRect.x, thumbRect.y);
g.setColor(save);
}
-
+
/**
* Paints the track along which the thumb control moves.
- *
+ *
* @param g the graphics device.
*/
public void paintTrack(Graphics g)
@@ -215,10 +215,10 @@ public class MetalSliderUI extends BasicSliderUI
int trackY = trackRect.y + (trackRect.height - getTrackWidth()) / 2;
int trackW = trackRect.width;
int trackH = getTrackWidth();
-
+
// draw border
if (slider.isEnabled())
- BasicGraphicsUtils.drawEtchedRect(g, trackX, trackY, trackW, trackH,
+ BasicGraphicsUtils.drawEtchedRect(g, trackX, trackY, trackW, trackH,
darkShadowColor, shadowColor, darkShadowColor, highlightColor);
else
{
@@ -233,7 +233,7 @@ public class MetalSliderUI extends BasicSliderUI
{
int xPos = xPositionForValue(slider.getValue());
int x = slider.getInverted() ? xPos : trackRect.x;
- int w = slider.getInverted() ? trackX + trackW - xPos
+ int w = slider.getInverted() ? trackX + trackW - xPos
: xPos - trackRect.x;
g.setColor(MetalLookAndFeel.getWhite());
g.drawLine(x + 1, trackY + 1, x + w - 3, trackY + 1);
@@ -245,11 +245,11 @@ public class MetalSliderUI extends BasicSliderUI
g.drawLine(x + 1, trackY + 4, x + w - 3, trackY + 4);
}
}
- else if (filledSlider)
+ else if (filledSlider)
{
int xPos = xPositionForValue(slider.getValue());
int x = slider.getInverted() ? xPos : trackRect.x;
- int w = slider.getInverted() ? trackX + trackW - xPos
+ int w = slider.getInverted() ? trackX + trackW - xPos
: xPos - trackRect.x;
g.setColor(MetalLookAndFeel.getControlShadow());
g.fillRect(x + 1, trackY + 1, w - 3, getTrackWidth() - 3);
@@ -257,7 +257,7 @@ public class MetalSliderUI extends BasicSliderUI
{
g.setColor(MetalLookAndFeel.getControl());
g.drawLine(x + 1, trackY + 1, x + w - 3, trackY + 1);
- g.drawLine(x + 1, trackY + 1, x + 1,
+ g.drawLine(x + 1, trackY + 1, x + 1,
trackY + getTrackWidth() - 3);
}
}
@@ -269,7 +269,7 @@ public class MetalSliderUI extends BasicSliderUI
int trackW = getTrackWidth();
int trackH = trackRect.height;
if (slider.isEnabled())
- BasicGraphicsUtils.drawEtchedRect(g, trackX, trackY, trackW, trackH,
+ BasicGraphicsUtils.drawEtchedRect(g, trackX, trackY, trackW, trackH,
darkShadowColor, shadowColor, darkShadowColor, highlightColor);
else
{
@@ -284,9 +284,9 @@ public class MetalSliderUI extends BasicSliderUI
{
int yPos = yPositionForValue(slider.getValue());
int y = slider.getInverted() ? trackY : yPos;
- int h = slider.getInverted() ? yPos - trackY
+ int h = slider.getInverted() ? yPos - trackY
: trackY + trackH - yPos;
-
+
g.setColor(MetalLookAndFeel.getWhite());
g.drawLine(trackX + 1, y + 1, trackX + 1, y + h - 3);
g.setColor(UIManager.getColor("Slider.altTrackColor"));
@@ -297,11 +297,11 @@ public class MetalSliderUI extends BasicSliderUI
g.drawLine(trackX + 4, y + 1, trackX + 4, y + h - 3);
}
}
- else if (filledSlider)
+ else if (filledSlider)
{
int yPos = yPositionForValue(slider.getValue());
int y = slider.getInverted() ? trackY : yPos;
- int h = slider.getInverted() ? yPos - trackY
+ int h = slider.getInverted() ? yPos - trackY
: trackY + trackH - yPos;
g.setColor(MetalLookAndFeel.getControlShadow());
g.fillRect(trackX + 1, y + 1, getTrackWidth() - 3, h - 3);
@@ -314,14 +314,14 @@ public class MetalSliderUI extends BasicSliderUI
}
}
}
-
+
/**
- * Draws the focus rectangle for the slider. The Metal look and feel
- * indicates that the {@link JSlider} has the focus by changing the color of
- * the thumb control - this is handled elsewhere and so this method is empty
+ * Draws the focus rectangle for the slider. The Metal look and feel
+ * indicates that the {@link JSlider} has the focus by changing the color of
+ * the thumb control - this is handled elsewhere and so this method is empty
* (it overrides the method in the {@link BasicSliderUI} class to prevent
* a default focus highlight from being drawn).
- *
+ *
* @param g the graphics device.
*/
public void paintFocus(Graphics g)
@@ -329,25 +329,25 @@ public class MetalSliderUI extends BasicSliderUI
thumbColor = getFocusColor();
paintThumb(g);
}
-
+
/**
* Returns the size of the thumb icon.
- *
+ *
* @return The size of the thumb icon.
*/
protected Dimension getThumbSize()
{
if (slider.getOrientation() == JSlider.HORIZONTAL)
- return new Dimension(horizThumbIcon.getIconWidth(),
+ return new Dimension(horizThumbIcon.getIconWidth(),
horizThumbIcon.getIconHeight());
else
- return new Dimension(vertThumbIcon.getIconWidth(),
+ return new Dimension(vertThumbIcon.getIconWidth(),
vertThumbIcon.getIconHeight());
}
-
+
/**
* Returns the length of the major tick marks.
- *
+ *
* @return The length of the major tick marks.
*/
public int getTickLength()
@@ -357,31 +357,31 @@ public class MetalSliderUI extends BasicSliderUI
len += 2;
return len;
}
-
+
/**
* Returns the track width.
- *
+ *
* @return The track width.
*/
protected int getTrackWidth()
{
return trackWidth;
}
-
+
/**
* Returns the track length.
- *
+ *
* @return The track length.
*/
protected int getTrackLength()
{
- return slider.getOrientation() == JSlider.HORIZONTAL
+ return slider.getOrientation() == JSlider.HORIZONTAL
? tickRect.width : tickRect.height;
}
-
+
/**
* Returns the thumb overhang.
- *
+ *
* @return The thumb overhang.
*/
protected int getThumbOverhang()
@@ -389,16 +389,16 @@ public class MetalSliderUI extends BasicSliderUI
// FIXME: for what might this method be used?
return 0;
}
-
+
protected void scrollDueToClickInTrack(int dir)
{
// FIXME: for what might this method be overridden?
super.scrollDueToClickInTrack(dir);
}
-
+
/**
* Paints the minor ticks for a slider with a horizontal orientation.
- *
+ *
* @param g the graphics device.
* @param tickBounds the tick bounds.
* @param x the x value for the tick.
@@ -406,7 +406,7 @@ public class MetalSliderUI extends BasicSliderUI
protected void paintMinorTickForHorizSlider(Graphics g, Rectangle tickBounds,
int x)
{
- // Note the incoming 'g' has a translation in place to get us to the
+ // Note the incoming 'g' has a translation in place to get us to the
// start of the tick rect already...
if (slider.isEnabled())
g.setColor(slider.getForeground());
@@ -414,10 +414,10 @@ public class MetalSliderUI extends BasicSliderUI
g.setColor(MetalLookAndFeel.getControlShadow());
g.drawLine(x, TICK_BUFFER, x, TICK_BUFFER + tickLength / 2);
}
-
+
/**
* Paints the major ticks for a slider with a horizontal orientation.
- *
+ *
* @param g the graphics device.
* @param tickBounds the tick bounds.
* @param x the x value for the tick.
@@ -425,7 +425,7 @@ public class MetalSliderUI extends BasicSliderUI
protected void paintMajorTickForHorizSlider(Graphics g, Rectangle tickBounds,
int x)
{
- // Note the incoming 'g' has a translation in place to get us to the
+ // Note the incoming 'g' has a translation in place to get us to the
// start of the tick rect already...
if (slider.isEnabled())
g.setColor(slider.getForeground());
@@ -433,10 +433,10 @@ public class MetalSliderUI extends BasicSliderUI
g.setColor(MetalLookAndFeel.getControlShadow());
g.drawLine(x, TICK_BUFFER, x, TICK_BUFFER + tickLength - 1);
}
-
+
/**
* Paints the minor ticks for a slider with a vertical orientation.
- *
+ *
* @param g the graphics device.
* @param tickBounds the tick bounds.
* @param y the y value for the tick.
@@ -444,7 +444,7 @@ public class MetalSliderUI extends BasicSliderUI
protected void paintMinorTickForVertSlider(Graphics g, Rectangle tickBounds,
int y)
{
- // Note the incoming 'g' has a translation in place to get us to the
+ // Note the incoming 'g' has a translation in place to get us to the
// start of the tick rect already...
if (slider.isEnabled())
g.setColor(slider.getForeground());
@@ -452,10 +452,10 @@ public class MetalSliderUI extends BasicSliderUI
g.setColor(MetalLookAndFeel.getControlShadow());
g.drawLine(TICK_BUFFER, y, TICK_BUFFER + tickLength / 2, y);
}
-
+
/**
* Paints the major ticks for a slider with a vertical orientation.
- *
+ *
* @param g the graphics device.
* @param tickBounds the tick bounds.
* @param y the y value for the tick.
@@ -463,7 +463,7 @@ public class MetalSliderUI extends BasicSliderUI
protected void paintMajorTickForVertSlider(Graphics g, Rectangle tickBounds,
int y)
{
- // Note the incoming 'g' has a translation in place to get us to the
+ // Note the incoming 'g' has a translation in place to get us to the
// start of the tick rect already...
if (slider.isEnabled())
g.setColor(slider.getForeground());
@@ -471,5 +471,5 @@ public class MetalSliderUI extends BasicSliderUI
g.setColor(MetalLookAndFeel.getControlShadow());
g.drawLine(TICK_BUFFER, y, TICK_BUFFER + tickLength, y);
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java b/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java
index a3069da..0514998 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java
@@ -197,13 +197,13 @@ class MetalSplitPaneDivider extends BasicSplitPaneDivider
/** The light color in the pattern. */
Color light;
-
+
/** The JSplitPane the divider is on. */
JSplitPane splitPane;
/** The split pane orientation. */
int orientation;
-
+
/**
* Creates a new instance of <code>MetalSplitPaneDivider</code>.
*
@@ -232,7 +232,7 @@ class MetalSplitPaneDivider extends BasicSplitPaneDivider
g.setColor(UIManager.getColor("SplitPane.dividerFocusColor"));
g.fillRect(0, 0, s.width, s.height);
}
-
+
// Paint border if one exists.
Border border = getBorder();
if (border != null)
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneUI.java
index dbcc091..5b8f2127 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneUI.java
@@ -78,7 +78,7 @@ public class MetalSplitPaneUI extends BasicSplitPaneUI
* The divider returned by this method is a {@link BasicSplitPaneDivider}
* that is drawn using the Metal look.
*
- * @return the default divider to use for <code>JSplitPane</code>s.
+ * @return the default divider to use for <code>JSplitPane</code>s.
*/
public BasicSplitPaneDivider createDefaultDivider()
{
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java
index 53eaa3c..77705ba 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java
@@ -57,15 +57,15 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
{
/**
- * A {@link LayoutManager} responsible for placing all the tabs and the
- * visible component inside the {@link JTabbedPane}. This class is only used
+ * A {@link LayoutManager} responsible for placing all the tabs and the
+ * visible component inside the {@link JTabbedPane}. This class is only used
* for {@link JTabbedPane#WRAP_TAB_LAYOUT}.
*
* @specnote Apparently this class was intended to be protected,
* but was made public by a compiler bug and is now
* public for compatibility.
*/
- public class TabbedPaneLayout
+ public class TabbedPaneLayout
extends BasicTabbedPaneUI.TabbedPaneLayout
{
/**
@@ -75,12 +75,12 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
{
// Nothing to do here.
}
-
+
/**
- * Overridden to do nothing, because tab runs are not rotated in the
+ * Overridden to do nothing, because tab runs are not rotated in the
* {@link MetalLookAndFeel}.
- *
- * @param tabPlacement the tab placement (one of {@link #TOP},
+ *
+ * @param tabPlacement the tab placement (one of {@link #TOP},
* {@link #BOTTOM}, {@link #LEFT} or {@link #RIGHT}).
* @param selectedRun the index of the selected run.
*/
@@ -88,18 +88,18 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
{
// do nothing, because tab runs are not rotated in the MetalLookAndFeel
}
-
+
/**
* Overridden to do nothing, because the selected tab does not have extra
* padding in the {@link MetalLookAndFeel}.
- *
- * @param tabPlacement the tab placement (one of {@link #TOP},
+ *
+ * @param tabPlacement the tab placement (one of {@link #TOP},
* {@link #BOTTOM}, {@link #LEFT} or {@link #RIGHT}).
* @param selectedIndex the index of the selected tab.
*/
protected void padSelectedTab(int tabPlacement, int selectedIndex)
{
- // do nothing, because the selected tab does not have extra padding in
+ // do nothing, because the selected tab does not have extra padding in
// the MetalLookAndFeel
}
@@ -162,10 +162,10 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
{
return new MetalTabbedPaneUI();
}
-
+
/**
* Creates and returns an instance of {@link TabbedPaneLayout}.
- *
+ *
* @return A layout manager used by this UI delegate.
*/
protected LayoutManager createLayoutManager()
@@ -174,12 +174,12 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
? new MetalTabbedPaneUI.TabbedPaneLayout()
: super.createLayoutManager();
}
-
+
/**
* Paints the border for a single tab.
- *
+ *
* @param g the graphics device.
- * @param tabPlacement the tab placement ({@link #TOP}, {@link #LEFT},
+ * @param tabPlacement the tab placement ({@link #TOP}, {@link #LEFT},
* {@link #BOTTOM} or {@link #RIGHT}).
* @param tabIndex the index of the tab to draw the border for.
* @param x the x-coordinate for the tab's bounding rectangle.
@@ -188,15 +188,15 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
* @param h the height for the tab's bounding rectangle.
* @param isSelected indicates whether or not the tab is selected.
*/
- protected void paintTabBorder(Graphics g, int tabPlacement, int tabIndex,
- int x, int y, int w, int h, boolean isSelected)
+ protected void paintTabBorder(Graphics g, int tabPlacement, int tabIndex,
+ int x, int y, int w, int h, boolean isSelected)
{
int bottom = y + h - 1;
int right = x + w - 1;
switch (tabPlacement)
{
- case LEFT:
+ case LEFT:
paintLeftTabBorder(tabIndex, g, x, y, w, h, bottom, right, isSelected);
break;
case BOTTOM:
@@ -206,7 +206,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
paintRightTabBorder(tabIndex, g, x, y, w, h, bottom, right, isSelected);
break;
case TOP:
- default:
+ default:
paintTopTabBorder(tabIndex, g, x, y, w, h, bottom, right, isSelected);
}
}
@@ -214,7 +214,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
/**
* Paints the border for a tab assuming that the tab position is at the top
* ({@link #TOP}).
- *
+ *
* @param tabIndex the tab index.
* @param g the graphics device.
* @param x the x-coordinate for the tab's bounding rectangle.
@@ -306,11 +306,11 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
g.translate(-x, -y);
}
-
+
/**
* Paints the border for a tab assuming that the tab position is at the left
* ({@link #LEFT}).
- *
+ *
* @param tabIndex the tab index.
* @param g the graphics device.
* @param x the x-coordinate for the tab's bounding rectangle.
@@ -436,11 +436,11 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
g.translate(-x, -y);
}
-
+
/**
* Paints the border for a tab assuming that the tab position is at the right
* ({@link #RIGHT}).
- *
+ *
* @param tabIndex the tab index.
* @param g the graphics device.
* @param x the x-coordinate for the tab's bounding rectangle.
@@ -545,11 +545,11 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
}
g.translate(-x, -y);
}
-
+
/**
* Paints the border for a tab assuming that the tab position is at the bottom
* ({@link #BOTTOM}).
- *
+ *
* @param tabIndex the tab index.
* @param g the graphics device.
* @param x the x-coordinate for the tab's bounding rectangle.
@@ -606,7 +606,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
if (isOcean && isSelected)
{
g.drawLine(0, 0, 0, bottom - 5);
-
+
// Paint a connecting line to the tab below for all
// but the first tab in the last run.
if (tabIndex != tabRuns[runCount-1])
@@ -657,9 +657,9 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
/**
* Paints the background for a tab.
- *
+ *
* @param g the graphics device.
- * @param tabPlacement the tab placement ({@link #TOP}, {@link #LEFT},
+ * @param tabPlacement the tab placement ({@link #TOP}, {@link #LEFT},
* {@link #BOTTOM} or {@link #RIGHT}).
* @param tabIndex the index of the tab to draw the border for.
* @param x the x-coordinate for the tab's bounding rectangle.
@@ -696,7 +696,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
g.fillRect(x + 2, y + 5, 2, h - 5);
}
}
-
+
/**
* This method paints the focus rectangle around the selected tab.
*
@@ -719,19 +719,19 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
g.setColor(focus);
g.translate(rect.x, rect.y);
-
+
switch (tabPlacement)
{
case LEFT:
// Top line
g.drawLine(7, 2, rect.width-2, 2);
-
+
// Right line
g.drawLine(rect.width-1, 2, rect.width-1, rect.height-3);
-
+
// Bottom line
g.drawLine(rect.width-2, rect.height-2, 3, rect.height-2);
-
+
// Left line
g.drawLine(2, rect.height-3, 2, 7);
@@ -741,13 +741,13 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
case RIGHT:
// Top line
g.drawLine(1, 2, rect.width-8, 2);
-
+
// Slant
g.drawLine(rect.width-7, 2, rect.width-3, 6);
-
+
// Right line
g.drawLine(rect.width-3, 7, rect.width-3, rect.height-3);
-
+
// Bottom line
g.drawLine(rect.width-3, rect.height-2, 2, rect.height-2);
@@ -757,51 +757,51 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
case BOTTOM:
// Top line
g.drawLine(2, 1, rect.width-2, 1);
-
+
// Right line
g.drawLine(rect.width-1, 2, rect.width-1, rect.height-3);
-
+
// Bottom line
g.drawLine(7, rect.height-3, rect.width-2, rect.height-3);
-
+
// Slant
g.drawLine(6, rect.height-3, 2, rect.height-7);
-
+
// Left line
g.drawLine(2, rect.height-8, 2, 2);
-
+
break;
case TOP:
default:
// Top line
g.drawLine(6, 2, rect.width-2, 2);
-
+
// Right line
g.drawLine(rect.width-1, 2, rect.width-1, rect.height-3);
-
+
// Bottom line
g.drawLine(3, rect.height-3, rect.width-2, rect.height-3);
-
+
// Left line
g.drawLine(2, rect.height-3, 2, 7);
-
+
// Slant
g.drawLine(2, 6, 6, 2);
-
+
}
-
+
g.translate(-rect.x, -rect.y);
}
}
-
+
/**
- * Returns <code>true</code> if the tabs in the specified run should be
+ * Returns <code>true</code> if the tabs in the specified run should be
* padded to make the run fill the width/height of the {@link JTabbedPane}.
- *
+ *
* @param tabPlacement the tab placement for the {@link JTabbedPane} (one of
* {@link #TOP}, {@link #BOTTOM}, {@link #LEFT} and {@link #RIGHT}).
* @param run the run index.
- *
+ *
* @return A boolean.
*/
protected boolean shouldPadTabRun(int tabPlacement, int run)
@@ -824,14 +824,14 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
tabsOpaque = UIManager.getBoolean("TabbedPane.tabsOpaque");
minTabWidth = 0;
}
-
+
/**
* Returns the color for the gap.
- *
+ *
* @param currentRun - The current run to return the color for
* @param x - The x position of the current run
* @param y - The y position of the current run
- *
+ *
* @return the color for the gap in the current run.
*/
protected Color getColorForGap(int currentRun, int x, int y)
@@ -842,23 +842,23 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
return selectColor;
return tabAreaBackground;
}
-
+
/**
* Returns true if the gap should be filled in.
- *
+ *
* @param currentRun - The current run
* @param tabIndex - The current tab
* @param x - The x position of the tab
* @param y - The y position of the tab
- *
- * @return true if the gap at the current run should be filled
+ *
+ * @return true if the gap at the current run should be filled
*/
protected boolean shouldFillGap(int currentRun, int tabIndex, int x, int y)
{
// As far as I can tell, the gap is never filled in.
return false;
}
-
+
/**
* Paints the highlight below the tab, if there is one.
*/
@@ -867,14 +867,14 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
int selected = tabPane.getSelectedIndex();
int tabPlacement = tabPane.getTabPlacement();
Rectangle bounds = getTabBounds(tabPane, selected);
-
+
hg.setColor(selectColor);
int x = bounds.x;
int y = bounds.y;
int w = bounds.width;
int h = bounds.height;
- if (tabPlacement == TOP)
+ if (tabPlacement == TOP)
hg.fillRect(x, y + h - 2, w, 30);
else if (tabPlacement == LEFT)
hg.fillRect(x + w - 1, y, 20, h);
@@ -882,17 +882,17 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
hg.fillRect(x, y - h + 2, w, 30);
else if (tabPlacement == RIGHT)
hg.fillRect(x - 18, y, 20, h);
- else
+ else
throw new AssertionError("Unrecognised 'tabPlacement' argument.");
hg = null;
}
-
+
/**
- * Returns true if we should rotate the tab runs.
- *
+ * Returns true if we should rotate the tab runs.
+ *
* @param tabPlacement - The current tab placement.
* @param selectedRun - The selected run.
- *
+ *
* @return true if the tab runs should be rotated.
*/
protected boolean shouldRotateTabRuns(int tabPlacement,
@@ -1052,7 +1052,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
int w, int h)
{
g.setColor(darkShadow);
-
+
// If tabs are not placed on BOTTOM, or if the selected tab is not in the
// run directly below the content or the selected tab is not visible,
// then we draw an unbroken line.
@@ -1144,7 +1144,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
{
g.setColor(MetalLookAndFeel.getWhite());
g.drawLine(x, y + 1, x, y + h - 2);
- }
+ }
}
else
{
@@ -1163,7 +1163,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
}
}
}
-
+
}
/**
@@ -1251,7 +1251,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
bg = unselectedBackground;
return bg;
}
-
+
protected int getTabLabelShiftX(int tabPlacement,
int index,
boolean isSelected)
@@ -1265,5 +1265,5 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
{
return 0;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalTextFieldUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalTextFieldUI.java
index 30738b3..f7b18db 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalTextFieldUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalTextFieldUI.java
@@ -69,10 +69,10 @@ public class MetalTextFieldUI extends BasicTextFieldUI
{
return new MetalTextFieldUI();
}
-
+
/**
* This method gets called when a bound property is changed on the associated
- * JTextComponent. This is a hook which UI implementations may change to
+ * JTextComponent. This is a hook which UI implementations may change to
* reflect how the UI displays bound properties of JTextComponent subclasses.
*/
public void propertyChange(PropertyChangeEvent evt)
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalTheme.java b/libjava/classpath/javax/swing/plaf/metal/MetalTheme.java
index d5131af..209cbbe 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalTheme.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalTheme.java
@@ -49,7 +49,7 @@ import javax.swing.plaf.FontUIResource;
* The base class for themes used by the {@link MetalLookAndFeel}. A default
* theme ({@link DefaultMetalTheme}) is provided, or you can create and use
* your own.
- *
+ *
* @see MetalLookAndFeel#setCurrentTheme(MetalTheme)
*/
public abstract class MetalTheme
@@ -67,14 +67,14 @@ public abstract class MetalTheme
/**
* Returns the name of the theme.
- *
+ *
* @return The name of the theme.
*/
public abstract String getName();
/**
* Adds custom entries to the UI defaults table. This method is empty.
- *
+ *
* @param table the table.
*/
public void addCustomEntriesToTable(UIDefaults table)
@@ -87,7 +87,7 @@ public abstract class MetalTheme
/**
* Returns the accelerator foreground color. The default implementation
* returns the color from {@link #getPrimary1()}.
- *
+ *
* @return The accelerator foreground color.
*/
public ColorUIResource getAcceleratorForeground()
@@ -96,20 +96,20 @@ public abstract class MetalTheme
}
/**
- * Returns the accelerator selected foreground color. The default
+ * Returns the accelerator selected foreground color. The default
* implementation returns the color from {@link #getBlack()}.
- *
+ *
* @return The accelerator selected foreground color.
*/
public ColorUIResource getAcceleratorSelectedForeground()
{
return getBlack();
}
-
+
/**
- * Returns the control color. The default implementation returns the color
+ * Returns the control color. The default implementation returns the color
* from {@link #getSecondary3()}.
- *
+ *
* @return The control color.
*/
public ColorUIResource getControl()
@@ -118,9 +118,9 @@ public abstract class MetalTheme
}
/**
- * Returns the color used for dark shadows on controls. The default
+ * Returns the color used for dark shadows on controls. The default
* implementation returns the color from {@link #getSecondary1()}.
- *
+ *
* @return The color used for dark shadows on controls.
*/
public ColorUIResource getControlDarkShadow()
@@ -131,7 +131,7 @@ public abstract class MetalTheme
/**
* Returns the color used for disabled controls. The default implementation
* returns the color from {@link #getSecondary1()}.
- *
+ *
* @return The color used for disabled controls.
*/
public ColorUIResource getControlDisabled()
@@ -140,9 +140,9 @@ public abstract class MetalTheme
}
/**
- * Returns the color used to draw highlights for controls. The default
+ * Returns the color used to draw highlights for controls. The default
* implementation returns the color from {@link #getWhite()}.
- *
+ *
* @return The color used to draw highlights for controls.
*/
public ColorUIResource getControlHighlight()
@@ -151,9 +151,9 @@ public abstract class MetalTheme
}
/**
- * Returns the color used to display control info. The default
+ * Returns the color used to display control info. The default
* implementation returns the color from {@link #getBlack()}.
- *
+ *
* @return The color used to display control info.
*/
public ColorUIResource getControlInfo()
@@ -162,9 +162,9 @@ public abstract class MetalTheme
}
/**
- * Returns the color used to draw shadows for controls. The default
+ * Returns the color used to draw shadows for controls. The default
* implementation returns the color from {@link #getSecondary2()}.
- *
+ *
* @return The color used to draw shadows for controls.
*/
public ColorUIResource getControlShadow()
@@ -175,7 +175,7 @@ public abstract class MetalTheme
/**
* Returns the color used for text on controls. The default implementation
* returns the color from {@link #getControlInfo()}.
- *
+ *
* @return The color used for text on controls.
*/
public ColorUIResource getControlTextColor()
@@ -184,9 +184,9 @@ public abstract class MetalTheme
}
/**
- * Returns the color used for the desktop background. The default
+ * Returns the color used for the desktop background. The default
* implementation returns the color from {@link #getPrimary2()}.
- *
+ *
* @return The color used for the desktop background.
*/
public ColorUIResource getDesktopColor()
@@ -195,9 +195,9 @@ public abstract class MetalTheme
}
/**
- * Returns the color used to draw focus highlights. The default
+ * Returns the color used to draw focus highlights. The default
* implementation returns the color from {@link #getPrimary2()}.
- *
+ *
* @return The color used to draw focus highlights.
*/
public ColorUIResource getFocusColor()
@@ -208,7 +208,7 @@ public abstract class MetalTheme
/**
* Returns the color used to draw highlighted text. The default
* implementation returns the color from {@link #getHighlightedTextColor()}.
- *
+ *
* @return The color used to draw highlighted text.
*/
public ColorUIResource getHighlightedTextColor()
@@ -219,7 +219,7 @@ public abstract class MetalTheme
/**
* Returns the color used to draw text on inactive controls. The default
* implementation returns the color from {@link #getControlDisabled()}.
- *
+ *
* @return The color used to draw text on inactive controls.
*/
public ColorUIResource getInactiveControlTextColor()
@@ -230,7 +230,7 @@ public abstract class MetalTheme
/**
* Returns the color used to draw inactive system text. The default
* implementation returns the color from {@link #getSecondary2()}.
- *
+ *
* @return The color used to draw inactive system text.
*/
public ColorUIResource getInactiveSystemTextColor()
@@ -241,9 +241,9 @@ public abstract class MetalTheme
/**
* Returns the background color for menu items. The default implementation
* returns the color from {@link #getSecondary3()}.
- *
+ *
* @return The background color for menu items.
- *
+ *
* @see #getMenuSelectedBackground()
*/
public ColorUIResource getMenuBackground()
@@ -252,11 +252,11 @@ public abstract class MetalTheme
}
/**
- * Returns the foreground color for disabled menu items. The default
+ * Returns the foreground color for disabled menu items. The default
* implementation returns the color from {@link #getSecondary2()}.
- *
+ *
* @return The foreground color for disabled menu items.
- *
+ *
* @see #getMenuForeground()
*/
public ColorUIResource getMenuDisabledForeground()
@@ -267,9 +267,9 @@ public abstract class MetalTheme
/**
* Returns the foreground color for menu items. The default implementation
* returns the color from {@link #getBlack()}.
- *
+ *
* @return The foreground color for menu items.
- *
+ *
* @see #getMenuDisabledForeground()
* @see #getMenuSelectedForeground()
*/
@@ -279,11 +279,11 @@ public abstract class MetalTheme
}
/**
- * Returns the background color for selected menu items. The default
+ * Returns the background color for selected menu items. The default
* implementation returns the color from {@link #getPrimary2()}.
- *
+ *
* @return The background color for selected menu items.
- *
+ *
* @see #getMenuBackground()
*/
public ColorUIResource getMenuSelectedBackground()
@@ -292,11 +292,11 @@ public abstract class MetalTheme
}
/**
- * Returns the foreground color for selected menu items. The default
+ * Returns the foreground color for selected menu items. The default
* implementation returns the value from {@link #getBlack()}.
- *
+ *
* @return The foreground color for selected menu items.
- *
+ *
* @see #getMenuForeground()
*/
public ColorUIResource getMenuSelectedForeground()
@@ -307,7 +307,7 @@ public abstract class MetalTheme
/**
* Returns the primary color for controls. The default implementation
* returns the color from {@link #getPrimary3()}.
- *
+ *
* @return The primary color for controls.
*/
public ColorUIResource getPrimaryControl()
@@ -316,9 +316,9 @@ public abstract class MetalTheme
}
/**
- * Returns the primary color for the dark shadow on controls. The default
+ * Returns the primary color for the dark shadow on controls. The default
* implementation returns the color from {@link #getPrimary1()}.
- *
+ *
* @return The primary color for the dark shadow on controls.
*/
public ColorUIResource getPrimaryControlDarkShadow()
@@ -327,9 +327,9 @@ public abstract class MetalTheme
}
/**
- * Returns the primary color for the highlight on controls. The default
+ * Returns the primary color for the highlight on controls. The default
* implementation returns the color from {@link #getWhite()}.
- *
+ *
* @return The primary color for the highlight on controls.
*/
public ColorUIResource getPrimaryControlHighlight()
@@ -338,9 +338,9 @@ public abstract class MetalTheme
}
/**
- * Returns the primary color for the information on controls. The default
+ * Returns the primary color for the information on controls. The default
* implementation returns the color from {@link #getBlack()}.
- *
+ *
* @return The primary color for the information on controls.
*/
public ColorUIResource getPrimaryControlInfo()
@@ -349,9 +349,9 @@ public abstract class MetalTheme
}
/**
- * Returns the primary color for the shadow on controls. The default
+ * Returns the primary color for the shadow on controls. The default
* implementation returns the color from {@link #getPrimary2()}.
- *
+ *
* @return The primary color for the shadow on controls.
*/
public ColorUIResource getPrimaryControlShadow()
@@ -362,7 +362,7 @@ public abstract class MetalTheme
/**
* Returns the background color for separators. The default implementation
* returns the color from {@link #getWhite()}.
- *
+ *
* @return The background color for separators.
*/
public ColorUIResource getSeparatorBackground()
@@ -373,7 +373,7 @@ public abstract class MetalTheme
/**
* Returns the foreground color for separators. The default implementation
* returns the value from {@link #getPrimary1()}.
- *
+ *
* @return The foreground color for separators.
*/
public ColorUIResource getSeparatorForeground()
@@ -382,9 +382,9 @@ public abstract class MetalTheme
}
/**
- * Returns the color used for system text. The default implementation
+ * Returns the color used for system text. The default implementation
* returns the color from {@link #getBlack()}.
- *
+ *
* @return The color used for system text.
*/
public ColorUIResource getSystemTextColor()
@@ -395,7 +395,7 @@ public abstract class MetalTheme
/**
* Returns the color used to highlight text. The default implementation
* returns the color from {@link #getPrimary3()}.
- *
+ *
* @return The color used to highlight text.
*/
public ColorUIResource getTextHighlightColor()
@@ -406,18 +406,18 @@ public abstract class MetalTheme
/**
* Returns the color used to display user text. The default implementation
* returns the color from {@link #getBlack()}.
- *
+ *
* @return The color used to display user text.
*/
public ColorUIResource getUserTextColor()
{
return getBlack();
}
-
+
/**
* Returns the window background color. The default implementation returns
* the color from {@link #getWhite()}.
- *
+ *
* @return The window background color.
*/
public ColorUIResource getWindowBackground()
@@ -428,7 +428,7 @@ public abstract class MetalTheme
/**
* Returns the window title background color. The default implementation
* returns the color from {@link #getPrimary3()}.
- *
+ *
* @return The window title background color.
*/
public ColorUIResource getWindowTitleBackground()
@@ -439,7 +439,7 @@ public abstract class MetalTheme
/**
* Returns the window title foreground color. The default implementation
* returns the color from {@link #getBlack()}.
- *
+ *
* @return The window title foreground color.
*/
public ColorUIResource getWindowTitleForeground()
@@ -450,7 +450,7 @@ public abstract class MetalTheme
/**
* Returns the background color for an inactive window title. The default
* implementation returns the color from {@link #getSecondary3()}.
- *
+ *
* @return The background color for an inactive window title.
*/
public ColorUIResource getWindowTitleInactiveBackground()
@@ -461,7 +461,7 @@ public abstract class MetalTheme
/**
* Returns the foreground color for an inactive window title. The default
* implementation returns the color from {@link #getBlack()}.
- *
+ *
* @return The foreground color for an inactive window title.
*/
public ColorUIResource getWindowTitleInactiveForeground()
@@ -471,7 +471,7 @@ public abstract class MetalTheme
/**
* Returns the color used for black.
- *
+ *
* @return The color used for black.
*/
protected ColorUIResource getBlack()
@@ -481,7 +481,7 @@ public abstract class MetalTheme
/**
* Returns the color used for white.
- *
+ *
* @return The color used for white.
*/
protected ColorUIResource getWhite()
@@ -491,86 +491,86 @@ public abstract class MetalTheme
/**
* Returns the first primary color for this theme.
- *
+ *
* @return The first primary color.
*/
protected abstract ColorUIResource getPrimary1();
-
+
/**
* Returns the second primary color for this theme.
- *
+ *
* @return The second primary color.
*/
protected abstract ColorUIResource getPrimary2();
/**
* Returns the third primary color for this theme.
- *
+ *
* @return The third primary color.
*/
protected abstract ColorUIResource getPrimary3();
-
+
/**
* Returns the first secondary color for this theme.
- *
+ *
* @return The first secondary color.
*/
protected abstract ColorUIResource getSecondary1();
/**
* Returns the second secondary color for this theme.
- *
+ *
* @return The second secondary color.
*/
protected abstract ColorUIResource getSecondary2();
/**
* Returns the third secondary color for this theme.
- *
+ *
* @return The third secondary color.
*/
protected abstract ColorUIResource getSecondary3();
/**
* Returns the font used for text on controls.
- *
+ *
* @return The font used for text on controls.
*/
public abstract FontUIResource getControlTextFont();
/**
* Returns the font used for text in menus.
- *
+ *
* @return The font used for text in menus.
*/
public abstract FontUIResource getMenuTextFont();
/**
* Returns the font used for sub text.
- *
+ *
* @return The font used for sub text.
*/
public abstract FontUIResource getSubTextFont();
-
+
/**
* Returns the font used for system text.
- *
+ *
* @return The font used for system text.
*/
public abstract FontUIResource getSystemTextFont();
-
+
/**
* Returns the font used for user text.
- *
+ *
* @return The font used for user text.
*/
public abstract FontUIResource getUserTextFont();
/**
* Returns the font used for window titles.
- *
+ *
* @return The font used for window titles.
*/
public abstract FontUIResource getWindowTitleFont();
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalToggleButtonUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalToggleButtonUI.java
index 8c7a46e..2dacd7f 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalToggleButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalToggleButtonUI.java
@@ -113,9 +113,9 @@ public class MetalToggleButtonUI
}
/**
- * Returns the color for the text label of disabled buttons. The value
+ * Returns the color for the text label of disabled buttons. The value
* is initialised in the {@link #installDefaults(AbstractButton)} method
- * by reading the <code>ToggleButton.disabledText</code> item from the UI
+ * by reading the <code>ToggleButton.disabledText</code> item from the UI
* defaults.
*
* @return The color for the text label of disabled buttons.
@@ -127,7 +127,7 @@ public class MetalToggleButtonUI
/**
* Updates the button with the defaults for this look and feel.
- *
+ *
* @param b the button.
*/
public void installDefaults(AbstractButton b)
@@ -137,10 +137,10 @@ public class MetalToggleButtonUI
selectColor = UIManager.getColor(getPropertyPrefix() + "select");
disabledTextColor = UIManager.getColor(getPropertyPrefix() + "disabledText");
}
-
+
/**
- * Paints the button background when it is pressed/selected.
- *
+ * Paints the button background when it is pressed/selected.
+ *
* @param g the graphics device.
* @param b the button.
*/
@@ -155,19 +155,19 @@ public class MetalToggleButtonUI
g.setColor(saved);
}
}
-
+
/**
* Paints the text for the button.
- *
+ *
* As of JDK 1.4 this method is obsolete.
- * Use {@link BasicButtonUI#paintText(java.awt.Graphics,
+ * Use {@link BasicButtonUI#paintText(java.awt.Graphics,
* javax.swing.AbstractButton, java.awt.Rectangle, java.lang.String)}.
*
* @param g the graphics device.
* @param c the component.
* @param textRect the bounds for the text.
* @param text the text.
- *
+ *
*/
protected void paintText(Graphics g, JComponent c, Rectangle textRect,
String text)
@@ -185,10 +185,10 @@ public class MetalToggleButtonUI
g.setFont(savedFont);
g.setColor(savedColor);
}
-
+
/**
* Draws the focus highlight around the text and icon.
- *
+ *
* @param g the graphics device.
* @param b the button.
*/
@@ -201,7 +201,7 @@ public class MetalToggleButtonUI
g.setColor(focusColor);
Rectangle fr = iconRect.union(textRect);
g.drawRect(fr.x - 1, fr.y - 1, fr.width + 1, fr.height + 1);
- g.setColor(saved);
+ g.setColor(saved);
}
/**
@@ -226,5 +226,5 @@ public class MetalToggleButtonUI
else
super.update(g, c);
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalToolBarUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalToolBarUI.java
index 1848c1f..64e679c 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalToolBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalToolBarUI.java
@@ -59,12 +59,12 @@ import javax.swing.plaf.basic.BasicToolBarUI;
*/
public class MetalToolBarUI extends BasicToolBarUI
{
-
+
/**
- * A listener (no longer used) that responds when components are added to or
+ * A listener (no longer used) that responds when components are added to or
* removed from the {@link JToolBar}. The required behaviour is now
- * handled in the super class.
- *
+ * handled in the super class.
+ *
* @see MetalToolBarUI#createContainerListener()
*/
protected class MetalContainerListener
@@ -81,9 +81,9 @@ public class MetalToolBarUI extends BasicToolBarUI
/**
* A listener (no longer used) that responds to property change events in a
- * {@link JToolBar} component. The required behaviour is now handled in the
- * super class.
- *
+ * {@link JToolBar} component. The required behaviour is now handled in the
+ * super class.
+ *
* @see MetalToolBarUI#createRolloverListener()
*/
protected class MetalRolloverListener
@@ -97,16 +97,16 @@ public class MetalToolBarUI extends BasicToolBarUI
// Nothing to do here.
}
}
-
- /**
+
+ /**
* The container listener (an implementation specific field, according to the
* spec, and not used in GNU Classpath).
*/
protected ContainerListener contListener;
-
- /**
+
+ /**
* The rollover listener (an implementation specific field, according to the
- * spec, and not used in GNU Classpath).
+ * spec, and not used in GNU Classpath).
*/
protected PropertyChangeListener rolloverListener;
@@ -129,43 +129,43 @@ public class MetalToolBarUI extends BasicToolBarUI
{
return new MetalToolBarUI();
}
-
+
/**
* Returns <code>null</code> as permitted by recent versions of the API
- * specification. Originally it seems this method returned a new instance of
+ * specification. Originally it seems this method returned a new instance of
* {@link MetalRolloverListener}, but this is now redundant.
- *
+ *
* @return <code>null</code>.
*/
protected PropertyChangeListener createRolloverListener()
{
return null;
}
-
+
/**
* Returns <code>null</code> as permitted by recent versions of the API
- * specification. Originally it seems this method returned a new instance of
+ * specification. Originally it seems this method returned a new instance of
* {@link MetalContainerListener}, but this is now redundant.
- *
+ *
* @return <code>null</code>.
*/
protected ContainerListener createContainerListener()
{
return null;
}
-
+
/**
* Returns a border with no rollover effect for buttons in the tool bar.
- *
+ *
* @return A border.
- *
+ *
* @see MetalBorders#getToolbarButtonBorder()
*/
protected Border createNonRolloverBorder()
{
- return MetalBorders.getToolbarButtonBorder();
+ return MetalBorders.getToolbarButtonBorder();
}
-
+
/**
* Sets the offset for the window used for dragging the toolbar.
* It is set as long as the window is not null (it has been installed).
@@ -175,23 +175,23 @@ public class MetalToolBarUI extends BasicToolBarUI
if (dragWindow != null)
dragWindow.setOffset(p);
}
-
- /**
+
+ /**
* Creates and returns an instance of MetalDockingListener.
- *
+ *
* @return an instance of MetalDockingListener.
*/
protected MouseInputListener createDockingListener()
{
return new MetalDockingListener(toolBar);
}
-
+
/**
* This is the MouseHandler class that allows the user to drag the JToolBar
* in and out of the parent and dock it if it can.
*/
protected class MetalDockingListener extends BasicToolBarUI.DockingListener
- {
+ {
/**
* Creates a new DockingListener object.
*
@@ -201,7 +201,7 @@ public class MetalToolBarUI extends BasicToolBarUI
{
super(t);
}
-
+
/**
* This method is called when the mouse is pressed in the JToolBar. If the
* press doesn't occur in a place where it causes the JToolBar to be
@@ -214,7 +214,7 @@ public class MetalToolBarUI extends BasicToolBarUI
super.mousePressed(e);
setDragOffset(new Point(e.getX(), e.getY()));
}
-
+
/**
* This method is called when the mouse is dragged. It delegates the drag
* painting to the dragTo method.
@@ -223,7 +223,7 @@ public class MetalToolBarUI extends BasicToolBarUI
*/
public void mouseDragged(MouseEvent e)
{
- // Does not do anything differently than dragging
+ // Does not do anything differently than dragging
// BasicToolBarUI.DockingListener
super.mouseDragged(e);
}
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalToolTipUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalToolTipUI.java
index 6647cc0..742ff22 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalToolTipUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalToolTipUI.java
@@ -63,38 +63,38 @@ import javax.swing.plaf.basic.BasicToolTipUI;
public class MetalToolTipUI
extends BasicToolTipUI
{
- /**
- * The amount of space between the tool tip text and the accelerator
- * description (if visible).
+ /**
+ * The amount of space between the tool tip text and the accelerator
+ * description (if visible).
*/
public static final int padSpaceBetweenStrings = 12;
/** The shared UI instance. */
private static MetalToolTipUI instance;
-
+
/** A flag controlling the visibility of the accelerator (if there is one). */
private boolean isAcceleratorHidden;
-
+
/** A string representing the accelerator key for the component. */
private String acceleratorString;
-
- /**
+
+ /**
* The delimiter for the accelerator string.
*/
private String acceleratorDelimiter;
-
+
/** The font for the accelerator string. */
private Font acceleratorFont;
-
+
/** The color for the accelerator string. */
private Color acceleratorForeground;
-
+
/** The active border. */
private Border activeBorder;
-
+
/** The inactive border. */
private Border inactiveBorder;
-
+
/**
* Constructs a new instance of <code>MetalToolTipUI</code>.
*/
@@ -124,21 +124,21 @@ public class MetalToolTipUI
instance = new MetalToolTipUI();
return instance;
}
-
+
/**
- * Returns a string representing the accelerator key (if there is one) for
+ * Returns a string representing the accelerator key (if there is one) for
* the component that the tool tip belongs to.
- *
+ *
* @return A string representing the accelerator key.
*/
public String getAcceleratorString()
{
- return acceleratorString;
+ return acceleratorString;
}
-
+
/**
* Installs the UI for the specified component (a {@link JToolTip}).
- *
+ *
* @param c the {@link JToolTip} component.
*/
public void installUI(JComponent c)
@@ -151,12 +151,12 @@ public class MetalToolTipUI
c.setBorder(activeBorder);
else
c.setBorder(inactiveBorder);
- }
+ }
}
-
+
/**
* Clears the defaults set in {@link #installUI(JComponent)}.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -165,7 +165,7 @@ public class MetalToolTipUI
if (c.getBorder() instanceof UIResource)
c.setBorder(null);
}
-
+
/**
* Returns <code>true</code> if the accelerator string is hidden, and
* <code>false</code> otherwise. This setting is controlled by the
@@ -177,12 +177,12 @@ public class MetalToolTipUI
{
return isAcceleratorHidden;
}
-
+
/**
* Returns the preferred size for the {@link JToolTip} component.
- *
+ *
* @param c the component (a {@link JToolTip}).
- *
+ *
* @return The preferred size.
*/
public Dimension getPreferredSize(JComponent c)
@@ -196,10 +196,10 @@ public class MetalToolTipUI
}
return d;
}
-
+
/**
* Paints the tool tip.
- *
+ *
* @param g the graphics context.
* @param c the {@link JToolTip} component.
*/
@@ -208,14 +208,14 @@ public class MetalToolTipUI
super.paint(g, c);
// Somehow paint accelerator. Keep care for possible HTML rendering.
}
-
+
/**
- * Returns a string representing the accelerator for the component, or
+ * Returns a string representing the accelerator for the component, or
* <code>null</code> if the component has no accelerator.
- *
+ *
* @param c the component.
- *
- * @return A string representing the accelerator (possibly
+ *
+ * @return A string representing the accelerator (possibly
* <code>null</code>).
*/
private String fetchAcceleratorString(JComponent c)
@@ -240,19 +240,19 @@ public class MetalToolTipUI
mne = button.getMnemonic();
}
if (mne > 0)
- ks = KeyStroke.getKeyStroke(Character.toUpperCase((char) mne),
+ ks = KeyStroke.getKeyStroke(Character.toUpperCase((char) mne),
InputEvent.ALT_MASK, false);
if (ks != null)
result = acceleratorToString(ks);
}
return result;
}
-
+
/**
* Returns a string representing an accelerator.
- *
+ *
* @param accelerator the accelerator (<code>null</code> not permitted).
- *
+ *
* @return A string representing an accelerator.
*/
private String acceleratorToString(KeyStroke accelerator)
@@ -262,9 +262,9 @@ public class MetalToolTipUI
int modifiers = accelerator.getModifiers();
char keyChar = accelerator.getKeyChar();
int keyCode = accelerator.getKeyCode();
-
+
if (modifiers != 0)
- modifiersText = KeyEvent.getKeyModifiersText(modifiers)
+ modifiersText = KeyEvent.getKeyModifiersText(modifiers)
+ acceleratorDelimiter;
if (keyCode == KeyEvent.VK_UNDEFINED)
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalTreeUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalTreeUI.java
index ed1e5b4..bdfa2d4 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalTreeUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalTreeUI.java
@@ -69,7 +69,7 @@ public class MetalTreeUI extends BasicTreeUI
if (e.getPropertyName().equals(LINE_STYLE_PROPERTY))
decodeLineStyle(e.getNewValue());
}
-
+
}
/**
@@ -137,7 +137,7 @@ public class MetalTreeUI extends BasicTreeUI
{
return new MetalTreeUI();
}
-
+
/**
* The horizontal element of legs between nodes starts at the right of the
* left-hand side of the child node by default. This method makes the
@@ -150,19 +150,19 @@ public class MetalTreeUI extends BasicTreeUI
/**
* Configures the specified component appropriate for the look and feel.
- * This method is invoked when the ComponentUI instance is being installed
- * as the UI delegate on the specified component. This method should completely
+ * This method is invoked when the ComponentUI instance is being installed
+ * as the UI delegate on the specified component. This method should completely
* configure the component for the look and feel, including the following:
- * 1. Install any default property values for color, fonts, borders, icons,
+ * 1. Install any default property values for color, fonts, borders, icons,
* opacity, etc. on the component. Whenever possible, property values
* initialized by the client program should not be overridden.
* 2. Install a LayoutManager on the component if necessary.
* 3. Create/add any required sub-components to the component.
* 4. Create/install event listeners on the component.
- * 5. Create/install a PropertyChangeListener on the component in order
+ * 5. Create/install a PropertyChangeListener on the component in order
* to detect and respond to component property changes appropriately.
* 6. Install keyboard UI (mnemonics, traversal, etc.) on the component.
- * 7. Initialize any appropriate instance data.
+ * 7. Initialize any appropriate instance data.
*/
public void installUI(JComponent c)
{
@@ -174,21 +174,21 @@ public class MetalTreeUI extends BasicTreeUI
lineStyleListener = new LineStyleListener();
c.addPropertyChangeListener(lineStyleListener);
}
-
+
/**
- * Reverses configuration which was done on the specified component during
- * installUI. This method is invoked when this UIComponent instance is being
- * removed as the UI delegate for the specified component. This method should
- * undo the configuration performed in installUI, being careful to leave the
- * JComponent instance in a clean state (no extraneous listeners,
- * look-and-feel-specific property objects, etc.). This should include
+ * Reverses configuration which was done on the specified component during
+ * installUI. This method is invoked when this UIComponent instance is being
+ * removed as the UI delegate for the specified component. This method should
+ * undo the configuration performed in installUI, being careful to leave the
+ * JComponent instance in a clean state (no extraneous listeners,
+ * look-and-feel-specific property objects, etc.). This should include
* the following:
* 1. Remove any UI-set borders from the component.
* 2. Remove any UI-set layout managers on the component.
* 3. Remove any UI-added sub-components from the component.
* 4. Remove any UI-added event/property listeners from the component.
* 5. Remove any UI-installed keyboard UI from the component.
- * 6. Nullify any allocated instance data objects to allow for GC.
+ * 6. Nullify any allocated instance data objects to allow for GC.
*/
public void uninstallUI(JComponent c)
{
@@ -197,13 +197,13 @@ public class MetalTreeUI extends BasicTreeUI
c.removePropertyChangeListener(lineStyleListener);
lineStyleListener = null;
}
-
+
/**
* This function converts between the string passed into the client
* property and the internal representation (currently an int).
- *
+ *
* @param lineStyleFlag - String representation
- */
+ */
protected void decodeLineStyle(Object lineStyleFlag)
{
if (lineStyleFlag == null || lineStyleFlag.equals(LINE_STYLE_VALUE_ANGLED))
@@ -218,7 +218,7 @@ public class MetalTreeUI extends BasicTreeUI
/**
* Checks if the location is in expand control.
- *
+ *
* @param row - current row
* @param rowLevel - current level
* @param mouseX - current x location of the mouse click
@@ -227,33 +227,33 @@ public class MetalTreeUI extends BasicTreeUI
protected boolean isLocationInExpandControl(int row, int rowLevel,
int mouseX, int mouseY)
{
- return super.isLocationInExpandControl(tree.getPathForRow(row),
+ return super.isLocationInExpandControl(tree.getPathForRow(row),
mouseX, mouseY);
}
-
+
/**
- * Paints the specified component appropriate for the look and feel.
- * This method is invoked from the ComponentUI.update method when the
- * specified component is being painted. Subclasses should override this
- * method and use the specified Graphics object to render the content of
+ * Paints the specified component appropriate for the look and feel.
+ * This method is invoked from the ComponentUI.update method when the
+ * specified component is being painted. Subclasses should override this
+ * method and use the specified Graphics object to render the content of
* the component.
- *
+ *
* @param g - the current graphics configuration.
* @param c - the current component to draw
*/
public void paint(Graphics g, JComponent c)
{
// Calls BasicTreeUI's paint since it takes care of painting all
- // types of icons.
+ // types of icons.
super.paint(g, c);
if (lineStyle == LINE_STYLE_HORIZONTAL)
paintHorizontalSeparators(g, c);
}
-
+
/**
* Paints the horizontal separators.
- *
+ *
* @param g - the current graphics configuration.
* @param c - the current component to draw
*/
@@ -282,14 +282,14 @@ public class MetalTreeUI extends BasicTreeUI
}
}
-
+
/**
- * Paints the vertical part of the leg. The receiver should NOT modify
+ * Paints the vertical part of the leg. The receiver should NOT modify
* clipBounds, insets.
- *
+ *
* @param g - the current graphics configuration.
* @param clipBounds -
- * @param insets -
+ * @param insets -
* @param path - the current path
*/
protected void paintVerticalPartOfLeg(Graphics g, Rectangle clipBounds,
@@ -311,7 +311,7 @@ public class MetalTreeUI extends BasicTreeUI
boolean isLeaf)
{
if (lineStyle == LINE_STYLE_ANGLED)
- super.paintHorizontalPartOfLeg(g, clipBounds, insets, bounds, path, row,
+ super.paintHorizontalPartOfLeg(g, clipBounds, insets, bounds, path, row,
isExpanded, hasBeenExpanded, isLeaf);
}
}
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalUtils.java b/libjava/classpath/javax/swing/plaf/metal/MetalUtils.java
index 0c3a38d..247f922 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalUtils.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalUtils.java
@@ -180,7 +180,7 @@ class MetalUtils
{
paintGradient(g, x, y, w, h, dir, uiProp, null);
}
-
+
/**
* Paints the typical Metal gradient. See {@link #paintGradient(Graphics,
* int, int, int, int, float, float, Color, Color, Color, int, int[][])}
@@ -216,14 +216,14 @@ class MetalUtils
/**
* Paints the typical Metal gradient. The gradient is painted as follows:
* <pre>
- *
+ *
* +-------+--------+--------+-----------------------------+
* | | | | |
* +-------+--------+--------+-----------------------------+
* c1 -> c2 -- c2 -> c1 --------> c3
* < -g1- > < -g2- > < -g1- >
* </pre>
- *
+ *
* There are 4 distinct areas in this gradient:
* <ol>
* <li>A gradient from color 1 to color 2 with the relative width specified
@@ -306,7 +306,7 @@ class MetalUtils
float g1, float g2, Color c1, Color c2,
Color c3, int[][] mask)
{
-
+
if (g instanceof Graphics2D
&& SystemProperties.getProperty("gnu.javax.swing.noGraphics2D") == null)
{
diff --git a/libjava/classpath/javax/swing/plaf/metal/OceanTheme.java b/libjava/classpath/javax/swing/plaf/metal/OceanTheme.java
index 1ea0bc2..6a6a3f5 100644
--- a/libjava/classpath/javax/swing/plaf/metal/OceanTheme.java
+++ b/libjava/classpath/javax/swing/plaf/metal/OceanTheme.java
@@ -130,19 +130,19 @@ public class OceanTheme extends DefaultMetalTheme
/**
* Returns the OceanTheme's color for disabled menu foreground,
- *
+ *
*/
public ColorUIResource getMenuDisabledForeground()
{
return INACTIVE_CONTROL_TEXT;
}
-
+
/**
* Returns the OceanTheme's color for black, the RGB value
* (51, 51, 51).
*
- * @return Returns the OceanTheme's value for black
+ * @return Returns the OceanTheme's value for black
*/
protected ColorUIResource getBlack()
{
@@ -157,7 +157,7 @@ public class OceanTheme extends DefaultMetalTheme
{
return PRIMARY1;
}
-
+
/**
* Return the OceanTheme's value for primary 2, the RGB value
* (163, 184, 204).
@@ -166,7 +166,7 @@ public class OceanTheme extends DefaultMetalTheme
{
return PRIMARY2;
}
-
+
/**
* Return the OceanTheme's value for primary 1, the RGB value
* (184, 207, 229).
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiButtonUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiButtonUI.java
index ac2a5fa..044f651 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiButtonUI.java
@@ -53,32 +53,32 @@ import javax.swing.plaf.ComponentUI;
* A UI delegate that that coordinates multiple {@link ButtonUI} instances, one
* from the primary look and feel, and one or more from the auxiliary look and
* feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiButtonUI extends ButtonUI
+public class MultiButtonUI extends ButtonUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiButtonUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiButtonUI()
+ public MultiButtonUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiButtonUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiButtonUI extends ButtonUI
MultiButtonUI mui = new MultiButtonUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiButtonUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiButtonUI extends ButtonUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiButtonUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiButtonUI extends ButtonUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiButtonUI</code>. The first item in the array is always
+ * <code>MultiButtonUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiButtonUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiButtonUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiButtonUI extends ButtonUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiButtonUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiButtonUI extends ButtonUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiButtonUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiButtonUI extends ButtonUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiButtonUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiButtonUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiButtonUI extends ButtonUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiButtonUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiButtonUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiButtonUI extends ButtonUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiButtonUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiButtonUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiButtonUI extends ButtonUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiButtonUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiButtonUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiButtonUI extends ButtonUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiButtonUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiButtonUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiButtonUI extends ButtonUI
}
return result;
}
-
-} \ No newline at end of file
+
+}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiColorChooserUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiColorChooserUI.java
index 8adb950..1a96849 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiColorChooserUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiColorChooserUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ColorChooserUI;
import javax.swing.plaf.ComponentUI;
/**
- * A UI delegate that that coordinates multiple {@link ColorChooserUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link ColorChooserUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiColorChooserUI extends ColorChooserUI
+public class MultiColorChooserUI extends ColorChooserUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiColorChooserUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiColorChooserUI()
+ public MultiColorChooserUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
- * look and feels support this component, a <code>MultiColorChooserUI</code>
+ * Creates a delegate object for the specified component. If any auxiliary
+ * look and feels support this component, a <code>MultiColorChooserUI</code>
* is returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiColorChooserUI extends ColorChooserUI
MultiColorChooserUI mui = new MultiColorChooserUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiColorChooserUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiColorChooserUI extends ColorChooserUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiColorChooserUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiColorChooserUI extends ColorChooserUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiColorChooserUI</code>. The first item in the array is always
+ * <code>MultiColorChooserUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiColorChooserUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiColorChooserUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiColorChooserUI extends ColorChooserUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiColorChooserUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiColorChooserUI extends ColorChooserUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiColorChooserUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiColorChooserUI extends ColorChooserUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiColorChooserUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiColorChooserUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiColorChooserUI extends ColorChooserUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiColorChooserUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiColorChooserUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiColorChooserUI extends ColorChooserUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiColorChooserUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiColorChooserUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiColorChooserUI extends ColorChooserUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiColorChooserUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiColorChooserUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiColorChooserUI extends ColorChooserUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiColorChooserUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiColorChooserUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiColorChooserUI extends ColorChooserUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiComboBoxUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiComboBoxUI.java
index 33b4321..f169873 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiComboBoxUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiComboBoxUI.java
@@ -51,35 +51,35 @@ import javax.swing.plaf.ComboBoxUI;
import javax.swing.plaf.ComponentUI;
/**
- * A UI delegate that that coordinates multiple {@link ComboBoxUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link ComboBoxUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiComboBoxUI extends ComboBoxUI
+public class MultiComboBoxUI extends ComboBoxUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiComboBoxUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiComboBoxUI()
+ public MultiComboBoxUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
- * look and feels support this component, a <code>MultiComboBoxUI</code>
+ * Creates a delegate object for the specified component. If any auxiliary
+ * look and feels support this component, a <code>MultiComboBoxUI</code>
* is returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -87,11 +87,11 @@ public class MultiComboBoxUI extends ComboBoxUI
MultiComboBoxUI mui = new MultiComboBoxUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiComboBoxUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -105,9 +105,9 @@ public class MultiComboBoxUI extends ComboBoxUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiComboBoxUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -119,39 +119,39 @@ public class MultiComboBoxUI extends ComboBoxUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiComboBoxUI</code>. The first item in the array is always
+ * <code>MultiComboBoxUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiComboBoxUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiComboBoxUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -164,11 +164,11 @@ public class MultiComboBoxUI extends ComboBoxUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiComboBoxUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -183,9 +183,9 @@ public class MultiComboBoxUI extends ComboBoxUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiComboBoxUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -198,24 +198,24 @@ public class MultiComboBoxUI extends ComboBoxUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiComboBoxUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiComboBoxUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,25 +227,25 @@ public class MultiComboBoxUI extends ComboBoxUI
/* Dimension ignored = */ ui.getPreferredSize(c);
}
return result;
- }
-
+ }
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiComboBoxUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiComboBoxUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -258,24 +258,24 @@ public class MultiComboBoxUI extends ComboBoxUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiComboBoxUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiComboBoxUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -288,24 +288,24 @@ public class MultiComboBoxUI extends ComboBoxUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiComboBoxUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiComboBoxUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -318,25 +318,25 @@ public class MultiComboBoxUI extends ComboBoxUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiComboBoxUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiComboBoxUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -349,15 +349,15 @@ public class MultiComboBoxUI extends ComboBoxUI
}
return result;
}
-
+
/**
- * Calls the {@link ComboBoxUI#setPopupVisible(JComboBox, boolean)} method
+ * Calls the {@link ComboBoxUI#setPopupVisible(JComboBox, boolean)} method
* for all the UI delegates managed by this <code>MultiComboBoxUI</code>.
- *
+ *
* @param c the component.
* @param visible the visible state.
*/
- public void setPopupVisible(JComboBox c, boolean visible)
+ public void setPopupVisible(JComboBox c, boolean visible)
{
Iterator iterator = uis.iterator();
while (iterator.hasNext())
@@ -368,21 +368,21 @@ public class MultiComboBoxUI extends ComboBoxUI
}
/**
- * Calls the {@link ComboBoxUI#isPopupVisible(JComboBox)} method for all
- * the UI delegates managed by this <code>MultiComboBoxUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComboBoxUI#isPopupVisible(JComboBox)} method for all
+ * the UI delegates managed by this <code>MultiComboBoxUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The result for the UI delegate from the primary look and feel.
+ *
+ * @return The result for the UI delegate from the primary look and feel.
*/
- public boolean isPopupVisible(JComboBox c)
+ public boolean isPopupVisible(JComboBox c)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComboBoxUI ui = (ComboBoxUI) iterator.next();
result = ui.isPopupVisible(c);
@@ -397,23 +397,23 @@ public class MultiComboBoxUI extends ComboBoxUI
}
/**
- * Calls the {@link ComboBoxUI#isFocusTraversable(JComboBox)} method for all
- * the UI delegates managed by this <code>MultiComboBoxUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComboBoxUI#isFocusTraversable(JComboBox)} method for all
+ * the UI delegates managed by this <code>MultiComboBoxUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
+ *
* @return <code>true</code> if the combo box is traversable according to the
- * UI delegate in the primary look and feel, and <code>false</code>
- * otherwise.
+ * UI delegate in the primary look and feel, and <code>false</code>
+ * otherwise.
*/
- public boolean isFocusTraversable(JComboBox c)
+ public boolean isFocusTraversable(JComboBox c)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComboBoxUI ui = (ComboBoxUI) iterator.next();
result = ui.isFocusTraversable(c);
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiDesktopIconUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiDesktopIconUI.java
index 186ce32..091566e 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiDesktopIconUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiDesktopIconUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.DesktopIconUI;
/**
- * A UI delegate that that coordinates multiple {@link DesktopIconUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link DesktopIconUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiDesktopIconUI extends DesktopIconUI
+public class MultiDesktopIconUI extends DesktopIconUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiDesktopIconUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiDesktopIconUI()
+ public MultiDesktopIconUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiDesktopIconUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiDesktopIconUI extends DesktopIconUI
MultiDesktopIconUI mui = new MultiDesktopIconUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiDesktopIconUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiDesktopIconUI extends DesktopIconUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiDesktopIconUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiDesktopIconUI extends DesktopIconUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiDesktopIconUI</code>. The first item in the array is always
+ * <code>MultiDesktopIconUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiDesktopIconUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiDesktopIconUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiDesktopIconUI extends DesktopIconUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiDesktopIconUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiDesktopIconUI extends DesktopIconUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiDesktopIconUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiDesktopIconUI extends DesktopIconUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiDesktopIconUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiDesktopIconUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -226,25 +226,25 @@ public class MultiDesktopIconUI extends DesktopIconUI
/* Dimension ignored = */ ui.getPreferredSize(c);
}
return result;
- }
-
+ }
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiDesktopIconUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiDesktopIconUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiDesktopIconUI extends DesktopIconUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiDesktopIconUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiDesktopIconUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiDesktopIconUI extends DesktopIconUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiDesktopIconUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiDesktopIconUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiDesktopIconUI extends DesktopIconUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiDesktopIconUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiDesktopIconUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiDesktopIconUI extends DesktopIconUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiDesktopPaneUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiDesktopPaneUI.java
index d48fb2b..fb62257 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiDesktopPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiDesktopPaneUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.DesktopPaneUI;
/**
- * A UI delegate that that coordinates multiple {@link DesktopPaneUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link DesktopPaneUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiDesktopPaneUI extends DesktopPaneUI
+public class MultiDesktopPaneUI extends DesktopPaneUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiDesktopPaneUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiDesktopPaneUI()
+ public MultiDesktopPaneUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiDesktopPaneUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
MultiDesktopPaneUI mui = new MultiDesktopPaneUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiDesktopPaneUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiDesktopPaneUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiDesktopPaneUI</code>. The first item in the array is always
+ * <code>MultiDesktopPaneUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiDesktopPaneUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiDesktopPaneUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiDesktopPaneUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiDesktopPaneUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiDesktopPaneUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiDesktopPaneUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiDesktopPaneUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiDesktopPaneUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiDesktopPaneUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiDesktopPaneUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiDesktopPaneUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiDesktopPaneUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiDesktopPaneUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiDesktopPaneUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiFileChooserUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiFileChooserUI.java
index 719f043..2ab8841 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiFileChooserUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiFileChooserUI.java
@@ -54,35 +54,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.FileChooserUI;
/**
- * A UI delegate that that coordinates multiple {@link FileChooserUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link FileChooserUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiFileChooserUI extends FileChooserUI
+public class MultiFileChooserUI extends FileChooserUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiFileChooserUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiFileChooserUI()
+ public MultiFileChooserUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiFileChooserUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -90,11 +90,11 @@ public class MultiFileChooserUI extends FileChooserUI
MultiFileChooserUI mui = new MultiFileChooserUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiFileChooserUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -108,9 +108,9 @@ public class MultiFileChooserUI extends FileChooserUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiFileChooserUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -122,39 +122,39 @@ public class MultiFileChooserUI extends FileChooserUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiFileChooserUI</code>. The first item in the array is always
+ * <code>MultiFileChooserUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiFileChooserUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiFileChooserUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -167,11 +167,11 @@ public class MultiFileChooserUI extends FileChooserUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiFileChooserUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -186,9 +186,9 @@ public class MultiFileChooserUI extends FileChooserUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiFileChooserUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -201,24 +201,24 @@ public class MultiFileChooserUI extends FileChooserUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiFileChooserUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiFileChooserUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -231,24 +231,24 @@ public class MultiFileChooserUI extends FileChooserUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiFileChooserUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiFileChooserUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -261,24 +261,24 @@ public class MultiFileChooserUI extends FileChooserUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiFileChooserUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiFileChooserUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -291,24 +291,24 @@ public class MultiFileChooserUI extends FileChooserUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiFileChooserUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiFileChooserUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -321,25 +321,25 @@ public class MultiFileChooserUI extends FileChooserUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiFileChooserUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiFileChooserUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -352,24 +352,24 @@ public class MultiFileChooserUI extends FileChooserUI
}
return result;
}
-
+
/**
* Calls the {@link FileChooserUI#getAcceptAllFileFilter(JFileChooser)} method
- * for all the UI delegates managed by this <code>MultiFileChooserUI</code>,
- * returning the filter for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiFileChooserUI</code>,
+ * returning the filter for the UI delegate from the primary look and
+ * feel.
+ *
* @param chooser the file chooser.
- *
- * @return The filter returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The filter returned by the UI delegate from the primary
+ * look and feel.
*/
- public FileFilter getAcceptAllFileFilter(JFileChooser chooser)
+ public FileFilter getAcceptAllFileFilter(JFileChooser chooser)
{
FileFilter result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
FileChooserUI ui = (FileChooserUI) iterator.next();
result = ui.getAcceptAllFileFilter(chooser);
@@ -385,21 +385,21 @@ public class MultiFileChooserUI extends FileChooserUI
/**
* Calls the {@link FileChooserUI#getFileView(JFileChooser)} method
- * for all the UI delegates managed by this <code>MultiFileChooserUI</code>,
- * returning the view for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiFileChooserUI</code>,
+ * returning the view for the UI delegate from the primary look and
+ * feel.
+ *
* @param chooser the file chooser.
- *
- * @return The view returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The view returned by the UI delegate from the primary
+ * look and feel.
*/
- public FileView getFileView(JFileChooser chooser)
+ public FileView getFileView(JFileChooser chooser)
{
FileView result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
FileChooserUI ui = (FileChooserUI) iterator.next();
result = ui.getFileView(chooser);
@@ -415,21 +415,21 @@ public class MultiFileChooserUI extends FileChooserUI
/**
* Calls the {@link FileChooserUI#getApproveButtonText(JFileChooser)} method
- * for all the UI delegates managed by this <code>MultiFileChooserUI</code>,
- * returning the text for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiFileChooserUI</code>,
+ * returning the text for the UI delegate from the primary look and
+ * feel.
+ *
* @param chooser the file chooser.
- *
- * @return The text returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The text returned by the UI delegate from the primary
+ * look and feel.
*/
- public String getApproveButtonText(JFileChooser chooser)
+ public String getApproveButtonText(JFileChooser chooser)
{
String result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
FileChooserUI ui = (FileChooserUI) iterator.next();
result = ui.getApproveButtonText(chooser);
@@ -445,21 +445,21 @@ public class MultiFileChooserUI extends FileChooserUI
/**
* Calls the {@link FileChooserUI#getDialogTitle(JFileChooser)} method
- * for all the UI delegates managed by this <code>MultiFileChooserUI</code>,
- * returning the title for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiFileChooserUI</code>,
+ * returning the title for the UI delegate from the primary look and
+ * feel.
+ *
* @param chooser the file chooser.
- *
- * @return The title returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The title returned by the UI delegate from the primary
+ * look and feel.
*/
- public String getDialogTitle(JFileChooser chooser)
+ public String getDialogTitle(JFileChooser chooser)
{
String result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
FileChooserUI ui = (FileChooserUI) iterator.next();
result = ui.getDialogTitle(chooser);
@@ -474,13 +474,13 @@ public class MultiFileChooserUI extends FileChooserUI
}
/**
- * Calls the {@link FileChooserUI#rescanCurrentDirectory(JFileChooser)}
- * method for all the UI delegates managed by this
+ * Calls the {@link FileChooserUI#rescanCurrentDirectory(JFileChooser)}
+ * method for all the UI delegates managed by this
* <code>MultiFileChooserUI</code>.
- *
+ *
* @param chooser the file chooser.
*/
- public void rescanCurrentDirectory(JFileChooser chooser)
+ public void rescanCurrentDirectory(JFileChooser chooser)
{
Iterator iterator = uis.iterator();
while (iterator.hasNext())
@@ -491,14 +491,14 @@ public class MultiFileChooserUI extends FileChooserUI
}
/**
- * Calls the {@link FileChooserUI#ensureFileIsVisible(JFileChooser, File)}
- * method for all the UI delegates managed by this
+ * Calls the {@link FileChooserUI#ensureFileIsVisible(JFileChooser, File)}
+ * method for all the UI delegates managed by this
* <code>MultiFileChooserUI</code>.
- *
+ *
* @param chooser the file chooser.
* @param file the file.
*/
- public void ensureFileIsVisible(JFileChooser chooser, File file)
+ public void ensureFileIsVisible(JFileChooser chooser, File file)
{
Iterator iterator = uis.iterator();
while (iterator.hasNext())
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiInternalFrameUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiInternalFrameUI.java
index 01d1df6..37b2ee3 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiInternalFrameUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiInternalFrameUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.InternalFrameUI;
/**
- * A UI delegate that that coordinates multiple {@link InternalFrameUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link InternalFrameUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiInternalFrameUI extends InternalFrameUI
+public class MultiInternalFrameUI extends InternalFrameUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiInternalFrameUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiInternalFrameUI()
+ public MultiInternalFrameUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
- * look and feels support this component, a <code>MultiInternalFrameUI</code>
+ * Creates a delegate object for the specified component. If any auxiliary
+ * look and feels support this component, a <code>MultiInternalFrameUI</code>
* is returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,12 +86,12 @@ public class MultiInternalFrameUI extends InternalFrameUI
MultiInternalFrameUI mui = new MultiInternalFrameUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
-
+
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiInternalFrameUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -105,9 +105,9 @@ public class MultiInternalFrameUI extends InternalFrameUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiInternalFrameUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -119,39 +119,39 @@ public class MultiInternalFrameUI extends InternalFrameUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiInternalFrameUI</code>. The first item in the array is always
+ * <code>MultiInternalFrameUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiInternalFrameUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiInternalFrameUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -164,11 +164,11 @@ public class MultiInternalFrameUI extends InternalFrameUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiInternalFrameUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -183,9 +183,9 @@ public class MultiInternalFrameUI extends InternalFrameUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiInternalFrameUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -198,24 +198,24 @@ public class MultiInternalFrameUI extends InternalFrameUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiInternalFrameUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiInternalFrameUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -228,24 +228,24 @@ public class MultiInternalFrameUI extends InternalFrameUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiInternalFrameUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiInternalFrameUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -258,24 +258,24 @@ public class MultiInternalFrameUI extends InternalFrameUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiInternalFrameUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiInternalFrameUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -288,24 +288,24 @@ public class MultiInternalFrameUI extends InternalFrameUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiInternalFrameUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiInternalFrameUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -318,25 +318,25 @@ public class MultiInternalFrameUI extends InternalFrameUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiInternalFrameUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiInternalFrameUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -349,5 +349,5 @@ public class MultiInternalFrameUI extends InternalFrameUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiLabelUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiLabelUI.java
index ba5b9d4..2f0e7d0 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiLabelUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiLabelUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.LabelUI;
/**
- * A UI delegate that that coordinates multiple {@link LabelUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link LabelUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiLabelUI extends LabelUI
+public class MultiLabelUI extends LabelUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiLabelUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiLabelUI()
+ public MultiLabelUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiLabelUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiLabelUI extends LabelUI
MultiLabelUI mui = new MultiLabelUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiLabelUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiLabelUI extends LabelUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiLabelUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiLabelUI extends LabelUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiLabelUI</code>. The first item in the array is always
+ * <code>MultiLabelUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiLabelUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiLabelUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiLabelUI extends LabelUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiLabelUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiLabelUI extends LabelUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiLabelUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiLabelUI extends LabelUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiLabelUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiLabelUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiLabelUI extends LabelUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiLabelUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiLabelUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiLabelUI extends LabelUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiLabelUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiLabelUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiLabelUI extends LabelUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiLabelUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiLabelUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiLabelUI extends LabelUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiLabelUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiLabelUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiLabelUI extends LabelUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiListUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiListUI.java
index 78c2241..d6b77f5 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiListUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiListUI.java
@@ -53,35 +53,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.ListUI;
/**
- * A UI delegate that that coordinates multiple {@link ListUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link ListUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiListUI extends ListUI
+public class MultiListUI extends ListUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiListUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiListUI()
+ public MultiListUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiListUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -89,11 +89,11 @@ public class MultiListUI extends ListUI
MultiListUI mui = new MultiListUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiListUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -107,9 +107,9 @@ public class MultiListUI extends ListUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiListUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -121,39 +121,39 @@ public class MultiListUI extends ListUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiListUI</code>. The first item in the array is always
+ * <code>MultiListUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiListUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiListUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -166,11 +166,11 @@ public class MultiListUI extends ListUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiListUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -185,9 +185,9 @@ public class MultiListUI extends ListUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiListUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -200,24 +200,24 @@ public class MultiListUI extends ListUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiListUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiListUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -230,24 +230,24 @@ public class MultiListUI extends ListUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiListUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiListUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -260,24 +260,24 @@ public class MultiListUI extends ListUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiListUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiListUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -290,24 +290,24 @@ public class MultiListUI extends ListUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiListUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiListUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -320,25 +320,25 @@ public class MultiListUI extends ListUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiListUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiListUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -351,25 +351,25 @@ public class MultiListUI extends ListUI
}
return result;
}
-
+
/**
* Calls the {@link ListUI#locationToIndex(JList, Point)} method for all
- * the UI delegates managed by this <code>MultiListUI</code>,
- * returning the index for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiListUI</code>,
+ * returning the index for the UI delegate from the primary look and
+ * feel.
+ *
* @param list the list.
* @param location the location.
- *
- * @return The index returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The index returned by the UI delegate from the primary
+ * look and feel.
*/
- public int locationToIndex(JList list, Point location)
+ public int locationToIndex(JList list, Point location)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ListUI ui = (ListUI) iterator.next();
result = ui.locationToIndex(list, location);
@@ -385,22 +385,22 @@ public class MultiListUI extends ListUI
/**
* Calls the {@link ListUI#indexToLocation(JList, int)} method for all
- * the UI delegates managed by this <code>MultiListUI</code>,
- * returning the location for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiListUI</code>,
+ * returning the location for the UI delegate from the primary look and
+ * feel.
+ *
* @param list the list.
* @param index the index.
- *
- * @return The location returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The location returned by the UI delegate from the primary
+ * look and feel.
*/
- public Point indexToLocation(JList list, int index)
+ public Point indexToLocation(JList list, int index)
{
Point result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ListUI ui = (ListUI) iterator.next();
result = ui.indexToLocation(list, index);
@@ -416,23 +416,23 @@ public class MultiListUI extends ListUI
/**
* Calls the {@link ListUI#getCellBounds(JList, int, int)} method for all
- * the UI delegates managed by this <code>MultiListUI</code>,
- * returning the bounds for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiListUI</code>,
+ * returning the bounds for the UI delegate from the primary look and
+ * feel.
+ *
* @param list the list.
* @param index1 the first index.
* @param index2 the second index.
- *
- * @return The bounds returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The bounds returned by the UI delegate from the primary
+ * look and feel.
*/
- public Rectangle getCellBounds(JList list, int index1, int index2)
+ public Rectangle getCellBounds(JList list, int index1, int index2)
{
Rectangle result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ListUI ui = (ListUI) iterator.next();
result = ui.getCellBounds(list, index1, index2);
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiLookAndFeel.java b/libjava/classpath/javax/swing/plaf/multi/MultiLookAndFeel.java
index 1235165..4e81fd0 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiLookAndFeel.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiLookAndFeel.java
@@ -49,7 +49,7 @@ import javax.swing.plaf.ComponentUI;
* A look and feel that provides the ability to use auxiliary look and feels
* in addition to the primary look and feel.
*/
-public class MultiLookAndFeel extends LookAndFeel
+public class MultiLookAndFeel extends LookAndFeel
{
/**
@@ -59,62 +59,62 @@ public class MultiLookAndFeel extends LookAndFeel
{
// Nothing to do here.
}
-
+
/**
* Returns the name for the look and feel.
- *
+ *
* @return "Multiplexing Look and Feel".
*/
public String getName()
{
return "Multiplexing Look and Feel";
}
-
+
/**
* Returns an identifier for the look and feel.
- *
+ *
* @return "Multiplex".
*/
public String getID()
{
- return "Multiplex";
+ return "Multiplex";
}
-
+
/**
* Returns a description of the look and feel.
- *
+ *
* @return A description of the look and feel.
*/
public String getDescription()
{
- return "Allows multiple UI instances per component instance";
+ return "Allows multiple UI instances per component instance";
}
-
+
/**
- * Returns <code>false</code> to indicate that this look and feel is not
+ * Returns <code>false</code> to indicate that this look and feel is not
* native to any platform.
- *
+ *
* @return <code>false</code>.
*/
public boolean isNativeLookAndFeel()
{
- return false;
+ return false;
}
/**
* Returns <code>true</code> always, since this look and feel is supported on
* all platforms.
- *
+ *
* @return <code>true</code>.
*/
public boolean isSupportedLookAndFeel()
{
return true;
}
-
+
/**
* Creates and returns the UI defaults for this look and feel.
- *
+ *
* @return The UI defaults.
*/
public UIDefaults getDefaults()
@@ -123,7 +123,7 @@ public class MultiLookAndFeel extends LookAndFeel
defaults.put("ButtonUI", "javax.swing.plaf.multi.MultiButtonUI");
defaults.put("CheckBoxUI", "javax.swing.plaf.multi.MultiButtonUI");
defaults.put("CheckBoxMenuItemUI", "javax.swing.plaf.multi.MultiMenuItemUI");
- defaults.put("ColorChooserUI",
+ defaults.put("ColorChooserUI",
"javax.swing.plaf.multi.MultiColorChooserUI");
defaults.put("ComboBoxUI", "javax.swing.plaf.multi.MultiComboBoxUI");
defaults.put("DesktopPaneUI", "javax.swing.plaf.multi.MultiDesktopPaneUI");
@@ -131,7 +131,7 @@ public class MultiLookAndFeel extends LookAndFeel
defaults.put("EditorPaneUI", "javax.swing.plaf.multi.MultiTextUI");
defaults.put("FileChooserUI", "javax.swing.plaf.multi.MultiFileChooserUI");
defaults.put("FormattedTextFieldUI", "javax.swing.plaf.multi.MultiTextUI");
- defaults.put("InternalFrameUI",
+ defaults.put("InternalFrameUI",
"javax.swing.plaf.multi.MultiInternalFrameUI");
defaults.put("LabelUI", "javax.swing.plaf.multi.MultiLabelUI");
defaults.put("ListUI", "javax.swing.plaf.multi.MultiListUI");
@@ -142,11 +142,11 @@ public class MultiLookAndFeel extends LookAndFeel
defaults.put("PanelUI", "javax.swing.plaf.multi.MultiPanelUI");
defaults.put("PasswordFieldUI", "javax.swing.plaf.multi.MultiTextUI");
defaults.put("PopupMenuUI", "javax.swing.plaf.multi.MultiPopupMenuUI");
- defaults.put("PopupMenuSeparatorUI",
+ defaults.put("PopupMenuSeparatorUI",
"javax.swing.plaf.multi.MultiSeparatorUI");
defaults.put("ProgressBarUI", "javax.swing.plaf.multi.MultiProgressBarUI");
defaults.put("RadioButtonUI", "javax.swing.plaf.multi.MultiButtonUI");
- defaults.put("RadioButtonMenuItemUI",
+ defaults.put("RadioButtonMenuItemUI",
"javax.swing.plaf.multi.MultiMenuItemUI");
defaults.put("RootPaneUI", "javax.swing.plaf.multi.MultiRootPaneUI");
defaults.put("ScrollBarUI", "javax.swing.plaf.multi.MultiScrollBarUI");
@@ -162,43 +162,43 @@ public class MultiLookAndFeel extends LookAndFeel
defaults.put("TextFieldUI", "javax.swing.plaf.multi.MultiTextUI");
defaults.put("TextPaneUI", "javax.swing.plaf.multi.MultiTextUI");
defaults.put("ToggleButtonUI", "javax.swing.plaf.multi.MultiButtonUI");
- defaults.put("ToolBarSeparatorUI",
+ defaults.put("ToolBarSeparatorUI",
"javax.swing.plaf.multi.MultiSeparatorUI");
defaults.put("ToolBarUI", "javax.swing.plaf.multi.MultiToolBarUI");
defaults.put("ToolTipUI", "javax.swing.plaf.multi.MultiToolTipUI");
defaults.put("ViewportUI", "javax.swing.plaf.multi.MultiViewportUI");
return defaults;
}
-
+
/**
* Creates the UI delegates for the <code>target</code> component and
* returns a multiplexing UI delegate (<code>mui</code>) if there are
* multiple delegates.
- *
+ *
* @param mui a multiplexing UI delegate appropriate for the component.
* @param uis a vector into which the UI delegates will be added.
* @param target the target component.
- *
+ *
* @return A UI delegate.
*/
- public static ComponentUI createUIs(ComponentUI mui, Vector uis,
+ public static ComponentUI createUIs(ComponentUI mui, Vector uis,
JComponent target)
{
// get primary UI delegate for 'target', and add it to uis
ComponentUI ui = null;
LookAndFeel primary = UIManager.getLookAndFeel();
- if (primary != null)
+ if (primary != null)
{
ui = UIManager.getUI(target);
uis.add(ui);
}
- // for any auxiliary look and feels in use, get the UI delegate and add
+ // for any auxiliary look and feels in use, get the UI delegate and add
// it to uis
LookAndFeel[] auxlafs = UIManager.getAuxiliaryLookAndFeels();
for (int i = 0; i < auxlafs.length; i++)
{
LookAndFeel auxlaf = auxlafs[i];
- // FIXME: here I call getDefaults() to get the UI delegate from the
+ // FIXME: here I call getDefaults() to get the UI delegate from the
// auxiliary look and feel. But getDefaults() creates a new set of
// defaults every time it is called, which is wasteful. Unfortunately
// I cannot find another way to get the UI delegate, so I'm doing it
@@ -208,36 +208,36 @@ public class MultiLookAndFeel extends LookAndFeel
if (ui != null)
uis.add(ui);
}
- // if uis contains more than 1 delegate, return mui, otherwise return
+ // if uis contains more than 1 delegate, return mui, otherwise return
// the primary delegate
if (uis.size() > 1)
return mui;
else
- return ui;
+ return ui;
}
-
+
/**
* Returns an array containing the same {@link ComponentUI} instances as
* <code>uis</code>. If <code>uis</code> is <code>null</code>, a zero-length
* array is returned.
- *
- * @param uis a list of {@link ComponentUI} references (<code>null</code>
+ *
+ * @param uis a list of {@link ComponentUI} references (<code>null</code>
* permitted).
- *
+ *
* @return An array containing the same {@link ComponentUI} instances as
* <code>uis</code>, or <code>null</code> if <code>uis</code> is
- * empty.
+ * empty.
*/
protected static ComponentUI[] uisToArray(Vector uis)
{
- if (uis == null)
+ if (uis == null)
return new ComponentUI[0];
int size = uis.size();
- if (size == 0)
+ if (size == 0)
return null;
ComponentUI[] result = new ComponentUI[size];
uis.copyInto(result);
- return result;
+ return result;
}
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiMenuBarUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiMenuBarUI.java
index a8e805a..5b43f6b 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiMenuBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiMenuBarUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.MenuBarUI;
/**
- * A UI delegate that that coordinates multiple {@link MenuBarUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link MenuBarUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiMenuBarUI extends MenuBarUI
+public class MultiMenuBarUI extends MenuBarUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiMenuBarUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiMenuBarUI()
+ public MultiMenuBarUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiMenuBarUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiMenuBarUI extends MenuBarUI
MultiMenuBarUI mui = new MultiMenuBarUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiMenuBarUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiMenuBarUI extends MenuBarUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiMenuBarUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiMenuBarUI extends MenuBarUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiMenuBarUI</code>. The first item in the array is always
+ * <code>MultiMenuBarUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiMenuBarUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiMenuBarUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiMenuBarUI extends MenuBarUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiMenuBarUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiMenuBarUI extends MenuBarUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiMenuBarUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiMenuBarUI extends MenuBarUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiMenuBarUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiMenuBarUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiMenuBarUI extends MenuBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiMenuBarUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiMenuBarUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiMenuBarUI extends MenuBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiMenuBarUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiMenuBarUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiMenuBarUI extends MenuBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiMenuBarUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiMenuBarUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiMenuBarUI extends MenuBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiMenuBarUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiMenuBarUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiMenuBarUI extends MenuBarUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiMenuItemUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiMenuItemUI.java
index ccab5fe..6d361b0 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiMenuItemUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiMenuItemUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.MenuItemUI;
/**
- * A UI delegate that that coordinates multiple {@link MenuItemUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link MenuItemUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiMenuItemUI extends MenuItemUI
+public class MultiMenuItemUI extends MenuItemUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiMenuItemUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiMenuItemUI()
+ public MultiMenuItemUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiItemUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiMenuItemUI extends MenuItemUI
MultiMenuItemUI mui = new MultiMenuItemUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiMenuItemUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiMenuItemUI extends MenuItemUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiMenuItemUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiMenuItemUI extends MenuItemUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiMenuItemUI</code>. The first item in the array is always
+ * <code>MultiMenuItemUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiMenuItemUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiMenuItemUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiMenuItemUI extends MenuItemUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiMenuItemUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiMenuItemUI extends MenuItemUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiMenuItemUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiMenuItemUI extends MenuItemUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiMenuItemUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiMenuItemUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiMenuItemUI extends MenuItemUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiMenuItemUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiMenuItemUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiMenuItemUI extends MenuItemUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiMenuItemUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiMenuItemUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiMenuItemUI extends MenuItemUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiMenuItemUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiMenuItemUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiMenuItemUI extends MenuItemUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiMenuItemUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiMenuItemUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiMenuItemUI extends MenuItemUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java
index 8d6f386..eaa4a42 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java
@@ -51,35 +51,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.OptionPaneUI;
/**
- * A UI delegate that that coordinates multiple {@link OptionPaneUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link OptionPaneUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiOptionPaneUI extends OptionPaneUI
+public class MultiOptionPaneUI extends OptionPaneUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiOptionPaneUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiOptionPaneUI()
+ public MultiOptionPaneUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiOptionPaneUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -87,11 +87,11 @@ public class MultiOptionPaneUI extends OptionPaneUI
MultiOptionPaneUI mui = new MultiOptionPaneUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiOptionPaneUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -105,9 +105,9 @@ public class MultiOptionPaneUI extends OptionPaneUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiOptionPaneUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -119,39 +119,39 @@ public class MultiOptionPaneUI extends OptionPaneUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiOptionPaneUI</code>. The first item in the array is always
+ * <code>MultiOptionPaneUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiOptionPaneUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiOptionPaneUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -164,11 +164,11 @@ public class MultiOptionPaneUI extends OptionPaneUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiOptionPaneUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -183,9 +183,9 @@ public class MultiOptionPaneUI extends OptionPaneUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiOptionPaneUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -198,24 +198,24 @@ public class MultiOptionPaneUI extends OptionPaneUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiOptionPaneUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiOptionPaneUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -228,24 +228,24 @@ public class MultiOptionPaneUI extends OptionPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiOptionPaneUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiOptionPaneUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -258,24 +258,24 @@ public class MultiOptionPaneUI extends OptionPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiOptionPaneUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiOptionPaneUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -288,24 +288,24 @@ public class MultiOptionPaneUI extends OptionPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiOptionPaneUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiOptionPaneUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -318,25 +318,25 @@ public class MultiOptionPaneUI extends OptionPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiOptionPaneUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiOptionPaneUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -349,14 +349,14 @@ public class MultiOptionPaneUI extends OptionPaneUI
}
return result;
}
-
+
/**
* Calls the {@link OptionPaneUI#selectInitialValue(JOptionPane)} method for
* all the UI delegates managed by this <code>MultiOptionPaneUI</code>.
- *
+ *
* @param pane the option pane.
*/
- public void selectInitialValue(JOptionPane pane)
+ public void selectInitialValue(JOptionPane pane)
{
Iterator iterator = uis.iterator();
while (iterator.hasNext())
@@ -367,21 +367,21 @@ public class MultiOptionPaneUI extends OptionPaneUI
}
/**
- * Calls the {@link OptionPaneUI#containsCustomComponents(JOptionPane)}
- * method for all the UI delegates managed by this
- * <code>MultiOptionPaneUI</code>, returning the result for the UI delegate
- * from the primary look and feel.
- *
+ * Calls the {@link OptionPaneUI#containsCustomComponents(JOptionPane)}
+ * method for all the UI delegates managed by this
+ * <code>MultiOptionPaneUI</code>, returning the result for the UI delegate
+ * from the primary look and feel.
+ *
* @param pane the option pane.
- *
- * @return The result for the UI delegate from the primary look and feel.
+ *
+ * @return The result for the UI delegate from the primary look and feel.
*/
- public boolean containsCustomComponents(JOptionPane pane)
+ public boolean containsCustomComponents(JOptionPane pane)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
OptionPaneUI ui = (OptionPaneUI) iterator.next();
result = ui.containsCustomComponents(pane);
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiPanelUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiPanelUI.java
index 67629b2..7b84599 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiPanelUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiPanelUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.PanelUI;
/**
- * A UI delegate that that coordinates multiple {@link PanelUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link PanelUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiPanelUI extends PanelUI
+public class MultiPanelUI extends PanelUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiPanelUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiPanelUI()
+ public MultiPanelUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiPanelUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiPanelUI extends PanelUI
MultiPanelUI mui = new MultiPanelUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiPanelUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiPanelUI extends PanelUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiPanelUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiPanelUI extends PanelUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiPanelUI</code>. The first item in the array is always
+ * <code>MultiPanelUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiPanelUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiPanelUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiPanelUI extends PanelUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiPanelUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiPanelUI extends PanelUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiPanelUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiPanelUI extends PanelUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiPanelUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiPanelUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiPanelUI extends PanelUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiPanelUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiPanelUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiPanelUI extends PanelUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiPanelUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiPanelUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiPanelUI extends PanelUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiPanelUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiPanelUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiPanelUI extends PanelUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiPanelUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiPanelUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiPanelUI extends PanelUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiPopupMenuUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiPopupMenuUI.java
index 161429d..0afaaf7 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiPopupMenuUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiPopupMenuUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.PopupMenuUI;
/**
- * A UI delegate that that coordinates multiple {@link PopupMenuUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link PopupMenuUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiPopupMenuUI extends PopupMenuUI
+public class MultiPopupMenuUI extends PopupMenuUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiPopupMenuUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiPopupMenuUI()
+ public MultiPopupMenuUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiPopupMenuUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiPopupMenuUI extends PopupMenuUI
MultiPopupMenuUI mui = new MultiPopupMenuUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiPopupMenuUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiPopupMenuUI extends PopupMenuUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiPopupMenuUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiPopupMenuUI extends PopupMenuUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiPopupMenuUI</code>. The first item in the array is always
+ * <code>MultiPopupMenuUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiPopupMenuUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiPopupMenuUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiPopupMenuUI extends PopupMenuUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiPopupMenuUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiPopupMenuUI extends PopupMenuUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiPopupMenuUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiPopupMenuUI extends PopupMenuUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiPopupMenuUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiPopupMenuUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiPopupMenuUI extends PopupMenuUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiPopupMenuUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiPopupMenuUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiPopupMenuUI extends PopupMenuUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiPopupMenuUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiPopupMenuUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiPopupMenuUI extends PopupMenuUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiPopupMenuUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiPopupMenuUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiPopupMenuUI extends PopupMenuUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiPopupMenuUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiPopupMenuUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiPopupMenuUI extends PopupMenuUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiProgressBarUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiProgressBarUI.java
index c5dbbe8..0395bdd 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiProgressBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiProgressBarUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.ProgressBarUI;
/**
- * A UI delegate that that coordinates multiple {@link ProgressBarUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link ProgressBarUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiProgressBarUI extends ProgressBarUI
+public class MultiProgressBarUI extends ProgressBarUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiProgressBarUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiProgressBarUI()
+ public MultiProgressBarUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiProgressBarUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiProgressBarUI extends ProgressBarUI
MultiProgressBarUI mui = new MultiProgressBarUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiProgressBarUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiProgressBarUI extends ProgressBarUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiProgressBarUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiProgressBarUI extends ProgressBarUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiProgressBarUI</code>. The first item in the array is always
+ * <code>MultiProgressBarUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiProgressBarUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiProgressBarUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiProgressBarUI extends ProgressBarUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiProgressBarUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiProgressBarUI extends ProgressBarUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiProgressBarUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiProgressBarUI extends ProgressBarUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiProgressBarUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiProgressBarUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiProgressBarUI extends ProgressBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiProgressBarUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiProgressBarUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiProgressBarUI extends ProgressBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiProgressBarUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiProgressBarUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiProgressBarUI extends ProgressBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiProgressBarUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiProgressBarUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiProgressBarUI extends ProgressBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiProgressBarUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiProgressBarUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiProgressBarUI extends ProgressBarUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiRootPaneUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiRootPaneUI.java
index bd0cb5c..69c7ffe 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiRootPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiRootPaneUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.RootPaneUI;
/**
- * A UI delegate that that coordinates multiple {@link RootPaneUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link RootPaneUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiRootPaneUI extends RootPaneUI
+public class MultiRootPaneUI extends RootPaneUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiRootPanelUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiRootPaneUI()
+ public MultiRootPaneUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiRootPaneUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiRootPaneUI extends RootPaneUI
MultiRootPaneUI mui = new MultiRootPaneUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiRootPaneUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiRootPaneUI extends RootPaneUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiRootPaneUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiRootPaneUI extends RootPaneUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiRootPaneUI</code>. The first item in the array is always
+ * <code>MultiRootPaneUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiRootPaneUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiRootPaneUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiRootPaneUI extends RootPaneUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiRootPaneUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiRootPaneUI extends RootPaneUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiRootPaneUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiRootPaneUI extends RootPaneUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiRootPaneUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiRootPaneUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiRootPaneUI extends RootPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiRootPaneUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiRootPaneUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiRootPaneUI extends RootPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiRootPaneUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiRootPaneUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiRootPaneUI extends RootPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiRootPaneUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiRootPaneUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiRootPaneUI extends RootPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiRootPaneUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiRootPaneUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiRootPaneUI extends RootPaneUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiScrollBarUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiScrollBarUI.java
index 1a993b8..4ec8b3f 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiScrollBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiScrollBarUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.ScrollBarUI;
/**
- * A UI delegate that that coordinates multiple {@link ScrollBarUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link ScrollBarUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiScrollBarUI extends ScrollBarUI
+public class MultiScrollBarUI extends ScrollBarUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiScrollBarUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiScrollBarUI()
+ public MultiScrollBarUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiScrollBarUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiScrollBarUI extends ScrollBarUI
MultiScrollBarUI mui = new MultiScrollBarUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiScrollBarUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiScrollBarUI extends ScrollBarUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiScrollBarUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiScrollBarUI extends ScrollBarUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiScrollBarUI</code>. The first item in the array is always
+ * <code>MultiScrollBarUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiScrollBarUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiScrollBarUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiScrollBarUI extends ScrollBarUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiScrollBarUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiScrollBarUI extends ScrollBarUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiScrollBarUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiScrollBarUI extends ScrollBarUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiScrollBarUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiScrollBarUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -230,21 +230,21 @@ public class MultiScrollBarUI extends ScrollBarUI
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiScrollBarUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiScrollBarUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiScrollBarUI extends ScrollBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiScrollBarUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiScrollBarUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiScrollBarUI extends ScrollBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiScrollBarUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiScrollBarUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiScrollBarUI extends ScrollBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiScrollBarUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiScrollBarUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiScrollBarUI extends ScrollBarUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiScrollPaneUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiScrollPaneUI.java
index a50c3ba..5a0bc1e 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiScrollPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiScrollPaneUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.ScrollPaneUI;
/**
- * A UI delegate that that coordinates multiple {@link ScrollPaneUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link ScrollPaneUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiScrollPaneUI extends ScrollPaneUI
+public class MultiScrollPaneUI extends ScrollPaneUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiScrollPaneUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiScrollPaneUI()
+ public MultiScrollPaneUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiScrollPaneUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiScrollPaneUI extends ScrollPaneUI
MultiScrollPaneUI mui = new MultiScrollPaneUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiScrollPaneUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiScrollPaneUI extends ScrollPaneUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiScrollPaneUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiScrollPaneUI extends ScrollPaneUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiScrollPaneUI</code>. The first item in the array is always
+ * <code>MultiScrollPaneUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiScrollPaneUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiScrollPaneUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiScrollPaneUI extends ScrollPaneUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiScrollPaneUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiScrollPaneUI extends ScrollPaneUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiScrollPaneUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiScrollPaneUI extends ScrollPaneUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiScrollPaneUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiScrollPaneUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiScrollPaneUI extends ScrollPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiScrollPaneUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiScrollPaneUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiScrollPaneUI extends ScrollPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiScrollPaneUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiScrollPaneUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiScrollPaneUI extends ScrollPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiScrollPaneUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiScrollPaneUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiScrollPaneUI extends ScrollPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiScrollPaneUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiScrollPaneUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiScrollPaneUI extends ScrollPaneUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiSeparatorUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiSeparatorUI.java
index f8e4fea..fbd9712 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiSeparatorUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiSeparatorUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.SeparatorUI;
/**
- * A UI delegate that that coordinates multiple {@link MultiSeparatorUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link MultiSeparatorUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiSeparatorUI extends SeparatorUI
+public class MultiSeparatorUI extends SeparatorUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiSeparatorUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiSeparatorUI()
+ public MultiSeparatorUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiSeparatorUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiSeparatorUI extends SeparatorUI
MultiSeparatorUI mui = new MultiSeparatorUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiSeparatorUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiSeparatorUI extends SeparatorUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiSeparatorUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiSeparatorUI extends SeparatorUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiSeparatorUI</code>. The first item in the array is always
+ * <code>MultiSeparatorUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiSeparatorUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiSeparatorUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiSeparatorUI extends SeparatorUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiSeparatorUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiSeparatorUI extends SeparatorUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiSeparatorUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiSeparatorUI extends SeparatorUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiSeparatorUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiSeparatorUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiSeparatorUI extends SeparatorUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiSeparatorUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiSeparatorUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiSeparatorUI extends SeparatorUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiSeparatorUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiSeparatorUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiSeparatorUI extends SeparatorUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiSeparatorUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiSeparatorUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiSeparatorUI extends SeparatorUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiSeparatorUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiSeparatorUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiSeparatorUI extends SeparatorUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiSliderUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiSliderUI.java
index 8a4aab6..cb896c5 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiSliderUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiSliderUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.SliderUI;
/**
- * A UI delegate that that coordinates multiple {@link SliderUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link SliderUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiSliderUI extends SliderUI
+public class MultiSliderUI extends SliderUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiSliderUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiSliderUI()
+ public MultiSliderUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiSliderUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiSliderUI extends SliderUI
MultiSliderUI mui = new MultiSliderUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiSliderUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiSliderUI extends SliderUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiSliderUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiSliderUI extends SliderUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiSliderUI</code>. The first item in the array is always
+ * <code>MultiSliderUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiSliderUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiSliderUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiSliderUI extends SliderUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiSliderUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiSliderUI extends SliderUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiSliderUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiSliderUI extends SliderUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiSliderUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiSliderUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiSliderUI extends SliderUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiSliderUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiSliderUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiSliderUI extends SliderUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiSliderUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiSliderUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiSliderUI extends SliderUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiSliderUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiSliderUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiSliderUI extends SliderUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiSliderUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiSliderUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiSliderUI extends SliderUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiSpinnerUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiSpinnerUI.java
index 70068e8..fd805f9 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiSpinnerUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiSpinnerUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.SpinnerUI;
/**
- * A UI delegate that that coordinates multiple {@link SpinnerUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link SpinnerUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiSpinnerUI extends SpinnerUI
+public class MultiSpinnerUI extends SpinnerUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiSpinnerUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiSpinnerUI()
+ public MultiSpinnerUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiSpinnerUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiSpinnerUI extends SpinnerUI
MultiSpinnerUI mui = new MultiSpinnerUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiSpinnerUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiSpinnerUI extends SpinnerUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiSpinnerUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiSpinnerUI extends SpinnerUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiSpinnerUI</code>. The first item in the array is always
+ * <code>MultiSpinnerUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiSpinnerUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiSpinnerUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiSpinnerUI extends SpinnerUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiSpinnerUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiSpinnerUI extends SpinnerUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiSpinnerUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiSpinnerUI extends SpinnerUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiSpinnerUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiSpinnerUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiSpinnerUI extends SpinnerUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiSpinnerUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiSpinnerUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiSpinnerUI extends SpinnerUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiSpinnerUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiSpinnerUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiSpinnerUI extends SpinnerUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiSpinnerUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiSpinnerUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiSpinnerUI extends SpinnerUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiSpinnerUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiSpinnerUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiSpinnerUI extends SpinnerUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java
index 70ea4f1..1eb2e41 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java
@@ -51,35 +51,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.SplitPaneUI;
/**
- * A UI delegate that that coordinates multiple {@link SplitPaneUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link SplitPaneUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiSplitPaneUI extends SplitPaneUI
+public class MultiSplitPaneUI extends SplitPaneUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiSplitPaneUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiSplitPaneUI()
+ public MultiSplitPaneUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiSplitPaneUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -87,11 +87,11 @@ public class MultiSplitPaneUI extends SplitPaneUI
MultiSplitPaneUI mui = new MultiSplitPaneUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiSplitPaneUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -105,9 +105,9 @@ public class MultiSplitPaneUI extends SplitPaneUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiSplitPaneUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -119,39 +119,39 @@ public class MultiSplitPaneUI extends SplitPaneUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiSplitPaneUI</code>. The first item in the array is always
+ * <code>MultiSplitPaneUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiSplitPaneUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiSplitPaneUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -164,11 +164,11 @@ public class MultiSplitPaneUI extends SplitPaneUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiSplitPaneUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -183,9 +183,9 @@ public class MultiSplitPaneUI extends SplitPaneUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiSplitPaneUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -198,24 +198,24 @@ public class MultiSplitPaneUI extends SplitPaneUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiSplitPaneUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiSplitPaneUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -231,21 +231,21 @@ public class MultiSplitPaneUI extends SplitPaneUI
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiSplitPaneUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiSplitPaneUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -258,24 +258,24 @@ public class MultiSplitPaneUI extends SplitPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiSplitPaneUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiSplitPaneUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -288,24 +288,24 @@ public class MultiSplitPaneUI extends SplitPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiSplitPaneUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiSplitPaneUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -318,25 +318,25 @@ public class MultiSplitPaneUI extends SplitPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiSplitPaneUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiSplitPaneUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -349,14 +349,14 @@ public class MultiSplitPaneUI extends SplitPaneUI
}
return result;
}
-
+
/**
- * Calls the {@link SplitPaneUI#resetToPreferredSizes(JSplitPane)} method
+ * Calls the {@link SplitPaneUI#resetToPreferredSizes(JSplitPane)} method
* for all the UI delegates managed by this <code>MultiSplitPaneUI</code>.
- *
+ *
* @param pane the component.
*/
- public void resetToPreferredSizes(JSplitPane pane)
+ public void resetToPreferredSizes(JSplitPane pane)
{
Iterator iterator = uis.iterator();
while (iterator.hasNext())
@@ -367,13 +367,13 @@ public class MultiSplitPaneUI extends SplitPaneUI
}
/**
- * Calls the {@link SplitPaneUI#setDividerLocation(JSplitPane, int)} method
+ * Calls the {@link SplitPaneUI#setDividerLocation(JSplitPane, int)} method
* for all the UI delegates managed by this <code>MultiSplitPaneUI</code>.
- *
+ *
* @param pane the component.
* @param location the location.
*/
- public void setDividerLocation(JSplitPane pane, int location)
+ public void setDividerLocation(JSplitPane pane, int location)
{
Iterator iterator = uis.iterator();
while (iterator.hasNext())
@@ -385,21 +385,21 @@ public class MultiSplitPaneUI extends SplitPaneUI
/**
* Calls the {@link SplitPaneUI#getDividerLocation(JSplitPane)} method for all
- * the UI delegates managed by this <code>MultiSplitPaneUI</code>,
- * returning the location for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiSplitPaneUI</code>,
+ * returning the location for the UI delegate from the primary look and
+ * feel.
+ *
* @param pane the component.
- *
- * @return The location returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The location returned by the UI delegate from the primary
+ * look and feel.
*/
- public int getDividerLocation(JSplitPane pane)
+ public int getDividerLocation(JSplitPane pane)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
SplitPaneUI ui = (SplitPaneUI) iterator.next();
result = ui.getDividerLocation(pane);
@@ -414,22 +414,22 @@ public class MultiSplitPaneUI extends SplitPaneUI
}
/**
- * Calls the {@link SplitPaneUI#getMinimumDividerLocation(JSplitPane)} method
- * for all the UI delegates managed by this <code>MultiSplitPaneUI</code>,
- * returning the location for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link SplitPaneUI#getMinimumDividerLocation(JSplitPane)} method
+ * for all the UI delegates managed by this <code>MultiSplitPaneUI</code>,
+ * returning the location for the UI delegate from the primary look and
+ * feel.
+ *
* @param pane the component.
- *
- * @return The location returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The location returned by the UI delegate from the primary
+ * look and feel.
*/
- public int getMinimumDividerLocation(JSplitPane pane)
+ public int getMinimumDividerLocation(JSplitPane pane)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
SplitPaneUI ui = (SplitPaneUI) iterator.next();
result = ui.getMinimumDividerLocation(pane);
@@ -444,22 +444,22 @@ public class MultiSplitPaneUI extends SplitPaneUI
}
/**
- * Calls the {@link SplitPaneUI#getMaximumDividerLocation(JSplitPane)} method
- * for all the UI delegates managed by this <code>MultiSplitPaneUI</code>,
- * returning the location for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link SplitPaneUI#getMaximumDividerLocation(JSplitPane)} method
+ * for all the UI delegates managed by this <code>MultiSplitPaneUI</code>,
+ * returning the location for the UI delegate from the primary look and
+ * feel.
+ *
* @param pane the component.
- *
- * @return The location returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The location returned by the UI delegate from the primary
+ * look and feel.
*/
- public int getMaximumDividerLocation(JSplitPane pane)
+ public int getMaximumDividerLocation(JSplitPane pane)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
SplitPaneUI ui = (SplitPaneUI) iterator.next();
result = ui.getMaximumDividerLocation(pane);
@@ -474,14 +474,14 @@ public class MultiSplitPaneUI extends SplitPaneUI
}
/**
- * Calls the {@link SplitPaneUI#finishedPaintingChildren(JSplitPane,
- * Graphics)} method for all the UI delegates managed by this
+ * Calls the {@link SplitPaneUI#finishedPaintingChildren(JSplitPane,
+ * Graphics)} method for all the UI delegates managed by this
* <code>MultiSplitPaneUI</code>.
- *
+ *
* @param pane the component.
* @param g the graphics device.
*/
- public void finishedPaintingChildren(JSplitPane pane, Graphics g)
+ public void finishedPaintingChildren(JSplitPane pane, Graphics g)
{
Iterator iterator = uis.iterator();
while (iterator.hasNext())
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java
index 2a2599b..3f9d22a 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java
@@ -52,35 +52,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.TabbedPaneUI;
/**
- * A UI delegate that that coordinates multiple {@link TabbedPaneUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link TabbedPaneUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiTabbedPaneUI extends TabbedPaneUI
+public class MultiTabbedPaneUI extends TabbedPaneUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiTabbedPaneUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiTabbedPaneUI()
+ public MultiTabbedPaneUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiTabbedPaneUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -88,11 +88,11 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
MultiTabbedPaneUI mui = new MultiTabbedPaneUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiTabbedPaneUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -106,9 +106,9 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiTabbedPaneUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -120,39 +120,39 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiTabbedPaneUI</code>. The first item in the array is always
+ * <code>MultiTabbedPaneUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiTabbedPaneUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiTabbedPaneUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -165,11 +165,11 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiTabbedPaneUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -184,9 +184,9 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiTabbedPaneUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -199,24 +199,24 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTabbedPaneUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTabbedPaneUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -232,21 +232,21 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTabbedPaneUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTabbedPaneUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -259,24 +259,24 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTabbedPaneUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTabbedPaneUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -289,24 +289,24 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiTabbedPaneUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTabbedPaneUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -319,25 +319,25 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiTabbedPaneUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTabbedPaneUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -350,26 +350,26 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
}
return result;
}
-
+
/**
- * Calls the {@link TabbedPaneUI#tabForCoordinate(JTabbedPane, int, int)}
- * method for all the UI delegates managed by this
- * <code>MultiTabbedPaneUI</code>, returning the tab index for the UI
- * delegate from the primary look and feel.
- *
+ * Calls the {@link TabbedPaneUI#tabForCoordinate(JTabbedPane, int, int)}
+ * method for all the UI delegates managed by this
+ * <code>MultiTabbedPaneUI</code>, returning the tab index for the UI
+ * delegate from the primary look and feel.
+ *
* @param pane the tabbed pane.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
- * @return The tab index returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The tab index returned by the UI delegate from the primary
+ * look and feel.
*/
- public int tabForCoordinate(JTabbedPane pane, int x, int y)
+ public int tabForCoordinate(JTabbedPane pane, int x, int y)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TabbedPaneUI ui = (TabbedPaneUI) iterator.next();
result = ui.tabForCoordinate(pane, x, y);
@@ -384,23 +384,23 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
}
/**
- * Calls the {@link TabbedPaneUI#getTabBounds(JTabbedPane, int)}
- * method for all the UI delegates managed by this
- * <code>MultiTabbedPaneUI</code>, returning the bounds for the UI
- * delegate from the primary look and feel.
- *
+ * Calls the {@link TabbedPaneUI#getTabBounds(JTabbedPane, int)}
+ * method for all the UI delegates managed by this
+ * <code>MultiTabbedPaneUI</code>, returning the bounds for the UI
+ * delegate from the primary look and feel.
+ *
* @param pane the tabbed pane.
* @param index the index.
- *
- * @return The bounds returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The bounds returned by the UI delegate from the primary
+ * look and feel.
*/
- public Rectangle getTabBounds(JTabbedPane pane, int index)
+ public Rectangle getTabBounds(JTabbedPane pane, int index)
{
Rectangle result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TabbedPaneUI ui = (TabbedPaneUI) iterator.next();
result = ui.getTabBounds(pane, index);
@@ -415,22 +415,22 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
}
/**
- * Calls the {@link TabbedPaneUI#getTabRunCount(JTabbedPane)}
- * method for all the UI delegates managed by this
- * <code>MultiTabbedPaneUI</code>, returning the nt for the UI
- * delegate from the primary look and feel.
- *
+ * Calls the {@link TabbedPaneUI#getTabRunCount(JTabbedPane)}
+ * method for all the UI delegates managed by this
+ * <code>MultiTabbedPaneUI</code>, returning the nt for the UI
+ * delegate from the primary look and feel.
+ *
* @param pane the tabbed pane.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
- public int getTabRunCount(JTabbedPane pane)
+ public int getTabRunCount(JTabbedPane pane)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TabbedPaneUI ui = (TabbedPaneUI) iterator.next();
result = ui.getTabRunCount(pane);
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiTableHeaderUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiTableHeaderUI.java
index 6c59cef..972303b 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiTableHeaderUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiTableHeaderUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.TableHeaderUI;
/**
- * A UI delegate that that coordinates multiple {@link TableHeaderUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link TableHeaderUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiTableHeaderUI extends TableHeaderUI
+public class MultiTableHeaderUI extends TableHeaderUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiTableHeaderUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiTableHeaderUI()
+ public MultiTableHeaderUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiTableHeaderUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiTableHeaderUI extends TableHeaderUI
MultiTableHeaderUI mui = new MultiTableHeaderUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiTableHeaderUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiTableHeaderUI extends TableHeaderUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiTableHeaderUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiTableHeaderUI extends TableHeaderUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiTableHeaderUI</code>. The first item in the array is always
+ * <code>MultiTableHeaderUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiTableHeaderUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiTableHeaderUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiTableHeaderUI extends TableHeaderUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiTableHeaderUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiTableHeaderUI extends TableHeaderUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiTableHeaderUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiTableHeaderUI extends TableHeaderUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTableHeaderUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTableHeaderUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiTableHeaderUI extends TableHeaderUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTableHeaderUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTableHeaderUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiTableHeaderUI extends TableHeaderUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTableHeaderUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTableHeaderUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiTableHeaderUI extends TableHeaderUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiTableHeaderUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTableHeaderUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiTableHeaderUI extends TableHeaderUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiTableHeaderUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTableHeaderUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiTableHeaderUI extends TableHeaderUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiTableUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiTableUI.java
index 2e5b5bc..1cd1a4c 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiTableUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiTableUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.TableUI;
/**
- * A UI delegate that that coordinates multiple {@link TableUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link TableUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiTableUI extends TableUI
+public class MultiTableUI extends TableUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiTableUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiTableUI()
+ public MultiTableUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiTableUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiTableUI extends TableUI
MultiTableUI mui = new MultiTableUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiTableUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiTableUI extends TableUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiTableUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiTableUI extends TableUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiTableUI</code>. The first item in the array is always
+ * <code>MultiTableUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiTableUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiTableUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiTableUI extends TableUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiTableUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiTableUI extends TableUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiTableUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiTableUI extends TableUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTableUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTableUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiTableUI extends TableUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTableUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTableUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiTableUI extends TableUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTableUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTableUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiTableUI extends TableUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiTableUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTableUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiTableUI extends TableUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiTableUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTableUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiTableUI extends TableUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiTextUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiTextUI.java
index c5dee24..392fd98 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiTextUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiTextUI.java
@@ -58,35 +58,35 @@ import javax.swing.text.View;
import javax.swing.text.Position.Bias;
/**
- * A UI delegate that that coordinates multiple {@link TextUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link TextUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiTextUI extends TextUI
+public class MultiTextUI extends TextUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiTextUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiTextUI()
+ public MultiTextUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiTextUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -94,11 +94,11 @@ public class MultiTextUI extends TextUI
MultiTextUI mui = new MultiTextUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiTextUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -112,9 +112,9 @@ public class MultiTextUI extends TextUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiTextUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -126,39 +126,39 @@ public class MultiTextUI extends TextUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiTextUI</code>. The first item in the array is always
+ * <code>MultiTextUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiTextUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiTextUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -171,11 +171,11 @@ public class MultiTextUI extends TextUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiTextUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -190,9 +190,9 @@ public class MultiTextUI extends TextUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiTextUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -205,24 +205,24 @@ public class MultiTextUI extends TextUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTextUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTextUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -235,24 +235,24 @@ public class MultiTextUI extends TextUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTextUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTextUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -265,24 +265,24 @@ public class MultiTextUI extends TextUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTextUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTextUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -295,24 +295,24 @@ public class MultiTextUI extends TextUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiTextUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTextUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -325,25 +325,25 @@ public class MultiTextUI extends TextUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiTextUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTextUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -356,25 +356,25 @@ public class MultiTextUI extends TextUI
}
return result;
}
-
+
/**
* Calls the {@link TextUI#modelToView(JTextComponent, int)} method for all
- * the UI delegates managed by this <code>MultiTextUI</code>,
- * returning the bounds for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTextUI</code>,
+ * returning the bounds for the UI delegate from the primary look and
+ * feel.
+ *
* @param tc the text component.
- *
- * @return The bounds returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The bounds returned by the UI delegate from the primary
+ * look and feel.
*/
public Rectangle modelToView(JTextComponent tc, int pos)
- throws BadLocationException
+ throws BadLocationException
{
Rectangle result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TextUI ui = (TextUI) iterator.next();
result = ui.modelToView(tc, pos);
@@ -389,23 +389,23 @@ public class MultiTextUI extends TextUI
}
/**
- * Calls the {@link TextUI#modelToView(JTextComponent, int, Position.Bias)}
- * method for all the UI delegates managed by this <code>MultiTextUI</code>,
- * returning the bounds for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link TextUI#modelToView(JTextComponent, int, Position.Bias)}
+ * method for all the UI delegates managed by this <code>MultiTextUI</code>,
+ * returning the bounds for the UI delegate from the primary look and
+ * feel.
+ *
* @param tc the text component.
- *
- * @return The bounds returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The bounds returned by the UI delegate from the primary
+ * look and feel.
*/
public Rectangle modelToView(JTextComponent tc, int pos, Bias bias)
- throws BadLocationException
+ throws BadLocationException
{
Rectangle result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TextUI ui = (TextUI) iterator.next();
result = ui.modelToView(tc, pos, bias);
@@ -421,22 +421,22 @@ public class MultiTextUI extends TextUI
/**
* Calls the {@link TextUI#viewToModel(JTextComponent, Point)} method for all
- * the UI delegates managed by this <code>MultiTextUI</code>,
- * returning the position for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTextUI</code>,
+ * returning the position for the UI delegate from the primary look and
+ * feel.
+ *
* @param t the text component.
* @param pt the point.
- *
- * @return The position returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The position returned by the UI delegate from the primary
+ * look and feel.
*/
- public int viewToModel(JTextComponent t, Point pt)
+ public int viewToModel(JTextComponent t, Point pt)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TextUI ui = (TextUI) iterator.next();
result = ui.viewToModel(t, pt);
@@ -451,22 +451,22 @@ public class MultiTextUI extends TextUI
}
/**
- * Calls the {@link TextUI#viewToModel(JTextComponent, Point, Bias[])} method
- * for all the UI delegates managed by this <code>MultiTextUI</code>,
- * returning the position for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link TextUI#viewToModel(JTextComponent, Point, Bias[])} method
+ * for all the UI delegates managed by this <code>MultiTextUI</code>,
+ * returning the position for the UI delegate from the primary look and
+ * feel.
+ *
* @param tc the text component.
- *
- * @return The position returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The position returned by the UI delegate from the primary
+ * look and feel.
*/
- public int viewToModel(JTextComponent tc, Point loc, Bias[] outBias)
+ public int viewToModel(JTextComponent tc, Point loc, Bias[] outBias)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TextUI ui = (TextUI) iterator.next();
result = ui.viewToModel(tc, loc, outBias);
@@ -481,48 +481,48 @@ public class MultiTextUI extends TextUI
}
/**
- * Calls the {@link TextUI#getNextVisualPositionFrom(JTextComponent, int,
+ * Calls the {@link TextUI#getNextVisualPositionFrom(JTextComponent, int,
* Position.Bias, int, Position.Bias[])} method for all
- * the UI delegates managed by this <code>MultiTextUI</code>,
- * returning the position for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTextUI</code>,
+ * returning the position for the UI delegate from the primary look and
+ * feel.
+ *
* @param tc the text component.
- *
- * @return The position returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The position returned by the UI delegate from the primary
+ * look and feel.
*/
public int getNextVisualPositionFrom(JTextComponent tc, int pos, Bias bias,
- int direction, Bias[] outBias) throws BadLocationException
+ int direction, Bias[] outBias) throws BadLocationException
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TextUI ui = (TextUI) iterator.next();
- result = ui.getNextVisualPositionFrom(tc, pos, bias, direction,
+ result = ui.getNextVisualPositionFrom(tc, pos, bias, direction,
outBias);
}
// return values from auxiliary UI delegates are ignored
while (iterator.hasNext())
{
TextUI ui = (TextUI) iterator.next();
- /* int ignored = */ ui.getNextVisualPositionFrom(tc, pos, bias,
+ /* int ignored = */ ui.getNextVisualPositionFrom(tc, pos, bias,
direction, outBias);
}
return result;
}
/**
- * Calls the {@link TextUI#damageRange(JTextComponent, int, int)} method for
+ * Calls the {@link TextUI#damageRange(JTextComponent, int, int)} method for
* all the UI delegates managed by this <code>MultiTextUI</code>.
- *
+ *
* @param tc the component.
* @param start the start position.
* @param end the end position.
*/
- public void damageRange(JTextComponent tc, int start, int end)
+ public void damageRange(JTextComponent tc, int start, int end)
{
Iterator iterator = uis.iterator();
while (iterator.hasNext())
@@ -533,10 +533,10 @@ public class MultiTextUI extends TextUI
}
/**
- * Calls the {@link TextUI#damageRange(JTextComponent, int, int,
- * Position.Bias, Position.Bias)} method for all the UI delegates managed by
+ * Calls the {@link TextUI#damageRange(JTextComponent, int, int,
+ * Position.Bias, Position.Bias)} method for all the UI delegates managed by
* this <code>MultiTextUI</code>.
- *
+ *
* @param tc the component.
* @param start the start position.
* @param end the end position.
@@ -544,7 +544,7 @@ public class MultiTextUI extends TextUI
* @param endBias the end bias.
*/
public void damageRange(JTextComponent tc, int start, int end,
- Bias startBias, Bias endBias)
+ Bias startBias, Bias endBias)
{
Iterator iterator = uis.iterator();
while (iterator.hasNext())
@@ -556,21 +556,21 @@ public class MultiTextUI extends TextUI
/**
* Calls the {@link TextUI#getEditorKit(JTextComponent)} method for all
- * the UI delegates managed by this <code>MultiTextUI</code>,
- * returning the editor kit for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTextUI</code>,
+ * returning the editor kit for the UI delegate from the primary look and
+ * feel.
+ *
* @param tc the text component.
- *
- * @return The editor kit returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The editor kit returned by the UI delegate from the primary
+ * look and feel.
*/
- public EditorKit getEditorKit(JTextComponent tc)
+ public EditorKit getEditorKit(JTextComponent tc)
{
EditorKit result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TextUI ui = (TextUI) iterator.next();
result = ui.getEditorKit(tc);
@@ -586,21 +586,21 @@ public class MultiTextUI extends TextUI
/**
* Calls the {@link TextUI#getRootView(JTextComponent)} method for all
- * the UI delegates managed by this <code>MultiTextUI</code>,
- * returning the view for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTextUI</code>,
+ * returning the view for the UI delegate from the primary look and
+ * feel.
+ *
* @param tc the text component.
- *
- * @return The view returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The view returned by the UI delegate from the primary
+ * look and feel.
*/
- public View getRootView(JTextComponent tc)
+ public View getRootView(JTextComponent tc)
{
View result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TextUI ui = (TextUI) iterator.next();
result = ui.getRootView(tc);
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiToolBarUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiToolBarUI.java
index afe63bf..5f308d9 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiToolBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiToolBarUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.ToolBarUI;
/**
- * A UI delegate that that coordinates multiple {@link ToolBarUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link ToolBarUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiToolBarUI extends ToolBarUI
+public class MultiToolBarUI extends ToolBarUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiToolBarUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiToolBarUI()
+ public MultiToolBarUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiToolBarUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiToolBarUI extends ToolBarUI
MultiToolBarUI mui = new MultiToolBarUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiToolBarUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiToolBarUI extends ToolBarUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiToolBarUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiToolBarUI extends ToolBarUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiToolBarUI</code>. The first item in the array is always
+ * <code>MultiToolBarUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiToolBarUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiToolBarUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiToolBarUI extends ToolBarUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiToolBarUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiToolBarUI extends ToolBarUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiToolBarUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiToolBarUI extends ToolBarUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiToolBarUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiToolBarUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiToolBarUI extends ToolBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiToolBarUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiToolBarUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiToolBarUI extends ToolBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiToolBarUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiToolBarUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiToolBarUI extends ToolBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiToolBarUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiToolBarUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiToolBarUI extends ToolBarUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiToolBarUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiToolBarUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiToolBarUI extends ToolBarUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiToolTipUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiToolTipUI.java
index fcd622d..9db9efb 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiToolTipUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiToolTipUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.ToolTipUI;
/**
- * A UI delegate that that coordinates multiple {@link ToolTipUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link ToolTipUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiToolTipUI extends ToolTipUI
+public class MultiToolTipUI extends ToolTipUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiToolTipUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiToolTipUI()
+ public MultiToolTipUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiToolTipUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiToolTipUI extends ToolTipUI
MultiToolTipUI mui = new MultiToolTipUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiToolTipUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiToolTipUI extends ToolTipUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiToolTipUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiToolTipUI extends ToolTipUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiToolTipUI</code>. The first item in the array is always
+ * <code>MultiToolTipUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiToolTipUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiToolTipUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiToolTipUI extends ToolTipUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiToolTipUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiToolTipUI extends ToolTipUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiToolTipUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiToolTipUI extends ToolTipUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiToolTipUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiToolTipUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -230,21 +230,21 @@ public class MultiToolTipUI extends ToolTipUI
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiToolTipUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiToolTipUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiToolTipUI extends ToolTipUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiToolTipUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiToolTipUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiToolTipUI extends ToolTipUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiToolTipUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiToolTipUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiToolTipUI extends ToolTipUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiToolTipUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiToolTipUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiToolTipUI extends ToolTipUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiTreeUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiTreeUI.java
index de1dc6c..f70decc 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiTreeUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiTreeUI.java
@@ -53,35 +53,35 @@ import javax.swing.plaf.TreeUI;
import javax.swing.tree.TreePath;
/**
- * A UI delegate that that coordinates multiple {@link TreeUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link TreeUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiTreeUI extends TreeUI
+public class MultiTreeUI extends TreeUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiTreeUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiTreeUI()
+ public MultiTreeUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiTreeUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -89,11 +89,11 @@ public class MultiTreeUI extends TreeUI
MultiTreeUI mui = new MultiTreeUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiTreeUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -107,9 +107,9 @@ public class MultiTreeUI extends TreeUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiTreeUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -121,39 +121,39 @@ public class MultiTreeUI extends TreeUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiTreeUI</code>. The first item in the array is always
+ * <code>MultiTreeUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiTreeUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiTreeUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -166,11 +166,11 @@ public class MultiTreeUI extends TreeUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiTreeUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -185,9 +185,9 @@ public class MultiTreeUI extends TreeUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiTreeUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -200,24 +200,24 @@ public class MultiTreeUI extends TreeUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTreeUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTreeUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -230,24 +230,24 @@ public class MultiTreeUI extends TreeUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTreeUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTreeUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -260,24 +260,24 @@ public class MultiTreeUI extends TreeUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiTreeUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTreeUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -290,24 +290,24 @@ public class MultiTreeUI extends TreeUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiTreeUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTreeUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -320,25 +320,25 @@ public class MultiTreeUI extends TreeUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiTreeUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTreeUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -351,24 +351,24 @@ public class MultiTreeUI extends TreeUI
}
return result;
}
-
+
/**
* Calls the {@link TreeUI#getPathBounds(JTree, TreePath)} method
- * for all the UI delegates managed by this <code>MultiTreeUI</code>,
- * returning the bounds for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTreeUI</code>,
+ * returning the bounds for the UI delegate from the primary look and
+ * feel.
+ *
* @param tree the tree component.
- *
- * @return The bounds returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The bounds returned by the UI delegate from the primary
+ * look and feel.
*/
- public Rectangle getPathBounds(JTree tree, TreePath path)
+ public Rectangle getPathBounds(JTree tree, TreePath path)
{
Rectangle result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TreeUI ui = (TreeUI) iterator.next();
result = ui.getPathBounds(tree, path);
@@ -384,21 +384,21 @@ public class MultiTreeUI extends TreeUI
/**
* Calls the {@link TreeUI#getPathForRow(JTree, int)} method
- * for all the UI delegates managed by this <code>MultiTreeUI</code>,
- * returning the path for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTreeUI</code>,
+ * returning the path for the UI delegate from the primary look and
+ * feel.
+ *
* @param tree the tree component.
- *
- * @return The path returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The path returned by the UI delegate from the primary
+ * look and feel.
*/
- public TreePath getPathForRow(JTree tree, int row)
+ public TreePath getPathForRow(JTree tree, int row)
{
TreePath result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TreeUI ui = (TreeUI) iterator.next();
result = ui.getPathForRow(tree, row);
@@ -414,21 +414,21 @@ public class MultiTreeUI extends TreeUI
/**
* Calls the {@link TreeUI#getRowForPath(JTree, TreePath)} method
- * for all the UI delegates managed by this <code>MultiTreeUI</code>,
- * returning the row index for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTreeUI</code>,
+ * returning the row index for the UI delegate from the primary look and
+ * feel.
+ *
* @param tree the tree component.
- *
- * @return The row index returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The row index returned by the UI delegate from the primary
+ * look and feel.
*/
- public int getRowForPath(JTree tree, TreePath path)
+ public int getRowForPath(JTree tree, TreePath path)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TreeUI ui = (TreeUI) iterator.next();
result = ui.getRowForPath(tree, path);
@@ -439,26 +439,26 @@ public class MultiTreeUI extends TreeUI
TreeUI ui = (TreeUI) iterator.next();
/* int ignored = */ ui.getRowForPath(tree, path);
}
- return result;
+ return result;
}
/**
* Calls the {@link TreeUI#getRowCount(JTree)} method
- * for all the UI delegates managed by this <code>MultiTreeUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTreeUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param tree the tree component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
- public int getRowCount(JTree tree)
+ public int getRowCount(JTree tree)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TreeUI ui = (TreeUI) iterator.next();
result = ui.getRowCount(tree);
@@ -469,26 +469,26 @@ public class MultiTreeUI extends TreeUI
TreeUI ui = (TreeUI) iterator.next();
/* int ignored = */ ui.getRowCount(tree);
}
- return result;
+ return result;
}
/**
* Calls the {@link TreeUI#getClosestPathForLocation(JTree, int, int)} method
- * for all the UI delegates managed by this <code>MultiTreeUI</code>,
- * returning the path for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiTreeUI</code>,
+ * returning the path for the UI delegate from the primary look and
+ * feel.
+ *
* @param tree the tree component.
- *
- * @return The path returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The path returned by the UI delegate from the primary
+ * look and feel.
*/
- public TreePath getClosestPathForLocation(JTree tree, int x, int y)
+ public TreePath getClosestPathForLocation(JTree tree, int x, int y)
{
TreePath result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TreeUI ui = (TreeUI) iterator.next();
result = ui.getClosestPathForLocation(tree, x, y);
@@ -499,26 +499,26 @@ public class MultiTreeUI extends TreeUI
TreeUI ui = (TreeUI) iterator.next();
/* TreePath ignored = */ ui.getClosestPathForLocation(tree, x, y);
}
- return result;
+ return result;
}
/**
* Calls the {@link TreeUI#isEditing(JTree)} method for all
- * the UI delegates managed by this <code>MultiTreeUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTreeUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param tree the tree component.
- *
- * @return The result returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The result returned by the UI delegate from the primary
+ * look and feel.
*/
- public boolean isEditing(JTree tree)
+ public boolean isEditing(JTree tree)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TreeUI ui = (TreeUI) iterator.next();
result = ui.isEditing(tree);
@@ -534,21 +534,21 @@ public class MultiTreeUI extends TreeUI
/**
* Calls the {@link TreeUI#stopEditing(JTree)} method for all
- * the UI delegates managed by this <code>MultiTreeUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTreeUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param tree the tree component.
- *
- * @return The result returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The result returned by the UI delegate from the primary
+ * look and feel.
*/
- public boolean stopEditing(JTree tree)
+ public boolean stopEditing(JTree tree)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TreeUI ui = (TreeUI) iterator.next();
result = ui.stopEditing(tree);
@@ -563,12 +563,12 @@ public class MultiTreeUI extends TreeUI
}
/**
- * Calls the {@link TreeUI#cancelEditing(JTree)} method for
+ * Calls the {@link TreeUI#cancelEditing(JTree)} method for
* all the UI delegates managed by this <code>MultiTreeUI</code>.
- *
+ *
* @param tree the tree component.
*/
- public void cancelEditing(JTree tree)
+ public void cancelEditing(JTree tree)
{
Iterator iterator = uis.iterator();
while (iterator.hasNext())
@@ -579,13 +579,13 @@ public class MultiTreeUI extends TreeUI
}
/**
- * Calls the {@link TreeUI#startEditingAtPath(JTree, TreePath)} method for
+ * Calls the {@link TreeUI#startEditingAtPath(JTree, TreePath)} method for
* all the UI delegates managed by this <code>MultiTreeUI</code>.
- *
+ *
* @param tree the tree component.
* @param path the path.
*/
- public void startEditingAtPath(JTree tree, TreePath path)
+ public void startEditingAtPath(JTree tree, TreePath path)
{
Iterator iterator = uis.iterator();
while (iterator.hasNext())
@@ -597,21 +597,21 @@ public class MultiTreeUI extends TreeUI
/**
* Calls the {@link TreeUI#getEditingPath(JTree)} method for all
- * the UI delegates managed by this <code>MultiTreeUI</code>,
- * returning the path for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiTreeUI</code>,
+ * returning the path for the UI delegate from the primary look and
+ * feel.
+ *
* @param tree the tree component.
- *
- * @return The path returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The path returned by the UI delegate from the primary
+ * look and feel.
*/
- public TreePath getEditingPath(JTree tree)
+ public TreePath getEditingPath(JTree tree)
{
TreePath result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
TreeUI ui = (TreeUI) iterator.next();
result = ui.getEditingPath(tree);
@@ -622,7 +622,7 @@ public class MultiTreeUI extends TreeUI
TreeUI ui = (TreeUI) iterator.next();
/* TreePath ignored = */ ui.getEditingPath(tree);
}
- return result;
+ return result;
}
}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiViewportUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiViewportUI.java
index 33bbc3b..55f9cba 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiViewportUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiViewportUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.ViewportUI;
/**
- * A UI delegate that that coordinates multiple {@link ViewportUI}
- * instances, one from the primary look and feel, and one or more from the
+ * A UI delegate that that coordinates multiple {@link ViewportUI}
+ * instances, one from the primary look and feel, and one or more from the
* auxiliary look and feel(s).
- *
+ *
* @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
*/
-public class MultiViewportUI extends ViewportUI
+public class MultiViewportUI extends ViewportUI
{
/** A list of references to the actual component UIs. */
protected Vector uis;
-
+
/**
* Creates a new <code>MultiViewPortUI</code> instance.
- *
+ *
* @see #createUI(JComponent)
*/
- public MultiViewportUI()
+ public MultiViewportUI()
{
uis = new Vector();
}
-
+
/**
- * Creates a delegate object for the specified component. If any auxiliary
+ * Creates a delegate object for the specified component. If any auxiliary
* look and feels support this component, a <code>MultiViewportUI</code> is
* returned, otherwise the UI from the default look and feel is returned.
- *
+ *
* @param target the component.
- *
+ *
* @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
*/
public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiViewportUI extends ViewportUI
MultiViewportUI mui = new MultiViewportUI();
return MultiLookAndFeel.createUIs(mui, mui.uis, target);
}
-
+
/**
- * Calls the {@link ComponentUI#installUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#installUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiViewportUI</code>.
- *
+ *
* @param c the component.
*/
public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiViewportUI extends ViewportUI
}
/**
- * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
+ * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
* the UI delegates managed by this <code>MultiViewportUI</code>.
- *
+ *
* @param c the component.
*/
public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiViewportUI extends ViewportUI
ui.uninstallUI(c);
}
}
-
+
/**
* Returns an array containing the UI delegates managed by this
- * <code>MultiViewportUI</code>. The first item in the array is always
+ * <code>MultiViewportUI</code>. The first item in the array is always
* the UI delegate from the installed default look and feel.
- *
+ *
* @return An array of UI delegates.
*/
public ComponentUI[] getUIs()
{
return MultiLookAndFeel.uisToArray(uis);
}
-
+
/**
- * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
- * the UI delegates managed by this <code>MultiViewportUI</code>,
- * returning the result for the UI delegate from the primary look and
- * feel.
- *
+ * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+ * the UI delegates managed by this <code>MultiViewportUI</code>,
+ * returning the result for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
* @param x the x-coordinate.
* @param y the y-coordinate.
- *
+ *
* @return <code>true</code> if the specified (x, y) coordinate falls within
* the bounds of the component as rendered by the UI delegate in the
- * primary look and feel, and <code>false</code> otherwise.
+ * primary look and feel, and <code>false</code> otherwise.
*/
- public boolean contains(JComponent c, int x, int y)
+ public boolean contains(JComponent c, int x, int y)
{
boolean result = false;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiViewportUI extends ViewportUI
}
return result;
}
-
+
/**
- * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
+ * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
* the UI delegates managed by this <code>MultiViewportUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -182,9 +182,9 @@ public class MultiViewportUI extends ViewportUI
}
/**
- * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
+ * Calls the <code>paint(Graphics, JComponent)</code> method for all the UI
* delegates managed by this <code>MultiViewportUI</code>.
- *
+ *
* @param g the graphics device.
* @param c the component.
*/
@@ -197,24 +197,24 @@ public class MultiViewportUI extends ViewportUI
ui.paint(g, c);
}
}
-
+
/**
* Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiViewportUI</code>,
- * returning the preferred size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiViewportUI</code>,
+ * returning the preferred size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The preferred size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The preferred size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getPreferredSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiViewportUI extends ViewportUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiViewportUI</code>,
- * returning the minimum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiViewportUI</code>,
+ * returning the minimum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The minimum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The minimum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMinimumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiViewportUI extends ViewportUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
- * the UI delegates managed by this <code>MultiViewportUI</code>,
- * returning the maximum size for the UI delegate from the primary look and
- * feel.
- *
+ * the UI delegates managed by this <code>MultiViewportUI</code>,
+ * returning the maximum size for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The maximum size returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The maximum size returned by the UI delegate from the primary
+ * look and feel.
*/
public Dimension getMaximumSize(JComponent c)
{
Dimension result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiViewportUI extends ViewportUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
- * for all the UI delegates managed by this <code>MultiViewportUI</code>,
- * returning the count for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiViewportUI</code>,
+ * returning the count for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component.
- *
- * @return The count returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The count returned by the UI delegate from the primary
+ * look and feel.
*/
public int getAccessibleChildrenCount(JComponent c)
{
int result = 0;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiViewportUI extends ViewportUI
}
return result;
}
-
+
/**
* Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
- * for all the UI delegates managed by this <code>MultiViewportUI</code>,
- * returning the child for the UI delegate from the primary look and
- * feel.
- *
+ * for all the UI delegates managed by this <code>MultiViewportUI</code>,
+ * returning the child for the UI delegate from the primary look and
+ * feel.
+ *
* @param c the component
* @param i the child index.
- *
- * @return The child returned by the UI delegate from the primary
- * look and feel.
+ *
+ * @return The child returned by the UI delegate from the primary
+ * look and feel.
*/
public Accessible getAccessibleChild(JComponent c, int i)
{
Accessible result = null;
Iterator iterator = uis.iterator();
// first UI delegate provides the return value
- if (iterator.hasNext())
+ if (iterator.hasNext())
{
ComponentUI ui = (ComponentUI) iterator.next();
result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiViewportUI extends ViewportUI
}
return result;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/plaf/synth/SynthGraphicsUtils.java b/libjava/classpath/javax/swing/plaf/synth/SynthGraphicsUtils.java
index 1907d75..76a46cb 100644
--- a/libjava/classpath/javax/swing/plaf/synth/SynthGraphicsUtils.java
+++ b/libjava/classpath/javax/swing/plaf/synth/SynthGraphicsUtils.java
@@ -91,10 +91,10 @@ public class SynthGraphicsUtils
* Lays out a label and (if non-null) an icon. The calculated coordinates are
* then stored in <code>viewR</code>, <code>iconR</code> and
* <code>textR</code>.
- *
+ *
* The alignment and position parameters may be one of the alignment or
* position constants defined in {@link javax.swing.SwingConstants}.
- *
+ *
* @param ctx the synth context, identifies the current region
* @param fm the font metrics to use to fetch the text measures
* @param text the text to lay out, may be <code>null</code>
@@ -123,7 +123,7 @@ public class SynthGraphicsUtils
/**
* Returns the width of the string <code>text</code> for the specified font
* and font metrics.
- *
+ *
* @param ctx identifies the current region
* @param font the font
* @param fm the font metrics to use
diff --git a/libjava/classpath/javax/swing/plaf/synth/SynthLookAndFeel.java b/libjava/classpath/javax/swing/plaf/synth/SynthLookAndFeel.java
index 46a95f0..ac24dd4 100644
--- a/libjava/classpath/javax/swing/plaf/synth/SynthLookAndFeel.java
+++ b/libjava/classpath/javax/swing/plaf/synth/SynthLookAndFeel.java
@@ -73,7 +73,7 @@ public class SynthLookAndFeel
* Creates a new instance of <code>SynthLookAndFeel</code>. In order to use
* the Synth look and feel you either need to call {@link #load} to load a
* set of styles from an XML file, or you need to call
- * {@link #setStyleFactory} to provide your own style factory.
+ * {@link #setStyleFactory} to provide your own style factory.
*/
public SynthLookAndFeel()
{
diff --git a/libjava/classpath/javax/swing/plaf/synth/SynthPainter.java b/libjava/classpath/javax/swing/plaf/synth/SynthPainter.java
index fa1f6f5..6a57dad 100644
--- a/libjava/classpath/javax/swing/plaf/synth/SynthPainter.java
+++ b/libjava/classpath/javax/swing/plaf/synth/SynthPainter.java
@@ -68,7 +68,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
* @param dir the orientation of the arrow
@@ -86,7 +86,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
* @param dir the orientation of the progress bar
@@ -105,7 +105,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
* @param dir the orientation of the separator
@@ -124,7 +124,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
* @param dir the orientation of the divider
@@ -143,7 +143,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
* @param dir the orientation of the divider
@@ -162,7 +162,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -179,7 +179,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -196,7 +196,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -213,7 +213,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -230,7 +230,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -247,7 +247,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -264,7 +264,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -281,7 +281,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -298,7 +298,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -315,7 +315,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -332,7 +332,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -349,7 +349,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -366,7 +366,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -383,7 +383,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -400,7 +400,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -417,7 +417,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -434,7 +434,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -451,7 +451,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -468,7 +468,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -485,7 +485,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -502,7 +502,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -519,7 +519,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -536,7 +536,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -553,7 +553,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -570,7 +570,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -587,7 +587,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -604,7 +604,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -621,7 +621,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -638,7 +638,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -655,7 +655,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -672,7 +672,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -689,7 +689,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -706,7 +706,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -723,7 +723,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -740,7 +740,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -757,7 +757,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -774,7 +774,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -791,7 +791,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -808,7 +808,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -825,7 +825,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -842,7 +842,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -859,7 +859,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -876,7 +876,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -893,7 +893,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -910,7 +910,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -927,7 +927,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -944,7 +944,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -961,7 +961,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -978,7 +978,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -995,7 +995,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1012,7 +1012,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1029,7 +1029,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1046,7 +1046,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1063,7 +1063,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1080,7 +1080,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1097,7 +1097,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
* @param orientation orientation of the scrollbar
@@ -1115,7 +1115,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
* @param orientation orientation of the scrollbar
@@ -1133,7 +1133,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1150,7 +1150,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1167,7 +1167,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1184,7 +1184,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1201,7 +1201,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1218,7 +1218,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1235,7 +1235,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1252,7 +1252,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1269,7 +1269,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
* @param orientation orientation of the slider
@@ -1287,7 +1287,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
* @param orientation orientation of the slider
@@ -1305,7 +1305,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1322,7 +1322,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1339,7 +1339,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1356,7 +1356,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1373,7 +1373,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1390,7 +1390,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1407,7 +1407,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1424,7 +1424,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1441,7 +1441,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1458,7 +1458,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1475,7 +1475,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1492,7 +1492,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1509,7 +1509,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1526,7 +1526,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
* @param index the index of the tab to paint
@@ -1544,7 +1544,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
* @param index the index of the tab to paint
@@ -1562,7 +1562,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1579,7 +1579,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1596,7 +1596,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1613,7 +1613,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1630,7 +1630,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1647,7 +1647,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1664,7 +1664,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1681,7 +1681,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1698,7 +1698,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1715,7 +1715,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1732,7 +1732,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1749,7 +1749,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1766,7 +1766,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1783,7 +1783,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1800,7 +1800,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1817,7 +1817,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1834,7 +1834,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1851,7 +1851,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1868,7 +1868,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1885,7 +1885,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1902,7 +1902,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1919,7 +1919,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1936,7 +1936,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1953,7 +1953,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1970,7 +1970,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
@@ -1987,7 +1987,7 @@ public abstract class SynthPainter
* painting
* @param g the graphics context to use for painting
* @param x the X coordinate of the area to paint
- * @param y the Y coordinate of the area to paint
+ * @param y the Y coordinate of the area to paint
* @param w the width of the area to paint
* @param h the height of the area to paint
*/
diff --git a/libjava/classpath/javax/swing/table/AbstractTableModel.java b/libjava/classpath/javax/swing/table/AbstractTableModel.java
index 743e5d4..7e9886d 100644
--- a/libjava/classpath/javax/swing/table/AbstractTableModel.java
+++ b/libjava/classpath/javax/swing/table/AbstractTableModel.java
@@ -48,9 +48,9 @@ import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
/**
- * A base class that can be used to create implementations of the
+ * A base class that can be used to create implementations of the
* {@link TableModel} interface.
- *
+ *
* @author Andrew Selkirk
*/
public abstract class AbstractTableModel implements TableModel, Serializable
@@ -71,10 +71,10 @@ public abstract class AbstractTableModel implements TableModel, Serializable
}
/**
- * Returns the name of the specified column. This method generates default
- * names in a sequence (starting with column 0): A, B, C, ..., Z, AA, AB,
+ * Returns the name of the specified column. This method generates default
+ * names in a sequence (starting with column 0): A, B, C, ..., Z, AA, AB,
* AC, ..., AZ, BA, BB, BC, and so on. Subclasses may override this method
- * to allow column names to be specified on some other basis.
+ * to allow column names to be specified on some other basis.
*
* @param columnIndex the column index.
*
@@ -98,19 +98,19 @@ public abstract class AbstractTableModel implements TableModel, Serializable
* @param columnName the name of the column (<code>null</code> not permitted).
*
* @return The index of the column, -1 if not found.
- *
+ *
* @see #getColumnName(int)
- * @throws NullPointerException if <code>columnName</code> is
+ * @throws NullPointerException if <code>columnName</code> is
* <code>null</code>.
*/
public int findColumn(String columnName)
{
int count = getColumnCount();
-
+
for (int index = 0; index < count; index++)
{
String name = getColumnName(index);
-
+
if (columnName.equals(name))
return index;
}
@@ -121,10 +121,10 @@ public abstract class AbstractTableModel implements TableModel, Serializable
/**
* Returns the <code>Class</code> for all <code>Object</code> instances
- * in the specified column.
- *
+ * in the specified column.
+ *
* @param columnIndex the column index.
- *
+ *
* @return The class.
*/
public Class<?> getColumnClass(int columnIndex)
@@ -133,9 +133,9 @@ public abstract class AbstractTableModel implements TableModel, Serializable
}
/**
- * Returns <code>true</code> if the specified cell is editable, and
- * <code>false</code> if it is not. This implementation returns
- * <code>false</code> for all arguments, subclasses should override the
+ * Returns <code>true</code> if the specified cell is editable, and
+ * <code>false</code> if it is not. This implementation returns
+ * <code>false</code> for all arguments, subclasses should override the
* method if necessary.
*
* @param rowIndex the row index of the cell.
@@ -149,8 +149,8 @@ public abstract class AbstractTableModel implements TableModel, Serializable
}
/**
- * Sets the value of the given cell. This implementation ignores all
- * arguments and does nothing, subclasses should override the
+ * Sets the value of the given cell. This implementation ignores all
+ * arguments and does nothing, subclasses should override the
* method if necessary.
*
* @param value the new value (<code>null</code> permitted).
@@ -219,7 +219,7 @@ public abstract class AbstractTableModel implements TableModel, Serializable
/**
* Sends a {@link TableModelEvent} to all registered listeners to inform
* them that some rows have been inserted into the model.
- *
+ *
* @param firstRow the index of the first row.
* @param lastRow the index of the last row.
*/
@@ -233,7 +233,7 @@ public abstract class AbstractTableModel implements TableModel, Serializable
/**
* Sends a {@link TableModelEvent} to all registered listeners to inform
* them that some rows have been updated.
- *
+ *
* @param firstRow the index of the first row.
* @param lastRow the index of the last row.
*/
@@ -247,7 +247,7 @@ public abstract class AbstractTableModel implements TableModel, Serializable
/**
* Sends a {@link TableModelEvent} to all registered listeners to inform
* them that some rows have been deleted from the model.
- *
+ *
* @param firstRow the index of the first row.
* @param lastRow the index of the last row.
*/
@@ -261,7 +261,7 @@ public abstract class AbstractTableModel implements TableModel, Serializable
/**
* Sends a {@link TableModelEvent} to all registered listeners to inform
* them that a single cell has been updated.
- *
+ *
* @param row the row index.
* @param column the column index.
*/
@@ -272,15 +272,15 @@ public abstract class AbstractTableModel implements TableModel, Serializable
/**
* Sends the specified event to all registered listeners.
- *
+ *
* @param event the event to send.
*/
public void fireTableChanged(TableModelEvent event)
{
- int index;
+ int index;
TableModelListener listener;
Object[] list = listenerList.getListenerList();
-
+
for (index = 0; index < list.length; index += 2)
{
listener = (TableModelListener) list [index + 1];
@@ -291,9 +291,9 @@ public abstract class AbstractTableModel implements TableModel, Serializable
/**
* Returns an array of listeners of the given type that are registered with
* this model.
- *
+ *
* @param listenerType the listener class.
- *
+ *
* @return An array of listeners (possibly empty).
*/
public <T extends EventListener> T[] getListeners(Class<T> listenerType)
diff --git a/libjava/classpath/javax/swing/table/DefaultTableCellRenderer.java b/libjava/classpath/javax/swing/table/DefaultTableCellRenderer.java
index 7fecefe..5d4a160 100644
--- a/libjava/classpath/javax/swing/table/DefaultTableCellRenderer.java
+++ b/libjava/classpath/javax/swing/table/DefaultTableCellRenderer.java
@@ -131,7 +131,7 @@ public class DefaultTableCellRenderer extends JLabel
* @param hasFocus has the cell the focus?
* @param row the row to render
* @param column the cell to render
- *
+ *
* @return this component (the default table cell renderer)
*/
public Component getTableCellRendererComponent(JTable table, Object value,
@@ -180,8 +180,8 @@ public class DefaultTableCellRenderer extends JLabel
// can avoid filling the background by setting the renderer opaque.
Color back = getBackground();
setOpaque(back != null && back.equals(table.getBackground()));
-
- return this;
+
+ return this;
}
/**
@@ -254,14 +254,14 @@ public class DefaultTableCellRenderer extends JLabel
* do something.</p>
*/
public void firePropertyChange(String propertyName, boolean oldValue,
- boolean newValue)
+ boolean newValue)
{
// Does nothing.
}
/**
* Sets the String for this cell.
- *
+ *
* @param value the string value for this cell; if value is null it
* sets the text value to an empty string
*/
diff --git a/libjava/classpath/javax/swing/table/DefaultTableColumnModel.java b/libjava/classpath/javax/swing/table/DefaultTableColumnModel.java
index 717ea98..532b513 100644
--- a/libjava/classpath/javax/swing/table/DefaultTableColumnModel.java
+++ b/libjava/classpath/javax/swing/table/DefaultTableColumnModel.java
@@ -57,10 +57,10 @@ import javax.swing.event.TableColumnModelListener;
/**
* A model that stores information about the columns used in a {@link JTable}.
- *
+ *
* @see JTable#setColumnModel(TableColumnModel)
- *
- * @author Andrew Selkirk
+ *
+ * @author Andrew Selkirk
*/
public class DefaultTableColumnModel
implements TableColumnModel, PropertyChangeListener, ListSelectionListener,
@@ -89,15 +89,15 @@ public class DefaultTableColumnModel
protected EventListenerList listenerList = new EventListenerList();
/**
- * A change event used when notifying listeners of a change to the
+ * A change event used when notifying listeners of a change to the
* <code>columnMargin</code> field. This single event is reused for all
- * notifications (it is lazily instantiated within the
+ * notifications (it is lazily instantiated within the
* {@link #fireColumnMarginChanged()} method).
*/
protected transient ChangeEvent changeEvent;
/**
- * A flag that indicates whether or not columns can be selected.
+ * A flag that indicates whether or not columns can be selected.
*/
protected boolean columnSelectionAllowed;
@@ -107,10 +107,10 @@ public class DefaultTableColumnModel
protected int totalColumnWidth;
/**
- * Creates a new table column model with zero columns. A default column
+ * Creates a new table column model with zero columns. A default column
* selection model is created by calling {@link #createSelectionModel()}.
* The default value for <code>columnMargin</code> is <code>1</code> and
- * the default value for <code>columnSelectionAllowed</code> is
+ * the default value for <code>columnSelectionAllowed</code> is
* <code>false</code>.
*/
public DefaultTableColumnModel()
@@ -123,17 +123,17 @@ public class DefaultTableColumnModel
}
/**
- * Adds a column to the model then calls
+ * Adds a column to the model then calls
* {@link #fireColumnAdded(TableColumnModelEvent)} to notify the registered
* listeners. The model registers itself with the column as a
* {@link PropertyChangeListener} so that changes to the column width will
* invalidate the cached {@link #totalColumnWidth} value.
*
* @param column the column (<code>null</code> not permitted).
- *
- * @throws IllegalArgumentException if <code>column</code> is
+ *
+ * @throws IllegalArgumentException if <code>column</code> is
* <code>null</code>.
- *
+ *
* @see #removeColumn(TableColumn)
*/
public void addColumn(TableColumn column)
@@ -143,18 +143,18 @@ public class DefaultTableColumnModel
tableColumns.add(column);
column.addPropertyChangeListener(this);
invalidateWidthCache();
- fireColumnAdded(new TableColumnModelEvent(this, 0,
+ fireColumnAdded(new TableColumnModelEvent(this, 0,
tableColumns.size() - 1));
}
/**
* Removes a column from the model then calls
* {@link #fireColumnRemoved(TableColumnModelEvent)} to notify the registered
- * listeners. If the specified column does not belong to the model, or is
+ * listeners. If the specified column does not belong to the model, or is
* <code>null</code>, this method does nothing.
*
* @param column the column to be removed (<code>null</code> permitted).
- *
+ *
* @see #addColumn(TableColumn)
*/
public void removeColumn(TableColumn column)
@@ -163,21 +163,21 @@ public class DefaultTableColumnModel
if (index < 0)
return;
tableColumns.remove(column);
- fireColumnRemoved(new TableColumnModelEvent(this, index, 0));
+ fireColumnRemoved(new TableColumnModelEvent(this, index, 0));
column.removePropertyChangeListener(this);
invalidateWidthCache();
}
/**
- * Moves the column at index i to the position specified by index j, then
+ * Moves the column at index i to the position specified by index j, then
* calls {@link #fireColumnMoved(TableColumnModelEvent)} to notify registered
* listeners.
*
* @param i index of the column that will be moved.
* @param j index of the column's new location.
- *
+ *
* @throws IllegalArgumentException if <code>i</code> or <code>j</code> are
- * outside the range <code>0</code> to <code>N-1</code>, where
+ * outside the range <code>0</code> to <code>N-1</code>, where
* <code>N</code> is the column count.
*/
public void moveColumn(int i, int j)
@@ -195,9 +195,9 @@ public class DefaultTableColumnModel
/**
* Sets the column margin then calls {@link #fireColumnMarginChanged()} to
* notify the registered listeners.
- *
+ *
* @param margin the column margin.
- *
+ *
* @see #getColumnMargin()
*/
public void setColumnMargin(int margin)
@@ -208,7 +208,7 @@ public class DefaultTableColumnModel
/**
* Returns the number of columns in the model.
- *
+ *
* @return The column count.
*/
public int getColumnCount()
@@ -218,7 +218,7 @@ public class DefaultTableColumnModel
/**
* Returns an enumeration of the columns in the model.
- *
+ *
* @return An enumeration of the columns in the model.
*/
public Enumeration<TableColumn> getColumns()
@@ -230,10 +230,10 @@ public class DefaultTableColumnModel
* Returns the index of the {@link TableColumn} with the given identifier.
*
* @param identifier the identifier (<code>null</code> not permitted).
- *
+ *
* @return The index of the {@link TableColumn} with the given identifier.
- *
- * @throws IllegalArgumentException if <code>identifier</code> is
+ *
+ * @throws IllegalArgumentException if <code>identifier</code> is
* <code>null</code> or there is no column with that identifier.
*/
public int getColumnIndex(Object identifier)
@@ -241,7 +241,7 @@ public class DefaultTableColumnModel
if (identifier == null)
throw new IllegalArgumentException("Null identifier.");
int columnCount = tableColumns.size();
- for (int i = 0; i < columnCount; i++)
+ for (int i = 0; i < columnCount; i++)
{
TableColumn tc = tableColumns.get(i);
if (identifier.equals(tc.getIdentifier()))
@@ -252,13 +252,13 @@ public class DefaultTableColumnModel
/**
* Returns the column at the specified index.
- *
- * @param columnIndex the column index (in the range from <code>0</code> to
- * <code>N-1</code>, where <code>N</code> is the number of columns in
+ *
+ * @param columnIndex the column index (in the range from <code>0</code> to
+ * <code>N-1</code>, where <code>N</code> is the number of columns in
* the model).
- *
+ *
* @return The column at the specified index.
- *
+ *
* @throws ArrayIndexOutOfBoundsException if <code>i</code> is not within
* the specified range.
*/
@@ -269,9 +269,9 @@ public class DefaultTableColumnModel
/**
* Returns the column margin.
- *
+ *
* @return The column margin.
- *
+ *
* @see #setColumnMargin(int)
*/
public int getColumnMargin()
@@ -288,15 +288,15 @@ public class DefaultTableColumnModel
* <li>individual column widths are taken into account, but the column margin
* is ignored.</li>
* </ul>
- * If no column contains the specified position, this method returns
+ * If no column contains the specified position, this method returns
* <code>-1</code>.
- *
+ *
* @param x the x-position.
- *
+ *
* @return The column index, or <code>-1</code>.
*/
public int getColumnIndexAtX(int x)
- {
+ {
for (int i = 0; i < tableColumns.size(); ++i)
{
int w = (tableColumns.get(i)).getWidth();
@@ -322,21 +322,21 @@ public class DefaultTableColumnModel
}
/**
- * Sets the selection model that will be used to keep track of the selected
+ * Sets the selection model that will be used to keep track of the selected
* columns.
*
* @param model the selection model (<code>null</code> not permitted).
- *
- * @throws IllegalArgumentException if <code>model</code> is
+ *
+ * @throws IllegalArgumentException if <code>model</code> is
* <code>null</code>.
- *
+ *
* @see #getSelectionModel()
*/
public void setSelectionModel(ListSelectionModel model)
{
if (model == null)
throw new IllegalArgumentException();
-
+
selectionModel.removeListSelectionListener(this);
selectionModel = model;
selectionModel.addListSelectionListener(this);
@@ -344,9 +344,9 @@ public class DefaultTableColumnModel
/**
* Returns the selection model used to track table column selections.
- *
+ *
* @return The selection model.
- *
+ *
* @see #setSelectionModel(ListSelectionModel)
*/
public ListSelectionModel getSelectionModel()
@@ -358,7 +358,7 @@ public class DefaultTableColumnModel
* Sets the flag that indicates whether or not column selection is allowed.
*
* @param flag the new flag value.
- *
+ *
* @see #getColumnSelectionAllowed()
*/
public void setColumnSelectionAllowed(boolean flag)
@@ -367,11 +367,11 @@ public class DefaultTableColumnModel
}
/**
- * Returns <code>true</code> if column selection is allowed, and
+ * Returns <code>true</code> if column selection is allowed, and
* <code>false</code> if column selection is not allowed.
*
* @return A boolean.
- *
+ *
* @see #setColumnSelectionAllowed(boolean)
*/
public boolean getColumnSelectionAllowed()
@@ -386,12 +386,12 @@ public class DefaultTableColumnModel
*/
public int[] getSelectedColumns()
{
- // FIXME: Implementation of this method was taken from private method
+ // FIXME: Implementation of this method was taken from private method
// JTable.getSelections(), which is used in various places in JTable
// including selected row calculations and cannot be simply removed.
// This design should be improved to illuminate duplication of code.
-
- ListSelectionModel lsm = this.selectionModel;
+
+ ListSelectionModel lsm = this.selectionModel;
int sz = getSelectedColumnCount();
int [] ret = new int[sz];
@@ -405,16 +405,16 @@ public class DefaultTableColumnModel
{
case ListSelectionModel.SINGLE_SELECTION:
ret[0] = lo;
- break;
-
- case ListSelectionModel.SINGLE_INTERVAL_SELECTION:
+ break;
+
+ case ListSelectionModel.SINGLE_INTERVAL_SELECTION:
for (int i = lo; i <= hi; ++i)
ret[j++] = i;
break;
-
- case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:
+
+ case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:
for (int i = lo; i <= hi; ++i)
- if (lsm.isSelectedIndex(i))
+ if (lsm.isSelectedIndex(i))
ret[j++] = i;
break;
}
@@ -424,23 +424,23 @@ public class DefaultTableColumnModel
/**
* Returns the number of selected columns in the model.
- *
+ *
* @return The selected column count.
- *
+ *
* @see #getSelectionModel()
*/
public int getSelectedColumnCount()
{
- // FIXME: Implementation of this method was taken from private method
+ // FIXME: Implementation of this method was taken from private method
// JTable.countSelections(), which is used in various places in JTable
// including selected row calculations and cannot be simply removed.
// This design should be improved to illuminate duplication of code.
-
+
ListSelectionModel lsm = this.selectionModel;
int lo = lsm.getMinSelectionIndex();
int hi = lsm.getMaxSelectionIndex();
int sum = 0;
-
+
if (lo != -1 && hi != -1)
{
switch (lsm.getSelectionMode())
@@ -448,19 +448,19 @@ public class DefaultTableColumnModel
case ListSelectionModel.SINGLE_SELECTION:
sum = 1;
break;
-
+
case ListSelectionModel.SINGLE_INTERVAL_SELECTION:
sum = hi - lo + 1;
break;
-
- case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:
+
+ case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:
for (int i = lo; i <= hi; ++i)
- if (lsm.isSelectedIndex(i))
+ if (lsm.isSelectedIndex(i))
++sum;
break;
}
}
-
+
return sum;
}
@@ -476,7 +476,7 @@ public class DefaultTableColumnModel
}
/**
- * Deregisters a listener so that it no longer receives notification of
+ * Deregisters a listener so that it no longer receives notification of
* changes to this model.
*
* @param listener the listener to remove
@@ -489,10 +489,10 @@ public class DefaultTableColumnModel
/**
* Returns an array containing the listeners that are registered with the
* model. If there are no listeners, an empty array is returned.
- *
+ *
* @return An array containing the listeners that are registered with the
* model.
- *
+ *
* @see #addColumnModelListener(TableColumnModelListener)
* @since 1.4
*/
@@ -500,34 +500,34 @@ public class DefaultTableColumnModel
{
return (TableColumnModelListener[])
listenerList.getListeners(TableColumnModelListener.class);
- }
+ }
/**
- * Sends the specified {@link TableColumnModelEvent} to all registered
+ * Sends the specified {@link TableColumnModelEvent} to all registered
* listeners, to indicate that a column has been added to the model. The
* event's <code>toIndex</code> attribute should contain the index of the
- * added column.
- *
+ * added column.
+ *
* @param e the event.
- *
+ *
* @see #addColumn(TableColumn)
*/
protected void fireColumnAdded(TableColumnModelEvent e)
- {
+ {
TableColumnModelListener[] listeners = getColumnModelListeners();
for (int i = 0; i < listeners.length; i++)
- listeners[i].columnAdded(e);
+ listeners[i].columnAdded(e);
}
/**
- * Sends the specified {@link TableColumnModelEvent} to all registered
+ * Sends the specified {@link TableColumnModelEvent} to all registered
* listeners, to indicate that a column has been removed from the model. The
* event's <code>fromIndex</code> attribute should contain the index of the
- * removed column.
- *
+ * removed column.
+ *
* @param e the event.
- *
+ *
* @see #removeColumn(TableColumn)
*/
protected void fireColumnRemoved(TableColumnModelEvent e)
@@ -535,18 +535,18 @@ public class DefaultTableColumnModel
TableColumnModelListener[] listeners = getColumnModelListeners();
for (int i = 0; i < listeners.length; i++)
- listeners[i].columnRemoved(e);
+ listeners[i].columnRemoved(e);
}
/**
- * Sends the specified {@link TableColumnModelEvent} to all registered
+ * Sends the specified {@link TableColumnModelEvent} to all registered
* listeners, to indicate that a column in the model has been moved. The
* event's <code>fromIndex</code> attribute should contain the old column
* index, and the <code>toIndex</code> attribute should contain the new
- * column index.
- *
+ * column index.
+ *
* @param e the event.
- *
+ *
* @see #moveColumn(int, int)
*/
protected void fireColumnMoved(TableColumnModelEvent e)
@@ -554,7 +554,7 @@ public class DefaultTableColumnModel
TableColumnModelListener[] listeners = getColumnModelListeners();
for (int i = 0; i < listeners.length; i++)
- listeners[i].columnMoved(e);
+ listeners[i].columnMoved(e);
}
/**
@@ -562,7 +562,7 @@ public class DefaultTableColumnModel
* to indicate that the column selections have changed.
*
* @param e the event.
- *
+ *
* @see #valueChanged(ListSelectionEvent)
*/
protected void fireColumnSelectionChanged(ListSelectionEvent e)
@@ -573,9 +573,9 @@ public class DefaultTableColumnModel
}
/**
- * Sends a {@link ChangeEvent} to the model's registered listeners to
- * indicate that the column margin was changed.
- *
+ * Sends a {@link ChangeEvent} to the model's registered listeners to
+ * indicate that the column margin was changed.
+ *
* @see #setColumnMargin(int)
*/
protected void fireColumnMarginChanged()
@@ -588,13 +588,13 @@ public class DefaultTableColumnModel
}
/**
- * Returns an array containing the listeners (of the specified type) that
+ * Returns an array containing the listeners (of the specified type) that
* are registered with this model.
- *
- * @param listenerType the listener type (must indicate a subclass of
+ *
+ * @param listenerType the listener type (must indicate a subclass of
* {@link EventListener}, <code>null</code> not permitted).
*
- * @return An array containing the listeners (of the specified type) that
+ * @return An array containing the listeners (of the specified type) that
* are registered with this model.
*/
public <T extends EventListener> T[] getListeners(Class<T> listenerType)
@@ -605,23 +605,23 @@ public class DefaultTableColumnModel
/**
* Receives notification of property changes for the columns in the model.
* If the <code>width</code> property for any column changes, we invalidate
- * the {@link #totalColumnWidth} value here.
+ * the {@link #totalColumnWidth} value here.
*
* @param event the event.
*/
public void propertyChange(PropertyChangeEvent event)
{
if (event.getPropertyName().equals("width"))
- invalidateWidthCache();
+ invalidateWidthCache();
}
/**
- * Receives notification of the change to the list selection model, and
- * responds by calling
+ * Receives notification of the change to the list selection model, and
+ * responds by calling
* {@link #fireColumnSelectionChanged(ListSelectionEvent)}.
- *
+ *
* @param e the list selection event.
- *
+ *
* @see #getSelectionModel()
*/
public void valueChanged(ListSelectionEvent e)
@@ -630,21 +630,21 @@ public class DefaultTableColumnModel
}
/**
- * Creates a default selection model to track the currently selected
+ * Creates a default selection model to track the currently selected
* column(s). This method is called by the constructor and returns a new
* instance of {@link DefaultListSelectionModel}.
*
* @return A new default column selection model.
*/
protected ListSelectionModel createSelectionModel()
- {
+ {
return new DefaultListSelectionModel();
}
/**
* Recalculates the total width of the columns, if the cached value is
* <code>-1</code>. Otherwise this method does nothing.
- *
+ *
* @see #getTotalColumnWidth()
*/
protected void recalcWidthCache()
@@ -661,7 +661,7 @@ public class DefaultTableColumnModel
/**
* Sets the {@link #totalColumnWidth} field to <code>-1</code>.
- *
+ *
* @see #recalcWidthCache()
*/
private void invalidateWidthCache()
diff --git a/libjava/classpath/javax/swing/table/DefaultTableModel.java b/libjava/classpath/javax/swing/table/DefaultTableModel.java
index 1b68ce2..e1d5e68 100644
--- a/libjava/classpath/javax/swing/table/DefaultTableModel.java
+++ b/libjava/classpath/javax/swing/table/DefaultTableModel.java
@@ -44,10 +44,10 @@ import java.util.Vector;
import javax.swing.event.TableModelEvent;
/**
- * A two dimensional data structure used to store <code>Object</code>
+ * A two dimensional data structure used to store <code>Object</code>
* instances, usually for display in a <code>JTable</code> component.
- *
- * @author Andrew Selkirk
+ *
+ * @author Andrew Selkirk
*/
public class DefaultTableModel extends AbstractTableModel
implements Serializable
@@ -55,7 +55,7 @@ public class DefaultTableModel extends AbstractTableModel
static final long serialVersionUID = 6680042567037222321L;
/**
- * Storage for the rows in the table (each row is itself
+ * Storage for the rows in the table (each row is itself
* a <code>Vector</code>).
*/
protected Vector dataVector;
@@ -68,27 +68,27 @@ public class DefaultTableModel extends AbstractTableModel
/**
* Creates an empty table with zero rows and zero columns.
*/
- public DefaultTableModel()
+ public DefaultTableModel()
{
this(0, 0);
}
-
+
/**
* Creates a new table with the specified number of rows and columns.
* All cells in the table are initially empty (set to <code>null</code>).
- *
+ *
* @param numRows the number of rows.
* @param numColumns the number of columns.
*/
- public DefaultTableModel(int numRows, int numColumns)
+ public DefaultTableModel(int numRows, int numColumns)
{
Vector defaultNames = new Vector(numColumns);
Vector data = new Vector(numRows);
- for (int i = 0; i < numColumns; i++)
+ for (int i = 0; i < numColumns; i++)
{
defaultNames.add(super.getColumnName(i));
- }
- for (int r = 0; r < numRows; r++)
+ }
+ for (int r = 0; r < numRows; r++)
{
Vector tmp = new Vector(numColumns);
tmp.setSize(numColumns);
@@ -96,16 +96,16 @@ public class DefaultTableModel extends AbstractTableModel
}
setDataVector(data, defaultNames);
}
-
+
/**
* Creates a new table with the specified column names and number of
* rows. The number of columns is determined by the number of column
* names supplied.
- *
+ *
* @param columnNames the column names.
* @param numRows the number of rows.
*/
- public DefaultTableModel(Vector columnNames, int numRows)
+ public DefaultTableModel(Vector columnNames, int numRows)
{
if (numRows < 0)
throw new IllegalArgumentException("numRows < 0");
@@ -114,8 +114,8 @@ public class DefaultTableModel extends AbstractTableModel
if (columnNames != null)
numColumns = columnNames.size();
-
- while (0 < numRows--)
+
+ while (0 < numRows--)
{
Vector rowData = new Vector();
rowData.setSize(numColumns);
@@ -126,43 +126,43 @@ public class DefaultTableModel extends AbstractTableModel
/**
* Creates a new table with the specified column names and row count.
- *
+ *
* @param columnNames the column names.
* @param numRows the number of rows.
*/
- public DefaultTableModel(Object[] columnNames, int numRows)
+ public DefaultTableModel(Object[] columnNames, int numRows)
{
this(convertToVector(columnNames), numRows);
}
-
+
/**
* Creates a new table with the specified data values and column names.
- *
+ *
* @param data the data values.
* @param columnNames the column names.
*/
- public DefaultTableModel(Vector data, Vector columnNames)
+ public DefaultTableModel(Vector data, Vector columnNames)
{
setDataVector(data, columnNames);
}
/**
* Creates a new table with the specified data values and column names.
- *
+ *
* @param data the data values.
* @param columnNames the column names.
*/
- public DefaultTableModel(Object[][] data, Object[] columnNames)
+ public DefaultTableModel(Object[][] data, Object[] columnNames)
{
this(convertToVector(data), convertToVector(columnNames));
}
/**
* Returns the vector containing the row data for the table.
- *
+ *
* @return The data vector.
*/
- public Vector getDataVector()
+ public Vector getDataVector()
{
return dataVector;
}
@@ -173,13 +173,13 @@ public class DefaultTableModel extends AbstractTableModel
* number of objects in each row does not match the number of column
* names specified, the row data is truncated or expanded (by adding
* <code>null</code> values) as required.
- *
+ *
* @param data the data for the table (a vector of row vectors).
* @param columnNames the column names.
- *
+ *
* @throws NullPointerException if either argument is <code>null</code>.
*/
- public void setDataVector(Vector data, Vector columnNames)
+ public void setDataVector(Vector data, Vector columnNames)
{
if (data == null)
dataVector = new Vector();
@@ -190,87 +190,87 @@ public class DefaultTableModel extends AbstractTableModel
/**
* Sets the data and column identifiers for the table.
- *
+ *
* @param data the data for the table.
* @param columnNames the column names.
- *
+ *
* @throws NullPointerException if either argument is <code>null</code>.
*/
- public void setDataVector(Object[][] data, Object[] columnNames)
+ public void setDataVector(Object[][] data, Object[] columnNames)
{
- setDataVector(convertToVector(data),
+ setDataVector(convertToVector(data),
convertToVector(columnNames));
}
-
+
/**
* Sends the specified <code>event</code> to all registered listeners.
- * This method is equivalent to
+ * This method is equivalent to
* {@link AbstractTableModel#fireTableChanged(TableModelEvent)}.
- *
+ *
* @param event the event.
*/
- public void newDataAvailable(TableModelEvent event)
+ public void newDataAvailable(TableModelEvent event)
{
fireTableChanged(event);
}
/**
* Sends the specified <code>event</code> to all registered listeners.
- * This method is equivalent to
+ * This method is equivalent to
* {@link AbstractTableModel#fireTableChanged(TableModelEvent)}.
- *
+ *
* @param event the event.
*/
- public void newRowsAdded(TableModelEvent event)
+ public void newRowsAdded(TableModelEvent event)
{
fireTableChanged(event);
}
/**
* Sends the specified <code>event</code> to all registered listeners.
- * This method is equivalent to
+ * This method is equivalent to
* {@link AbstractTableModel#fireTableChanged(TableModelEvent)}.
- *
+ *
* @param event the event.
*/
- public void rowsRemoved(TableModelEvent event)
+ public void rowsRemoved(TableModelEvent event)
{
fireTableChanged(event);
}
/**
* Sets the column identifiers, updates the data rows (truncating
- * or padding each row with <code>null</code> values) to match the
+ * or padding each row with <code>null</code> values) to match the
* number of columns, and sends a {@link TableModelEvent} to all
* registered listeners.
- *
+ *
* @param columnIdentifiers the column identifiers.
*/
- public void setColumnIdentifiers(Vector columnIdentifiers)
+ public void setColumnIdentifiers(Vector columnIdentifiers)
{
this.columnIdentifiers = columnIdentifiers;
setColumnCount(columnIdentifiers == null ? 0 : columnIdentifiers.size());
}
-
+
/**
* Sets the column identifiers, updates the data rows (truncating
- * or padding each row with <code>null</code> values) to match the
+ * or padding each row with <code>null</code> values) to match the
* number of columns, and sends a {@link TableModelEvent} to all
* registered listeners.
- *
+ *
* @param columnIdentifiers the column identifiers.
*/
- public void setColumnIdentifiers(Object[] columnIdentifiers)
+ public void setColumnIdentifiers(Object[] columnIdentifiers)
{
setColumnIdentifiers(convertToVector(columnIdentifiers));
}
/**
* This method is obsolete, use {@link #setRowCount(int)} instead.
- *
+ *
* @param numRows the number of rows.
*/
- public void setNumRows(int numRows)
+ public void setNumRows(int numRows)
{
setRowCount(numRows);
}
@@ -280,18 +280,18 @@ public class DefaultTableModel extends AbstractTableModel
* than the current number of rows in the table, rows are discarded.
* If <code>rowCount</code> is greater than the current number of rows in
* the table, new (empty) rows are added.
- *
+ *
* @param rowCount the row count.
*/
- public void setRowCount(int rowCount)
+ public void setRowCount(int rowCount)
{
int existingRowCount = dataVector.size();
- if (rowCount < existingRowCount)
+ if (rowCount < existingRowCount)
{
dataVector.setSize(rowCount);
- fireTableRowsDeleted(rowCount, existingRowCount - 1);
+ fireTableRowsDeleted(rowCount, existingRowCount - 1);
}
- else
+ else
{
int rowsToAdd = rowCount - existingRowCount;
addExtraRows(rowsToAdd, columnIdentifiers.size());
@@ -303,16 +303,16 @@ public class DefaultTableModel extends AbstractTableModel
* Sets the number of columns in the table. Existing rows are truncated
* or padded with <code>null</code> values to match the new column count.
* A {@link TableModelEvent} is sent to all registered listeners.
- *
+ *
* @param columnCount the column count.
*/
- public void setColumnCount(int columnCount)
+ public void setColumnCount(int columnCount)
{
for (int i = 0; i < dataVector.size(); ++i)
{
((Vector) dataVector.get(i)).setSize(columnCount);
}
- if (columnIdentifiers != null)
+ if (columnIdentifiers != null)
columnIdentifiers.setSize(columnCount);
fireTableStructureChanged();
}
@@ -320,24 +320,24 @@ public class DefaultTableModel extends AbstractTableModel
/**
* Adds a column with the specified name to the table. All cell values
* for the column are initially set to <code>null</code>.
- *
+ *
* @param columnName the column name (<code>null</code> permitted).
*/
- public void addColumn(Object columnName)
+ public void addColumn(Object columnName)
{
addColumn(columnName, (Object[]) null);
}
/**
- * Adds a column with the specified name and data values to the table.
- *
+ * Adds a column with the specified name and data values to the table.
+ *
* @param columnName the column name (<code>null</code> permitted).
* @param columnData the column data.
*/
- public void addColumn(Object columnName, Vector columnData)
+ public void addColumn(Object columnName, Vector columnData)
{
Object[] dataArray = null;
- if (columnData != null)
+ if (columnData != null)
{
int rowCount = dataVector.size();
if (columnData.size() < rowCount)
@@ -349,17 +349,17 @@ public class DefaultTableModel extends AbstractTableModel
/**
* Adds a column with the specified name and data values to the table.
- *
+ *
* @param columnName the column name (<code>null</code> permitted).
* @param columnData the column data.
*/
- public void addColumn(Object columnName, Object[] columnData)
+ public void addColumn(Object columnName, Object[] columnData)
{
if (columnData != null)
{
// check columnData array for cases where the number of items
// doesn't match the number of rows in the existing table
- if (columnData.length > dataVector.size())
+ if (columnData.length > dataVector.size())
{
int rowsToAdd = columnData.length - dataVector.size();
addExtraRows(rowsToAdd, columnIdentifiers.size());
@@ -382,10 +382,10 @@ public class DefaultTableModel extends AbstractTableModel
/**
* Adds a new row containing the specified data to the table and sends a
* {@link TableModelEvent} to all registered listeners.
- *
+ *
* @param rowData the row data (<code>null</code> permitted).
*/
- public void addRow(Vector rowData)
+ public void addRow(Vector rowData)
{
int rowIndex = dataVector.size();
dataVector.add(rowData);
@@ -397,21 +397,21 @@ public class DefaultTableModel extends AbstractTableModel
/**
* Adds a new row containing the specified data to the table and sends a
* {@link TableModelEvent} to all registered listeners.
- *
+ *
* @param rowData the row data (<code>null</code> permitted).
*/
- public void addRow(Object[] rowData)
+ public void addRow(Object[] rowData)
{
addRow(convertToVector(rowData));
}
/**
* Inserts a new row into the table.
- *
+ *
* @param row the row index.
* @param rowData the row data.
*/
- public void insertRow(int row, Vector rowData)
+ public void insertRow(int row, Vector rowData)
{
dataVector.add(row, rowData);
fireTableRowsInserted(row, row);
@@ -419,11 +419,11 @@ public class DefaultTableModel extends AbstractTableModel
/**
* Inserts a new row into the table.
- *
+ *
* @param row the row index.
* @param rowData the row data.
*/
- public void insertRow(int row, Object[] rowData)
+ public void insertRow(int row, Object[] rowData)
{
insertRow(row, convertToVector(rowData));
}
@@ -431,21 +431,21 @@ public class DefaultTableModel extends AbstractTableModel
/**
* Moves the rows from <code>startIndex</code> to <code>endIndex</code>
* (inclusive) to the specified row.
- *
+ *
* @param startIndex the start row.
* @param endIndex the end row.
* @param toIndex the row to move to.
*/
- public void moveRow(int startIndex, int endIndex, int toIndex)
+ public void moveRow(int startIndex, int endIndex, int toIndex)
{
Vector removed = new Vector();
for (int i = endIndex; i >= startIndex; i--)
{
removed.add(this.dataVector.remove(i));
}
- for (int i = 0; i <= endIndex - startIndex; i++)
+ for (int i = 0; i <= endIndex - startIndex; i++)
{
- dataVector.insertElementAt(removed.get(i), toIndex);
+ dataVector.insertElementAt(removed.get(i), toIndex);
}
int firstRow = Math.min(startIndex, toIndex);
int lastRow = Math.max(endIndex, toIndex + (endIndex - startIndex));
@@ -455,10 +455,10 @@ public class DefaultTableModel extends AbstractTableModel
/**
* Removes a row from the table and sends a {@link TableModelEvent} to
* all registered listeners.
- *
+ *
* @param row the row index.
*/
- public void removeRow(int row)
+ public void removeRow(int row)
{
dataVector.remove(row);
fireTableRowsDeleted(row, row);
@@ -466,20 +466,20 @@ public class DefaultTableModel extends AbstractTableModel
/**
* Returns the number of rows in the model.
- *
+ *
* @return The row count.
*/
- public int getRowCount()
+ public int getRowCount()
{
return dataVector.size();
}
/**
* Returns the number of columns in the model.
- *
+ *
* @return The column count.
*/
- public int getColumnCount()
+ public int getColumnCount()
{
return columnIdentifiers == null ? 0 : columnIdentifiers.size();
}
@@ -489,23 +489,23 @@ public class DefaultTableModel extends AbstractTableModel
* the return value is the result of the .toString() method call on that
* identifier. If the identifier is not explicitly set, the returned value
* is calculated by {@link AbstractTableModel#getColumnName(int)}.
- *
+ *
* @param column the column index.
- *
+ *
* @return The column name.
*/
public String getColumnName(int column)
{
String result = "";
- if (columnIdentifiers == null)
+ if (columnIdentifiers == null)
result = super.getColumnName(column);
- else
+ else
{
if (column < getColumnCount())
{
checkSize();
Object id = columnIdentifiers.get(column);
- if (id != null)
+ if (id != null)
result = id.toString();
else
result = super.getColumnName(column);
@@ -520,40 +520,40 @@ public class DefaultTableModel extends AbstractTableModel
* Returns <code>true</code> if the specified cell can be modified, and
* <code>false</code> otherwise. For this implementation, the method
* always returns <code>true</code>.
- *
+ *
* @param row the row index.
* @param column the column index.
- *
+ *
* @return <code>true</code> in all cases.
*/
- public boolean isCellEditable(int row, int column)
+ public boolean isCellEditable(int row, int column)
{
return true;
}
/**
* Returns the value at the specified cell in the table.
- *
+ *
* @param row the row index.
* @param column the column index.
- *
- * @return The value (<code>Object</code>, possibly <code>null</code>) at
+ *
+ * @return The value (<code>Object</code>, possibly <code>null</code>) at
* the specified cell in the table.
*/
- public Object getValueAt(int row, int column)
+ public Object getValueAt(int row, int column)
{
return ((Vector) dataVector.get(row)).get(column);
}
/**
- * Sets the value for the specified cell in the table and sends a
+ * Sets the value for the specified cell in the table and sends a
* {@link TableModelEvent} to all registered listeners.
- *
+ *
* @param value the value (<code>Object</code>, <code>null</code> permitted).
* @param row the row index.
* @param column the column index.
*/
- public void setValueAt(Object value, int row, int column)
+ public void setValueAt(Object value, int row, int column)
{
((Vector) dataVector.get(row)).set(column, value);
fireTableCellUpdated(row, column);
@@ -561,31 +561,31 @@ public class DefaultTableModel extends AbstractTableModel
/**
* Converts the data array to a <code>Vector</code>.
- *
+ *
* @param data the data array (<code>null</code> permitted).
- *
- * @return A vector (or <code>null</code> if the data array
+ *
+ * @return A vector (or <code>null</code> if the data array
* is <code>null</code>).
*/
- protected static Vector convertToVector(Object[] data)
+ protected static Vector convertToVector(Object[] data)
{
if (data == null)
return null;
Vector vector = new Vector(data.length);
- for (int i = 0; i < data.length; i++)
+ for (int i = 0; i < data.length; i++)
vector.add(data[i]);
- return vector;
+ return vector;
}
-
+
/**
* Converts the data array to a <code>Vector</code> of rows.
- *
+ *
* @param data the data array (<code>null</code> permitted).
- *
- * @return A vector (or <code>null</code> if the data array
+ *
+ * @return A vector (or <code>null</code> if the data array
* is <code>null</code>.
*/
- protected static Vector convertToVector(Object[][] data)
+ protected static Vector convertToVector(Object[][] data)
{
if (data == null)
return null;
@@ -603,12 +603,12 @@ public class DefaultTableModel extends AbstractTableModel
*/
private void addExtraRows(int rowsToAdd, int nbColumns)
{
- for (int i = 0; i < rowsToAdd; i++)
+ for (int i = 0; i < rowsToAdd; i++)
{
Vector tmp = new Vector();
tmp.setSize(columnIdentifiers.size());
dataVector.add(tmp);
- }
+ }
}
/**
@@ -621,10 +621,10 @@ public class DefaultTableModel extends AbstractTableModel
{
int columnCount = getColumnCount();
int rowCount = getRowCount();
-
+
if (columnCount > columnIdentifiers.size())
columnIdentifiers.setSize(columnCount);
-
+
if (dataVector != null && rowCount > dataVector.size())
{
int rowsToAdd = rowCount - dataVector.size();
diff --git a/libjava/classpath/javax/swing/table/JTableHeader.java b/libjava/classpath/javax/swing/table/JTableHeader.java
index 4661748..4eb9115 100644
--- a/libjava/classpath/javax/swing/table/JTableHeader.java
+++ b/libjava/classpath/javax/swing/table/JTableHeader.java
@@ -81,23 +81,23 @@ public class JTableHeader extends JComponent
protected class AccessibleJTableHeaderEntry extends AccessibleContext
implements Accessible, AccessibleComponent
{
-
+
private int columnIndex;
-
+
private JTableHeader parent;
-
+
private JTable table;
-
+
public AccessibleJTableHeaderEntry(int c, JTableHeader p, JTable t)
{
columnIndex = c;
parent = p;
table = t;
}
-
+
/**
* Returns the column header renderer.
- *
+ *
* @return The column header renderer.
*/
Component getColumnHeaderRenderer()
@@ -106,14 +106,14 @@ public class JTableHeader extends JComponent
TableCellRenderer r = tc.getHeaderRenderer();
if (r == null)
r = parent.getDefaultRenderer();
- return r.getTableCellRendererComponent(table, tc.headerValue,
+ return r.getTableCellRendererComponent(table, tc.headerValue,
false, false, -1, columnIndex);
}
-
+
/**
- * Returns the accessible context for the column header renderer, or
+ * Returns the accessible context for the column header renderer, or
* <code>null</code>.
- *
+ *
* @return The accessible context.
*/
AccessibleContext getAccessibleColumnHeaderRenderer()
@@ -123,7 +123,7 @@ public class JTableHeader extends JComponent
return c.getAccessibleContext();
return null;
}
-
+
/**
* @see #removeFocusListener(FocusListener)
*/
@@ -134,7 +134,7 @@ public class JTableHeader extends JComponent
if (c != null)
c.addFocusListener(l);
}
-
+
/**
* @see #removePropertyChangeListener(PropertyChangeListener)
*/
@@ -146,26 +146,26 @@ public class JTableHeader extends JComponent
if (ac != null)
ac.addPropertyChangeListener(l);
}
-
+
public boolean contains(Point p)
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
AccessibleComponent c = ac.getAccessibleComponent();
if (c != null)
return c.contains(p);
- else
+ else
return false;
}
-
+
public AccessibleAction getAccessibleAction()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
if (ac instanceof AccessibleAction)
return (AccessibleAction) ac;
- else
+ else
return null;
}
-
+
public Accessible getAccessibleAt(Point p)
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -175,53 +175,53 @@ public class JTableHeader extends JComponent
else
return null;
}
-
+
/**
* Returns <code>null</code> as the header entry has no accessible
* children.
- *
+ *
* @return <code>null</code>.
*/
public Accessible getAccessibleChild(int i)
{
return null;
}
-
+
/**
* Returns the number of accessible children, zero in this case.
- *
+ *
* @return 0
*/
public int getAccessibleChildrenCount()
{
return 0;
}
-
+
/**
* Returns the accessible component for this header entry.
- *
+ *
* @return <code>this</code>.
*/
public AccessibleComponent getAccessibleComponent()
{
return this;
}
-
+
/**
* Returns the accessible context for this header entry.
- *
+ *
* @return <code>this</code>.
*/
public AccessibleContext getAccessibleContext()
{
return this;
}
-
+
/**
* Returns the accessible description.
- *
+ *
* @return The accessible description.
- *
+ *
* @see #setAccessibleDescription(String)
*/
public String getAccessibleDescription()
@@ -231,22 +231,22 @@ public class JTableHeader extends JComponent
return ac.getAccessibleDescription();
return accessibleDescription;
}
-
+
/**
* Returns the index of this header entry.
- *
+ *
* @return The index of this header entry.
*/
public int getAccessibleIndexInParent()
{
return columnIndex;
}
-
+
/**
* Returns the accessible name.
- *
+ *
* @return The accessible name.
- *
+ *
* @see #setAccessibleName(String)
*/
public String getAccessibleName()
@@ -256,10 +256,10 @@ public class JTableHeader extends JComponent
return ac.getAccessibleName();
return accessibleName;
}
-
+
/**
* Returns the accessible role for the header entry.
- *
+ *
* @return The accessible role.
*/
public AccessibleRole getAccessibleRole()
@@ -270,43 +270,43 @@ public class JTableHeader extends JComponent
else
return null;
}
-
+
public AccessibleSelection getAccessibleSelection()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
if (ac instanceof AccessibleValue)
return (AccessibleSelection) ac;
- else
+ else
return null;
}
-
+
public AccessibleStateSet getAccessibleStateSet()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
if (ac != null)
return ac.getAccessibleStateSet();
- else
+ else
return null;
}
-
+
public AccessibleText getAccessibleText()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
if (ac != null)
return ac.getAccessibleText();
- else
+ else
return null;
}
-
+
public AccessibleValue getAccessibleValue()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
if (ac instanceof AccessibleValue)
return (AccessibleValue) ac;
- else
+ else
return null;
}
-
+
public Color getBackground()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -316,7 +316,7 @@ public class JTableHeader extends JComponent
else
return null;
}
-
+
public Rectangle getBounds()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -326,7 +326,7 @@ public class JTableHeader extends JComponent
else
return null;
}
-
+
public Cursor getCursor()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -336,7 +336,7 @@ public class JTableHeader extends JComponent
else
return null;
}
-
+
public Font getFont()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -346,7 +346,7 @@ public class JTableHeader extends JComponent
else
return null;
}
-
+
public FontMetrics getFontMetrics(Font f)
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -356,7 +356,7 @@ public class JTableHeader extends JComponent
else
return null;
}
-
+
public Color getForeground()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -366,7 +366,7 @@ public class JTableHeader extends JComponent
else
return null;
}
-
+
public Locale getLocale()
{
Component c = getColumnHeaderRenderer();
@@ -374,7 +374,7 @@ public class JTableHeader extends JComponent
return c.getLocale();
return null;
}
-
+
public Point getLocation()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -384,7 +384,7 @@ public class JTableHeader extends JComponent
else
return null;
}
-
+
public Point getLocationOnScreen()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -394,7 +394,7 @@ public class JTableHeader extends JComponent
else
return null;
}
-
+
public Dimension getSize()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -404,7 +404,7 @@ public class JTableHeader extends JComponent
else
return null;
}
-
+
public boolean isEnabled()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -414,7 +414,7 @@ public class JTableHeader extends JComponent
else
return false;
}
-
+
public boolean isFocusTraversable()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -424,7 +424,7 @@ public class JTableHeader extends JComponent
else
return false;
}
-
+
public boolean isShowing()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -434,7 +434,7 @@ public class JTableHeader extends JComponent
else
return false;
}
-
+
public boolean isVisible()
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -444,7 +444,7 @@ public class JTableHeader extends JComponent
else
return false;
}
-
+
/**
* @see #addFocusListener(FocusListener)
*/
@@ -455,7 +455,7 @@ public class JTableHeader extends JComponent
if (c != null)
c.removeFocusListener(l);
}
-
+
/**
* @see #addPropertyChangeListener(PropertyChangeListener)
*/
@@ -465,7 +465,7 @@ public class JTableHeader extends JComponent
if (ac != null)
ac.removePropertyChangeListener(l);
}
-
+
/**
* @see #addFocusListener(FocusListener)
*/
@@ -476,7 +476,7 @@ public class JTableHeader extends JComponent
if (c != null)
c.requestFocus();
}
-
+
/**
* @see #getAccessibleDescription()
*/
@@ -488,7 +488,7 @@ public class JTableHeader extends JComponent
else
accessibleDescription = s;
}
-
+
/**
* @see #getAccessibleName()
*/
@@ -498,7 +498,7 @@ public class JTableHeader extends JComponent
if (ac != null)
ac.setAccessibleName(s);
}
-
+
public void setBackground(Color c)
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -506,7 +506,7 @@ public class JTableHeader extends JComponent
if (comp != null)
comp.setBackground(c);
}
-
+
public void setBounds(Rectangle r)
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -514,7 +514,7 @@ public class JTableHeader extends JComponent
if (comp != null)
comp.setBounds(r);
}
-
+
public void setCursor(Cursor c)
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -522,7 +522,7 @@ public class JTableHeader extends JComponent
if (comp != null)
comp.setCursor(c);
}
-
+
public void setEnabled(boolean b)
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -530,7 +530,7 @@ public class JTableHeader extends JComponent
if (comp != null)
comp.setEnabled(b);
}
-
+
public void setFont(Font f)
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -538,7 +538,7 @@ public class JTableHeader extends JComponent
if (comp != null)
comp.setFont(f);
}
-
+
public void setForeground(Color c)
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -546,7 +546,7 @@ public class JTableHeader extends JComponent
if (comp != null)
comp.setForeground(c);
}
-
+
public void setLocation(Point p)
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -554,7 +554,7 @@ public class JTableHeader extends JComponent
if (comp != null)
comp.setLocation(p);
}
-
+
public void setSize(Dimension d)
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -562,7 +562,7 @@ public class JTableHeader extends JComponent
if (comp != null)
comp.setSize(d);
}
-
+
public void setVisible(boolean b)
{
AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -571,28 +571,28 @@ public class JTableHeader extends JComponent
comp.setVisible(b);
}
}
-
+
public AccessibleRole getAccessibleRole()
{
return AccessibleRole.PANEL;
}
-
+
public int getAccessibleChildrenCount()
{
return table.getColumnCount();
}
-
+
public Accessible getAccessibleChild(int i)
{
return new AccessibleJTableHeaderEntry(i, JTableHeader.this, table);
}
-
+
public Accessible getAccessibleAt(Point p)
{
return getAccessibleChild(columnAtPoint(p));
}
}
-
+
/**
* Use serialVersionUid for interoperability.
*/
@@ -643,7 +643,7 @@ public class JTableHeader extends JComponent
*/
protected boolean updateTableInRealTime;
- TableCellRenderer cellRenderer;
+ TableCellRenderer cellRenderer;
/**
* Creates a new default instance.
@@ -655,21 +655,21 @@ public class JTableHeader extends JComponent
/**
* Creates a new header. If <code>cm</code> is <code>null</code>, a new
- * table column model is created by calling
+ * table column model is created by calling
* {@link #createDefaultColumnModel()}.
- *
+ *
* @param cm the table column model (<code>null</code> permitted).
*/
public JTableHeader(TableColumnModel cm)
{
- columnModel = cm == null ? createDefaultColumnModel() : cm;
+ columnModel = cm == null ? createDefaultColumnModel() : cm;
initializeLocalVars();
updateUI();
}
/**
* Creates a default table column model.
- *
+ *
* @return A default table column model.
*/
protected TableColumnModel createDefaultColumnModel()
@@ -724,7 +724,7 @@ public class JTableHeader extends JComponent
* disabled with {@link #setReorderingAllowed(boolean)}.
*
* @return true if reordering is allowed, false otherwise.
- */
+ */
public boolean getReorderingAllowed()
{
return reorderingAllowed;
@@ -736,7 +736,7 @@ public class JTableHeader extends JComponent
* by default, but can be disabled with {@link #setResizingAllowed(boolean)}.
*
* @return true if resizing is allowed, false otherwise.
- */
+ */
public boolean getResizingAllowed()
{
return resizingAllowed;
@@ -787,7 +787,7 @@ public class JTableHeader extends JComponent
* Set the value of the {@link #columnModel} property.
*
* @param c The new value of the property
- */
+ */
public void setColumnModel(TableColumnModel c)
{
columnModel.removeColumnModelListener(this);
@@ -797,11 +797,11 @@ public class JTableHeader extends JComponent
/**
* Set the column that is currently being dragged. This is used when
- * dragging the column with mouse. Setting to null will stop the
+ * dragging the column with mouse. Setting to null will stop the
* dragging session immediately.
*
* @param draggingIt the column being currently dragged, null if none.
- */
+ */
public void setDraggedColumn(TableColumn draggingIt)
{
draggedColumn = draggingIt;
@@ -811,7 +811,7 @@ public class JTableHeader extends JComponent
* Set the value of the {@link #draggedDistance} property.
*
* @param d The new value of the property
- */
+ */
public void setDraggedDistance(int d)
{
draggedDistance = d;
@@ -821,7 +821,7 @@ public class JTableHeader extends JComponent
* Set the value of the {@link #opaque} property.
*
* @param o The new value of the property
- */
+ */
public void setOpaque(boolean o)
{
opaque = o;
@@ -833,7 +833,7 @@ public class JTableHeader extends JComponent
* disabled with this method.
*
* @param allowed true if reordering is allowed, false otherwise.
- */
+ */
public void setReorderingAllowed(boolean allowed)
{
reorderingAllowed = allowed;
@@ -845,7 +845,7 @@ public class JTableHeader extends JComponent
* by default, but can be disabled using this method.
*
* @param allowed true if resizing is allowed, false otherwise.
- */
+ */
public void setResizingAllowed(boolean allowed)
{
resizingAllowed = allowed;
@@ -857,7 +857,7 @@ public class JTableHeader extends JComponent
* the resizing session immediately.
*
* @param resizingIt the column being currently resized
- */
+ */
public void setResizingColumn(TableColumn resizingIt)
{
resizingColumn = resizingIt;
@@ -867,7 +867,7 @@ public class JTableHeader extends JComponent
* Set the value of the {@link #table} property.
*
* @param t The new value of the property
- */
+ */
public void setTable(JTable t)
{
table = t;
@@ -877,7 +877,7 @@ public class JTableHeader extends JComponent
* Set the value of the {@link #updateTableInRealTime} property.
*
* @param u The new value of the property
- */
+ */
public void setUpdateTableInRealTime(boolean u)
{
updateTableInRealTime = u;
@@ -885,17 +885,17 @@ public class JTableHeader extends JComponent
/**
* Creates a default renderer.
- *
+ *
* @return A default renderer.
*/
protected TableCellRenderer createDefaultRenderer()
{
return new DefaultTableCellRenderer();
}
-
+
/**
* Returns the default table cell renderer.
- *
+ *
* @return The default table cell renderer.
*/
public TableCellRenderer getDefaultRenderer()
@@ -905,19 +905,19 @@ public class JTableHeader extends JComponent
/**
* Sets the default table cell renderer.
- *
+ *
* @param cellRenderer the renderer.
*/
public void setDefaultRenderer(TableCellRenderer cellRenderer)
{
this.cellRenderer = cellRenderer;
}
-
+
/**
* Get the rectangle, occupied by the header of the given column.
- *
+ *
* @param column the column, for that the header area is requested.
- *
+ *
* @return the column header area.
*/
public Rectangle getHeaderRect(int column)
@@ -956,16 +956,16 @@ public class JTableHeader extends JComponent
/**
* Returns the index of the column at the specified point.
- *
+ *
* @param point the point.
- *
+ *
* @return The column index, or -1.
*/
public int columnAtPoint(Point point)
{
if (getBounds().contains(point))
return columnModel.getColumnIndexAtX(point.x);
-
+
return -1;
}
diff --git a/libjava/classpath/javax/swing/table/TableCellEditor.java b/libjava/classpath/javax/swing/table/TableCellEditor.java
index 15070a7..933eb9e 100644
--- a/libjava/classpath/javax/swing/table/TableCellEditor.java
+++ b/libjava/classpath/javax/swing/table/TableCellEditor.java
@@ -47,7 +47,7 @@ import javax.swing.JTable;
* TableCellEditor public interface
* @author Andrew Selkirk
*/
-public interface TableCellEditor extends CellEditor
+public interface TableCellEditor extends CellEditor
{
/**
@@ -59,7 +59,7 @@ public interface TableCellEditor extends CellEditor
* @param column Column of cell
* @return Component
*/
- Component getTableCellEditorComponent(JTable table, Object value,
+ Component getTableCellEditorComponent(JTable table, Object value,
boolean isSelected, int row, int column);
}
diff --git a/libjava/classpath/javax/swing/table/TableCellRenderer.java b/libjava/classpath/javax/swing/table/TableCellRenderer.java
index 6c1fecf..da7296d 100644
--- a/libjava/classpath/javax/swing/table/TableCellRenderer.java
+++ b/libjava/classpath/javax/swing/table/TableCellRenderer.java
@@ -46,7 +46,7 @@ import javax.swing.JTable;
* TableCellRenderer public interface
* @author Andrew Selkirk
*/
-public interface TableCellRenderer
+public interface TableCellRenderer
{
/**
@@ -59,7 +59,7 @@ public interface TableCellRenderer
* @param column Column of cell
* @return Component
*/
- Component getTableCellRendererComponent(JTable table, Object value,
+ Component getTableCellRendererComponent(JTable table, Object value,
boolean isSelected, boolean hasFocus, int row, int column);
diff --git a/libjava/classpath/javax/swing/table/TableColumn.java b/libjava/classpath/javax/swing/table/TableColumn.java
index fbb877d..8db4bf6 100644
--- a/libjava/classpath/javax/swing/table/TableColumn.java
+++ b/libjava/classpath/javax/swing/table/TableColumn.java
@@ -49,8 +49,8 @@ import javax.swing.event.SwingPropertyChangeSupport;
/**
* Represents the attributes of a column in a table, including the column index,
* width, minimum width, preferred width and maximum width.
- *
- * @author Andrew Selkirk
+ *
+ * @author Andrew Selkirk
*/
public class TableColumn
implements Serializable
@@ -59,7 +59,7 @@ public class TableColumn
/**
* The name for the <code>columnWidth</code> property (this field is
- * obsolete and no longer used). Note also that the typo in the value
+ * obsolete and no longer used). Note also that the typo in the value
* string is deliberate, to match the specification.
*/
public static final String COLUMN_WIDTH_PROPERTY = "columWidth";
@@ -158,9 +158,9 @@ public class TableColumn
}
/**
- * Creates a new <code>TableColumn</code> that maps to the specified column
+ * Creates a new <code>TableColumn</code> that maps to the specified column
* in the related table model. The default width is <code>75</code> units.
- *
+ *
* @param modelIndex the index of the column in the model
*/
public TableColumn(int modelIndex)
@@ -169,9 +169,9 @@ public class TableColumn
}
/**
- * Creates a new <code>TableColumn</code> that maps to the specified column
+ * Creates a new <code>TableColumn</code> that maps to the specified column
* in the related table model, and has the specified <code>width</code>.
- *
+ *
* @param modelIndex the index of the column in the model
* @param width the width
*/
@@ -181,10 +181,10 @@ public class TableColumn
}
/**
- * Creates a new <code>TableColumn</code> that maps to the specified column
+ * Creates a new <code>TableColumn</code> that maps to the specified column
* in the related table model, and has the specified <code>width</code>,
* <code>cellRenderer</code> and <code>cellEditor</code>.
- *
+ *
* @param modelIndex the index of the column in the model
* @param width the width
* @param cellRenderer the cell renderer (<code>null</code> permitted).
@@ -206,9 +206,9 @@ public class TableColumn
* Sets the index of the column in the related {@link TableModel} that this
* <code>TableColumn</code> maps to, and sends a {@link PropertyChangeEvent}
* (with the property name 'modelIndex') to all registered listeners.
- *
+ *
* @param modelIndex the column index in the model.
- *
+ *
* @see #getModelIndex()
*/
public void setModelIndex(int modelIndex)
@@ -224,9 +224,9 @@ public class TableColumn
/**
* Returns the index of the column in the related {@link TableModel} that
* this <code>TableColumn</code> maps to.
- *
+ *
* @return the model index.
- *
+ *
* @see #setModelIndex(int)
*/
public int getModelIndex()
@@ -237,15 +237,15 @@ public class TableColumn
/**
* Sets the identifier for the column and sends a {@link PropertyChangeEvent}
* (with the property name 'identifier') to all registered listeners.
- *
+ *
* @param identifier the identifier (<code>null</code> permitted).
- *
+ *
* @see #getIdentifier()
*/
public void setIdentifier(Object identifier)
{
if (this.identifier != identifier)
- {
+ {
Object oldValue = this.identifier;
this.identifier = identifier;
changeSupport.firePropertyChange("identifier", oldValue, identifier);
@@ -253,10 +253,10 @@ public class TableColumn
}
/**
- * Returns the identifier for the column, or {@link #getHeaderValue()} if the
+ * Returns the identifier for the column, or {@link #getHeaderValue()} if the
* identifier is <code>null</code>.
- *
- * @return The identifier (or {@link #getHeaderValue()} if the identifier is
+ *
+ * @return The identifier (or {@link #getHeaderValue()} if the identifier is
* <code>null</code>).
*/
public Object getIdentifier()
@@ -267,29 +267,29 @@ public class TableColumn
}
/**
- * Sets the header value and sends a {@link PropertyChangeEvent} (with the
+ * Sets the header value and sends a {@link PropertyChangeEvent} (with the
* property name {@link #HEADER_VALUE_PROPERTY}) to all registered listeners.
- *
+ *
* @param headerValue the value of the header (<code>null</code> permitted).
- *
+ *
* @see #getHeaderValue()
*/
public void setHeaderValue(Object headerValue)
{
if (this.headerValue == headerValue)
return;
-
+
Object oldValue = this.headerValue;
this.headerValue = headerValue;
- changeSupport.firePropertyChange(HEADER_VALUE_PROPERTY, oldValue,
+ changeSupport.firePropertyChange(HEADER_VALUE_PROPERTY, oldValue,
headerValue);
}
/**
* Returns the header value.
- *
+ *
* @return the value of the header.
- *
+ *
* @see #getHeaderValue()
*/
public Object getHeaderValue()
@@ -298,30 +298,30 @@ public class TableColumn
}
/**
- * Sets the renderer for the column header and sends a
- * {@link PropertyChangeEvent} (with the property name
+ * Sets the renderer for the column header and sends a
+ * {@link PropertyChangeEvent} (with the property name
* {@link #HEADER_RENDERER_PROPERTY}) to all registered listeners.
- *
+ *
* @param renderer the header renderer (<code>null</code> permitted).
- *
+ *
* @see #getHeaderRenderer()
*/
public void setHeaderRenderer(TableCellRenderer renderer)
{
if (headerRenderer == renderer)
return;
-
+
TableCellRenderer oldRenderer = headerRenderer;
headerRenderer = renderer;
- changeSupport.firePropertyChange(HEADER_RENDERER_PROPERTY, oldRenderer,
+ changeSupport.firePropertyChange(HEADER_RENDERER_PROPERTY, oldRenderer,
headerRenderer);
}
/**
* Returns the renderer for the column header.
- *
+ *
* @return The renderer for the column header (possibly <code>null</code>).
- *
+ *
* @see #setHeaderRenderer(TableCellRenderer)
*/
public TableCellRenderer getHeaderRenderer()
@@ -330,30 +330,30 @@ public class TableColumn
}
/**
- * Sets the renderer for cells in this column and sends a
- * {@link PropertyChangeEvent} (with the property name
+ * Sets the renderer for cells in this column and sends a
+ * {@link PropertyChangeEvent} (with the property name
* {@link #CELL_RENDERER_PROPERTY}) to all registered listeners.
- *
+ *
* @param renderer the cell renderer (<code>null</code> permitted).
- *
+ *
* @see #getCellRenderer()
*/
public void setCellRenderer(TableCellRenderer renderer)
{
if (cellRenderer == renderer)
return;
-
+
TableCellRenderer oldRenderer = cellRenderer;
cellRenderer = renderer;
- changeSupport.firePropertyChange(CELL_RENDERER_PROPERTY, oldRenderer,
+ changeSupport.firePropertyChange(CELL_RENDERER_PROPERTY, oldRenderer,
cellRenderer);
}
/**
* Returns the renderer for the table cells in this column.
- *
+ *
* @return The cell renderer (possibly <code>null</code>).
- *
+ *
* @see #setCellRenderer(TableCellRenderer)
*/
public TableCellRenderer getCellRenderer()
@@ -364,9 +364,9 @@ public class TableColumn
/**
* Sets the cell editor for the column and sends a {@link PropertyChangeEvent}
* (with the property name 'cellEditor') to all registered listeners.
- *
+ *
* @param cellEditor the cell editor (<code>null</code> permitted).
- *
+ *
* @see #getCellEditor()
*/
public void setCellEditor(TableCellEditor cellEditor)
@@ -380,11 +380,11 @@ public class TableColumn
}
/**
- * Returns the cell editor for the column (the default value is
+ * Returns the cell editor for the column (the default value is
* <code>null</code>).
- *
+ *
* @return The cell editor (possibly <code>null</code>).
- *
+ *
* @see #setCellEditor(TableCellEditor)
*/
public TableCellEditor getCellEditor()
@@ -393,18 +393,18 @@ public class TableColumn
}
/**
- * Sets the width for the column and sends a {@link PropertyChangeEvent}
+ * Sets the width for the column and sends a {@link PropertyChangeEvent}
* (with the property name 'width') to all registered listeners. If the new
- * width falls outside the range getMinWidth() to getMaxWidth() it is
+ * width falls outside the range getMinWidth() to getMaxWidth() it is
* adjusted to the appropriate boundary value.
- *
+ *
* @param newWidth the width.
- *
+ *
* @see #getWidth()
*/
public void setWidth(int newWidth)
{
- int oldWidth = width;
+ int oldWidth = width;
if (newWidth < minWidth)
width = minWidth;
@@ -425,7 +425,7 @@ public class TableColumn
/**
* Returns the width for the column (the default value is <code>75</code>).
- *
+ *
* @return The width.
*
* @see #setWidth(int)
@@ -436,14 +436,14 @@ public class TableColumn
}
/**
- * Sets the preferred width for the column and sends a
- * {@link PropertyChangeEvent} (with the property name 'preferredWidth') to
- * all registered listeners. If necessary, the supplied value will be
- * adjusted to fit in the range {@link #getMinWidth()} to
+ * Sets the preferred width for the column and sends a
+ * {@link PropertyChangeEvent} (with the property name 'preferredWidth') to
+ * all registered listeners. If necessary, the supplied value will be
+ * adjusted to fit in the range {@link #getMinWidth()} to
* {@link #getMaxWidth()}.
- *
+ *
* @param preferredWidth the preferred width.
- *
+ *
* @see #getPreferredWidth()
*/
public void setPreferredWidth(int preferredWidth)
@@ -457,16 +457,16 @@ public class TableColumn
else
this.preferredWidth = preferredWidth;
- changeSupport.firePropertyChange("preferredWidth", oldPrefWidth,
+ changeSupport.firePropertyChange("preferredWidth", oldPrefWidth,
this.preferredWidth);
}
/**
- * Returns the preferred width for the column (the default value is
+ * Returns the preferred width for the column (the default value is
* <code>75</code>).
- *
+ *
* @return The preferred width.
- *
+ *
* @see #setPreferredWidth(int)
*/
public int getPreferredWidth()
@@ -475,14 +475,14 @@ public class TableColumn
}
/**
- * Sets the minimum width for the column and sends a
+ * Sets the minimum width for the column and sends a
* {@link PropertyChangeEvent} (with the property name 'minWidth') to all
- * registered listeners. If the current <code>width</code> and/or
+ * registered listeners. If the current <code>width</code> and/or
* <code>preferredWidth</code> are less than the new minimum width, they are
* adjusted accordingly.
- *
+ *
* @param minWidth the minimum width (negative values are treated as 0).
- *
+ *
* @see #getMinWidth()
*/
public void setMinWidth(int minWidth)
@@ -504,9 +504,9 @@ public class TableColumn
/**
* Returns the <code>TableColumn</code>'s minimum width (the default value
* is <code>15</code>).
- *
+ *
* @return The minimum width.
- *
+ *
* @see #setMinWidth(int)
*/
public int getMinWidth()
@@ -515,14 +515,14 @@ public class TableColumn
}
/**
- * Sets the maximum width for the column and sends a
+ * Sets the maximum width for the column and sends a
* {@link PropertyChangeEvent} (with the property name 'maxWidth') to all
- * registered listeners. If the current <code>width</code> and/or
- * <code>preferredWidth</code> are greater than the new maximum width, they
+ * registered listeners. If the current <code>width</code> and/or
+ * <code>preferredWidth</code> are greater than the new maximum width, they
* are adjusted accordingly.
- *
+ *
* @param maxWidth the maximum width.
- *
+ *
* @see #getMaxWidth()
*/
public void setMaxWidth(int maxWidth)
@@ -542,9 +542,9 @@ public class TableColumn
/**
* Returns the maximum width for the column (the default value is
* {@link Integer#MAX_VALUE}).
- *
+ *
* @return The maximum width for the column.
- *
+ *
* @see #setMaxWidth(int)
*/
public int getMaxWidth()
@@ -556,10 +556,10 @@ public class TableColumn
* Sets the flag that controls whether or not the column is resizable, and
* sends a {@link PropertyChangeEvent} (with the property name 'isResizable')
* to all registered listeners.
- *
+ *
* @param isResizable <code>true</code> if this column is resizable,
* <code>false</code> otherwise.
- *
+ *
* @see #getResizable()
*/
public void setResizable(boolean isResizable)
@@ -567,17 +567,17 @@ public class TableColumn
if (this.isResizable != isResizable)
{
this.isResizable = isResizable;
- changeSupport.firePropertyChange("isResizable", !this.isResizable,
+ changeSupport.firePropertyChange("isResizable", !this.isResizable,
isResizable);
}
}
/**
* Returns the flag that controls whether or not the column is resizable.
- *
+ *
* @return <code>true</code> if this column is resizable,
* <code>false</code> otherwise.
- *
+ *
* @see #setResizable(boolean)
*/
public boolean getResizable()
@@ -594,7 +594,7 @@ public class TableColumn
{
if (headerRenderer == null)
return;
- Component c = headerRenderer.getTableCellRendererComponent(null,
+ Component c = headerRenderer.getTableCellRendererComponent(null,
getHeaderValue(), false, false, 0, 0);
Dimension min = c.getMinimumSize();
Dimension max = c.getMaximumSize();
@@ -624,27 +624,27 @@ public class TableColumn
}
/**
- * Adds a listener so that it receives {@link PropertyChangeEvent}
+ * Adds a listener so that it receives {@link PropertyChangeEvent}
* notifications from this column. The properties defined by the column are:
* <ul>
* <li><code>width</code> - see {@link #setWidth(int)};</li>
* <li><code>preferredWidth</code> - see {@link #setPreferredWidth(int)};</li>
- * <li><code>minWidth</code> - see {@link #setMinWidth(int)};</li>
+ * <li><code>minWidth</code> - see {@link #setMinWidth(int)};</li>
* <li><code>maxWidth</code> - see {@link #setMaxWidth(int)};</li>
* <li><code>modelIndex</code> - see {@link #setModelIndex(int)};</li>
* <li><code>isResizable</code> - see {@link #setResizable(boolean)};</li>
- * <li><code>cellRenderer</code> - see
+ * <li><code>cellRenderer</code> - see
* {@link #setCellRenderer(TableCellRenderer)};</li>
- * <li><code>cellEditor</code> - see
+ * <li><code>cellEditor</code> - see
* {@link #setCellEditor(TableCellEditor)};</li>
- * <li><code>headerRenderer</code> - see
+ * <li><code>headerRenderer</code> - see
* {@link #setHeaderRenderer(TableCellRenderer)};</li>
* <li><code>headerValue</code> - see {@link #setHeaderValue(Object)};</li>
* <li><code>identifier</code> - see {@link #setIdentifier(Object)}.</li>
* </ul>
- *
+ *
* @param listener the listener to add (<code>null</code> is ignored).
- *
+ *
* @see #removePropertyChangeListener(PropertyChangeListener)
*/
public synchronized void addPropertyChangeListener(
@@ -654,11 +654,11 @@ public class TableColumn
}
/**
- * Removes a listener so that it no longer receives
- * {@link PropertyChangeEvent} notifications from this column. If
- * <code>listener</code> is not registered with the column, or is
+ * Removes a listener so that it no longer receives
+ * {@link PropertyChangeEvent} notifications from this column. If
+ * <code>listener</code> is not registered with the column, or is
* <code>null</code>, this method does nothing.
- *
+ *
* @param listener the listener to remove (<code>null</code> is ignored).
*/
public synchronized void removePropertyChangeListener(
@@ -670,9 +670,9 @@ public class TableColumn
/**
* Returns the property change listeners for this <code>TableColumn</code>.
* An empty array is returned if there are currently no listeners registered.
- *
+ *
* @return The property change listeners registered with this column.
- *
+ *
* @since 1.4
*/
public PropertyChangeListener[] getPropertyChangeListeners()
@@ -683,7 +683,7 @@ public class TableColumn
/**
* Creates and returns a default renderer for the column header (in this case,
* a new instance of {@link DefaultTableCellRenderer}).
- *
+ *
* @return A default renderer for the column header.
*/
protected TableCellRenderer createDefaultHeaderRenderer()
diff --git a/libjava/classpath/javax/swing/table/TableColumnModel.java b/libjava/classpath/javax/swing/table/TableColumnModel.java
index 7e8a70c..9a95f92 100644
--- a/libjava/classpath/javax/swing/table/TableColumnModel.java
+++ b/libjava/classpath/javax/swing/table/TableColumnModel.java
@@ -49,17 +49,17 @@ import javax.swing.event.TableColumnModelListener;
/**
* The interface used by {@link JTable} to access the columns in the table
* view.
- *
+ *
* @author Andrew Selkirk
*/
public interface TableColumnModel
{
/**
* Adds a column to the model.
- *
+ *
* @param column the new column (<code>null</code> not permitted).
- *
- * @throws IllegalArgumentException if <code>column</code> is
+ *
+ * @throws IllegalArgumentException if <code>column</code> is
* <code>null</code>.
*/
void addColumn(TableColumn column);
@@ -67,14 +67,14 @@ public interface TableColumnModel
/**
* Removes a column from the model. If <code>column</code> is not defined
* in the model, this method does nothing.
- *
+ *
* @param column TableColumn
*/
void removeColumn(TableColumn column);
/**
* Moves a column.
- *
+ *
* @param columnIndex Index of column to move
* @param newIndex New index of column
*/
@@ -83,23 +83,23 @@ public interface TableColumnModel
/**
* Sets the column margin and sends a {@link ChangeEvent} to all registered
* {@link TableColumnModelListener}s registered with the model.
- *
+ *
* @param margin the column margin.
- *
+ *
* @see #getColumnMargin()
*/
void setColumnMargin(int margin);
/**
* Returns the number of columns in the model.
- *
+ *
* @return The column count.
*/
int getColumnCount();
/**
* Returns an enumeration of the columns in the model.
- *
+ *
* @return An enumeration of the columns in the model.
*/
Enumeration<TableColumn> getColumns();
@@ -108,28 +108,28 @@ public interface TableColumnModel
* Returns the index of the {@link TableColumn} with the given identifier.
*
* @param identifier the identifier (<code>null</code> not permitted).
- *
+ *
* @return The index of the {@link TableColumn} with the given identifier.
- *
- * @throws IllegalArgumentException if <code>identifier</code> is
+ *
+ * @throws IllegalArgumentException if <code>identifier</code> is
* <code>null</code> or there is no column with that identifier.
*/
int getColumnIndex(Object identifier);
/**
* Returns the <code>TableColumn</code> at the specified index.
- *
+ *
* @param columnIndex the column index.
- *
+ *
* @return The table column.
*/
TableColumn getColumn(int columnIndex);
/**
* Returns the column margin.
- *
+ *
* @return The column margin.
- *
+ *
* @see #setColumnMargin(int)
*/
int getColumnMargin();
@@ -143,11 +143,11 @@ public interface TableColumnModel
* <li>individual column widths are taken into account, but the column margin
* is ignored.</li>
* </ul>
- * If no column contains the specified position, this method returns
+ * If no column contains the specified position, this method returns
* <code>-1</code>.
- *
+ *
* @param xPosition the x-position.
- *
+ *
* @return The column index, or <code>-1</code>.
*/
int getColumnIndexAtX(int xPosition);
@@ -164,17 +164,17 @@ public interface TableColumnModel
* Sets the flag that indicates whether or not column selection is allowed.
*
* @param allowed the new flag value.
- *
+ *
* @see #getColumnSelectionAllowed()
*/
void setColumnSelectionAllowed(boolean allowed);
/**
- * Returns <code>true</code> if column selection is allowed, and
+ * Returns <code>true</code> if column selection is allowed, and
* <code>false</code> if column selection is not allowed.
*
* @return A boolean.
- *
+ *
* @see #setColumnSelectionAllowed(boolean)
*/
boolean getColumnSelectionAllowed();
@@ -187,29 +187,29 @@ public interface TableColumnModel
/**
* Returns the number of selected columns in the model.
- *
+ *
* @return The selected column count.
- *
+ *
* @see #getSelectionModel()
*/
int getSelectedColumnCount();
/**
- * Sets the selection model that will be used to keep track of the selected
+ * Sets the selection model that will be used to keep track of the selected
* columns.
*
* @param model the selection model (<code>null</code> not permitted).
- *
- * @throws IllegalArgumentException if <code>model</code> is
+ *
+ * @throws IllegalArgumentException if <code>model</code> is
* <code>null</code>.
*/
void setSelectionModel(ListSelectionModel model);
/**
* Returns the selection model used to track table column selections.
- *
+ *
* @return The selection model.
- *
+ *
* @see #setSelectionModel(ListSelectionModel)
*/
ListSelectionModel getSelectionModel();
@@ -223,9 +223,9 @@ public interface TableColumnModel
void addColumnModelListener(TableColumnModelListener listener);
/**
- * Deregisters a listener, so that it will no longer receive
+ * Deregisters a listener, so that it will no longer receive
* {@link TableColumnModelEvent} notifications.
- *
+ *
* @param listener the listener.
*/
void removeColumnModelListener(TableColumnModelListener listener);
diff --git a/libjava/classpath/javax/swing/table/TableModel.java b/libjava/classpath/javax/swing/table/TableModel.java
index 7629fa4..d8fb713 100644
--- a/libjava/classpath/javax/swing/table/TableModel.java
+++ b/libjava/classpath/javax/swing/table/TableModel.java
@@ -40,48 +40,48 @@ package javax.swing.table;
import javax.swing.event.TableModelListener;
/**
- * A <code>TableModel</code> is a two dimensional data structure that
+ * A <code>TableModel</code> is a two dimensional data structure that
* can store arbitrary <code>Object</code> instances, usually for the
- * purpose of display in a {@link javax.swing.JTable} component. Individual
- * objects can be accessed by specifying the row index and column index for
+ * purpose of display in a {@link javax.swing.JTable} component. Individual
+ * objects can be accessed by specifying the row index and column index for
* the object. Each column in the model has a name associated with it.
* <p>
* The {@link DefaultTableModel} class provides one implementation of
* this interface.
- *
+ *
* @author Andrew Selkirk
*/
public interface TableModel
{
/**
* Returns the number of rows in the model.
- *
+ *
* @return The row count.
*/
int getRowCount();
/**
* Returns the number of columns in the model.
- *
+ *
* @return The column count
*/
int getColumnCount();
/**
* Returns the name of a column in the model.
- *
+ *
* @param columnIndex the column index.
- *
+ *
* @return The column name.
*/
String getColumnName(int columnIndex);
/**
* Returns the <code>Class</code> for all <code>Object</code> instances
- * in the specified column.
- *
+ * in the specified column.
+ *
* @param columnIndex the column index.
- *
+ *
* @return The class.
*/
Class<?> getColumnClass(int columnIndex);
@@ -89,10 +89,10 @@ public interface TableModel
/**
* Returns <code>true</code> if the cell is editable, and <code>false</code>
* otherwise.
- *
+ *
* @param rowIndex the row index.
* @param columnIndex the column index.
- *
+ *
* @return <code>true</code> if editable, <code>false</code> otherwise.
*/
boolean isCellEditable(int rowIndex, int columnIndex);
@@ -100,17 +100,17 @@ public interface TableModel
/**
* Returns the value (<code>Object</code>) at a particular cell in the
* table.
- *
+ *
* @param rowIndex the row index.
* @param columnIndex the column index.
- *
+ *
* @return The value at the specified cell.
*/
Object getValueAt(int rowIndex, int columnIndex);
/**
- * Sets the value at a particular cell in the table.
- *
+ * Sets the value at a particular cell in the table.
+ *
* @param aValue the value (<code>null</code> permitted).
* @param rowIndex the row index.
* @param columnIndex the column index.
@@ -120,14 +120,14 @@ public interface TableModel
/**
* Adds a listener to the model. The listener will receive notification
* of updates to the model.
- *
+ *
* @param listener the listener.
*/
void addTableModelListener(TableModelListener listener);
/**
* Removes a listener from the model.
- *
+ *
* @param listener the listener.
*/
void removeTableModelListener(TableModelListener listener);
diff --git a/libjava/classpath/javax/swing/text/AbstractDocument.java b/libjava/classpath/javax/swing/text/AbstractDocument.java
index 29b20b3..25915bb 100644
--- a/libjava/classpath/javax/swing/text/AbstractDocument.java
+++ b/libjava/classpath/javax/swing/text/AbstractDocument.java
@@ -149,22 +149,22 @@ public abstract class AbstractDocument implements Document, Serializable
* Manages event listeners for this <code>Document</code>.
*/
protected EventListenerList listenerList = new EventListenerList();
-
+
/**
* Stores the current writer thread. Used for locking.
- */
+ */
private Thread currentWriter = null;
-
+
/**
* The number of readers. Used for locking.
*/
private int numReaders = 0;
-
+
/**
* The number of current writers. If this is > 1 then the same thread entered
* the write lock more than once.
*/
- private int numWriters = 0;
+ private int numWriters = 0;
/** An instance of a DocumentFilter.FilterBypass which allows calling
* the insert, remove and replace method without checking for an installed
@@ -234,17 +234,17 @@ public abstract class AbstractDocument implements Document, Serializable
writeUnlock();
}
}
-
+
/** Returns the DocumentFilter.FilterBypass instance for this
* document and create it if it does not exist yet.
- *
+ *
* @return This document's DocumentFilter.FilterBypass instance.
*/
private DocumentFilter.FilterBypass getBypass()
{
if (bypass == null)
bypass = new Bypass();
-
+
return bypass;
}
@@ -283,7 +283,7 @@ public abstract class AbstractDocument implements Document, Serializable
* @see BranchElement
*/
protected Element createBranchElement(Element parent,
- AttributeSet attributes)
+ AttributeSet attributes)
{
return new BranchElement(parent, attributes);
}
@@ -303,7 +303,7 @@ public abstract class AbstractDocument implements Document, Serializable
* @see LeafElement
*/
protected Element createLeafElement(Element parent, AttributeSet attributes,
- int start, int end)
+ int start, int end)
{
return new LeafElement(parent, attributes, start, end);
}
@@ -413,7 +413,7 @@ public abstract class AbstractDocument implements Document, Serializable
Object val = getProperty(AsyncLoadPriority);
int prio = -1;
if (val != null)
- prio = ((Integer) val).intValue();
+ prio = ((Integer) val).intValue();
return prio;
}
@@ -621,13 +621,13 @@ public abstract class AbstractDocument implements Document, Serializable
/**
* Inserts a String into this <code>Document</code> at the specified
* position and assigning the specified attributes to it.
- *
+ *
* <p>If a {@link DocumentFilter} is installed in this document, the
* corresponding method of the filter object is called.</p>
- *
+ *
* <p>The method has no effect when <code>text</code> is <code>null</code>
* or has a length of zero.</p>
- *
+ *
*
* @param offset the location at which the string should be inserted
* @param text the content to be inserted
@@ -665,7 +665,7 @@ public abstract class AbstractDocument implements Document, Serializable
return;
DefaultDocumentEvent event =
new DefaultDocumentEvent(offset, text.length(),
- DocumentEvent.EventType.INSERT);
+ DocumentEvent.EventType.INSERT);
UndoableEdit undo = content.insertString(offset, text);
if (undo != null)
@@ -1078,14 +1078,14 @@ public abstract class AbstractDocument implements Document, Serializable
// balance by using a finally block:
// readLock()
// try
- // {
- // doSomethingHere
+ // {
+ // doSomethingHere
// }
// finally
// {
// readUnlock();
// }
-
+
// All that the JDK seems to check for is that you don't call unlock
// more times than you've previously called lock, but it doesn't make
// sure that the threads calling unlock were the same ones that called lock
@@ -1096,13 +1096,13 @@ public abstract class AbstractDocument implements Document, Serializable
if (currentWriter == Thread.currentThread())
return;
- // FIXME: the reference implementation throws a
+ // FIXME: the reference implementation throws a
// javax.swing.text.StateInvariantError here
if (numReaders <= 0)
throw new IllegalStateException("document lock failure");
-
- // If currentWriter is not null, the application code probably had a
- // writeLock and then tried to obtain a readLock, in which case
+
+ // If currentWriter is not null, the application code probably had a
+ // writeLock and then tried to obtain a readLock, in which case
// numReaders wasn't incremented
numReaders--;
notify();
@@ -1110,16 +1110,16 @@ public abstract class AbstractDocument implements Document, Serializable
/**
* Removes a piece of content from this <code>Document</code>.
- *
+ *
* <p>If a {@link DocumentFilter} is installed in this document, the
* corresponding method of the filter object is called. The
* <code>DocumentFilter</code> is called even if <code>length</code>
* is zero. This is different from {@link #replace}.</p>
- *
+ *
* <p>Note: When <code>length</code> is zero or below the call is not
* forwarded to the underlying {@link AbstractDocument.Content} instance
* of this document and no exception is thrown.</p>
- *
+ *
* @param offset the start offset of the fragment to be removed
* @param length the length of the fragment to be removed
*
@@ -1159,8 +1159,8 @@ public abstract class AbstractDocument implements Document, Serializable
DefaultDocumentEvent event =
new DefaultDocumentEvent(offset, length,
DocumentEvent.EventType.REMOVE);
-
- // The order of the operations below is critical!
+
+ // The order of the operations below is critical!
removeUpdate(event);
UndoableEdit temp = content.remove(offset, length);
@@ -1172,10 +1172,10 @@ public abstract class AbstractDocument implements Document, Serializable
/**
* Replaces a piece of content in this <code>Document</code> with
* another piece of content.
- *
+ *
* <p>If a {@link DocumentFilter} is installed in this document, the
* corresponding method of the filter object is called.</p>
- *
+ *
* <p>The method has no effect if <code>length</code> is zero (and
* only zero) and, at the same time, <code>text</code> is
* <code>null</code> or has zero length.</p>
@@ -1196,7 +1196,7 @@ public abstract class AbstractDocument implements Document, Serializable
throws BadLocationException
{
// Bail out if we have a bogus replacement (Behavior observed in RI).
- if (length == 0
+ if (length == 0
&& (text == null || text.length() == 0))
return;
@@ -1222,9 +1222,9 @@ public abstract class AbstractDocument implements Document, Serializable
writeUnlock();
}
}
-
+
void replaceImpl(int offset, int length, String text,
- AttributeSet attributes)
+ AttributeSet attributes)
throws BadLocationException
{
removeImpl(offset, length);
@@ -1356,7 +1356,7 @@ public abstract class AbstractDocument implements Document, Serializable
}
/**
- * Blocks until a write lock can be obtained. Must wait if there are
+ * Blocks until a write lock can be obtained. Must wait if there are
* readers currently reading or another thread is currently writing.
*/
protected synchronized final void writeLock()
@@ -1882,7 +1882,7 @@ public abstract class AbstractDocument implements Document, Serializable
/**
* Returns the resolve parent of this element.
* This is taken from the AttributeSet, but if this is null,
- * this method instead returns the Element's parent's
+ * this method instead returns the Element's parent's
* AttributeSet
*
* @return the resolve parent of this element
@@ -1919,7 +1919,7 @@ public abstract class AbstractDocument implements Document, Serializable
* is equal to this element's <code>AttributeSet</code>,
* <code>false</code> otherwise
*/
- public boolean isEqual(AttributeSet attrs)
+ public boolean isEqual(AttributeSet attrs)
{
return attributes.isEqual(attrs);
}
@@ -2066,7 +2066,7 @@ public abstract class AbstractDocument implements Document, Serializable
+ "must not be thrown "
+ "here.");
err.initCause(ex);
- throw err;
+ throw err;
}
b.append("]\n");
}
@@ -2137,7 +2137,7 @@ public abstract class AbstractDocument implements Document, Serializable
for (int index = 0; index < numChildren; ++index)
tmp.add(children[index]);
-
+
return tmp.elements();
}
@@ -2337,11 +2337,11 @@ public abstract class AbstractDocument implements Document, Serializable
// as beginning from first element each time.
for (int index = 0; index < numChildren; ++index)
{
- Element elem = children[index];
+ Element elem = children[index];
- if ((elem.getStartOffset() <= position)
- && (position < elem.getEndOffset()))
- return elem;
+ if ((elem.getStartOffset() <= position)
+ && (position < elem.getEndOffset()))
+ return elem;
}
return null;
@@ -2359,7 +2359,7 @@ public abstract class AbstractDocument implements Document, Serializable
int delta = elements.length - length;
int copyFrom = offset + length; // From where to copy.
int copyTo = copyFrom + delta; // Where to copy to.
- int numMove = numChildren - copyFrom; // How many elements are moved.
+ int numMove = numChildren - copyFrom; // How many elements are moved.
if (numChildren + delta > children.length)
{
// Gotta grow the array.
@@ -2386,7 +2386,7 @@ public abstract class AbstractDocument implements Document, Serializable
public String toString()
{
return ("BranchElement(" + getName() + ") "
- + getStartOffset() + "," + getEndOffset() + "\n");
+ + getStartOffset() + "," + getEndOffset() + "\n");
}
}
@@ -2403,7 +2403,7 @@ public abstract class AbstractDocument implements Document, Serializable
* The threshold that indicates when we switch to using a Hashtable.
*/
private static final int THRESHOLD = 10;
-
+
/** The starting offset of the change. */
private int offset;
@@ -2417,7 +2417,7 @@ public abstract class AbstractDocument implements Document, Serializable
* Maps <code>Element</code> to their change records. This is only
* used when the changes array gets too big. We can use an
* (unsync'ed) HashMap here, since changes to this are (should) always
- * be performed inside a write lock.
+ * be performed inside a write lock.
*/
private HashMap changes;
@@ -2435,7 +2435,7 @@ public abstract class AbstractDocument implements Document, Serializable
* @param type the type of change
*/
public DefaultDocumentEvent(int offset, int length,
- DocumentEvent.EventType type)
+ DocumentEvent.EventType type)
{
this.offset = offset;
this.length = length;
@@ -2548,7 +2548,7 @@ public abstract class AbstractDocument implements Document, Serializable
}
return change;
}
-
+
/**
* Returns a String description of the change event. This returns the
* toString method of the Vector of edits.
@@ -2558,7 +2558,7 @@ public abstract class AbstractDocument implements Document, Serializable
return edits.toString();
}
}
-
+
/**
* An implementation of {@link DocumentEvent.ElementChange} to be added
* to {@link DefaultDocumentEvent}s.
@@ -2588,7 +2588,7 @@ public abstract class AbstractDocument implements Document, Serializable
* The added elements.
*/
private Element[] added;
-
+
/**
* Creates a new <code>ElementEdit</code>.
*
@@ -2598,7 +2598,7 @@ public abstract class AbstractDocument implements Document, Serializable
* @param added the added elements
*/
public ElementEdit(Element elem, int index,
- Element[] removed, Element[] added)
+ Element[] removed, Element[] added)
{
this.elem = elem;
this.index = index;
@@ -2811,7 +2811,7 @@ public abstract class AbstractDocument implements Document, Serializable
public String toString()
{
return ("LeafElement(" + getName() + ") "
- + getStartOffset() + "," + getEndOffset() + "\n");
+ + getStartOffset() + "," + getEndOffset() + "\n");
}
}
@@ -2900,7 +2900,7 @@ public abstract class AbstractDocument implements Document, Serializable
{
AbstractDocument.this.replaceImpl(offset, length, string, attrs);
}
-
+
}
-
+
}
diff --git a/libjava/classpath/javax/swing/text/AbstractWriter.java b/libjava/classpath/javax/swing/text/AbstractWriter.java
index 8d5a607..e7df26e 100644
--- a/libjava/classpath/javax/swing/text/AbstractWriter.java
+++ b/libjava/classpath/javax/swing/text/AbstractWriter.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -66,7 +66,7 @@ public abstract class AbstractWriter
// Number of characters we have currently written.
private int lineLength;
// True if we can apply line wrapping.
- private boolean canWrapLines; // FIXME default?
+ private boolean canWrapLines; // FIXME default?
// The number of spaces per indentation level.
private int indentSpace = 2;
// The current indentation level.
@@ -167,7 +167,7 @@ public abstract class AbstractWriter
/**
* This method must be overridden by a concrete subclass. It is
* responsible for iterating over the Elements of the Document and
- * writing them out.
+ * writing them out.
*/
protected abstract void write() throws IOException, BadLocationException;
@@ -182,9 +182,9 @@ public abstract class AbstractWriter
{
if (! elt.isLeaf())
throw new BadLocationException("Element is not a leaf",
- elt.getStartOffset());
- return document.getText(elt.getStartOffset(),
- elt.getEndOffset() - elt.getStartOffset());
+ elt.getStartOffset());
+ return document.getText(elt.getStartOffset(),
+ elt.getEndOffset() - elt.getStartOffset());
}
/**
@@ -239,37 +239,37 @@ public abstract class AbstractWriter
{
if (getCanWrapLines())
{
- // FIXME: should we be handling newlines specially here?
- for (int i = 0; i < len; )
- {
- int start_i = i;
- // Find next space.
- while (i < len && data[start + i] != ' ')
- ++i;
- if (i < len && lineLength + i - start_i >= maxLineLength)
- writeLineSeparator();
- else if (i < len)
- {
- // Write the trailing space.
- ++i;
- }
- // Write out the text.
- output(data, start + start_i, start + i - start_i);
- }
+ // FIXME: should we be handling newlines specially here?
+ for (int i = 0; i < len; )
+ {
+ int start_i = i;
+ // Find next space.
+ while (i < len && data[start + i] != ' ')
+ ++i;
+ if (i < len && lineLength + i - start_i >= maxLineLength)
+ writeLineSeparator();
+ else if (i < len)
+ {
+ // Write the trailing space.
+ ++i;
+ }
+ // Write out the text.
+ output(data, start + start_i, start + i - start_i);
+ }
}
else
{
- int saved_i = start;
- for (int i = start; i < start + len; ++i)
- {
- if (data[i] == NEWLINE)
- {
- output(data, saved_i, i - saved_i);
- writeLineSeparator();
- }
- }
- if (saved_i < start + len - 1)
- output(data, saved_i, start + len - saved_i);
+ int saved_i = start;
+ for (int i = start; i < start + len; ++i)
+ {
+ if (data[i] == NEWLINE)
+ {
+ output(data, saved_i, i - saved_i);
+ writeLineSeparator();
+ }
+ }
+ if (saved_i < start + len - 1)
+ output(data, saved_i, start + len - saved_i);
}
}
@@ -284,9 +284,9 @@ public abstract class AbstractWriter
int spaces = indentLevel * indentSpace;
if (spaces > 0)
{
- char[] v = new char[spaces];
- Arrays.fill(v, ' ');
- write(v, 0, v.length);
+ char[] v = new char[spaces];
+ Arrays.fill(v, ' ');
+ write(v, 0, v.length);
}
indented = true;
}
@@ -318,7 +318,7 @@ public abstract class AbstractWriter
int eltStart = elt.getStartOffset();
int eltEnd = elt.getEndOffset();
return ((eltStart >= startOffset && eltStart < endOffset)
- || (eltEnd >= startOffset && eltEnd < endOffset));
+ || (eltEnd >= startOffset && eltEnd < endOffset));
}
/**
@@ -472,10 +472,10 @@ public abstract class AbstractWriter
Enumeration e = attrs.getAttributeNames();
while (e.hasMoreElements())
{
- Object name = e.nextElement();
- Object val = attrs.getAttribute(name);
- write(name + "=" + val);
- writeLineSeparator();
+ Object name = e.nextElement();
+ Object val = attrs.getAttribute(name);
+ write(name + "=" + val);
+ writeLineSeparator();
}
}
}
diff --git a/libjava/classpath/javax/swing/text/AsyncBoxView.java b/libjava/classpath/javax/swing/text/AsyncBoxView.java
index 327c2b8..aca77aa 100644
--- a/libjava/classpath/javax/swing/text/AsyncBoxView.java
+++ b/libjava/classpath/javax/swing/text/AsyncBoxView.java
@@ -160,7 +160,7 @@ public class AsyncBoxView
*
* @param index the index of the child view
* @param a the current allocation of this view
- *
+ *
* @return the current allocation for a child view
*/
public synchronized Shape getChildAllocation(int index, Shape a)
@@ -216,7 +216,7 @@ public class AsyncBoxView
/**
* Returns the current allocation of the child view with the specified
* index. Note that this will <em>not</em> update any location information.
- *
+ *
* @param index the index of the requested child view
*
* @return the current allocation of the child view with the specified
@@ -428,7 +428,7 @@ public class AsyncBoxView
* Returns the child view for which this <code>ChildState</code> represents
* the layout state.
*
- * @return the child view for this child state object
+ * @return the child view for this child state object
*/
public View getChildView()
{
@@ -1002,7 +1002,7 @@ public class AsyncBoxView
replace(0, 0, added);
}
}
-
+
/**
* Returns the span along an axis that is taken up by the insets.
*
@@ -1355,14 +1355,14 @@ public class AsyncBoxView
return;
}
}
- int index = getViewIndexAtPosition(view.getStartOffset(),
+ int index = getViewIndexAtPosition(view.getStartOffset(),
Position.Bias.Forward);
ChildState cs = getChildState(index);
cs.preferenceChanged(width, height);
LayoutQueue q = getLayoutQueue();
q.addTask(cs);
q.addTask(flushTask);
- }
+ }
}
/**
@@ -1375,7 +1375,7 @@ public class AsyncBoxView
* @param e the document event
* @param a the current allocation of this view
*/
- protected void updateLayout(DocumentEvent.ElementChange ec,
+ protected void updateLayout(DocumentEvent.ElementChange ec,
DocumentEvent e, Shape a)
{
if (ec != null)
@@ -1385,8 +1385,8 @@ public class AsyncBoxView
locator.childChanged(cs);
}
}
-
-
+
+
/**
* Returns the <code>ChildState</code> object associated with the child view
* at the specified <code>index</code>.
@@ -1416,7 +1416,7 @@ public class AsyncBoxView
/**
* Returns the child view index of the view that represents the specified
* position in the document model.
- *
+ *
* @param pos the position in the model
* @param b the bias
*
diff --git a/libjava/classpath/javax/swing/text/AttributeSet.java b/libjava/classpath/javax/swing/text/AttributeSet.java
index 2d39881..a596cd4 100644
--- a/libjava/classpath/javax/swing/text/AttributeSet.java
+++ b/libjava/classpath/javax/swing/text/AttributeSet.java
@@ -1,4 +1,4 @@
-/* AttributeSet.java --
+/* AttributeSet.java --
Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -52,7 +52,7 @@ import java.util.Enumeration;
* @author Roman Kennke (roman@kennke.org)
*/
public interface AttributeSet
-{
+{
/**
* Used as keys to identify character-run attributes.
*/
@@ -191,5 +191,5 @@ public interface AttributeSet
* are equal to the attributes in this <code>AttributeSet</code>,
* <code>false</code> otherwise
*/
- boolean isEqual(AttributeSet attr);
+ boolean isEqual(AttributeSet attr);
}
diff --git a/libjava/classpath/javax/swing/text/BoxView.java b/libjava/classpath/javax/swing/text/BoxView.java
index 0754d9b..325364d 100644
--- a/libjava/classpath/javax/swing/text/BoxView.java
+++ b/libjava/classpath/javax/swing/text/BoxView.java
@@ -155,8 +155,8 @@ public class BoxView
* automatically when any of the child view changes its preferences
* via {@link #preferenceChanged(View, boolean, boolean)}.
*
- * The layout will be updated the next time when
- * {@link #setSize(float, float)} is called, typically from within the
+ * The layout will be updated the next time when
+ * {@link #setSize(float, float)} is called, typically from within the
* {@link #paint(Graphics, Shape)} method.
*
* Valid values for the axis are {@link View#X_AXIS} and
@@ -387,7 +387,7 @@ public class BoxView
int totalDescentMin = 0;
int totalDescentPref = 0;
int totalDescentMax = 0;
-
+
int count = getViewCount();
for (int i = 0; i < count; i++)
{
@@ -578,7 +578,7 @@ public class BoxView
return res;
}
-
+
/**
* Returns <code>true</code> if the specified point lies before the
@@ -699,7 +699,7 @@ public class BoxView
* Computes the allocation for a child <code>View</code>. The parameter
* <code>a</code> stores the allocation of this <code>CompositeView</code>
* and is then adjusted to hold the allocation of the child view.
- *
+ *
* @param index
* the index of the child <code>View</code>
* @param a
@@ -957,13 +957,13 @@ public class BoxView
updateRequirements(axis);
return requirements[axis].alignment;
}
-
+
/**
* Called by a child View when its preferred span has changed.
- *
+ *
* @param width indicates that the preferred width of the child changed.
* @param height indicates that the preferred height of the child changed.
- * @param child the child View.
+ * @param child the child View.
*/
public void preferenceChanged(View child, boolean width, boolean height)
{
@@ -979,7 +979,7 @@ public class BoxView
}
super.preferenceChanged(child, width, height);
}
-
+
/**
* Maps the document model position <code>pos</code> to a Shape
* in the view coordinate space. This method overrides CompositeView's
diff --git a/libjava/classpath/javax/swing/text/Caret.java b/libjava/classpath/javax/swing/text/Caret.java
index d641190..06972f9 100644
--- a/libjava/classpath/javax/swing/text/Caret.java
+++ b/libjava/classpath/javax/swing/text/Caret.java
@@ -1,4 +1,4 @@
-/* Caret.java --
+/* Caret.java --
Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -77,7 +77,7 @@ public interface Caret
* @param c the text component to install this caret to
*/
void install(JTextComponent c);
-
+
/**
* Deinstalls this <code>Caret</code> from the specified text component.
* This usually involves removing listeners from the text component.
@@ -105,7 +105,7 @@ public interface Caret
* @param rate the new blink rate to set
*/
void setBlinkRate(int rate);
-
+
/**
* Returns the current position of this <code>Caret</code> within the
* <code>Document</code>.
@@ -125,7 +125,7 @@ public interface Caret
* @see #moveDot(int)
*/
void setDot(int dot);
-
+
/**
* Moves the <code>dot</code> location without touching the
* <code>mark</code>. This is used when making a selection.
@@ -135,7 +135,7 @@ public interface Caret
* @see #setDot(int)
*/
void moveDot(int dot);
-
+
/**
* Returns the current position of the <code>mark</code>. The
* <code>mark</code> marks the location in the <code>Document</code> that
@@ -145,7 +145,7 @@ public interface Caret
* @return the current position of the mark
*/
int getMark();
-
+
/**
* Returns the current visual position of this <code>Caret</code>.
*
@@ -194,7 +194,7 @@ public interface Caret
* <code>Caret</code>, <code>false</code> hides it.
*
* @param v the visibility to set
- */
+ */
void setVisible(boolean v);
/**
@@ -203,5 +203,5 @@ public interface Caret
*
* @param g the graphics context to render to
*/
- void paint(Graphics g);
+ void paint(Graphics g);
}
diff --git a/libjava/classpath/javax/swing/text/ComponentView.java b/libjava/classpath/javax/swing/text/ComponentView.java
index 8de4de6..3680b42 100644
--- a/libjava/classpath/javax/swing/text/ComponentView.java
+++ b/libjava/classpath/javax/swing/text/ComponentView.java
@@ -1,4 +1,4 @@
-/* ComponentView.java --
+/* ComponentView.java --
Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -459,7 +459,7 @@ public class ComponentView extends View
}
}
}
-
+
/**
* Maps coordinates from the <code>View</code>'s space into a position
* in the document model.
diff --git a/libjava/classpath/javax/swing/text/CompositeView.java b/libjava/classpath/javax/swing/text/CompositeView.java
index 570fc95..ae3c79d 100644
--- a/libjava/classpath/javax/swing/text/CompositeView.java
+++ b/libjava/classpath/javax/swing/text/CompositeView.java
@@ -309,7 +309,7 @@ public abstract class CompositeView
* listed valid values
*/
public Shape modelToView(int p1, Position.Bias b1,
- int p2, Position.Bias b2, Shape a)
+ int p2, Position.Bias b2, Shape a)
throws BadLocationException
{
// TODO: This is most likely not 100% ok, figure out what else is to
@@ -346,7 +346,7 @@ public abstract class CompositeView
* of the caret when navigating around the document with the arrow keys. This
* is a convenience method for {@link #getNextNorthSouthVisualPositionFrom}
* and {@link #getNextEastWestVisualPositionFrom}.
- *
+ *
* @param pos
* the model position to start search from
* @param b
@@ -662,7 +662,7 @@ public abstract class CompositeView
// This limitation is described as PR 27345.
int index = getViewIndex(pos, b);
View v = null;
-
+
if (index == -1)
return pos;
@@ -673,7 +673,7 @@ public abstract class CompositeView
// provided.
if (index <= 0)
return pos;
-
+
v = getView(index - 1);
break;
case SOUTH:
@@ -681,13 +681,13 @@ public abstract class CompositeView
// provided.
if (index >= getViewCount() - 1)
return pos;
-
+
v = getView(index + 1);
break;
default:
throw new IllegalArgumentException();
}
-
+
return v.getNextVisualPositionFrom(pos, b, a, direction, biasRet);
}
@@ -738,9 +738,9 @@ public abstract class CompositeView
//
// This limitation is described as PR 27346.
int index;
-
+
View v = null;
-
+
switch (direction)
{
case EAST:
@@ -749,7 +749,7 @@ public abstract class CompositeView
// provided.
if (index == -1)
return pos;
-
+
v = getView(index);
break;
case WEST:
@@ -758,13 +758,13 @@ public abstract class CompositeView
// provided.
if (index == -1)
return pos;
-
+
v = getView(index);
break;
default:
throw new IllegalArgumentException();
}
-
+
return v.getNextVisualPositionFrom(pos,
b,
a,
diff --git a/libjava/classpath/javax/swing/text/DefaultCaret.java b/libjava/classpath/javax/swing/text/DefaultCaret.java
index c4c2580..acfcdb3 100644
--- a/libjava/classpath/javax/swing/text/DefaultCaret.java
+++ b/libjava/classpath/javax/swing/text/DefaultCaret.java
@@ -70,15 +70,15 @@ import javax.swing.text.Position.Bias;
public class DefaultCaret extends Rectangle
implements Caret, FocusListener, MouseListener, MouseMotionListener
{
-
+
/** A text component in the current VM which currently has a
* text selection or <code>null</code>.
- */
+ */
static JTextComponent componentWithSelection;
/** An implementation of NavigationFilter.FilterBypass which delegates
- * to the corresponding methods of the <code>DefaultCaret</code>.
- *
+ * to the corresponding methods of the <code>DefaultCaret</code>.
+ *
* @author Robert Schuster (robertschuster@fsfe.org)
*/
class Bypass extends NavigationFilter.FilterBypass
@@ -98,9 +98,9 @@ public class DefaultCaret extends Rectangle
{
DefaultCaret.this.setDotImpl(dot);
}
-
+
}
-
+
/**
* Controls the blinking of the caret.
*
@@ -116,11 +116,11 @@ public class DefaultCaret extends Rectangle
* the caret visible one iteration longer.
*/
boolean ignoreNextEvent;
-
+
/**
* Receives notification when the blink timer fires and updates the visible
* state of the caret.
- *
+ *
* @param event the action event
*/
public void actionPerformed(ActionEvent event)
@@ -138,7 +138,7 @@ public class DefaultCaret extends Rectangle
/**
* Listens for changes in the text component's document and updates the
* caret accordingly.
- *
+ *
* @author Roman Kennke (kennke@aicas.com)
*/
private class DocumentHandler implements DocumentListener
@@ -162,10 +162,10 @@ public class DefaultCaret extends Rectangle
*/
public void insertUpdate(DocumentEvent event)
{
- if (policy == ALWAYS_UPDATE ||
- (SwingUtilities.isEventDispatchThread() &&
+ if (policy == ALWAYS_UPDATE ||
+ (SwingUtilities.isEventDispatchThread() &&
policy == UPDATE_WHEN_ON_EDT))
- {
+ {
int dot = getDot();
setDot(dot + event.getLength());
}
@@ -216,14 +216,14 @@ public class DefaultCaret extends Rectangle
*/
public void propertyChange(PropertyChangeEvent e)
{
- String name = e.getPropertyName();
-
+ String name = e.getPropertyName();
+
if (name.equals("document"))
{
Document oldDoc = (Document) e.getOldValue();
if (oldDoc != null)
oldDoc.removeDocumentListener(documentListener);
-
+
Document newDoc = (Document) e.getNewValue();
if (newDoc != null)
newDoc.addDocumentListener(documentListener);
@@ -238,19 +238,19 @@ public class DefaultCaret extends Rectangle
active = (((Boolean) e.getNewValue()).booleanValue()
&& textComponent.isEditable());
}
-
+
}
-
+
}
/** The serialization UID (compatible with JDK1.5). */
private static final long serialVersionUID = 4325555698756477346L;
-
+
/**
* Indicates the Caret position should always be updated after Document
* changes even if the updates are not performed on the Event Dispatching
* thread.
- *
+ *
* @since 1.5
*/
public static final int ALWAYS_UPDATE = 2;
@@ -259,22 +259,22 @@ public class DefaultCaret extends Rectangle
* Indicates the Caret position should not be changed unless the Document
* length becomes less than the Caret position, in which case the Caret
* is moved to the end of the Document.
- *
+ *
* @since 1.5
*/
public static final int NEVER_UPDATE = 1;
-
- /**
+
+ /**
* Indicates the Caret position should be updated only if Document changes
* are made on the Event Dispatcher thread.
- *
+ *
* @since 1.5
*/
public static final int UPDATE_WHEN_ON_EDT = 0;
-
+
/** Keeps track of the current update policy **/
int policy = UPDATE_WHEN_ON_EDT;
-
+
/**
* The <code>ChangeEvent</code> that is fired by {@link #fireStateChanged()}.
*/
@@ -297,7 +297,7 @@ public class DefaultCaret extends Rectangle
/**
* The text component in which this caret is installed.
- *
+ *
* (Package private to avoid synthetic accessor method.)
*/
JTextComponent textComponent;
@@ -332,11 +332,11 @@ public class DefaultCaret extends Rectangle
* package private to avoid an accessor method.
*/
boolean visible = false;
-
+
/** Indicates whether the text component where the caret is installed is
* editable and enabled. If either of these properties is <code>false</code>
* the caret is not drawn.
- */
+ */
boolean active = true;
/**
@@ -345,7 +345,7 @@ public class DefaultCaret extends Rectangle
private Object highlightEntry;
private Timer blinkTimer;
-
+
private BlinkTimerListener blinkListener;
/**
@@ -362,10 +362,10 @@ public class DefaultCaret extends Rectangle
{
// Nothing to do here.
}
-
+
/** Returns the caret's <code>NavigationFilter.FilterBypass</code> instance
* and creates it if it does not yet exist.
- *
+ *
* @return The caret's <code>NavigationFilter.FilterBypass</code> instance.
*/
private NavigationFilter.FilterBypass getBypass()
@@ -375,17 +375,17 @@ public class DefaultCaret extends Rectangle
/**
* Sets the Caret update policy.
- *
+ *
* @param policy the new policy. Valid values are:
* ALWAYS_UPDATE: always update the Caret position, even when Document
* updates don't occur on the Event Dispatcher thread.
* NEVER_UPDATE: don't update the Caret position unless the Document
* length becomes less than the Caret position (then update the
* Caret to the end of the Document).
- * UPDATE_WHEN_ON_EDT: update the Caret position when the
- * Document updates occur on the Event Dispatcher thread. This is the
+ * UPDATE_WHEN_ON_EDT: update the Caret position when the
+ * Document updates occur on the Event Dispatcher thread. This is the
* default.
- *
+ *
* @since 1.5
* @throws IllegalArgumentException if policy is not one of the above.
*/
@@ -393,15 +393,15 @@ public class DefaultCaret extends Rectangle
{
if (policy != ALWAYS_UPDATE && policy != NEVER_UPDATE
&& policy != UPDATE_WHEN_ON_EDT)
- throw new
+ throw new
IllegalArgumentException
("policy must be ALWAYS_UPDATE, NEVER__UPDATE, or UPDATE_WHEN_ON_EDT");
this.policy = policy;
}
-
+
/**
* Gets the caret update policy.
- *
+ *
* @return the caret update policy.
* @since 1.5
*/
@@ -409,11 +409,11 @@ public class DefaultCaret extends Rectangle
{
return policy;
}
-
+
/**
* Moves the caret position when the mouse is dragged over the text
* component, modifying the selectiony.
- *
+ *
* <p>When the text component where the caret is installed is disabled,
* the selection is not change but you can still scroll the text and
* update the caret's location.</p>
@@ -462,9 +462,9 @@ public class DefaultCaret extends Rectangle
// Do not modify selection if component is disabled.
if (!textComponent.isEnabled())
return;
-
+
int count = event.getClickCount();
-
+
if (event.getButton() == MouseEvent.BUTTON1 && count >= 2)
{
int newDot = getComponent().viewToModel(event.getPoint());
@@ -480,7 +480,7 @@ public class DefaultCaret extends Rectangle
else
{
int wordStart = Utilities.getWordStart(t, newDot);
-
+
// When the mouse points at the offset of the first character
// in a word Utilities().getPreviousWord will not return that
// word but we want to select that. We have to use
@@ -495,7 +495,7 @@ public class DefaultCaret extends Rectangle
int nextWord = Utilities.getNextWord(t, newDot);
int previousWord = Utilities.getPreviousWord(t, newDot);
int previousWordEnd = Utilities.getWordEnd(t, previousWord);
-
+
// If the user clicked in the space between two words,
// then select the space.
if (newDot >= previousWordEnd && newDot <= nextWord)
@@ -517,7 +517,7 @@ public class DefaultCaret extends Rectangle
// TODO: Swallowing ok here?
}
}
-
+
}
/**
@@ -552,7 +552,7 @@ public class DefaultCaret extends Rectangle
*/
public void mousePressed(MouseEvent event)
{
-
+
// The implementation assumes that consuming the event makes the AWT event
// mechanism forget about this event instance and not transfer focus.
// By observing how the RI reacts the following behavior has been
@@ -617,14 +617,14 @@ public class DefaultCaret extends Rectangle
{
if (textComponent.isEditable())
{
- setVisible(true);
+ setVisible(true);
updateTimerStatus();
}
}
/**
* Sets the caret to <code>invisible</code>.
- *
+ *
* @param event the <code>FocusEvent</code>
*/
public void focusLost(FocusEvent event)
@@ -632,13 +632,13 @@ public class DefaultCaret extends Rectangle
if (textComponent.isEditable() && event.isTemporary() == false)
{
setVisible(false);
-
+
// Stop the blinker, if running.
if (blinkTimer != null && blinkTimer.isRunning())
blinkTimer.stop();
}
}
-
+
/**
* Install (if not present) and start the timer, if the caret must blink. The
* caret does not blink if it is invisible, or the component is disabled or
@@ -724,11 +724,11 @@ public class DefaultCaret extends Rectangle
propertyChangeListener = new PropertyChangeHandler();
textComponent.addPropertyChangeListener(propertyChangeListener);
documentListener = new DocumentHandler();
-
+
Document doc = textComponent.getDocument();
if (doc != null)
doc.addDocumentListener(documentListener);
-
+
active = textComponent.isEditable() && textComponent.isEnabled();
repaint();
@@ -769,21 +769,21 @@ public class DefaultCaret extends Rectangle
{
return mark;
}
-
+
private void clearHighlight()
{
Highlighter highlighter = textComponent.getHighlighter();
-
+
if (highlighter == null)
return;
-
+
if (selectionVisible)
{
try
{
if (highlightEntry != null)
highlighter.changeHighlight(highlightEntry, 0, 0);
-
+
// Free the global variable which stores the text component with an active
// selection.
if (componentWithSelection == textComponent)
@@ -808,22 +808,22 @@ public class DefaultCaret extends Rectangle
private void handleHighlight()
{
Highlighter highlighter = textComponent.getHighlighter();
-
+
if (highlighter == null)
return;
-
+
int p0 = Math.min(dot, mark);
int p1 = Math.max(dot, mark);
-
+
if (selectionVisible)
{
- try
- {
- if (highlightEntry == null)
- highlightEntry = highlighter.addHighlight(p0, p1, getSelectionPainter());
- else
- highlighter.changeHighlight(highlightEntry, p0, p1);
-
+ try
+ {
+ if (highlightEntry == null)
+ highlightEntry = highlighter.addHighlight(p0, p1, getSelectionPainter());
+ else
+ highlighter.changeHighlight(highlightEntry, p0, p1);
+
// If another component currently has a text selection clear that selection
// first.
if (componentWithSelection != null)
@@ -833,21 +833,21 @@ public class DefaultCaret extends Rectangle
c.setDot(c.getDot());
}
componentWithSelection = textComponent;
-
- }
- catch (BadLocationException e)
- {
- // This should never happen.
- throw new InternalError();
- }
+
+ }
+ catch (BadLocationException e)
+ {
+ // This should never happen.
+ throw new InternalError();
+ }
}
else
{
- if (highlightEntry != null)
- {
- highlighter.removeHighlight(highlightEntry);
- highlightEntry = null;
- }
+ if (highlightEntry != null)
+ {
+ highlighter.removeHighlight(highlightEntry);
+ highlightEntry = null;
+ }
}
}
@@ -861,7 +861,7 @@ public class DefaultCaret extends Rectangle
{
if (selectionVisible == v)
return;
-
+
selectionVisible = v;
handleHighlight();
repaint();
@@ -1049,7 +1049,7 @@ public class DefaultCaret extends Rectangle
*
* <p>If the underlying text component has a {@link NavigationFilter}
* installed the caret will call the corresponding method of that object.</p>
- *
+ *
* @param dot the location where to move the dot
*
* @see #setDot(int)
@@ -1062,7 +1062,7 @@ public class DefaultCaret extends Rectangle
else
moveDotImpl(dot);
}
-
+
void moveDotImpl(int dot)
{
if (dot >= 0)
@@ -1071,7 +1071,7 @@ public class DefaultCaret extends Rectangle
if (doc != null)
this.dot = Math.min(dot, doc.getLength());
this.dot = Math.max(this.dot, 0);
-
+
handleHighlight();
appear();
@@ -1082,10 +1082,10 @@ public class DefaultCaret extends Rectangle
* Sets the current position of this <code>Caret</code> within the
* <code>Document</code>. This also sets the <code>mark</code> to the new
* location.
- *
+ *
* <p>If the underlying text component has a {@link NavigationFilter}
* installed the caret will call the corresponding method of that object.</p>
- *
+ *
* @param dot
* the new position to be set
* @see #moveDot(int)
@@ -1098,27 +1098,27 @@ public class DefaultCaret extends Rectangle
else
setDotImpl(dot);
}
-
+
void setDotImpl(int dot)
{
if (dot >= 0)
- {
+ {
Document doc = textComponent.getDocument();
if (doc != null)
this.dot = Math.min(dot, doc.getLength());
this.dot = Math.max(this.dot, 0);
this.mark = this.dot;
-
+
clearHighlight();
-
+
appear();
}
}
-
+
/**
* Show the caret (may be hidden due blinking) and adjust the timer not to
* hide it (possibly immediately).
- *
+ *
* @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
*/
void appear()
@@ -1137,7 +1137,7 @@ public class DefaultCaret extends Rectangle
visible = true;
Rectangle area = null;
- int dot = getDot();
+ int dot = getDot();
try
{
area = getComponent().modelToView(dot);
@@ -1158,7 +1158,7 @@ public class DefaultCaret extends Rectangle
}
}
repaint();
- }
+ }
/**
* Returns <code>true</code> if this <code>Caret</code> is blinking,
@@ -1195,7 +1195,7 @@ public class DefaultCaret extends Rectangle
* <code>Caret</code>, <code>false</code> hides it.
*
* @param v the visibility to set
- */
+ */
public void setVisible(boolean v)
{
if (v != visible)
@@ -1203,17 +1203,17 @@ public class DefaultCaret extends Rectangle
visible = v;
updateTimerStatus();
Rectangle area = null;
- int dot = getDot();
+ int dot = getDot();
try
- {
+ {
area = getComponent().modelToView(dot);
}
catch (BadLocationException e)
{
- AssertionError ae;
- ae = new AssertionError("Unexpected bad caret location: " + dot);
- ae.initCause(e);
- throw ae;
+ AssertionError ae;
+ ae = new AssertionError("Unexpected bad caret location: " + dot);
+ ae.initCause(e);
+ throw ae;
}
if (area != null)
damage(area);
@@ -1258,7 +1258,7 @@ public class DefaultCaret extends Rectangle
// Should not happen.
throw new InternalError("Caret location not within document range.");
}
-
+
repaint();
}
@@ -1283,5 +1283,5 @@ public class DefaultCaret extends Rectangle
blinkTimer = new Timer(getBlinkRate(), blinkListener);
blinkTimer.setRepeats(true);
}
-
+
}
diff --git a/libjava/classpath/javax/swing/text/DefaultEditorKit.java b/libjava/classpath/javax/swing/text/DefaultEditorKit.java
index 0d999a3..b3b7e60 100644
--- a/libjava/classpath/javax/swing/text/DefaultEditorKit.java
+++ b/libjava/classpath/javax/swing/text/DefaultEditorKit.java
@@ -79,11 +79,11 @@ public class DefaultEditorKit extends EditorKit
try
{
JTextComponent t = getTextComponent(event);
-
+
if (t != null)
{
int offs = Utilities.getPreviousWord(t, t.getCaretPosition());
-
+
Caret c = t.getCaret();
c.moveDot(offs);
c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -109,11 +109,11 @@ public class DefaultEditorKit extends EditorKit
try
{
JTextComponent t = getTextComponent(event);
-
+
if (t != null)
{
int offs = Utilities.getNextWord(t, t.getCaretPosition());
-
+
Caret c = t.getCaret();
c.moveDot(offs);
c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -132,17 +132,17 @@ public class DefaultEditorKit extends EditorKit
{
super(selectionBeginWordAction);
}
-
+
public void actionPerformed(ActionEvent event)
{
try
{
JTextComponent t = getTextComponent(event);
-
+
if (t != null)
{
int offs = Utilities.getWordStart(t, t.getCaretPosition());
-
+
Caret c = t.getCaret();
c.moveDot(offs);
c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -154,24 +154,24 @@ public class DefaultEditorKit extends EditorKit
}
}
}
-
+
static class SelectionEndWordAction extends TextAction
{
SelectionEndWordAction()
{
super(selectionEndWordAction);
}
-
+
public void actionPerformed(ActionEvent event)
{
try
{
JTextComponent t = getTextComponent(event);
-
+
if (t != null)
{
int offs = Utilities.getWordEnd(t, t.getCaretPosition());
-
+
Caret c = t.getCaret();
c.moveDot(offs);
c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -183,24 +183,24 @@ public class DefaultEditorKit extends EditorKit
}
}
}
-
+
static class BeginWordAction extends TextAction
{
BeginWordAction()
{
super(beginWordAction);
}
-
+
public void actionPerformed(ActionEvent event)
{
try
{
JTextComponent t = getTextComponent(event);
-
+
if (t != null)
{
int offs = Utilities.getWordStart(t, t.getCaretPosition());
-
+
Caret c = t.getCaret();
c.setDot(offs);
c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -212,24 +212,24 @@ public class DefaultEditorKit extends EditorKit
}
}
}
-
+
static class EndWordAction extends TextAction
{
EndWordAction()
{
super(endWordAction);
}
-
+
public void actionPerformed(ActionEvent event)
{
try
{
JTextComponent t = getTextComponent(event);
-
+
if (t != null)
{
int offs = Utilities.getWordEnd(t, t.getCaretPosition());
-
+
Caret c = t.getCaret();
c.setDot(offs);
c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -255,11 +255,11 @@ public class DefaultEditorKit extends EditorKit
try
{
JTextComponent t = getTextComponent(event);
-
+
if (t != null)
{
int offs = Utilities.getPreviousWord(t, t.getCaretPosition());
-
+
Caret c = t.getCaret();
c.setDot(offs);
c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -285,11 +285,11 @@ public class DefaultEditorKit extends EditorKit
try
{
JTextComponent t = getTextComponent(event);
-
+
if (t != null)
{
int offs = Utilities.getNextWord(t, t.getCaretPosition());
-
+
Caret c = t.getCaret();
c.setDot(offs);
c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -320,7 +320,7 @@ public class DefaultEditorKit extends EditorKit
c.setDot(0);
c.moveDot(offs);
try
- {
+ {
c.setMagicCaretPosition(t.modelToView(offs).getLocation());
}
catch(BadLocationException ble)
@@ -347,7 +347,7 @@ public class DefaultEditorKit extends EditorKit
Caret c = t.getCaret();
c.moveDot(0);
try
- {
+ {
c.setMagicCaretPosition(t.modelToView(0).getLocation());
}
catch(BadLocationException ble)
@@ -375,7 +375,7 @@ public class DefaultEditorKit extends EditorKit
Caret c = t.getCaret();
c.moveDot(offs);
try
- {
+ {
c.setMagicCaretPosition(t.modelToView(offs).getLocation());
}
catch(BadLocationException ble)
@@ -385,11 +385,11 @@ public class DefaultEditorKit extends EditorKit
}
}
}
-
+
static class SelectionBeginLineAction
extends TextAction
{
-
+
SelectionBeginLineAction()
{
super(selectionBeginLineAction);
@@ -440,14 +440,14 @@ public class DefaultEditorKit extends EditorKit
}
}
}
-
+
static class SelectLineAction extends TextAction
{
SelectLineAction()
{
super(selectLineAction);
}
-
+
public void actionPerformed(ActionEvent event)
{
JTextComponent t = getTextComponent(event);
@@ -469,14 +469,14 @@ public class DefaultEditorKit extends EditorKit
}
}
}
-
+
static class SelectWordAction extends TextAction
{
SelectWordAction()
{
super(selectWordAction);
}
-
+
public void actionPerformed(ActionEvent event)
{
JTextComponent t = getTextComponent(event);
@@ -497,11 +497,11 @@ public class DefaultEditorKit extends EditorKit
else
{
// Current cursor position is not on the first character
- // in a word.
+ // in a word.
int nextWord = Utilities.getNextWord(t, dot);
int previousWord = Utilities.getPreviousWord(t, dot);
int previousWordEnd = Utilities.getWordEnd(t, previousWord);
-
+
// Cursor position is in the space between two words. In such a
// situation just select the space.
if (dot >= previousWordEnd && dot <= nextWord)
@@ -542,7 +542,7 @@ public class DefaultEditorKit extends EditorKit
{
c.moveDot(offs);
}
-
+
}
static class SelectionUpAction
@@ -614,7 +614,7 @@ public class DefaultEditorKit extends EditorKit
{
c.setDot(offs);
}
-
+
}
static class ForwardAction
@@ -629,7 +629,7 @@ public class DefaultEditorKit extends EditorKit
{
c.setDot(offs);
}
-
+
}
static class BackwardAction
@@ -644,7 +644,7 @@ public class DefaultEditorKit extends EditorKit
{
c.setDot(offs);
}
-
+
}
static class DeletePrevCharAction
@@ -664,7 +664,7 @@ public class DefaultEditorKit extends EditorKit
{
int pos = t.getSelectionStart();
int len = t.getSelectionEnd() - pos;
-
+
if (len > 0)
t.getDocument().remove(pos, len);
else if (pos > 0)
@@ -701,12 +701,12 @@ public class DefaultEditorKit extends EditorKit
{
int pos = t.getSelectionStart();
int len = t.getSelectionEnd() - pos;
-
+
if (len > 0)
t.getDocument().remove(pos, len);
else if (pos < t.getDocument().getLength())
t.getDocument().remove(pos, 1);
-
+
Caret c = t.getCaret();
c.setDot(pos);
c.setMagicCaretPosition(t.modelToView(pos).getLocation());
@@ -783,7 +783,7 @@ public class DefaultEditorKit extends EditorKit
static class BeginAction extends TextAction
{
-
+
BeginAction()
{
super(beginAction);
@@ -810,7 +810,7 @@ public class DefaultEditorKit extends EditorKit
static class EndAction extends TextAction
{
-
+
EndAction()
{
super(endAction);
@@ -825,7 +825,7 @@ public class DefaultEditorKit extends EditorKit
Caret c = t.getCaret();
c.setDot(offs);
try
- {
+ {
c.setMagicCaretPosition(t.modelToView(offs).getLocation());
}
catch(BadLocationException ble)
@@ -835,7 +835,7 @@ public class DefaultEditorKit extends EditorKit
}
}
}
-
+
/**
* Creates a beep on the PC speaker.
*
@@ -962,12 +962,12 @@ public class DefaultEditorKit extends EditorKit
* event is received and no keymap entry exists for that. The purpose
* of this action is to filter out a couple of characters. This includes
* the control characters and characters with the ALT-modifier.
- *
+ *
* If an event does not get filtered, it is inserted into the document
* of the text component. If there is some text selected in the text
* component, this text will be replaced.
*/
- public static class DefaultKeyTypedAction
+ public static class DefaultKeyTypedAction
extends TextAction
{
@@ -1008,7 +1008,7 @@ public class DefaultEditorKit extends EditorKit
}
}
}
- }
+ }
}
/**
@@ -1481,9 +1481,9 @@ public class DefaultEditorKit extends EditorKit
* The <code>Action</code>s that are supported by the
* <code>DefaultEditorKit</code>.
*/
- private static Action[] defaultActions =
+ private static Action[] defaultActions =
new Action[] {
- // These classes are public because they are so in the RI.
+ // These classes are public because they are so in the RI.
new BeepAction(),
new CopyAction(),
new CutAction(),
@@ -1492,29 +1492,29 @@ public class DefaultEditorKit extends EditorKit
new InsertContentAction(),
new InsertTabAction(),
new PasteAction(),
-
+
// These are (package-)private inner classes.
new DeleteNextCharAction(),
new DeletePrevCharAction(),
new BeginLineAction(),
new SelectionBeginLineAction(),
-
+
new EndLineAction(),
new SelectionEndLineAction(),
-
+
new BackwardAction(),
new SelectionBackwardAction(),
new ForwardAction(),
new SelectionForwardAction(),
-
+
new UpAction(),
new SelectionUpAction(),
new DownAction(),
new SelectionDownAction(),
-
+
new NextWordAction(),
new SelectionNextWordAction(),
@@ -1523,16 +1523,16 @@ public class DefaultEditorKit extends EditorKit
new BeginAction(),
new SelectionBeginAction(),
-
+
new EndAction(),
new SelectionEndAction(),
-
+
new BeginWordAction(),
new SelectionBeginWordAction(),
-
+
new EndWordAction(),
new SelectionEndWordAction(),
-
+
new SelectAllAction(),
new SelectLineAction(),
new SelectWordAction()
@@ -1640,12 +1640,12 @@ public class DefaultEditorKit extends EditorKit
while ((line = reader.readLine()) != null)
{
- content.append(line);
- content.append("\n");
+ content.append(line);
+ content.append("\n");
}
-
+
document.insertString(offset, content.substring(0, content.length() - 1),
- SimpleAttributeSet.EMPTY);
+ SimpleAttributeSet.EMPTY);
}
/**
@@ -1680,7 +1680,7 @@ public class DefaultEditorKit extends EditorKit
* @param offset the beginning offset from where to write
* @param len the length of the fragment to write
*
- * @throws BadLocationException if <code>offset</code> is an
+ * @throws BadLocationException if <code>offset</code> is an
* invalid location inside <code>document</code>.
* @throws IOException if something goes wrong while writing to
* <code>out</code>
diff --git a/libjava/classpath/javax/swing/text/DefaultFormatter.java b/libjava/classpath/javax/swing/text/DefaultFormatter.java
index bf7c02a..cd9829d 100644
--- a/libjava/classpath/javax/swing/text/DefaultFormatter.java
+++ b/libjava/classpath/javax/swing/text/DefaultFormatter.java
@@ -54,7 +54,7 @@ import javax.swing.JFormattedTextField;
* a value, the value class must provide a single argument constructor that
* takes a String object as argument value. If no such constructor is found,
* the String itself is passed back by #stringToValue.
- *
+ *
* @author Roman Kennke (roman@kennke.org)
*/
public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
@@ -89,7 +89,7 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
checkValidInput();
commitIfAllowed();
}
-
+
/**
* Invoked when text is inserted into a text component.
*
@@ -115,7 +115,7 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
/**
* Invoked when text is replaced in a text component.
- *
+ *
* @param bypass the FilterBypass to use to mutate the document
* @param offset the start position of the modification
* @param length the length of the removed text
@@ -176,9 +176,9 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
{
// if that happens, something serious must be wrong
AssertionError ae;
- ae = new AssertionError("values must be parseable");
- ae.initCause(pe);
- throw ae;
+ ae = new AssertionError("values must be parseable");
+ ae.initCause(pe);
+ throw ae;
}
}
}
@@ -238,7 +238,7 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
* one of the mentioned methods in order to customize behaviour.
*
* @param ftf the {@link JFormattedTextField} in which this formatter
- * is installed
+ * is installed
*/
public void install(JFormattedTextField ftf)
{
@@ -287,7 +287,7 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
/**
* Sets the value of the <code>overwriteMode</code> property.
- *
+ *
* If that is set to <code>true</code> then newly inserted characters
* overwrite existing values, otherwise the characters are inserted like
* normal. The default is <code>true</code>.
diff --git a/libjava/classpath/javax/swing/text/DefaultFormatterFactory.java b/libjava/classpath/javax/swing/text/DefaultFormatterFactory.java
index 84a1676..a6a9def 100644
--- a/libjava/classpath/javax/swing/text/DefaultFormatterFactory.java
+++ b/libjava/classpath/javax/swing/text/DefaultFormatterFactory.java
@@ -45,19 +45,19 @@ import javax.swing.JFormattedTextField.AbstractFormatter;
import javax.swing.JFormattedTextField.AbstractFormatterFactory;
/**
- * This class is Swing's only concrete implementation of
+ * This class is Swing's only concrete implementation of
* JFormattedTextField.AbstractFormatterFactory. It holds several
- * formatters and determines the best one to be used based on the
+ * formatters and determines the best one to be used based on the
* passed-in value from the text field.
- *
+ *
* @author Anthony Balkissoon abalkiss at redhat dot com
* @since 1.4
*/
public class DefaultFormatterFactory extends AbstractFormatterFactory implements
Serializable
{
- /**
- * The default formatter.
+ /**
+ * The default formatter.
**/
AbstractFormatter defaultFormatter;
@@ -69,14 +69,14 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
AbstractFormatter editFormatter;
/**
- * The formatter to use when the JFormattedTextField doesn't havefocus and
- * either the value isn't null or the value is null but no
+ * The formatter to use when the JFormattedTextField doesn't havefocus and
+ * either the value isn't null or the value is null but no
* <code>nullFormatter</code> has been specified.
*/
AbstractFormatter displayFormatter;
/**
- * The formatter to use when the value of the JFormattedTextField is null.
+ * The formatter to use when the value of the JFormattedTextField is null.
*/
AbstractFormatter nullFormatter;
@@ -102,7 +102,7 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
* Creates a new DefaultFormatterFactory with the specified formatters.
* @param defaultFormat the formatter to use if no other appropriate non-null
* formatted can be found.
- * @param displayFormat the formatter to use if the JFormattedTextField
+ * @param displayFormat the formatter to use if the JFormattedTextField
* doesn't have focus and either the value is not null or the value is null
* but no <code>nullFormatter</code> has been specified.
*/
@@ -117,7 +117,7 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
* Creates a new DefaultFormatterFactory with the specified formatters.
* @param defaultFormat the formatter to use if no other appropriate non-null
* formatted can be found.
- * @param displayFormat the formatter to use if the JFormattedTextField
+ * @param displayFormat the formatter to use if the JFormattedTextField
* doesn't have focus and either the value is not null or the value is null
* but no <code>nullFormatter</code> has been specified.
* @param editFormat the formatter to use if the JFormattedTextField has
@@ -137,13 +137,13 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
* Creates a new DefaultFormatterFactory with the specified formatters.
* @param defaultFormat the formatter to use if no other appropriate non-null
* formatted can be found.
- * @param displayFormat the formatter to use if the JFormattedTextField
+ * @param displayFormat the formatter to use if the JFormattedTextField
* doesn't have focus and either the value is not null or the value is null
* but no <code>nullFormatter</code> has been specified.
* @param editFormat the formatter to use if the JFormattedTextField has
* focus and either the value is not null or the value is null but not
* <code>nullFormatter</code> has been specified.
- * @param nullFormat the formatter to use when the value of the
+ * @param nullFormat the formatter to use when the value of the
* JFormattedTextField is null.
*/
public DefaultFormatterFactory(AbstractFormatter defaultFormat,
@@ -158,9 +158,9 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
}
/**
- * Returns the formatted to be used if no other appropriate non-null
+ * Returns the formatted to be used if no other appropriate non-null
* formatter can be found.
- * @return the formatted to be used if no other appropriate non-null
+ * @return the formatted to be used if no other appropriate non-null
* formatter can be found.
*/
public AbstractFormatter getDefaultFormatter()
@@ -169,7 +169,7 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
}
/**
- * Sets the formatted to be used if no other appropriate non-null formatter
+ * Sets the formatted to be used if no other appropriate non-null formatter
* can be found.
* @param defaultFormatter the formatted to be used if no other appropriate
* non-null formatter can be found.
@@ -180,13 +180,13 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
}
/**
- * Gets the <code>displayFormatter</code>. This is the formatter to use if
- * the JFormattedTextField is not being edited and either the value is not
- * null or the value is null and no <code>nullFormatter<code> has been
+ * Gets the <code>displayFormatter</code>. This is the formatter to use if
+ * the JFormattedTextField is not being edited and either the value is not
+ * null or the value is null and no <code>nullFormatter<code> has been
* specified.
- * @return the formatter to use if
- * the JFormattedTextField is not being edited and either the value is not
- * null or the value is null and no <code>nullFormatter<code> has been
+ * @return the formatter to use if
+ * the JFormattedTextField is not being edited and either the value is not
+ * null or the value is null and no <code>nullFormatter<code> has been
* specified.
*/
public AbstractFormatter getDisplayFormatter()
@@ -195,9 +195,9 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
}
/**
- * Sets the <code>displayFormatter</code>. This is the formatter to use if
- * the JFormattedTextField is not being edited and either the value is not
- * null or the value is null and no <code>nullFormatter<code> has been
+ * Sets the <code>displayFormatter</code>. This is the formatter to use if
+ * the JFormattedTextField is not being edited and either the value is not
+ * null or the value is null and no <code>nullFormatter<code> has been
* specified.
* @param displayFormatter the formatter to use.
*/
@@ -208,10 +208,10 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
/**
* Gets the <code>editFormatter</code>. This is the formatter to use if the
- * JFormattedTextField is being edited and either the value is not null or
+ * JFormattedTextField is being edited and either the value is not null or
* the value is null and no <code>nullFormatter<code> has been specified.
* @return the formatter to use if the JFormattedTextField is being edited
- * and the value is not null or the value is null but no nullFormatted has
+ * and the value is not null or the value is null but no nullFormatted has
* been specified.
*/
public AbstractFormatter getEditFormatter()
@@ -221,7 +221,7 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
/**
* Sets the <code>editFormatter</code>. This is the formatter to use if the
- * JFormattedTextField is being edited and either the value is not null or
+ * JFormattedTextField is being edited and either the value is not null or
* the value is null and no <code>nullFormatter<code> has been specified.
* @param editFormatter the formatter to use.
*/
@@ -250,11 +250,11 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
}
/**
- * Returns the appropriate formatter based on the state of
+ * Returns the appropriate formatter based on the state of
* <code>tf</code>. If <code>tf<code> is null we return null, otherwise
* we return one of the following:
- * 1. Returns <code>nullFormatter</code> if <code>tf.getValue()</code> is
- * null and <code>nullFormatter</code> is not.
+ * 1. Returns <code>nullFormatter</code> if <code>tf.getValue()</code> is
+ * null and <code>nullFormatter</code> is not.
* 2. Returns <code>editFormatter</code> if <code>tf.hasFocus()</code> is
* true and <code>editFormatter</code> is not null.
* 3. Returns <code>displayFormatter</code> if <code>tf.hasFocus()</code> is
@@ -265,7 +265,7 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
{
if (tf == null)
return null;
-
+
if (tf.getValue() == null && nullFormatter != null)
return nullFormatter;
diff --git a/libjava/classpath/javax/swing/text/DefaultHighlighter.java b/libjava/classpath/javax/swing/text/DefaultHighlighter.java
index 69563e4..a4264d3 100644
--- a/libjava/classpath/javax/swing/text/DefaultHighlighter.java
+++ b/libjava/classpath/javax/swing/text/DefaultHighlighter.java
@@ -51,7 +51,7 @@ import javax.swing.plaf.TextUI;
/**
* The default highlight for Swing text components. It highlights text
- * by filling the background with a rectangle.
+ * by filling the background with a rectangle.
*/
public class DefaultHighlighter extends LayeredHighlighter
{
@@ -59,7 +59,7 @@ public class DefaultHighlighter extends LayeredHighlighter
extends LayerPainter
{
private Color color;
-
+
public DefaultHighlightPainter(Color c)
{
super();
@@ -72,11 +72,11 @@ public class DefaultHighlighter extends LayeredHighlighter
}
public void paint(Graphics g, int p0, int p1, Shape bounds,
- JTextComponent t)
+ JTextComponent t)
{
if (p0 == p1)
return;
-
+
Rectangle rect = bounds.getBounds();
Color col = getColor();
@@ -85,13 +85,13 @@ public class DefaultHighlighter extends LayeredHighlighter
g.setColor(col);
TextUI ui = t.getUI();
-
+
try
{
Rectangle l0 = ui.modelToView(t, p0, null);
Rectangle l1 = ui.modelToView(t, p1, null);
-
+
// Note: The computed locations may lie outside of the allocation
// area if the text is scrolled.
@@ -101,8 +101,8 @@ public class DefaultHighlighter extends LayeredHighlighter
// Paint only inside the allocation area.
SwingUtilities.computeIntersection(rect.x, rect.y, rect.width,
- rect.height, l1);
-
+ rect.height, l1);
+
g.fillRect(l1.x, l1.y, l1.width, l1.height);
}
else
@@ -115,62 +115,62 @@ public class DefaultHighlighter extends LayeredHighlighter
// 3. The final line is painted from the left border to the
// position of p1.
- int firstLineWidth = rect.x + rect.width - l0.x;
- g.fillRect(l0.x, l0.y, firstLineWidth, l0.height);
- if (l0.y + l0.height != l1.y)
- {
- g.fillRect(rect.x, l0.y + l0.height, rect.width,
- l1.y - l0.y - l0.height);
- }
- g.fillRect(rect.x, l1.y, l1.x - rect.x, l1.height);
- }
+ int firstLineWidth = rect.x + rect.width - l0.x;
+ g.fillRect(l0.x, l0.y, firstLineWidth, l0.height);
+ if (l0.y + l0.height != l1.y)
+ {
+ g.fillRect(rect.x, l0.y + l0.height, rect.width,
+ l1.y - l0.y - l0.height);
+ }
+ g.fillRect(rect.x, l1.y, l1.x - rect.x, l1.height);
+ }
}
catch (BadLocationException ex)
{
- // Can't render. Comment out for debugging.
- // ex.printStackTrace();
+ // Can't render. Comment out for debugging.
+ // ex.printStackTrace();
}
}
public Shape paintLayer(Graphics g, int p0, int p1, Shape bounds,
- JTextComponent c, View view)
+ JTextComponent c, View view)
{
Color col = getColor();
if (col == null)
- col = c.getSelectionColor();
+ col = c.getSelectionColor();
g.setColor(col);
Rectangle rect = null;
if (p0 == view.getStartOffset() && p1 == view.getEndOffset())
- {
- // Paint complete bounds region.
+ {
+ // Paint complete bounds region.
rect = bounds instanceof Rectangle ? (Rectangle) bounds
- : bounds.getBounds();
- }
+ : bounds.getBounds();
+ }
else
- {
- // Only partly inside the view.
+ {
+ // Only partly inside the view.
try
- {
+ {
Shape s = view.modelToView(p0, Position.Bias.Forward,
- p1, Position.Bias.Backward,
- bounds);
- rect = s instanceof Rectangle ? (Rectangle) s : s.getBounds();
- }
- catch (BadLocationException ex)
- {
- // Can't render the highlight.
- }
- }
+ p1, Position.Bias.Backward,
+ bounds);
+ rect = s instanceof Rectangle ? (Rectangle) s : s.getBounds();
+ }
+ catch (BadLocationException ex)
+ {
+ // Can't render the highlight.
+ }
+ }
if (rect != null)
- {
+ {
g.fillRect(rect.x, rect.y, rect.width, rect.height);
- }
+ }
return rect;
}
}
-
+
private class HighlightEntry implements Highlighter.Highlight
{
Position p0;
@@ -228,28 +228,28 @@ public class DefaultHighlighter extends LayeredHighlighter
* and manages the paint rectangle.
*/
void paintLayeredHighlight(Graphics g, int p0, int p1, Shape bounds,
- JTextComponent tc, View view)
+ JTextComponent tc, View view)
{
p0 = Math.max(getStartOffset(), p0);
p1 = Math.min(getEndOffset(), p1);
Highlighter.HighlightPainter painter = getPainter();
if (painter instanceof LayerPainter)
- {
- LayerPainter layerPainter = (LayerPainter) painter;
- Shape area = layerPainter.paintLayer(g, p0, p1, bounds, tc, view);
- Rectangle rect;
- if (area instanceof Rectangle && paintRect != null)
- rect = (Rectangle) area;
- else
- rect = area.getBounds();
-
- if (paintRect.width == 0 || paintRect.height == 0)
- paintRect = rect.getBounds();
- else
- paintRect = SwingUtilities.computeUnion(rect.x, rect.y, rect.width,
- rect.height, paintRect);
- }
+ {
+ LayerPainter layerPainter = (LayerPainter) painter;
+ Shape area = layerPainter.paintLayer(g, p0, p1, bounds, tc, view);
+ Rectangle rect;
+ if (area instanceof Rectangle && paintRect != null)
+ rect = (Rectangle) area;
+ else
+ rect = area.getBounds();
+
+ if (paintRect.width == 0 || paintRect.height == 0)
+ paintRect = rect.getBounds();
+ else
+ paintRect = SwingUtilities.computeUnion(rect.x, rect.y, rect.width,
+ rect.height, paintRect);
+ }
}
}
@@ -258,11 +258,11 @@ public class DefaultHighlighter extends LayeredHighlighter
*/
public static final LayeredHighlighter.LayerPainter DefaultPainter =
new DefaultHighlightPainter(null);
-
+
private JTextComponent textComponent;
private ArrayList highlights = new ArrayList();
private boolean drawsLayeredHighlights = true;
-
+
public DefaultHighlighter()
{
// Nothing to do here.
@@ -277,13 +277,13 @@ public class DefaultHighlighter extends LayeredHighlighter
{
drawsLayeredHighlights = newValue;
}
-
+
private void checkPositions(int p0, int p1)
throws BadLocationException
{
if (p0 < 0)
throw new BadLocationException("DefaultHighlighter", p0);
-
+
if (p1 < p0)
throw new BadLocationException("DefaultHighlighter", p1);
}
@@ -313,9 +313,9 @@ public class DefaultHighlighter extends LayeredHighlighter
else
entry = new HighlightEntry(pos0, pos1, painter);
highlights.add(entry);
-
+
textComponent.getUI().damageRange(textComponent, p0, p1);
-
+
return entry;
}
@@ -324,16 +324,16 @@ public class DefaultHighlighter extends LayeredHighlighter
HighlightEntry entry = (HighlightEntry) tag;
if (entry instanceof LayerHighlightEntry)
{
- LayerHighlightEntry lEntry = (LayerHighlightEntry) entry;
- Rectangle paintRect = lEntry.paintRect;
- textComponent.repaint(paintRect.x, paintRect.y, paintRect.width,
- paintRect.height);
+ LayerHighlightEntry lEntry = (LayerHighlightEntry) entry;
+ Rectangle paintRect = lEntry.paintRect;
+ textComponent.repaint(paintRect.x, paintRect.y, paintRect.width,
+ paintRect.height);
}
else
{
- textComponent.getUI().damageRange(textComponent,
- entry.getStartOffset(),
- entry.getEndOffset());
+ textComponent.getUI().damageRange(textComponent,
+ entry.getStartOffset(),
+ entry.getEndOffset());
}
highlights.remove(tag);
@@ -380,14 +380,14 @@ public class DefaultHighlighter extends LayeredHighlighter
TextUI ui = textComponent.getUI();
ui.damageRange(textComponent, p0, p1);
}
-
+
}
highlights.clear();
}
public Highlighter.Highlight[] getHighlights()
{
- return (Highlighter.Highlight[])
+ return (Highlighter.Highlight[])
highlights.toArray(new Highlighter.Highlight[highlights.size()]);
}
@@ -439,22 +439,22 @@ public class DefaultHighlighter extends LayeredHighlighter
{
for (Iterator i = highlights.iterator(); i.hasNext();)
{
- Object o = i.next();
- if (o instanceof LayerHighlightEntry)
- {
- LayerHighlightEntry entry = (LayerHighlightEntry) o;
- int start = entry.getStartOffset();
- int end = entry.getEndOffset();
- if ((p0 < start && p1 > start) || (p0 >= start && p0 < end))
- entry.paintLayeredHighlight(g, p0, p1, viewBounds, editor, view);
- }
+ Object o = i.next();
+ if (o instanceof LayerHighlightEntry)
+ {
+ LayerHighlightEntry entry = (LayerHighlightEntry) o;
+ int start = entry.getStartOffset();
+ int end = entry.getEndOffset();
+ if ((p0 < start && p1 > start) || (p0 >= start && p0 < end))
+ entry.paintLayeredHighlight(g, p0, p1, viewBounds, editor, view);
+ }
}
}
public void paint(Graphics g)
{
int size = highlights.size();
-
+
// Check if there are any highlights.
if (size == 0)
return;
@@ -466,11 +466,11 @@ public class DefaultHighlighter extends LayeredHighlighter
insets.top,
textComponent.getWidth() - insets.left - insets.right,
textComponent.getHeight() - insets.top - insets.bottom);
-
+
for (int index = 0; index < size; ++index)
{
- HighlightEntry entry = (HighlightEntry) highlights.get(index);
- if (! (entry instanceof LayerHighlightEntry))
+ HighlightEntry entry = (HighlightEntry) highlights.get(index);
+ if (! (entry instanceof LayerHighlightEntry))
entry.painter.paint(g, entry.getStartOffset(), entry.getEndOffset(),
bounds, textComponent);
}
diff --git a/libjava/classpath/javax/swing/text/DefaultStyledDocument.java b/libjava/classpath/javax/swing/text/DefaultStyledDocument.java
index 8c70a8a..9021a19 100644
--- a/libjava/classpath/javax/swing/text/DefaultStyledDocument.java
+++ b/libjava/classpath/javax/swing/text/DefaultStyledDocument.java
@@ -62,7 +62,7 @@ import javax.swing.undo.UndoableEdit;
* single root, which has one or more {@link AbstractDocument.BranchElement}s
* as paragraph nodes and each paragraph node having one or more
* {@link AbstractDocument.LeafElement}s as content nodes.
- *
+ *
* @author Michael Koch (konqueror@gmx.de)
* @author Roman Kennke (roman@kennke.org)
*/
@@ -72,7 +72,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* An {@link UndoableEdit} that can undo attribute changes to an element.
- *
+ *
* @author Roman Kennke (kennke@aicas.com)
*/
public static class AttributeUndoableEdit extends AbstractUndoableEdit
@@ -100,7 +100,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Creates a new <code>AttributeUndoableEdit</code>.
- *
+ *
* @param el
* the element that changes attributes
* @param newAtts
@@ -233,7 +233,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Creates a new <code>ElementSpec</code> with no content, length or
* offset. This is most useful for start and end tags.
- *
+ *
* @param a
* the attributes for the element to be created
* @param type
@@ -248,7 +248,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
* Creates a new <code>ElementSpec</code> that specifies the length but
* not the offset of an element. Such <code>ElementSpec</code>s are
* processed sequentially from a known starting point.
- *
+ *
* @param a
* the attributes for the element to be created
* @param type
@@ -263,7 +263,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Creates a new <code>ElementSpec</code> with document content.
- *
+ *
* @param a
* the attributes for the element to be created
* @param type
@@ -287,7 +287,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Sets the type of the element.
- *
+ *
* @param type
* the type of the element to be set
*/
@@ -298,7 +298,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Returns the type of the element.
- *
+ *
* @return the type of the element
*/
public short getType()
@@ -308,7 +308,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Sets the direction of the element.
- *
+ *
* @param dir
* the direction of the element to be set
*/
@@ -319,7 +319,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Returns the direction of the element.
- *
+ *
* @return the direction of the element
*/
public short getDirection()
@@ -329,7 +329,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Returns the attributes of the element.
- *
+ *
* @return the attributes of the element
*/
public AttributeSet getAttributes()
@@ -339,7 +339,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Returns the actual content of the element.
- *
+ *
* @return the actual content of the element
*/
public char[] getArray()
@@ -349,7 +349,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Returns the offset of the content.
- *
+ *
* @return the offset of the content
*/
public int getOffset()
@@ -359,7 +359,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Returns the length of the content.
- *
+ *
* @return the length of the content
*/
public int getLength()
@@ -371,7 +371,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
* Returns a String representation of this <code>ElementSpec</code>
* describing the type, direction and length of this
* <code>ElementSpec</code>.
- *
+ *
* @return a String representation of this <code>ElementSpec</code>
*/
public String toString()
@@ -534,7 +534,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Creates a new <code>ElementBuffer</code> for the specified
* <code>root</code> element.
- *
+ *
* @param root
* the root element for this <code>ElementBuffer</code>
*/
@@ -545,7 +545,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Returns the root element of this <code>ElementBuffer</code>.
- *
+ *
* @return the root element of this <code>ElementBuffer</code>
*/
public Element getRootElement()
@@ -556,7 +556,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Removes the content. This method sets some internal parameters and
* delegates the work to {@link #removeUpdate}.
- *
+ *
* @param offs
* the offset from which content is remove
* @param len
@@ -583,7 +583,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
private boolean removeElements(Element elem, int rmOffs0, int rmOffs1)
{
- boolean ret = false;
+ boolean ret = false;
if (! elem.isLeaf())
{
// Update stack for changes.
@@ -874,7 +874,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
* created as necessary. This also updates the
* <code>DefaultDocumentEvent</code> to reflect the structural changes.
* The bulk work is delegated to {@link #changeUpdate()}.
- *
+ *
* @param offset
* the start index of the interval to be changed
* @param length
@@ -967,7 +967,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
* Inserts new <code>Element</code> in the document at the specified
* position. Most of the work is done by {@link #insertUpdate}, after some
* fields have been prepared for it.
- *
+ *
* @param offset
* the location in the document at which the content is inserted
* @param length
@@ -982,11 +982,11 @@ public class DefaultStyledDocument extends AbstractDocument implements
DefaultDocumentEvent ev)
{
if (length > 0)
- {
- prepareEdit(offset, length);
- insertUpdate(data);
- finishEdit(ev);
- }
+ {
+ prepareEdit(offset, length);
+ insertUpdate(data);
+ finishEdit(ev);
+ }
}
/**
@@ -1003,14 +1003,14 @@ public class DefaultStyledDocument extends AbstractDocument implements
this.length = length;
if (edits == null)
- edits = new ArrayList();
+ edits = new ArrayList();
else
- edits.clear();
+ edits.clear();
if (elementStack == null)
- elementStack = new Stack();
+ elementStack = new Stack();
else
- elementStack.clear();
+ elementStack.clear();
fracturedParent = null;
fracturedChild = null;
@@ -1029,7 +1029,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
// This for loop applies all the changes that were made and updates the
// DocumentEvent.
for (Iterator i = edits.iterator(); i.hasNext();)
- {
+ {
Edit edits = (Edit) i.next();
Element[] removed = new Element[edits.removed.size()];
removed = (Element[]) edits.removed.toArray(removed);
@@ -1040,14 +1040,14 @@ public class DefaultStyledDocument extends AbstractDocument implements
parent.replace(index, removed.length, added);
ElementEdit ee = new ElementEdit(parent, index, removed, added);
ev.addEdit(ee);
- }
+ }
edits.clear();
elementStack.clear();
}
/**
* Inserts new content.
- *
+ *
* @param data the element specifications for the elements to be inserted
*/
protected void insertUpdate(ElementSpec[] data)
@@ -1130,7 +1130,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
p < data.length && data[p].getType() == ElementSpec.EndTagType;
p++)
;
-
+
Edit edit = insertPath[insertPath.length - p - 1];
edit.index--;
edit.removed.add(0, edit.e.getElement(edit.index));
@@ -1162,7 +1162,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
{
if (elementStack.isEmpty())
return;
-
+
Edit edit = (Edit) elementStack.peek();
switch (spec.getType())
{
@@ -1223,7 +1223,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Inserts the first tag into the document.
- *
+ *
* @param data -
* the data to be inserted.
*/
@@ -1301,7 +1301,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Inserts a content element into the document structure.
- *
+ *
* @param tag -
* the element spec
*/
@@ -1342,7 +1342,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
edit.removed.add(first);
}
}
- else
+ else
{
Element leaf = createLeafElement(edit.e, tag.getAttributes(), pos,
pos + len);
@@ -1350,13 +1350,13 @@ public class DefaultStyledDocument extends AbstractDocument implements
}
pos += len;
-
+
}
/**
* This method fractures bottomost leaf in the elementStack. This
* happens when the first inserted tag is not content.
- *
+ *
* @param data
* the ElementSpecs used for the entire insertion
*/
@@ -1644,12 +1644,12 @@ public class DefaultStyledDocument extends AbstractDocument implements
ec.added.add(e);
e = createLeafElement(ec.e, child.getAttributes(),
pos, child.getEndOffset());
-
+
ec.added.add(e);
}
}
return splitEnd;
-
+
}
}
@@ -1672,7 +1672,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Returns the name of the element. This method always returns
* &quot;section&quot;.
- *
+ *
* @return the name of the element
*/
public String getName()
@@ -1684,7 +1684,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Receives notification when any of the document's style changes and calls
* {@link DefaultStyledDocument#styleChanged(Style)}.
- *
+ *
* @author Roman Kennke (kennke@aicas.com)
*/
private class StyleChangeListener implements ChangeListener
@@ -1693,7 +1693,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Receives notification when any of the document's style changes and calls
* {@link DefaultStyledDocument#styleChanged(Style)}.
- *
+ *
* @param event
* the change event
*/
@@ -1734,7 +1734,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Creates a new <code>DefaultStyledDocument</code> that uses the specified
* {@link StyleContext}.
- *
+ *
* @param context
* the <code>StyleContext</code> to use
*/
@@ -1746,7 +1746,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Creates a new <code>DefaultStyledDocument</code> that uses the specified
* {@link StyleContext} and {@link Content} buffer.
- *
+ *
* @param content
* the <code>Content</code> buffer to use
* @param context
@@ -1790,7 +1790,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Create the default root element for this kind of <code>Document</code>.
- *
+ *
* @return the default root element for this kind of <code>Document</code>
*/
protected AbstractDocument.AbstractElement createDefaultRoot()
@@ -1814,7 +1814,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Returns the <code>Element</code> that corresponds to the character at the
* specified position.
- *
+ *
* @param position
* the position of which we query the corresponding
* <code>Element</code>
@@ -1836,7 +1836,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Extracts a background color from a set of attributes.
- *
+ *
* @param attributes
* the attributes from which to get a background color
* @return the background color that correspond to the attributes
@@ -1849,7 +1849,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Returns the default root element.
- *
+ *
* @return the default root element
*/
public Element getDefaultRootElement()
@@ -1859,7 +1859,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Extracts a font from a set of attributes.
- *
+ *
* @param attributes
* the attributes from which to get a font
* @return the font that correspond to the attributes
@@ -1872,7 +1872,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Extracts a foreground color from a set of attributes.
- *
+ *
* @param attributes
* the attributes from which to get a foreground color
* @return the foreground color that correspond to the attributes
@@ -1885,7 +1885,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Returns the logical <code>Style</code> for the specified position.
- *
+ *
* @param position
* the position from which to query to logical style
* @return the logical <code>Style</code> for the specified position
@@ -1907,7 +1907,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
* element is returned. That is the last paragraph if
* <code>position >= endIndex</code> or the first paragraph if
* <code>position < startIndex</code>.
- *
+ *
* @param position
* the position for which to query the paragraph element
* @return the paragraph element for the specified position
@@ -1925,7 +1925,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Looks up and returns a named <code>Style</code>.
- *
+ *
* @param nm
* the name of the <code>Style</code>
* @return the found <code>Style</code> of <code>null</code> if no such
@@ -1939,7 +1939,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Removes a named <code>Style</code> from the style hierarchy.
- *
+ *
* @param nm
* the name of the <code>Style</code> to be removed
*/
@@ -1952,7 +1952,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Sets text attributes for the fragment specified by <code>offset</code>
* and <code>length</code>.
- *
+ *
* @param offset
* the start offset of the fragment
* @param length
@@ -2015,7 +2015,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Sets the logical style for the paragraph at the specified position.
- *
+ *
* @param position
* the position at which the logical style is added
* @param style
@@ -2056,7 +2056,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Sets text attributes for the paragraph at the specified fragment.
- *
+ *
* @param offset
* the beginning of the fragment
* @param length
@@ -2115,7 +2115,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Called in response to content insert actions. This is used to update the
* element structure.
- *
+ *
* @param ev
* the <code>DocumentEvent</code> describing the change
* @param attr
@@ -2310,7 +2310,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
}
if (e != null)
-
+
{
// e is now the common parent.
// Insert the end tags.
@@ -2342,7 +2342,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* A helper method to set up the ElementSpec buffer for the special case of an
* insertion occurring immediately after a newline.
- *
+ *
* @param specs
* the ElementSpec buffer to initialize.
*/
@@ -2369,7 +2369,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
* forwarded to the {@link ElementBuffer} of this document. Any changes to the
* document structure are added to the specified document event and sent to
* registered listeners.
- *
+ *
* @param ev
* the document event that records the changes to the document
*/
@@ -2381,7 +2381,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Returns an enumeration of all style names.
- *
+ *
* @return an enumeration of all style names
*/
public Enumeration<?> getStyleNames()
@@ -2392,7 +2392,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Called when any of this document's styles changes.
- *
+ *
* @param style
* the style that changed
*/
@@ -2403,7 +2403,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Inserts a bulk of structured content at once.
- *
+ *
* @param offset
* the offset at which the content should be inserted
* @param data
@@ -2469,7 +2469,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
/**
* Initializes the <code>DefaultStyledDocument</code> with the specified
* data.
- *
+ *
* @param data
* the specification of the content with which the document is
* initialized
diff --git a/libjava/classpath/javax/swing/text/DocumentFilter.java b/libjava/classpath/javax/swing/text/DocumentFilter.java
index f86f41c..1f7e8a6 100644
--- a/libjava/classpath/javax/swing/text/DocumentFilter.java
+++ b/libjava/classpath/javax/swing/text/DocumentFilter.java
@@ -48,21 +48,21 @@ public class DocumentFilter
}
public abstract Document getDocument();
-
+
public abstract void insertString(int offset, String string,
- AttributeSet attr)
+ AttributeSet attr)
throws BadLocationException;
-
+
public abstract void remove(int offset, int length)
throws BadLocationException;
-
+
public abstract void replace(int offset, int length, String string,
- AttributeSet attrs)
+ AttributeSet attrs)
throws BadLocationException;
}
-
+
public void insertString(DocumentFilter.FilterBypass fb, int offset,
- String string, AttributeSet attr)
+ String string, AttributeSet attr)
throws BadLocationException
{
fb.insertString(offset, string, attr);
@@ -75,7 +75,7 @@ public class DocumentFilter
}
public void replace(DocumentFilter.FilterBypass fb, int offset, int length,
- String text, AttributeSet attr)
+ String text, AttributeSet attr)
throws BadLocationException
{
fb.replace(offset, length, text, attr);
diff --git a/libjava/classpath/javax/swing/text/EditorKit.java b/libjava/classpath/javax/swing/text/EditorKit.java
index 8719aee..62b4a64 100644
--- a/libjava/classpath/javax/swing/text/EditorKit.java
+++ b/libjava/classpath/javax/swing/text/EditorKit.java
@@ -51,7 +51,7 @@ import javax.swing.JEditorPane;
public abstract class EditorKit implements Cloneable, Serializable
{
private static final long serialVersionUID = -5044124649345887822L;
-
+
public EditorKit()
{
// Nothing to do here.
diff --git a/libjava/classpath/javax/swing/text/Element.java b/libjava/classpath/javax/swing/text/Element.java
index eb53ee9..83d8835 100644
--- a/libjava/classpath/javax/swing/text/Element.java
+++ b/libjava/classpath/javax/swing/text/Element.java
@@ -1,4 +1,4 @@
-/* Element.java --
+/* Element.java --
Copyright (C) 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/text/ElementIterator.java b/libjava/classpath/javax/swing/text/ElementIterator.java
index 112d55e..141137e2 100644
--- a/libjava/classpath/javax/swing/text/ElementIterator.java
+++ b/libjava/classpath/javax/swing/text/ElementIterator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -49,7 +49,7 @@ import java.util.Stack;
public class ElementIterator implements Cloneable
{
/**
- * Uses to track the iteration on the stack.
+ * Uses to track the iteration on the stack.
*/
private class ElementRef
{
@@ -110,12 +110,12 @@ public class ElementIterator implements Cloneable
{
try
{
- return super.clone();
+ return super.clone();
}
catch (CloneNotSupportedException _)
{
- // Can't happen.
- return null;
+ // Can't happen.
+ return null;
}
}
diff --git a/libjava/classpath/javax/swing/text/EmptyAttributeSet.java b/libjava/classpath/javax/swing/text/EmptyAttributeSet.java
index 98fb882..92263bc 100644
--- a/libjava/classpath/javax/swing/text/EmptyAttributeSet.java
+++ b/libjava/classpath/javax/swing/text/EmptyAttributeSet.java
@@ -108,7 +108,7 @@ final class EmptyAttributeSet
{
throw new NoSuchElementException("No more elements");
}
-
+
};
}
diff --git a/libjava/classpath/javax/swing/text/FieldView.java b/libjava/classpath/javax/swing/text/FieldView.java
index e357a1e..c47bef9 100644
--- a/libjava/classpath/javax/swing/text/FieldView.java
+++ b/libjava/classpath/javax/swing/text/FieldView.java
@@ -1,4 +1,4 @@
-/* FieldView.java --
+/* FieldView.java --
Copyright (C) 2004, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -56,36 +56,36 @@ import javax.swing.event.DocumentEvent;
public class FieldView extends PlainView
{
BoundedRangeModel horizontalVisibility;
-
+
/** Caches the preferred span of the X axis. It is invalidated by
* setting it to -1f. This is done when text in the document
* is inserted, removed or changed. The value is corrected as
- * soon as calculateHorizontalSpan() is called.
+ * soon as calculateHorizontalSpan() is called.
*/
float cachedSpan = -1f;
public FieldView(Element elem)
{
super(elem);
-
+
}
-
+
/** Checks whether the given container is a JTextField. If so
* it retrieves the textfield's horizontalVisibility instance.
- *
+ *
* <p>This method should be only called when the view's container
* is valid. Naturally that would be the setParent() method however
* that method is not overridden in the RI and that is why we chose
* paint() instead.</p>
- */
+ */
private void checkContainer()
{
Container c = getContainer();
-
+
if (c instanceof JTextField)
{
horizontalVisibility = ((JTextField) c).getHorizontalVisibility();
-
+
// Provokes a repaint when the BoundedRangeModel's values change
// (which is what the RI does).
horizontalVisibility.addChangeListener(new ChangeListener(){
@@ -98,25 +98,25 @@ public class FieldView extends PlainView
// and needs to be recalculated (e.g. a different font setting is
// not taken into account).
calculateHorizontalSpan();
-
+
// Initializes the BoundedRangeModel properly.
updateVisibility();
}
-
+
}
-
+
private void updateVisibility()
{
JTextField tf = (JTextField) getContainer();
Insets insets = tf.getInsets();
int width = tf.getWidth() - insets.left - insets.right;
-
+
horizontalVisibility.setMaximum(Math.max((int) ((cachedSpan != -1f)
? cachedSpan
: calculateHorizontalSpan()),
width));
-
+
horizontalVisibility.setExtent(width - 1);
}
@@ -140,7 +140,7 @@ public class FieldView extends PlainView
// Return null when the original allocation is null (like the RI).
if (shape == null)
return null;
-
+
Rectangle rectIn = shape.getBounds();
// vertical adjustment
int height = (int) getPreferredSpan(Y_AXIS);
@@ -177,7 +177,7 @@ public class FieldView extends PlainView
x = rectIn.x;
break;
}
-
+
return new Rectangle(x, y, width, height);
}
@@ -192,13 +192,13 @@ public class FieldView extends PlainView
if (cachedSpan != -1f)
return cachedSpan;
-
+
return calculateHorizontalSpan();
}
-
+
/** Calculates and sets the horizontal span and stores the value
* in cachedSpan.
- */
+ */
private float calculateHorizontalSpan()
{
Segment s = getLineBuffer();
@@ -209,15 +209,15 @@ public class FieldView extends PlainView
elem.getDocument().getText(elem.getStartOffset(),
elem.getEndOffset() - 1,
s);
-
+
return cachedSpan = Utilities.getTabbedTextWidth(s, getFontMetrics(), 0, this, s.offset);
}
catch (BadLocationException e)
{
- // Should never happen
- AssertionError ae = new AssertionError();
- ae.initCause(e);
- throw ae;
+ // Should never happen
+ AssertionError ae = new AssertionError();
+ ae.initCause(e);
+ throw ae;
}
}
@@ -225,21 +225,21 @@ public class FieldView extends PlainView
{
return axis == X_AXIS ? 1 : 0;
}
-
+
public Shape modelToView(int pos, Shape a, Position.Bias bias)
throws BadLocationException
{
Shape newAlloc = adjustAllocation(a);
return super.modelToView(pos, newAlloc, bias);
}
-
+
public void paint(Graphics g, Shape s)
{
if (horizontalVisibility == null)
checkContainer();
Shape newAlloc = adjustAllocation(s);
-
+
Shape clip = g.getClip();
if (clip != null)
{
@@ -262,18 +262,18 @@ public class FieldView extends PlainView
super.paint(g, newAlloc);
g.setClip(clip);
-
+
}
public void insertUpdate(DocumentEvent ev, Shape shape, ViewFactory vf)
{
cachedSpan = -1f;
-
+
if (horizontalVisibility != null)
updateVisibility();
-
+
Shape newAlloc = adjustAllocation(shape);
-
+
super.insertUpdate(ev, newAlloc, vf);
getContainer().repaint();
}
@@ -281,7 +281,7 @@ public class FieldView extends PlainView
public void removeUpdate(DocumentEvent ev, Shape shape, ViewFactory vf)
{
cachedSpan = -1f;
-
+
if (horizontalVisibility != null)
updateVisibility();
@@ -293,7 +293,7 @@ public class FieldView extends PlainView
public void changedUpdate(DocumentEvent ev, Shape shape, ViewFactory vf)
{
cachedSpan = -1f;
-
+
if (horizontalVisibility != null)
updateVisibility();
@@ -306,5 +306,5 @@ public class FieldView extends PlainView
{
return super.viewToModel(fx, fy, adjustAllocation(a), bias);
}
-
+
}
diff --git a/libjava/classpath/javax/swing/text/FlowView.java b/libjava/classpath/javax/swing/text/FlowView.java
index c2bed39..a9a8083 100644
--- a/libjava/classpath/javax/swing/text/FlowView.java
+++ b/libjava/classpath/javax/swing/text/FlowView.java
@@ -216,7 +216,7 @@ public abstract class FlowView extends BoxView
* the logical view. If the available space is exhausted,
* {@link #adjustRow(FlowView, int, int, int)} is called to fit the row into
* the available span.
- *
+ *
* @param fv the flow view for which we perform the layout
* @param rowIndex the index of the row
* @param pos the model position for the beginning of the row
@@ -616,7 +616,7 @@ public abstract class FlowView extends BoxView
{
int axis = getAxis();
int flowAxis;
-
+
if (axis == X_AXIS)
flowAxis = Y_AXIS;
else
@@ -697,7 +697,7 @@ public abstract class FlowView extends BoxView
protected void layout(int width, int height)
{
int flowAxis = getFlowAxis();
- int span;
+ int span;
if (flowAxis == X_AXIS)
span = (int) width;
else
diff --git a/libjava/classpath/javax/swing/text/GapContent.java b/libjava/classpath/javax/swing/text/GapContent.java
index 08a318d..2e68fb5 100644
--- a/libjava/classpath/javax/swing/text/GapContent.java
+++ b/libjava/classpath/javax/swing/text/GapContent.java
@@ -64,7 +64,7 @@ import javax.swing.undo.UndoableEdit;
public class GapContent
implements AbstractDocument.Content, Serializable
{
-
+
/**
* A {@link Position} implementation for <code>GapContent</code>.
*/
@@ -80,7 +80,7 @@ public class GapContent
/**
* Returns the current offset of this Position within the content.
- *
+ *
* @return the current offset of this Position within the content.
*/
public int getOffset()
@@ -94,7 +94,7 @@ public class GapContent
* the actual offset of the position. This is pulled out of the
* GapContentPosition object so that the mark and position can be handled
* independently, and most important, so that the GapContentPosition can
- * be garbage collected while we still hold a reference to the Mark object.
+ * be garbage collected while we still hold a reference to the Mark object.
*/
private class Mark
extends WeakReference
@@ -149,7 +149,7 @@ public class GapContent
/**
* Stores a reference to a mark that can be resetted to the original value
- * after a mark has been moved. This is used for undoing actions.
+ * after a mark has been moved. This is used for undoing actions.
*/
private class UndoPosRef
{
@@ -213,7 +213,7 @@ public class GapContent
throw new CannotUndoException();
}
}
-
+
public void redo () throws CannotUndoException
{
super.redo();
@@ -231,9 +231,9 @@ public class GapContent
throw new CannotRedoException();
}
}
-
+
}
-
+
private class UndoRemove extends AbstractUndoableEdit
{
public int where;
@@ -265,7 +265,7 @@ public class GapContent
throw new CannotUndoException();
}
}
-
+
public void redo () throws CannotUndoException
{
super.redo();
@@ -280,7 +280,7 @@ public class GapContent
throw new CannotRedoException();
}
}
-
+
}
/** The serialization UID (compatible with JDK1.5). */
@@ -348,7 +348,7 @@ public class GapContent
/**
* Creates a new GapContent object with a specified initial size.
- *
+ *
* @param size the initial size of the buffer
*/
public GapContent(int size)
@@ -365,9 +365,9 @@ public class GapContent
/**
* Allocates an array of the specified length that can then be used as
* buffer.
- *
+ *
* @param size the size of the array to be allocated
- *
+ *
* @return the allocated array
*/
protected Object allocateArray(int size)
@@ -377,7 +377,7 @@ public class GapContent
/**
* Returns the length of the allocated buffer array.
- *
+ *
* @return the length of the allocated buffer array
*/
protected int getArrayLength()
@@ -387,7 +387,7 @@ public class GapContent
/**
* Returns the length of the content.
- *
+ *
* @return the length of the content
*/
public int length()
@@ -397,12 +397,12 @@ public class GapContent
/**
* Inserts a string at the specified position.
- *
+ *
* @param where the position where the string is inserted
* @param str the string that is to be inserted
- *
+ *
* @return an UndoableEdit object
- *
+ *
* @throws BadLocationException if <code>where</code> is not a valid
* location in the buffer
*/
@@ -429,12 +429,12 @@ public class GapContent
/**
* Removes a piece of content at th specified position.
- *
+ *
* @param where the position where the content is to be removed
* @param nitems number of characters to be removed
- *
+ *
* @return an UndoableEdit object
- *
+ *
* @throws BadLocationException if <code>where</code> is not a valid
* location in the buffer
*/
@@ -442,11 +442,11 @@ public class GapContent
{
// check arguments
int length = length();
-
+
if ((where + nitems) >= length)
throw new BadLocationException("where + nitems cannot be greater"
+ " than the content length", where + nitems);
-
+
String removedText = getString(where, nitems);
UndoRemove undoRemove = new UndoRemove(where, removedText);
replace(where, nitems, null, 0);
@@ -456,10 +456,10 @@ public class GapContent
/**
* Returns a piece of content as String.
- *
+ *
* @param where the start location of the fragment
* @param len the length of the fragment
- *
+ *
* @throws BadLocationException if <code>where</code> or
* <code>where + len</code> are no valid locations in the buffer
*/
@@ -487,15 +487,15 @@ public class GapContent
/**
* Fetches a piece of content and stores it in a {@link Segment} object.
- *
+ *
* If the requested piece of text spans the gap, the content is copied into a
* new array. If it doesn't then it is contiguous and the actual content
* store is returned.
- *
+ *
* @param where the start location of the fragment
* @param len the length of the fragment
* @param txt the Segment object to store the fragment in
- *
+ *
* @throws BadLocationException if <code>where</code> or
* <code>where + len</code> are no valid locations in the buffer
*/
@@ -515,7 +515,7 @@ public class GapContent
if (len < 0)
throw new BadLocationException("negative length not allowed: ", len);
- // Optimized to copy only when really needed.
+ // Optimized to copy only when really needed.
if (where + len <= gapStart)
{
// Simple case: completely before gap.
@@ -556,11 +556,11 @@ public class GapContent
/**
* Creates and returns a mark at the specified position.
- *
+ *
* @param offset the position at which to create the mark
- *
+ *
* @return the create Position object for the mark
- *
+ *
* @throws BadLocationException if the offset is not a valid position in the
* buffer
*/
@@ -597,7 +597,7 @@ public class GapContent
marks.add(insertIndex, m);
}
// Otherwise use the found position.
-
+
return pos;
}
@@ -606,7 +606,7 @@ public class GapContent
* segment before the gap as it is and the segment after the gap at the end
* of the new buffer array. This does change the gapEnd mark but not the
* gapStart mark.
- *
+ *
* @param newSize the new size of the gap
*/
protected void shiftEnd(int newSize)
@@ -641,7 +641,7 @@ public class GapContent
/**
* Shifts the gap to the specified position.
- *
+ *
* @param newGapStart the new start position of the gap
*/
protected void shiftGap(int newGapStart)
@@ -746,14 +746,14 @@ public class GapContent
m.mark = newGapEnd;
}
-
+
gapEnd = newGapEnd;
resetMarksAtZero();
}
/**
* Returns the allocated buffer array.
- *
+ *
* @return the allocated buffer array
*/
protected final Object getArray()
@@ -763,7 +763,7 @@ public class GapContent
/**
* Replaces a portion of the storage with the specified items.
- *
+ *
* @param position the position at which to remove items
* @param rmSize the number of items to remove
* @param addItems the items to add at location
@@ -915,7 +915,7 @@ public class GapContent
}
return v;
}
-
+
/**
* Resets all <code>Position</code> that have an offset of <code>0</code>,
* to also have an array index of <code>0</code>. This might be necessary
diff --git a/libjava/classpath/javax/swing/text/GlyphView.java b/libjava/classpath/javax/swing/text/GlyphView.java
index 6bc2a38..3f4ccf9 100644
--- a/libjava/classpath/javax/swing/text/GlyphView.java
+++ b/libjava/classpath/javax/swing/text/GlyphView.java
@@ -110,7 +110,7 @@ public class GlyphView extends View implements TabableView, Cloneable
/**
* Determines the model offset, so that the text between <code>p0</code>
* and this offset fits within the span starting at <code>x</code> with
- * the length of <code>len</code>.
+ * the length of <code>len</code>.
*
* @param v the glyph view
* @param p0 the starting offset in the model
@@ -403,7 +403,7 @@ public class GlyphView extends View implements TabableView, Cloneable
: Position.Bias.Backward;
return pos + v.getStartOffset();
}
-
+
}
/**
@@ -424,7 +424,7 @@ public class GlyphView extends View implements TabableView, Cloneable
float height = fontMetrics.getHeight();
return height;
}
-
+
/**
* Paints the glyphs.
*
@@ -562,7 +562,7 @@ public class GlyphView extends View implements TabableView, Cloneable
/**
* Determines the model offset, so that the text between <code>p0</code>
* and this offset fits within the span starting at <code>x</code> with
- * the length of <code>len</code>.
+ * the length of <code>len</code>.
*
* @param v the glyph view
* @param p0 the starting offset in the model
@@ -739,7 +739,7 @@ public class GlyphView extends View implements TabableView, Cloneable
g.fillRect(r.x, r.y, r.width, r.height);
}
-
+
// Paint layered highlights if there are any.
if (tc != null)
{
@@ -972,11 +972,11 @@ public class GlyphView extends View implements TabableView, Cloneable
}
catch (BadLocationException ex)
{
- AssertionError ae;
+ AssertionError ae;
ae = new AssertionError("BadLocationException should not be "
- + "thrown here. p0 = " + p0 + ", p1 = " + p1);
- ae.initCause(ex);
- throw ae;
+ + "thrown here. p0 = " + p0 + ", p1 = " + p1);
+ ae.initCause(ex);
+ throw ae;
}
return cached;
diff --git a/libjava/classpath/javax/swing/text/Highlighter.java b/libjava/classpath/javax/swing/text/Highlighter.java
index 91f3b79..b4b671a 100644
--- a/libjava/classpath/javax/swing/text/Highlighter.java
+++ b/libjava/classpath/javax/swing/text/Highlighter.java
@@ -57,7 +57,7 @@ public interface Highlighter
{
void paint(Graphics g, int p0, int p1, Shape bounds, JTextComponent c);
}
-
+
void install(JTextComponent c);
void deinstall(JTextComponent c);
@@ -76,4 +76,3 @@ public interface Highlighter
void paint(Graphics g);
}
-
diff --git a/libjava/classpath/javax/swing/text/InternationalFormatter.java b/libjava/classpath/javax/swing/text/InternationalFormatter.java
index 1de5ca2..8dcd03a 100644
--- a/libjava/classpath/javax/swing/text/InternationalFormatter.java
+++ b/libjava/classpath/javax/swing/text/InternationalFormatter.java
@@ -206,7 +206,7 @@ public class InternationalFormatter
* one of the mentioned methods in order to customize behaviour.
*
* @param ftf the {@link JFormattedTextField} in which this formatter
- * is installed
+ * is installed
*/
public void install(JFormattedTextField ftf)
{
diff --git a/libjava/classpath/javax/swing/text/JTextComponent.java b/libjava/classpath/javax/swing/text/JTextComponent.java
index 24035e3..a118cf8 100644
--- a/libjava/classpath/javax/swing/text/JTextComponent.java
+++ b/libjava/classpath/javax/swing/text/JTextComponent.java
@@ -246,7 +246,7 @@ public abstract class JTextComponent extends JComponent
{
return this;
}
-
+
/**
* Handle a text insertion event and fire an
* AccessibleContext.ACCESSIBLE_TEXT_PROPERTY property change
@@ -313,7 +313,7 @@ public abstract class JTextComponent extends JComponent
public Rectangle getCharacterBounds(int index)
{
// This is basically the same as BasicTextUI.modelToView().
-
+
Rectangle bounds = null;
if (index >= 0 && index < doc.getLength() - 1)
{
@@ -368,12 +368,12 @@ public abstract class JTextComponent extends JComponent
return JTextComponent.this.getText().length();
}
- /**
+ /**
* Gets the character attributes of the character at index. If
* the index is out of bounds, null is returned.
*
* @param index - index of the character
- *
+ *
* @return the character's attributes
*/
public AttributeSet getCharacterAttribute(int index)
@@ -402,24 +402,24 @@ public abstract class JTextComponent extends JComponent
/**
* Gets the text located at index. null is returned if the index
* or part is invalid.
- *
+ *
* @param part - {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
* @param index - index of the part
- *
+ *
* @return the part of text at that index, or null
*/
public String getAtIndex(int part, int index)
{
return getAtIndexImpl(part, index, 0);
}
-
+
/**
* Gets the text located after index. null is returned if the index
* or part is invalid.
- *
+ *
* @param part - {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
* @param index - index after the part
- *
+ *
* @return the part of text after that index, or null
*/
public String getAfterIndex(int part, int index)
@@ -430,10 +430,10 @@ public abstract class JTextComponent extends JComponent
/**
* Gets the text located before index. null is returned if the index
* or part is invalid.
- *
+ *
* @param part - {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
* @param index - index before the part
- *
+ *
* @return the part of text before that index, or null
*/
public String getBeforeIndex(int part, int index)
@@ -518,20 +518,20 @@ public abstract class JTextComponent extends JComponent
/**
* Returns the number of actions for this object. The zero-th
* object represents the default action.
- *
+ *
* @return the number of actions (0-based).
*/
public int getAccessibleActionCount()
{
return getActions().length;
}
-
+
/**
* Returns the description of the i-th action. Null is returned if
* i is out of bounds.
- *
+ *
* @param i - the action to get the description for
- *
+ *
* @return description of the i-th action
*/
public String getAccessibleActionDescription(int i)
@@ -542,13 +542,13 @@ public abstract class JTextComponent extends JComponent
desc = (String) actions[i].getValue(Action.NAME);
return desc;
}
-
+
/**
- * Performs the i-th action. Nothing happens if i is
+ * Performs the i-th action. Nothing happens if i is
* out of bounds.
*
* @param i - the action to perform
- *
+ *
* @return true if the action was performed successfully
*/
public boolean doAccessibleAction(int i)
@@ -564,7 +564,7 @@ public abstract class JTextComponent extends JComponent
}
return ret;
}
-
+
/**
* Sets the text contents.
*
@@ -727,7 +727,7 @@ public abstract class JTextComponent extends JComponent
* objects, by delegation to the underlying {@link Keymap}.</li>
*
* <li>KeymapActionMap extends {@link ActionMap} also holds a reference to
- * the underlying {@link Keymap} but only appears to use it for listing
+ * the underlying {@link Keymap} but only appears to use it for listing
* its keys. </li>
*
* <li>KeymapActionMap maps all {@link Action} objects to
@@ -774,7 +774,7 @@ public abstract class JTextComponent extends JComponent
public KeyStroke[] keys()
{
KeyStroke[] superKeys = super.keys();
- KeyStroke[] mapKeys = map.getBoundKeyStrokes();
+ KeyStroke[] mapKeys = map.getBoundKeyStrokes();
KeyStroke[] bothKeys = new KeyStroke[superKeys.length + mapKeys.length];
for (int i = 0; i < superKeys.length; ++i)
bothKeys[i] = superKeys[i];
@@ -824,22 +824,22 @@ public abstract class JTextComponent extends JComponent
return map.getBoundKeyStrokes().length + super.size();
}
- public Object[] keys()
+ public Object[] keys()
{
Object[] superKeys = super.keys();
- Object[] mapKeys = map.getBoundKeyStrokes();
+ Object[] mapKeys = map.getBoundKeyStrokes();
Object[] bothKeys = new Object[superKeys.length + mapKeys.length];
for (int i = 0; i < superKeys.length; ++i)
bothKeys[i] = superKeys[i];
for (int i = 0; i < mapKeys.length; ++i)
bothKeys[i + superKeys.length] = mapKeys[i];
- return bothKeys;
+ return bothKeys;
}
public Object[] allKeys()
{
Object[] superKeys = super.allKeys();
- Object[] mapKeys = map.getBoundKeyStrokes();
+ Object[] mapKeys = map.getBoundKeyStrokes();
Object[] bothKeys = new Object[superKeys.length + mapKeys.length];
for (int i = 0; i < superKeys.length; ++i)
bothKeys[i] = superKeys[i];
@@ -929,10 +929,10 @@ public abstract class JTextComponent extends JComponent
i = 0;
e = map.keys();
while (e.hasMoreElements())
- {
+ {
KeyStroke k = (KeyStroke) e.nextElement();
if (map.get(k).equals(a))
- ret[i++] = k;
+ ret[i++] = k;
}
return ret;
}
@@ -978,21 +978,21 @@ public abstract class JTextComponent extends JComponent
public boolean canImport(JComponent component, DataFlavor[] flavors)
{
JTextComponent textComponent = (JTextComponent) component;
-
+
if (! (textComponent.isEnabled()
- && textComponent.isEditable()
- && flavors != null))
+ && textComponent.isEditable()
+ && flavors != null))
return false;
for (int i = 0; i < flavors.length; ++i)
- if (flavors[i].equals(DataFlavor.stringFlavor))
- return true;
+ if (flavors[i].equals(DataFlavor.stringFlavor))
+ return true;
return false;
}
-
+
public void exportToClipboard(JComponent component, Clipboard clipboard,
- int action)
+ int action)
{
JTextComponent textComponent = (JTextComponent) component;
int start = textComponent.getSelectionStart();
@@ -1017,7 +1017,7 @@ public abstract class JTextComponent extends JComponent
// Ignore this and do nothing.
}
}
-
+
public int getSourceActions()
{
return NONE;
@@ -1034,7 +1034,7 @@ public abstract class JTextComponent extends JComponent
for (int i = 0; i < flavors.length; ++i)
if (flavors[i].equals(DataFlavor.stringFlavor))
flavor = flavors[i];
-
+
if (flavor == null)
return false;
@@ -1059,10 +1059,10 @@ public abstract class JTextComponent extends JComponent
}
private static final long serialVersionUID = -8796518220218978795L;
-
+
public static final String DEFAULT_KEYMAP = "default";
public static final String FOCUS_ACCELERATOR_KEY = "focusAcceleratorKey";
-
+
private static DefaultTransferHandler defaultTransferHandler;
private static Hashtable keymaps = new Hashtable();
private Keymap keymap;
@@ -1096,7 +1096,7 @@ public abstract class JTextComponent extends JComponent
* @see #addKeymap
* @see #getKeymap()
* @see #keymaps
- */
+ */
public static Keymap removeKeymap(String n)
{
Keymap km = (Keymap) keymaps.get(n);
@@ -1110,7 +1110,7 @@ public abstract class JTextComponent extends JComponent
* in which case the new Keymap will <em>not</em> be added to the global
* Keymap table. The parent may also be <code>null</code>, which is
* harmless.
- *
+ *
* @param n The name of the new Keymap, or <code>null</code>
* @param parent The parent of the new Keymap, or <code>null</code>
*
@@ -1137,7 +1137,7 @@ public abstract class JTextComponent extends JComponent
* @see #setKeymap
* @see #keymap
*/
- public Keymap getKeymap()
+ public Keymap getKeymap()
{
return keymap;
}
@@ -1151,26 +1151,26 @@ public abstract class JTextComponent extends JComponent
* @see #getKeymap()
* @see #keymap
*/
- public void setKeymap(Keymap k)
+ public void setKeymap(Keymap k)
{
// phase 1: replace the KeymapWrapper entry in the InputMap chain.
// the goal here is to always maintain the following ordering:
//
// [InputMap]? -> [KeymapWrapper]? -> [InputMapUIResource]*
- //
+ //
// that is to say, component-specific InputMaps need to remain children
// of Keymaps, and Keymaps need to remain children of UI-installed
// InputMaps (and the order of each group needs to be preserved, of
// course).
-
+
KeymapWrapper kw = (k == null ? null : new KeymapWrapper(k));
InputMap childInputMap = getInputMap(JComponent.WHEN_FOCUSED);
if (childInputMap == null)
setInputMap(JComponent.WHEN_FOCUSED, kw);
else
{
- while (childInputMap.getParent() != null
+ while (childInputMap.getParent() != null
&& !(childInputMap.getParent() instanceof KeymapWrapper)
&& !(childInputMap.getParent() instanceof InputMapUIResource))
childInputMap = childInputMap.getParent();
@@ -1178,7 +1178,7 @@ public abstract class JTextComponent extends JComponent
// option 1: there is nobody to replace at the end of the chain
if (childInputMap.getParent() == null)
childInputMap.setParent(kw);
-
+
// option 2: there is already a KeymapWrapper in the chain which
// needs replacing (possibly with its own parents, possibly without)
else if (childInputMap.getParent() instanceof KeymapWrapper)
@@ -1212,7 +1212,7 @@ public abstract class JTextComponent extends JComponent
setActionMap(kam);
else
{
- while (childActionMap.getParent() != null
+ while (childActionMap.getParent() != null
&& !(childActionMap.getParent() instanceof KeymapActionMap)
&& !(childActionMap.getParent() instanceof ActionMapUIResource))
childActionMap = childActionMap.getParent();
@@ -1220,7 +1220,7 @@ public abstract class JTextComponent extends JComponent
// option 1: there is nobody to replace at the end of the chain
if (childActionMap.getParent() == null)
childActionMap.setParent(kam);
-
+
// option 2: there is already a KeymapActionMap in the chain which
// needs replacing (possibly with its own parents, possibly without)
else if (childActionMap.getParent() instanceof KeymapActionMap)
@@ -1269,8 +1269,8 @@ public abstract class JTextComponent extends JComponent
* @see Action#getValue
* @see KeyBinding#actionName
*/
- public static void loadKeymap(Keymap map,
- JTextComponent.KeyBinding[] bindings,
+ public static void loadKeymap(Keymap map,
+ JTextComponent.KeyBinding[] bindings,
Action[] actions)
{
Hashtable acts = new Hashtable(actions.length);
@@ -1298,12 +1298,12 @@ public abstract class JTextComponent extends JComponent
{
return getUI().getEditorKit(this).getActions();
}
-
+
// These are package-private to avoid an accessor method.
Document doc;
Caret caret;
boolean editable;
-
+
private Highlighter highlighter;
private Color caretColor;
private Color disabledTextColor;
@@ -1445,10 +1445,10 @@ public abstract class JTextComponent extends JComponent
{
int start = getSelectionStart();
int offset = getSelectionEnd() - start;
-
+
if (offset <= 0)
return null;
-
+
try
{
return doc.getText(start, offset);
@@ -1565,7 +1565,7 @@ public abstract class JTextComponent extends JComponent
{
if (editable == newValue)
return;
-
+
boolean oldValue = editable;
editable = newValue;
firePropertyChange("editable", oldValue, newValue);
@@ -1590,13 +1590,13 @@ public abstract class JTextComponent extends JComponent
{
if (caret != null)
caret.deinstall(this);
-
+
Caret oldCaret = caret;
caret = newCaret;
if (caret != null)
caret.install(this);
-
+
firePropertyChange("caret", oldCaret, newCaret);
}
@@ -1698,13 +1698,13 @@ public abstract class JTextComponent extends JComponent
{
if (highlighter != null)
highlighter.deinstall(this);
-
+
Highlighter oldHighlighter = highlighter;
highlighter = newHighlighter;
if (highlighter != null)
highlighter.install(this);
-
+
firePropertyChange("highlighter", oldHighlighter, newHighlighter);
}
@@ -1757,7 +1757,7 @@ public abstract class JTextComponent extends JComponent
public void select(int start, int end)
{
int length = doc.getLength();
-
+
start = Math.max(start, 0);
start = Math.min(start, length);
@@ -1803,7 +1803,7 @@ public abstract class JTextComponent extends JComponent
// Set dot to new position,
dot = start + content.length();
setCaretPosition(dot);
-
+
// and update it's magic position.
caret.setMagicCaretPosition(modelToView(dot).getLocation());
}
@@ -1969,7 +1969,7 @@ public abstract class JTextComponent extends JComponent
focusAccelerator = newKey;
firePropertyChange(FOCUS_ACCELERATOR_KEY, oldKey, newKey);
}
-
+
public char getFocusAccelerator()
{
return focusAccelerator;
@@ -1990,7 +1990,7 @@ public abstract class JTextComponent extends JComponent
{
navigationFilter = filter;
}
-
+
/**
* Read and set the content this component. If not overridden, the
* method reads the component content as a plain text.
diff --git a/libjava/classpath/javax/swing/text/Keymap.java b/libjava/classpath/javax/swing/text/Keymap.java
index c3f61d8..e1b305f 100644
--- a/libjava/classpath/javax/swing/text/Keymap.java
+++ b/libjava/classpath/javax/swing/text/Keymap.java
@@ -1,4 +1,4 @@
-/* Keymap.java --
+/* Keymap.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -42,19 +42,17 @@ import javax.swing.KeyStroke;
public interface Keymap
{
- void addActionForKeyStroke(KeyStroke key, Action a);
- Action getAction(KeyStroke key);
- Action[] getBoundActions();
- KeyStroke[] getBoundKeyStrokes();
- Action getDefaultAction();
- KeyStroke[] getKeyStrokesForAction(Action a);
- String getName();
- Keymap getResolveParent();
- boolean isLocallyDefined(KeyStroke key);
- void removeBindings();
- void removeKeyStrokeBinding(KeyStroke keys);
- void setDefaultAction(Action a);
+ void addActionForKeyStroke(KeyStroke key, Action a);
+ Action getAction(KeyStroke key);
+ Action[] getBoundActions();
+ KeyStroke[] getBoundKeyStrokes();
+ Action getDefaultAction();
+ KeyStroke[] getKeyStrokesForAction(Action a);
+ String getName();
+ Keymap getResolveParent();
+ boolean isLocallyDefined(KeyStroke key);
+ void removeBindings();
+ void removeKeyStrokeBinding(KeyStroke keys);
+ void setDefaultAction(Action a);
void setResolveParent(Keymap parent);
}
-
-
diff --git a/libjava/classpath/javax/swing/text/LayeredHighlighter.java b/libjava/classpath/javax/swing/text/LayeredHighlighter.java
index dcaf1c50..3eac26b 100644
--- a/libjava/classpath/javax/swing/text/LayeredHighlighter.java
+++ b/libjava/classpath/javax/swing/text/LayeredHighlighter.java
@@ -47,10 +47,10 @@ public abstract class LayeredHighlighter
implements Highlighter.HighlightPainter
{
public abstract Shape paintLayer(Graphics g, int p0, int p1,
- Shape viewBounds, JTextComponent editor,
- View view);
+ Shape viewBounds, JTextComponent editor,
+ View view);
}
-
+
public abstract void paintLayeredHighlights(Graphics g, int p0, int p1,
Shape viewBounds,
JTextComponent editor, View view);
diff --git a/libjava/classpath/javax/swing/text/LayoutQueue.java b/libjava/classpath/javax/swing/text/LayoutQueue.java
index b0c84b9..10fadd5 100644
--- a/libjava/classpath/javax/swing/text/LayoutQueue.java
+++ b/libjava/classpath/javax/swing/text/LayoutQueue.java
@@ -67,8 +67,8 @@ public class LayoutQueue
{
synchronized (list)
{
- list.addLast(task);
- list.notify();
+ list.addLast(task);
+ list.notify();
}
}
@@ -81,20 +81,20 @@ public class LayoutQueue
{
synchronized (list)
{
- while (list.size() == 0)
- {
- try
- {
- list.wait();
- }
- catch (InterruptedException _)
- {
- // This seemed like a good idea, but it has not been
- // tested on the JDK.
- return null;
- }
- }
- return (Runnable) list.removeFirst();
+ while (list.size() == 0)
+ {
+ try
+ {
+ list.wait();
+ }
+ catch (InterruptedException _)
+ {
+ // This seemed like a good idea, but it has not been
+ // tested on the JDK.
+ return null;
+ }
+ }
+ return (Runnable) list.removeFirst();
}
}
diff --git a/libjava/classpath/javax/swing/text/MaskFormatter.java b/libjava/classpath/javax/swing/text/MaskFormatter.java
index 4ebf65b..c8f631a 100644
--- a/libjava/classpath/javax/swing/text/MaskFormatter.java
+++ b/libjava/classpath/javax/swing/text/MaskFormatter.java
@@ -1,4 +1,4 @@
-/* MaskFormatter.java --
+/* MaskFormatter.java --
Copyright (C) 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -59,53 +59,53 @@ public class MaskFormatter extends DefaultFormatter
private static final char LETTER_CHAR = '?';
private static final char ANYTHING_CHAR = '*';
private static final char HEX_CHAR = 'H';
-
+
/** The mask for this MaskFormatter **/
private String mask;
-
- /**
- * A String made up of the characters that are not valid for input for
- * this MaskFormatter.
+
+ /**
+ * A String made up of the characters that are not valid for input for
+ * this MaskFormatter.
*/
private String invalidChars;
-
- /**
- * A String made up of the characters that are valid for input for
- * this MaskFormatter.
+
+ /**
+ * A String made up of the characters that are valid for input for
+ * this MaskFormatter.
*/
private String validChars;
-
- /** A String used in place of missing chracters if the value does not
+
+ /** A String used in place of missing chracters if the value does not
* completely fill in the spaces in the mask.
*/
private String placeHolder;
-
- /** A character used in place of missing characters if the value does
+
+ /** A character used in place of missing characters if the value does
* not completely fill in the spaces in the mask.
*/
private char placeHolderChar = ' ';
-
+
/**
* Whether or not stringToValue should return literal characters in the mask.
*/
private boolean valueContainsLiteralCharacters = true;
-
+
/** A String used for easy access to valid HEX characters **/
private static String hexString = "0123456789abcdefABCDEF";
-
+
/** An int to hold the length of the mask, accounting for escaped characters **/
int maskLength = 0;
-
+
public MaskFormatter ()
{
// Override super's default behaviour, in MaskFormatter the default
// is not to allow invalid values
setAllowsInvalid(false);
}
-
+
/**
* Creates a MaskFormatter with the specified mask.
- * @specnote doesn't actually throw a ParseException although it
+ * @specnote doesn't actually throw a ParseException although it
* is declared to do so
* @param mask
* @throws java.text.ParseException
@@ -115,7 +115,7 @@ public class MaskFormatter extends DefaultFormatter
this();
setMask (mask);
}
-
+
/**
* Returns the mask used in this MaskFormatter.
* @return the mask used in this MaskFormatter.
@@ -124,7 +124,7 @@ public class MaskFormatter extends DefaultFormatter
{
return mask;
}
-
+
/**
* Returns a String containing the characters that are not valid for input
* for this MaskFormatter.
@@ -134,19 +134,19 @@ public class MaskFormatter extends DefaultFormatter
{
return invalidChars;
}
-
+
/**
* Sets characters that are not valid for input. If
* <code>invalidCharacters</code> is non-null then no characters contained
* in it will be allowed to be input.
- *
+ *
* @param invalidCharacters the String specifying invalid characters.
*/
public void setInvalidCharacters (String invalidCharacters)
{
this.invalidChars = invalidCharacters;
}
-
+
/**
* Returns a String containing the characters that are valid for input
* for this MaskFormatter.
@@ -156,12 +156,12 @@ public class MaskFormatter extends DefaultFormatter
{
return validChars;
}
-
+
/**
* Sets characters that are valid for input. If
* <code>validCharacters</code> is non-null then no characters that are
* not contained in it will be allowed to be input.
- *
+ *
* @param validCharacters the String specifying valid characters.
*/
public void setValidCharacters (String validCharacters)
@@ -170,7 +170,7 @@ public class MaskFormatter extends DefaultFormatter
}
/**
- * Returns the place holder String that is used in place of missing
+ * Returns the place holder String that is used in place of missing
* characters when the value doesn't completely fill in the spaces
* in the mask.
* @return the place holder String.
@@ -179,18 +179,18 @@ public class MaskFormatter extends DefaultFormatter
{
return placeHolder;
}
-
+
/**
* Sets the string to use if the value does not completely fill in the mask.
* If this is null, the place holder character will be used instead.
- * @param placeholder the String to use if the value doesn't completely
+ * @param placeholder the String to use if the value doesn't completely
* fill in the mask.
*/
public void setPlaceholder (String placeholder)
{
this.placeHolder = placeholder;
}
-
+
/**
* Returns the character used in place of missing characters when the
* value doesn't completely fill the mask.
@@ -200,42 +200,42 @@ public class MaskFormatter extends DefaultFormatter
{
return placeHolderChar;
}
-
+
/**
* Sets the char to use if the value does not completely fill in the mask.
- * This is only used if the place holder String has not been set or does
+ * This is only used if the place holder String has not been set or does
* not completely fill in the mask.
- * @param placeholder the char to use if the value doesn't completely
+ * @param placeholder the char to use if the value doesn't completely
* fill in the mask.
*/
public void setPlaceholderCharacter (char placeholder)
{
this.placeHolderChar = placeholder;
}
-
+
/**
- * Returns true if stringToValue should return the literal
+ * Returns true if stringToValue should return the literal
* characters in the mask.
- * @return true if stringToValue should return the literal
+ * @return true if stringToValue should return the literal
* characters in the mask
*/
public boolean getValueContainsLiteralCharacters()
{
return valueContainsLiteralCharacters;
}
-
+
/**
* Determines whether stringToValue will return literal characters or not.
- * @param containsLiteralChars if true, stringToValue will return the
+ * @param containsLiteralChars if true, stringToValue will return the
* literal characters in the mask, otherwise it will not.
*/
public void setValueContainsLiteralCharacters (boolean containsLiteralChars)
{
this.valueContainsLiteralCharacters = containsLiteralChars;
}
-
+
/**
- * Sets the mask for this MaskFormatter.
+ * Sets the mask for this MaskFormatter.
* @specnote doesn't actually throw a ParseException even though it is
* declared to do so
* @param mask the new mask for this MaskFormatter
@@ -247,14 +247,14 @@ public class MaskFormatter extends DefaultFormatter
// Update the cached maskLength.
int end = mask.length() - 1;
- maskLength = 0;
+ maskLength = 0;
for (int i = 0; i <= end; i++)
{
// Handle escape characters properly - they don't add to the maskLength
// but 2 escape characters in a row is really one escape character and
// one literal single quote, so that does add 1 to the maskLength.
if (mask.charAt(i) == '\'')
- {
+ {
// Escape characters at the end of the mask don't do anything.
if (i != end)
maskLength++;
@@ -264,14 +264,14 @@ public class MaskFormatter extends DefaultFormatter
maskLength++;
}
}
-
+
/**
* Installs this MaskFormatter on the JFormattedTextField.
- * Invokes valueToString to convert the current value from the
+ * Invokes valueToString to convert the current value from the
* JFormattedTextField to a String, then installs the Actions from
- * getActions, the DocumentFilter from getDocumentFilter, and the
+ * getActions, the DocumentFilter from getDocumentFilter, and the
* NavigationFilter from getNavigationFilter.
- *
+ *
* If valueToString throws a ParseException, this method sets the text
* to an empty String and marks the JFormattedTextField as invalid.
*/
@@ -293,14 +293,14 @@ public class MaskFormatter extends DefaultFormatter
}
}
}
-
+
/**
* Parses the text using the mask, valid characters, and invalid characters
* to determine the appropriate Object to return. This strips the literal
* characters if necessary and invokes super.stringToValue. If the paramter
- * is invalid for the current mask and valid/invalid character sets this
+ * is invalid for the current mask and valid/invalid character sets this
* method will throw a ParseException.
- *
+ *
* @param value the String to parse
* @throws ParseException if value doesn't match the mask and valid/invalid
* character sets
@@ -309,7 +309,7 @@ public class MaskFormatter extends DefaultFormatter
{
return super.stringToValue(convertStringToValue(value));
}
-
+
private String convertStringToValue(String value)
throws ParseException
{
@@ -347,7 +347,7 @@ public class MaskFormatter extends DefaultFormatter
valueChar = placeHolderChar;
}
- // This switch block on the mask character checks that the character
+ // This switch block on the mask character checks that the character
// within <code>value</code> at that point is valid according to the
// mask and also converts to upper/lowercase as needed.
switch (maskChar)
@@ -393,7 +393,7 @@ public class MaskFormatter extends DefaultFormatter
i++;
break;
case ESCAPE_CHAR:
- // Escape character, check the next character to make sure that
+ // Escape character, check the next character to make sure that
// the literals match
j++;
if (j < length)
@@ -427,7 +427,7 @@ public class MaskFormatter extends DefaultFormatter
/**
* Returns a String representation of the Object value based on the mask.
- *
+ *
* @param value the value to convert
* @throws ParseException if value is invalid for this mask and valid/invalid
* character sets
@@ -437,7 +437,7 @@ public class MaskFormatter extends DefaultFormatter
String string = value != null ? value.toString() : "";
return convertValueToString(string);
}
-
+
/**
* This method takes in a String and runs it through the mask to make
* sure that it is valid. If <code>convert</code> is true, it also
@@ -483,7 +483,7 @@ public class MaskFormatter extends DefaultFormatter
valueChar = placeHolderChar;
}
- // This switch block on the mask character checks that the character
+ // This switch block on the mask character checks that the character
// within <code>value</code> at that point is valid according to the
// mask and also converts to upper/lowercase as needed.
switch (maskChar)
@@ -529,7 +529,7 @@ public class MaskFormatter extends DefaultFormatter
i++;
break;
case ESCAPE_CHAR:
- // Escape character, check the next character to make sure that
+ // Escape character, check the next character to make sure that
// the literals match
j++;
if (j < length)
diff --git a/libjava/classpath/javax/swing/text/MutableAttributeSet.java b/libjava/classpath/javax/swing/text/MutableAttributeSet.java
index 5dd2406..eb52be5 100644
--- a/libjava/classpath/javax/swing/text/MutableAttributeSet.java
+++ b/libjava/classpath/javax/swing/text/MutableAttributeSet.java
@@ -40,10 +40,10 @@ package javax.swing.text;
import java.util.Enumeration;
/**
- * An {@link AttributeSet} that supports modification of the stored
+ * An {@link AttributeSet} that supports modification of the stored
* attributes.
- *
- * @author Andrew Selkirk
+ *
+ * @author Andrew Selkirk
* @since 1.2
*/
public interface MutableAttributeSet extends AttributeSet
@@ -52,54 +52,54 @@ public interface MutableAttributeSet extends AttributeSet
* Adds an attribute with the given <code>name</code> and <code>value</code>
* to the set. If the set already contains an attribute with the given
* <code>name</code>, the attribute value is updated.
- *
+ *
* @param name the attribute name (<code>null</code> not permitted).
* @param value the value (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if either argument is <code>null</code>.
*/
void addAttribute(Object name, Object value);
/**
* Adds all the attributes from <code>attributes</code> to this set.
- *
+ *
* @param attributes the set of attributes to add (<code>null</code> not
* permitted).
- *
- * @throws NullPointerException if <code>attributes</code> is
+ *
+ * @throws NullPointerException if <code>attributes</code> is
* <code>null</code>.
*/
void addAttributes(AttributeSet attributes);
/**
- * Removes the attribute with the specified <code>name</code>, if this
+ * Removes the attribute with the specified <code>name</code>, if this
* attribute is defined. This method will only remove an attribute from
* this set, not from the resolving parent.
- *
+ *
* @param name the attribute name (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if <code>name</code> is <code>null</code>.
*/
void removeAttribute(Object name);
/**
* Removes the attributes listed in <code>names</code>.
- *
+ *
* @param names the attribute names (<code>null</code> not permitted).
- *
- * @throws NullPointerException if <code>names</code> is <code>null</code>
+ *
+ * @throws NullPointerException if <code>names</code> is <code>null</code>
* or contains any <code>null</code> values.
*/
void removeAttributes(Enumeration<?> names);
/**
- * Removes attributes from this set if they are found in the
+ * Removes attributes from this set if they are found in the
* given set. Only attributes whose key AND value are removed.
- * Removes attributes only from this set, not from the resolving parent.
- * Since the resolving parent is stored as an attribute, if
+ * Removes attributes only from this set, not from the resolving parent.
+ * Since the resolving parent is stored as an attribute, if
* <code>attributes</code> has the same resolving parent as this set, the
* parent will be removed from this set.
- *
+ *
* @param attributes the attributes (<code>null</code> not permitted).
*/
void removeAttributes(AttributeSet attributes);
@@ -107,10 +107,10 @@ public interface MutableAttributeSet extends AttributeSet
/**
* Sets the reolving parent for this set. When looking up an attribute, if
* it is not found in this set, then the resolving parent is also used for
- * the lookup.
- *
+ * the lookup.
+ *
* @param parent the parent attribute set (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if <code>parent</code> is <code>null</code>.
*/
void setResolveParent(AttributeSet parent);
diff --git a/libjava/classpath/javax/swing/text/NavigationFilter.java b/libjava/classpath/javax/swing/text/NavigationFilter.java
index ea9b29d..647ac70 100644
--- a/libjava/classpath/javax/swing/text/NavigationFilter.java
+++ b/libjava/classpath/javax/swing/text/NavigationFilter.java
@@ -51,20 +51,20 @@ public class NavigationFilter
public abstract void moveDot(int dot, Position.Bias bias);
public abstract void setDot(int dot, Position.Bias bias);
}
-
+
public NavigationFilter()
{
// Do nothing here.
}
public void moveDot(NavigationFilter.FilterBypass fb, int dot,
- Position.Bias bias)
+ Position.Bias bias)
{
fb.moveDot(dot, bias);
}
public void setDot(NavigationFilter.FilterBypass fb, int dot,
- Position.Bias bias)
+ Position.Bias bias)
{
fb.setDot(dot, bias);
}
diff --git a/libjava/classpath/javax/swing/text/NumberFormatter.java b/libjava/classpath/javax/swing/text/NumberFormatter.java
index a858ff4..ce5eef9 100644
--- a/libjava/classpath/javax/swing/text/NumberFormatter.java
+++ b/libjava/classpath/javax/swing/text/NumberFormatter.java
@@ -1,4 +1,4 @@
-/* NumberFormatter.java --
+/* NumberFormatter.java --
Copyright (C) 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -45,22 +45,22 @@ import java.text.NumberFormat;
* <code>NumberFormatter</code> is an {@link InternationalFormatter}
* that implements value to string and string to value conversion via
* an instance of {@link NumberFormat}.
- *
+ *
* @author Anthony Balkissoon abalkiss at redhat dot com
* @since 1.4
*/
public class NumberFormatter extends InternationalFormatter
{
-
+
/**
- * Creates a NumberFormatter with the default NumberFormat from
- * NumberFormat.getNumberInstance().
+ * Creates a NumberFormatter with the default NumberFormat from
+ * NumberFormat.getNumberInstance().
*/
public NumberFormatter ()
{
this (NumberFormat.getNumberInstance());
}
-
+
/**
* Creates a NumberFormatter with the specified NumberFormat.
* @param format the NumberFormat to use for this NumberFormatter.
@@ -70,11 +70,11 @@ public class NumberFormatter extends InternationalFormatter
super(format);
setFormat(format);
}
-
+
/**
* Sets the NumberFormat that this NumberFormatter will use to determine
* legal values for editing and displaying.
- *
+ *
* @param format the Format to use to determine legal values.
*/
public void setFormat (Format format)
diff --git a/libjava/classpath/javax/swing/text/ParagraphView.java b/libjava/classpath/javax/swing/text/ParagraphView.java
index f2795e2..4d4c7a0 100644
--- a/libjava/classpath/javax/swing/text/ParagraphView.java
+++ b/libjava/classpath/javax/swing/text/ParagraphView.java
@@ -297,7 +297,7 @@ public class ParagraphView extends FlowView implements TabExpander
/**
* Sets the justification of the paragraph.
*
- * @param j the justification to set
+ * @param j the justification to set
*/
protected void setJustification(int j)
{
diff --git a/libjava/classpath/javax/swing/text/PasswordView.java b/libjava/classpath/javax/swing/text/PasswordView.java
index 9d4c86a..62b1419 100644
--- a/libjava/classpath/javax/swing/text/PasswordView.java
+++ b/libjava/classpath/javax/swing/text/PasswordView.java
@@ -1,4 +1,4 @@
-/* PasswordView.java --
+/* PasswordView.java --
Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -155,7 +155,7 @@ public class PasswordView
/**
* Determines the preferred span for this view along an axis.
- *
+ *
* @param axis to get the preferred span of
* @return the preferred span of the axis
*/
@@ -196,7 +196,7 @@ public class PasswordView
* @param a - the allocated region to render into
* @param b - typesafe enumeration to indicate bias to a position in the model.
* @return the bounding box of the given position
- * @throws BadLocationException if the given position does not
+ * @throws BadLocationException if the given position does not
* represent a valid location in the associated document
*/
public Shape modelToView(int pos, Shape a, Position.Bias b)
@@ -206,7 +206,7 @@ public class PasswordView
// Ensure metrics are up-to-date.
updateMetrics();
-
+
// Get rectangle of the line containing position.
int lineIndex = getElement().getElementIndex(pos);
Rectangle rect = lineToRect(newAlloc, lineIndex);
@@ -234,16 +234,16 @@ public class PasswordView
}
/**
- * Provides a mapping from the view coordinate space to the logical
+ * Provides a mapping from the view coordinate space to the logical
* coordinate space of the model.
- *
+ *
* @param fx - the X coordinate >= 0.0f
* @param fy - the Y coordinate >= 0.0f
- * @param a - the allocated region to render into
+ * @param a - the allocated region to render into
* @param bias - typesafe enumeration to indicate bias to a position in the model.
- * @return the location within the model that best represents
+ * @return the location within the model that best represents
* the given point in the view
- *
+ *
*/
public int viewToModel(float fx, float fy, Shape a, Position.Bias[] bias)
{
diff --git a/libjava/classpath/javax/swing/text/PlainDocument.java b/libjava/classpath/javax/swing/text/PlainDocument.java
index 730a619..070c760 100644
--- a/libjava/classpath/javax/swing/text/PlainDocument.java
+++ b/libjava/classpath/javax/swing/text/PlainDocument.java
@@ -52,7 +52,7 @@ import java.util.ArrayList;
public class PlainDocument extends AbstractDocument
{
private static final long serialVersionUID = 4758290289196893664L;
-
+
public static final String lineLimitAttribute = "lineLimit";
public static final String tabSizeAttribute = "tabSize";
@@ -62,7 +62,7 @@ public class PlainDocument extends AbstractDocument
* createDefaultRoot() (when overridden by a subclass).
*/
private Element rootElement;
-
+
public PlainDocument()
{
this(new GapContent());
@@ -80,7 +80,7 @@ public class PlainDocument extends AbstractDocument
private void reindex()
{
Element[] lines;
- try
+ try
{
String str = content.getString(0, content.length());
@@ -91,10 +91,10 @@ public class PlainDocument extends AbstractDocument
elts.add(createLeafElement(rootElement, SimpleAttributeSet.EMPTY, j, i + 1));
j = i + 1;
}
-
+
if (j < content.length())
elts.add(createLeafElement(rootElement, SimpleAttributeSet.EMPTY, j, content.length()));
-
+
lines = new Element[elts.size()];
for (int i = 0; i < elts.size(); ++i)
lines[i] = (Element) elts.get(i);
@@ -116,7 +116,7 @@ public class PlainDocument extends AbstractDocument
Element[] array = new Element[1];
array[0] = createLeafElement(root, null, 0, 1);
root.replace(0, 0, array);
-
+
return root;
}
@@ -239,9 +239,9 @@ public class PlainDocument extends AbstractDocument
removed = new Element [i2 - i1 + 1];
for (int i = i1; i <= i2; i++)
removed[i-i1] = rootElement.getElement(i);
-
+
int start = rootElement.getElement(i1).getStartOffset();
- int end = rootElement.getElement(i2).getEndOffset();
+ int end = rootElement.getElement(i2).getEndOffset();
added[0] = createLeafElement(rootElement,
SimpleAttributeSet.EMPTY,
start, end);
diff --git a/libjava/classpath/javax/swing/text/PlainView.java b/libjava/classpath/javax/swing/text/PlainView.java
index e048d5f..16112fd 100644
--- a/libjava/classpath/javax/swing/text/PlainView.java
+++ b/libjava/classpath/javax/swing/text/PlainView.java
@@ -1,4 +1,4 @@
-/* PlainView.java --
+/* PlainView.java --
Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -59,7 +59,7 @@ public class PlainView extends View implements TabExpander
* The color that is used to draw disabled text fields.
*/
Color disabledColor;
-
+
/**
* While painting this is the textcomponent's current start index
* of the selection.
@@ -73,13 +73,13 @@ public class PlainView extends View implements TabExpander
int selectionEnd;
Font font;
-
+
/** The length of the longest line in the Document **/
float maxLineLength = -1;
-
+
/** The longest line in the Document **/
Element longestLine = null;
-
+
protected FontMetrics metrics;
/**
@@ -112,12 +112,12 @@ public class PlainView extends View implements TabExpander
if (this.font != font)
{
- this.font = font;
- metrics = component.getFontMetrics(font);
+ this.font = font;
+ metrics = component.getFontMetrics(font);
tabSize = getTabSize() * metrics.charWidth('m');
}
}
-
+
/**
* @since 1.4
*/
@@ -125,11 +125,11 @@ public class PlainView extends View implements TabExpander
{
// Ensure metrics are up-to-date.
updateMetrics();
-
+
Rectangle rect = a instanceof Rectangle ? (Rectangle) a : a.getBounds();
int fontHeight = metrics.getHeight();
return new Rectangle(rect.x, rect.y + (line * fontHeight),
- rect.width, fontHeight);
+ rect.width, fontHeight);
}
public Shape modelToView(int position, Shape a, Position.Bias b)
@@ -137,7 +137,7 @@ public class PlainView extends View implements TabExpander
{
// Ensure metrics are up-to-date.
updateMetrics();
-
+
Document document = getDocument();
// Get rectangle of the line containing position.
@@ -151,7 +151,7 @@ public class PlainView extends View implements TabExpander
Segment segment = getLineBuffer();
document.getText(lineStart, position - lineStart, segment);
int xoffset = Utilities.getTabbedTextWidth(segment, metrics, tabBase,
- this, lineStart);
+ this, lineStart);
// Calc the real rectangle.
rect.x += xoffset;
@@ -160,7 +160,7 @@ public class PlainView extends View implements TabExpander
return rect;
}
-
+
/**
* Draws a line of text. The X and Y coordinates specify the start of
* the <em>baseline</em> of the line.
@@ -177,7 +177,7 @@ public class PlainView extends View implements TabExpander
Element line = getElement().getElement(lineIndex);
int startOffset = line.getStartOffset();
int endOffset = line.getEndOffset() - 1;
-
+
if (selectionStart <= startOffset)
// Selection starts before the line ...
if (selectionEnd <= startOffset)
@@ -265,7 +265,7 @@ public class PlainView extends View implements TabExpander
{
// Ensure metrics are up-to-date.
updateMetrics();
-
+
JTextComponent textComponent = (JTextComponent) getContainer();
selectedColor = textComponent.getSelectedTextColor();
@@ -324,7 +324,7 @@ public class PlainView extends View implements TabExpander
* Returns the tab size of a tab. Checks the Document's
* properties for PlainDocument.tabSizeAttribute and returns it if it is
* defined, otherwise returns 8.
- *
+ *
* @return the tab size.
*/
protected int getTabSize()
@@ -339,7 +339,7 @@ public class PlainView extends View implements TabExpander
* Returns the next tab stop position after a given reference position.
*
* This implementation ignores the <code>tabStop</code> argument.
- *
+ *
* @param x the current x position in pixels
* @param tabStop the position within the text stream that the tab occured at
*/
@@ -351,7 +351,7 @@ public class PlainView extends View implements TabExpander
int numTabs = (((int) x) - tabBase) / tabSize;
next = tabBase + (numTabs + 1) * tabSize;
}
- return next;
+ return next;
}
/**
@@ -363,7 +363,7 @@ public class PlainView extends View implements TabExpander
// if the longest line is cached, return the cached value
if (maxLineLength != -1)
return maxLineLength;
-
+
// otherwise we have to go through all the lines and find it
Element el = getElement();
Segment seg = getLineBuffer();
@@ -380,13 +380,13 @@ public class PlainView extends View implements TabExpander
catch (BadLocationException ex)
{
AssertionError ae = new AssertionError("Unexpected bad location");
- ae.initCause(ex);
- throw ae;
+ ae.initCause(ex);
+ throw ae;
}
-
+
if (seg == null || seg.array == null || seg.count == 0)
continue;
-
+
int width = metrics.charsWidth(seg.array, seg.offset, seg.count);
if (width > span)
{
@@ -397,7 +397,7 @@ public class PlainView extends View implements TabExpander
maxLineLength = span;
return maxLineLength;
}
-
+
public float getPreferredSpan(int axis)
{
if (axis != X_AXIS && axis != Y_AXIS)
@@ -419,7 +419,7 @@ public class PlainView extends View implements TabExpander
span = metrics.getHeight() * el.getElementCount();
break;
}
-
+
return span;
}
@@ -483,14 +483,14 @@ public class PlainView extends View implements TabExpander
pos = -1;
}
}
-
+
}
}
// Bias is always forward.
b[0] = Position.Bias.Forward;
return pos;
- }
-
+ }
+
/**
* Since insertUpdate and removeUpdate each deal with children
* Elements being both added and removed, they both have to perform
@@ -592,7 +592,7 @@ public class PlainView extends View implements TabExpander
/**
* This method is called when something is inserted into the Document
* that this View is displaying.
- *
+ *
* @param changes the DocumentEvent for the changes.
* @param a the allocation of the View
* @param f the ViewFactory used to rebuild
@@ -605,7 +605,7 @@ public class PlainView extends View implements TabExpander
/**
* This method is called when something is removed from the Document
* that this View is displaying.
- *
+ *
* @param changes the DocumentEvent for the changes.
* @param a the allocation of the View
* @param f the ViewFactory used to rebuild
@@ -614,28 +614,28 @@ public class PlainView extends View implements TabExpander
{
updateDamage(changes, a, f);
}
-
+
/**
- * This method is called when attributes were changed in the
+ * This method is called when attributes were changed in the
* Document in a location that this view is responsible for.
*/
public void changedUpdate (DocumentEvent changes, Shape a, ViewFactory f)
{
updateDamage(changes, a, f);
}
-
+
/**
* Repaint the given line range. This is called from insertUpdate,
- * changedUpdate, and removeUpdate when no new lines were added
- * and no lines were removed, to repaint the line that was
+ * changedUpdate, and removeUpdate when no new lines were added
+ * and no lines were removed, to repaint the line that was
* modified.
- *
+ *
* @param line0 the start of the range
* @param line1 the end of the range
* @param a the rendering region of the host
* @param host the Component that uses this View (used to call repaint
* on that Component)
- *
+ *
* @since 1.4
*/
protected void damageLineRange (int line0, int line1, Shape a, Component host)
@@ -656,7 +656,7 @@ public class PlainView extends View implements TabExpander
rec0.height, rec1);
host.repaint(repaintRec.x, repaintRec.y, repaintRec.width,
repaintRec.height);
- }
+ }
}
/**
@@ -722,4 +722,3 @@ public class PlainView extends View implements TabExpander
lineEl.getStartOffset());
}
}
-
diff --git a/libjava/classpath/javax/swing/text/Position.java b/libjava/classpath/javax/swing/text/Position.java
index d02eb83..56c8b6e 100644
--- a/libjava/classpath/javax/swing/text/Position.java
+++ b/libjava/classpath/javax/swing/text/Position.java
@@ -1,4 +1,4 @@
-/* Position.java --
+/* Position.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -46,7 +46,7 @@ public interface Position
public static final Bias Forward = new Bias("Forward");
private String name;
-
+
private Bias(String n)
{
name = n;
@@ -57,6 +57,6 @@ public interface Position
return name;
}
}
-
+
int getOffset();
}
diff --git a/libjava/classpath/javax/swing/text/Segment.java b/libjava/classpath/javax/swing/text/Segment.java
index 63c5fa0..7486ab3 100644
--- a/libjava/classpath/javax/swing/text/Segment.java
+++ b/libjava/classpath/javax/swing/text/Segment.java
@@ -45,16 +45,16 @@ import java.text.CharacterIterator;
public class Segment implements Cloneable, CharacterIterator
{
private boolean partialReturn;
-
+
/** The current index. */
private int current;
-
+
/** Storage for the characters (may contain additional characters). */
public char[] array;
-
+
/** The number of characters in the segment. */
public int count;
-
+
/** The offset of the first character in the segment. */
public int offset;
@@ -68,7 +68,7 @@ public class Segment implements Cloneable, CharacterIterator
/**
* Creates a new <code>Segment</code>.
- *
+ *
* @param array the underlying character data.
* @param offset the offset of the first character in the segment.
* @param count the number of characters in the segment.
@@ -79,38 +79,38 @@ public class Segment implements Cloneable, CharacterIterator
this.offset = offset;
this.count = count;
}
-
+
/**
* Clones the segment (note that the underlying character array is not cloned,
* just the reference to it).
- *
+ *
* @return A clone of the segment.
*/
public Object clone()
{
try
{
- return super.clone();
+ return super.clone();
}
catch (CloneNotSupportedException e)
{
- return null;
+ return null;
}
}
/**
* Returns the character at the current index. If the segment consists of
- * zero characters, or the current index has passed the end of the
+ * zero characters, or the current index has passed the end of the
* characters in the segment, this method returns {@link #DONE}.
- *
+ *
* @return The character at the current index.
*/
public char current()
{
if (count == 0
- || current >= getEndIndex())
+ || current >= getEndIndex())
return DONE;
-
+
return array[current];
}
@@ -118,8 +118,8 @@ public class Segment implements Cloneable, CharacterIterator
* Sets the current index to the first character in the segment and returns
* that character. If the segment contains zero characters, this method
* returns {@link #DONE}.
- *
- * @return The first character in the segment, or {@link #DONE} if the
+ *
+ * @return The first character in the segment, or {@link #DONE} if the
* segment contains zero characters.
*/
public char first()
@@ -133,7 +133,7 @@ public class Segment implements Cloneable, CharacterIterator
/**
* Returns the index of the first character in the segment.
- *
+ *
* @return The index of the first character.
*/
public int getBeginIndex()
@@ -142,10 +142,10 @@ public class Segment implements Cloneable, CharacterIterator
}
/**
- * Returns the end index for the segment (one position beyond the last
- * character in the segment - note that this can be outside the range of the
+ * Returns the end index for the segment (one position beyond the last
+ * character in the segment - note that this can be outside the range of the
* underlying character array).
- *
+ *
* @return The end index for the segment.
*/
public int getEndIndex()
@@ -155,7 +155,7 @@ public class Segment implements Cloneable, CharacterIterator
/**
* Returns the index of the current character in the segment.
- *
+ *
* @return The index of the current character.
*/
public int getIndex()
@@ -164,12 +164,12 @@ public class Segment implements Cloneable, CharacterIterator
}
/**
- * Sets the current index to point to the last character in the segment and
- * returns that character. If the segment contains zero characters, the
- * current index is set to {@link #getEndIndex()} and this method returns
+ * Sets the current index to point to the last character in the segment and
+ * returns that character. If the segment contains zero characters, the
+ * current index is set to {@link #getEndIndex()} and this method returns
* {@link #DONE}.
- *
- * @return The last character in the segment, or {@link #DONE} if the
+ *
+ * @return The last character in the segment, or {@link #DONE} if the
* segment contains zero characters.
*/
public char last()
@@ -179,20 +179,20 @@ public class Segment implements Cloneable, CharacterIterator
current = getEndIndex();
return DONE;
}
-
+
current = getEndIndex() - 1;
return array[current];
}
/**
- * Sets the current index to point to the next character in the segment and
+ * Sets the current index to point to the next character in the segment and
* returns that character. If the next character position is past the end of
* the segment, the index is set to {@link #getEndIndex()} and the method
- * returns {@link #DONE}. If the segment contains zero characters, this
+ * returns {@link #DONE}. If the segment contains zero characters, this
* method returns {@link #DONE}.
- *
+ *
* @return The next character in the segment or {@link #DONE} (if the next
- * character position is past the end of the segment or if the
+ * character position is past the end of the segment or if the
* segment contains zero characters).
*/
public char next()
@@ -202,30 +202,30 @@ public class Segment implements Cloneable, CharacterIterator
if ((current + 1) >= getEndIndex())
{
- current = getEndIndex();
- return DONE;
+ current = getEndIndex();
+ return DONE;
}
-
+
current++;
return array[current];
}
/**
- * Sets the current index to point to the previous character in the segment
- * and returns that character. If the current index is equal to
- * {@link #getBeginIndex()}, or if the segment contains zero characters, this
+ * Sets the current index to point to the previous character in the segment
+ * and returns that character. If the current index is equal to
+ * {@link #getBeginIndex()}, or if the segment contains zero characters, this
* method returns {@link #DONE}.
- *
- * @return The previous character in the segment or {@link #DONE} (if the
- * current character position is at the beginning of the segment or
+ *
+ * @return The previous character in the segment or {@link #DONE} (if the
+ * current character position is at the beginning of the segment or
* if the segment contains zero characters).
*/
public char previous()
{
if (count == 0
- || current == getBeginIndex())
+ || current == getBeginIndex())
return DONE;
-
+
current--;
return array[current];
}
@@ -233,20 +233,20 @@ public class Segment implements Cloneable, CharacterIterator
/**
* Sets the current index and returns the character at that position (or
* {@link #DONE} if the index is equal to {@link #getEndIndex()}.
- *
+ *
* @param position the current position.
- *
+ *
* @return The character at the specified <code>position</code>, or
- * {@link #DONE} if <code>position</code> is equal to
+ * {@link #DONE} if <code>position</code> is equal to
* {@link #getEndIndex()}.
- *
+ *
* @throws IllegalArgumentException if <code>position</code> is not in the
* range {@link #getBeginIndex()} to {@link #getEndIndex()}.
*/
public char setIndex(int position)
{
if (position < getBeginIndex()
- || position > getEndIndex())
+ || position > getEndIndex())
throw new IllegalArgumentException("position: " + position
+ ", beginIndex: " + getBeginIndex()
+ ", endIndex: " + getEndIndex()
@@ -256,15 +256,15 @@ public class Segment implements Cloneable, CharacterIterator
if (position == getEndIndex())
return DONE;
-
+
return array[current];
}
/**
- * Returns a <code>String</code> containing the same characters as this
+ * Returns a <code>String</code> containing the same characters as this
* <code>Segment</code>.
- *
- * @return A <code>String</code> containing the same characters as this
+ *
+ * @return A <code>String</code> containing the same characters as this
* <code>Segment</code>.
*/
public String toString()
@@ -274,19 +274,19 @@ public class Segment implements Cloneable, CharacterIterator
/**
* Sets the partial return flag.
- *
+ *
* @param p the new value of the flag.
- *
+ *
* @since 1.4
*/
public void setPartialReturn(boolean p)
{
partialReturn = p;
}
-
+
/**
* Returns the partial return flag.
- *
+ *
* @return The partial return flag.
* @since 1.4
*/
diff --git a/libjava/classpath/javax/swing/text/SimpleAttributeSet.java b/libjava/classpath/javax/swing/text/SimpleAttributeSet.java
index 701fa8a..0229901 100644
--- a/libjava/classpath/javax/swing/text/SimpleAttributeSet.java
+++ b/libjava/classpath/javax/swing/text/SimpleAttributeSet.java
@@ -66,13 +66,13 @@ public class SimpleAttributeSet
{
tab = new Hashtable();
}
-
+
/**
* Creates a new <code>SimpleAttributeSet</code> with the same attributes
* and resolve parent as the specified set.
- *
+ *
* @param a the attributes (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
*/
public SimpleAttributeSet(AttributeSet a)
@@ -85,10 +85,10 @@ public class SimpleAttributeSet
* Adds an attribute with the given <code>name</code> and <code>value</code>
* to the set. If the set already contains an attribute with the given
* <code>name</code>, the attribute value is updated.
- *
+ *
* @param name the attribute name (<code>null</code> not permitted).
* @param value the value (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if either argument is <code>null</code>.
*/
public void addAttribute(Object name, Object value)
@@ -98,11 +98,11 @@ public class SimpleAttributeSet
/**
* Adds all the attributes from <code>attributes</code> to this set.
- *
+ *
* @param attributes the set of attributes to add (<code>null</code> not
* permitted).
- *
- * @throws NullPointerException if <code>attributes</code> is
+ *
+ * @throws NullPointerException if <code>attributes</code> is
* <code>null</code>.
*/
public void addAttributes(AttributeSet attributes)
@@ -118,7 +118,7 @@ public class SimpleAttributeSet
/**
* Returns a clone of the attribute set.
- *
+ *
* @return A clone of the attribute set.
*/
public Object clone()
@@ -159,7 +159,7 @@ public class SimpleAttributeSet
return false;
}
}
-
+
/**
* Returns true if the given name and value are found in this AttributeSet.
* Does not check the resolve parent.
@@ -169,7 +169,7 @@ public class SimpleAttributeSet
*/
boolean containsAttributeLocally(Object name, Object value)
{
- return tab.containsKey(name)
+ return tab.containsKey(name)
&& tab.get(name).equals(value);
}
@@ -190,7 +190,7 @@ public class SimpleAttributeSet
Object name = e.nextElement();
Object val = attributes.getAttribute(name);
if (! containsAttribute(name, val))
- return false;
+ return false;
}
return true;
}
@@ -207,33 +207,33 @@ public class SimpleAttributeSet
/**
* Checks this set for equality with an arbitrary object.
- *
+ *
* @param obj the object (<code>null</code> permitted).
- *
+ *
* @return <code>true</code> if this set is equal to <code>obj</code>, and
- * <code>false</code> otherwise.
+ * <code>false</code> otherwise.
*/
public boolean equals(Object obj)
{
- return
+ return
(obj instanceof AttributeSet)
&& this.isEqual((AttributeSet) obj);
}
/**
- * Returns the value of the specified attribute, or <code>null</code> if
+ * Returns the value of the specified attribute, or <code>null</code> if
* there is no attribute with that name. If the attribute is not defined
* directly in this set, the parent hierarchy (if there is one) will be
* used.
- *
+ *
* @param name the attribute (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if <code>name</code> is <code>null</code>.
*/
public Object getAttribute(Object name)
{
Object val = tab.get(name);
- if (val != null)
+ if (val != null)
return val;
AttributeSet p = getResolveParent();
@@ -245,10 +245,10 @@ public class SimpleAttributeSet
/**
* Returns the number of attributes stored in this set, plus 1 if a parent
- * has been specified (the reference to the parent is stored as a special
+ * has been specified (the reference to the parent is stored as a special
* attribute). The attributes stored in the parent do NOT contribute
* to the count.
- *
+ *
* @return The attribute count.
*/
public int getAttributeCount()
@@ -258,7 +258,7 @@ public class SimpleAttributeSet
/**
* Returns an enumeration of the attribute names.
- *
+ *
* @return An enumeration of the attribute names.
*/
public Enumeration<?> getAttributeNames()
@@ -268,9 +268,9 @@ public class SimpleAttributeSet
/**
* Returns the resolving parent.
- *
+ *
* @return The resolving parent (possibly <code>null</code>).
- *
+ *
* @see #setResolveParent(AttributeSet)
*/
public AttributeSet getResolveParent()
@@ -280,7 +280,7 @@ public class SimpleAttributeSet
/**
* Returns a hash code for this instance.
- *
+ *
* @return A hash code.
*/
public int hashCode()
@@ -292,7 +292,7 @@ public class SimpleAttributeSet
* Returns <code>true</code> if the given attribute is defined in this set,
* and <code>false</code> otherwise. The parent attribute set is not
* checked.
- *
+ *
* @param attrName the attribute name (<code>null</code> not permitted).
*/
public boolean isDefined(Object attrName)
@@ -301,28 +301,28 @@ public class SimpleAttributeSet
}
/**
- * Returns <code>true</code> if the set contains no attributes, and
- * <code>false</code> otherwise. Note that the resolving parent is
- * stored as an attribute, so this method will return <code>false</code> if
+ * Returns <code>true</code> if the set contains no attributes, and
+ * <code>false</code> otherwise. Note that the resolving parent is
+ * stored as an attribute, so this method will return <code>false</code> if
* a resolving parent is set.
- *
- * @return <code>true</code> if the set contains no attributes, and
+ *
+ * @return <code>true</code> if the set contains no attributes, and
* <code>false</code> otherwise.
*/
public boolean isEmpty()
{
- return tab.isEmpty();
+ return tab.isEmpty();
}
/**
* Returns true if the given set has the same number of attributes
* as this set and <code>containsAttributes(attr)</code> returns
* <code>true</code>.
- *
+ *
* @param attr the attribute set (<code>null</code> not permitted).
- *
+ *
* @return A boolean.
- *
+ *
* @throws NullPointerException if <code>attr</code> is <code>null</code>.
*/
public boolean isEqual(AttributeSet attr)
@@ -330,14 +330,14 @@ public class SimpleAttributeSet
return getAttributeCount() == attr.getAttributeCount()
&& this.containsAttributes(attr);
}
-
+
/**
- * Removes the attribute with the specified <code>name</code>, if this
+ * Removes the attribute with the specified <code>name</code>, if this
* attribute is defined. This method will only remove an attribute from
* this set, not from the resolving parent.
- *
+ *
* @param name the attribute name (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if <code>name</code> is <code>null</code>.
*/
public void removeAttribute(Object name)
@@ -346,13 +346,13 @@ public class SimpleAttributeSet
}
/**
- * Removes attributes from this set if they are found in the
+ * Removes attributes from this set if they are found in the
* given set. Only attributes whose key AND value are removed.
- * Removes attributes only from this set, not from the resolving parent.
- * Since the resolving parent is stored as an attribute, if
+ * Removes attributes only from this set, not from the resolving parent.
+ * Since the resolving parent is stored as an attribute, if
* <code>attributes</code> has the same resolving parent as this set, the
* parent will be removed from this set.
- *
+ *
* @param attributes the attributes (<code>null</code> not permitted).
*/
public void removeAttributes(AttributeSet attributes)
@@ -363,16 +363,16 @@ public class SimpleAttributeSet
Object name = e.nextElement();
Object val = attributes.getAttribute(name);
if (containsAttributeLocally(name, val))
- removeAttribute(name);
+ removeAttribute(name);
}
}
/**
* Removes the attributes listed in <code>names</code>.
- *
+ *
* @param names the attribute names (<code>null</code> not permitted).
- *
- * @throws NullPointerException if <code>names</code> is <code>null</code>
+ *
+ * @throws NullPointerException if <code>names</code> is <code>null</code>
* or contains any <code>null</code> values.
*/
public void removeAttributes(Enumeration<?> names)
@@ -380,7 +380,7 @@ public class SimpleAttributeSet
while (names.hasMoreElements())
{
removeAttribute(names.nextElement());
- }
+ }
}
/**
@@ -388,28 +388,28 @@ public class SimpleAttributeSet
* it is not found in this set, then the resolving parent is also used for
* the lookup.
* <p>
- * Note that the parent is stored as an attribute, and will contribute 1 to
- * the count returned by {@link #getAttributeCount()}.
- *
+ * Note that the parent is stored as an attribute, and will contribute 1 to
+ * the count returned by {@link #getAttributeCount()}.
+ *
* @param parent the parent attribute set (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if <code>parent</code> is <code>null</code>.
- *
+ *
* @see #setResolveParent(AttributeSet)
*/
public void setResolveParent(AttributeSet parent)
{
addAttribute(ResolveAttribute, parent);
}
-
+
/**
* Returns a string representation of this instance, typically used for
* debugging purposes.
- *
+ *
* @return A string representation of this instance.
*/
public String toString()
{
return tab.toString();
- }
+ }
}
diff --git a/libjava/classpath/javax/swing/text/StringContent.java b/libjava/classpath/javax/swing/text/StringContent.java
index 4a3f9d7..a017de1 100644
--- a/libjava/classpath/javax/swing/text/StringContent.java
+++ b/libjava/classpath/javax/swing/text/StringContent.java
@@ -54,15 +54,15 @@ import javax.swing.undo.UndoableEdit;
* An implementation of the <code>AbstractDocument.Content</code>
* interface useful for small documents or debugging. The character
* content is a simple character array. It's not really efficient.
- *
+ *
* <p>Do not use this class for large size.</p>
*/
-public final class StringContent
+public final class StringContent
implements AbstractDocument.Content, Serializable
{
/**
* Stores a reference to a mark that can be resetted to the original value
- * after a mark has been moved. This is used for undoing actions.
+ * after a mark has been moved. This is used for undoing actions.
*/
private class UndoPosRef
{
@@ -102,7 +102,7 @@ public final class StringContent
* the actual offset of the position. This is pulled out of the
* GapContentPosition object so that the mark and position can be handled
* independently, and most important, so that the StickyPosition can
- * be garbage collected while we still hold a reference to the Mark object.
+ * be garbage collected while we still hold a reference to the Mark object.
*/
private class Mark
{
@@ -148,7 +148,7 @@ public final class StringContent
private class InsertUndo extends AbstractUndoableEdit
{
private int start;
-
+
private int length;
private String redoContent;
@@ -177,7 +177,7 @@ public final class StringContent
throw new CannotUndoException();
}
}
-
+
public void redo()
{
super.redo();
@@ -303,8 +303,8 @@ public final class StringContent
/**
* Creates a new instance containing the string "\n".
- *
- * @param initialLength the initial length of the underlying character
+ *
+ * @param initialLength the initial length of the underlying character
* array used to store the content.
*/
public StringContent(int initialLength)
@@ -337,10 +337,10 @@ public final class StringContent
* Creates a position reference for the character at the given offset. The
* position offset will be automatically updated when new characters are
* inserted into or removed from the content.
- *
+ *
* @param offset the character offset.
- *
- * @throws BadLocationException if offset is outside the bounds of the
+ *
+ * @throws BadLocationException if offset is outside the bounds of the
* content.
*/
public Position createPosition(int offset) throws BadLocationException
@@ -351,26 +351,26 @@ public final class StringContent
StickyPosition sp = new StickyPosition(offset);
return sp;
}
-
+
/**
* Returns the length of the string content, including the '\n' character at
* the end.
- *
+ *
* @return The length of the string content.
*/
public int length()
{
return count;
}
-
+
/**
- * Inserts <code>str</code> at the given position and returns an
+ * Inserts <code>str</code> at the given position and returns an
* {@link UndoableEdit} that enables undo/redo support.
- *
- * @param where the insertion point (must be less than
+ *
+ * @param where the insertion point (must be less than
* <code>length()</code>).
* @param str the string to insert (<code>null</code> not permitted).
- *
+ *
* @return An object that can undo the insertion.
*/
public UndoableEdit insertString(int where, String str)
@@ -402,23 +402,23 @@ public final class StringContent
InsertUndo iundo = new InsertUndo(where, insert.length);
return iundo;
}
-
+
/**
- * Removes the specified range of characters and returns an
+ * Removes the specified range of characters and returns an
* {@link UndoableEdit} that enables undo/redo support.
- *
+ *
* @param where the starting index.
* @param nitems the number of characters.
- *
+ *
* @return An object that can undo the removal.
- *
+ *
* @throws BadLocationException if the character range extends outside the
* bounds of the content OR includes the last character.
*/
public UndoableEdit remove(int where, int nitems) throws BadLocationException
{
checkLocation(where, nitems + 1);
- RemoveUndo rundo = new RemoveUndo(where, new String(this.content, where,
+ RemoveUndo rundo = new RemoveUndo(where, new String(this.content, where,
nitems));
replace(where, nitems, EMPTY);
@@ -464,15 +464,15 @@ public final class StringContent
}
/**
- * Returns a new <code>String</code> containing the characters in the
+ * Returns a new <code>String</code> containing the characters in the
* specified range.
- *
+ *
* @param where the start index.
* @param len the number of characters.
- *
+ *
* @return A string.
- *
- * @throws BadLocationException if the requested range of characters extends
+ *
+ * @throws BadLocationException if the requested range of characters extends
* outside the bounds of the content.
*/
public String getString(int where, int len) throws BadLocationException
@@ -482,21 +482,21 @@ public final class StringContent
checkLocation(where, len);
return new String(this.content, where, len);
}
-
+
/**
- * Updates <code>txt</code> to contain a direct reference to the underlying
+ * Updates <code>txt</code> to contain a direct reference to the underlying
* character array.
- *
+ *
* @param where the index of the first character.
* @param len the number of characters.
- * @param txt a carrier for the return result (<code>null</code> not
+ * @param txt a carrier for the return result (<code>null</code> not
* permitted).
- *
- * @throws BadLocationException if the requested character range is not
+ *
+ * @throws BadLocationException if the requested character range is not
* within the bounds of the content.
* @throws NullPointerException if <code>txt</code> is <code>null</code>.
*/
- public void getChars(int where, int len, Segment txt)
+ public void getChars(int where, int len, Segment txt)
throws BadLocationException
{
if (where + len > count)
@@ -523,13 +523,13 @@ public final class StringContent
}
}
- /**
+ /**
* A utility method that checks the validity of the specified character
* range.
- *
+ *
* @param where the first character in the range.
* @param len the number of characters in the range.
- *
+ *
* @throws BadLocationException if the specified range is not within the
* bounds of the content.
*/
@@ -567,4 +567,3 @@ public final class StringContent
}
}
}
-
diff --git a/libjava/classpath/javax/swing/text/Style.java b/libjava/classpath/javax/swing/text/Style.java
index 851ac02..8010828 100644
--- a/libjava/classpath/javax/swing/text/Style.java
+++ b/libjava/classpath/javax/swing/text/Style.java
@@ -1,4 +1,4 @@
-/* Style.java --
+/* Style.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/text/StyleConstants.java b/libjava/classpath/javax/swing/text/StyleConstants.java
index 4e5005c..bdc6371 100644
--- a/libjava/classpath/javax/swing/text/StyleConstants.java
+++ b/libjava/classpath/javax/swing/text/StyleConstants.java
@@ -45,35 +45,35 @@ import java.util.ArrayList;
import javax.swing.Icon;
/**
- * Represents standard attribute keys. This class also contains a set of
- * useful static utility methods for querying and populating an
+ * Represents standard attribute keys. This class also contains a set of
+ * useful static utility methods for querying and populating an
* {@link AttributeSet}.
- *
+ *
* @since 1.2
*/
public class StyleConstants
{
- /**
- * A value representing left alignment for the
- * {@link ParagraphConstants#Alignment} attribute.
+ /**
+ * A value representing left alignment for the
+ * {@link ParagraphConstants#Alignment} attribute.
*/
public static final int ALIGN_LEFT = 0;
- /**
- * A value representing center alignment for the
- * {@link ParagraphConstants#Alignment} attribute.
+ /**
+ * A value representing center alignment for the
+ * {@link ParagraphConstants#Alignment} attribute.
*/
public static final int ALIGN_CENTER = 1;
- /**
- * A value representing right alignment for the
- * {@link ParagraphConstants#Alignment} attribute.
+ /**
+ * A value representing right alignment for the
+ * {@link ParagraphConstants#Alignment} attribute.
*/
public static final int ALIGN_RIGHT = 2;
- /**
- * A value representing ful justification for the
- * {@link ParagraphConstants#Alignment} attribute.
+ /**
+ * A value representing ful justification for the
+ * {@link ParagraphConstants#Alignment} attribute.
*/
public static final int ALIGN_JUSTIFIED = 3;
@@ -82,72 +82,72 @@ public class StyleConstants
/** An alias for {@link CharacterConstants#BidiLevel}. */
public static final Object BidiLevel = CharacterConstants.BidiLevel;
-
+
/** An alias for {@link CharacterConstants#Bold}. */
public static final Object Bold = CharacterConstants.Bold;
-
+
/** An alias for {@link CharacterConstants#ComponentAttribute}. */
- public static final Object ComponentAttribute
+ public static final Object ComponentAttribute
= CharacterConstants.ComponentAttribute;
-
+
/** An alias for {@link CharacterConstants#Family}. */
public static final Object Family = CharacterConstants.Family;
-
+
/** An alias for {@link CharacterConstants#Family}. */
- public static final Object FontFamily = CharacterConstants.Family;
-
+ public static final Object FontFamily = CharacterConstants.Family;
+
/** An alias for {@link CharacterConstants#Size}. */
public static final Object FontSize = CharacterConstants.Size;
-
+
/** An alias for {@link CharacterConstants#Foreground}. */
public static final Object Foreground = CharacterConstants.Foreground;
-
+
/** An alias for {@link CharacterConstants#IconAttribute}. */
public static final Object IconAttribute = CharacterConstants.IconAttribute;
-
+
/** An alias for {@link CharacterConstants#Italic}. */
public static final Object Italic = CharacterConstants.Italic;
-
+
/** An alias for {@link CharacterConstants#Size}. */
public static final Object Size = CharacterConstants.Size;
-
+
/** An alias for {@link CharacterConstants#StrikeThrough}. */
public static final Object StrikeThrough = CharacterConstants.StrikeThrough;
-
+
/** An alias for {@link CharacterConstants#Subscript}. */
public static final Object Subscript = CharacterConstants.Subscript;
-
+
/** An alias for {@link CharacterConstants#Superscript}. */
public static final Object Superscript = CharacterConstants.Superscript;
-
+
/** An alias for {@link CharacterConstants#Underline}. */
public static final Object Underline = CharacterConstants.Underline;
/** An alias for {@link ParagraphConstants#Alignment}. */
public static final Object Alignment = ParagraphConstants.Alignment;
-
+
/** An alias for {@link ParagraphConstants#FirstLineIndent}. */
- public static final Object FirstLineIndent
+ public static final Object FirstLineIndent
= ParagraphConstants.FirstLineIndent;
-
+
/** An alias for {@link ParagraphConstants#LeftIndent}. */
public static final Object LeftIndent = ParagraphConstants.LeftIndent;
-
+
/** An alias for {@link ParagraphConstants#LineSpacing}. */
public static final Object LineSpacing = ParagraphConstants.LineSpacing;
-
+
/** An alias for {@link ParagraphConstants#Orientation}. */
public static final Object Orientation = ParagraphConstants.Orientation;
-
+
/** An alias for {@link ParagraphConstants#RightIndent}. */
public static final Object RightIndent = ParagraphConstants.RightIndent;
-
+
/** An alias for {@link ParagraphConstants#SpaceAbove}. */
public static final Object SpaceAbove = ParagraphConstants.SpaceAbove;
-
+
/** An alias for {@link ParagraphConstants#SpaceBelow}. */
public static final Object SpaceBelow = ParagraphConstants.SpaceBelow;
-
+
/** An alias for {@link ParagraphConstants#TabSet}. */
public static final Object TabSet = ParagraphConstants.TabSet;
@@ -155,13 +155,13 @@ public class StyleConstants
public static final String IconElementName = "icon";
- public static final Object ComposedTextAttribute
+ public static final Object ComposedTextAttribute
= new StyleConstants("composed text");
-
+
public static final Object ModelAttribute = new StyleConstants("model");
-
+
public static final Object NameAttribute = new StyleConstants("name");
-
+
public static final Object ResolveAttribute = new StyleConstants("resolver");
/**
@@ -174,7 +174,7 @@ public class StyleConstants
// Package-private to avoid accessor constructor for use by
// subclasses.
- StyleConstants(String k)
+ StyleConstants(String k)
{
keyname = k;
if (keys == null)
@@ -184,7 +184,7 @@ public class StyleConstants
/**
* Returns a string representation of the attribute key.
- *
+ *
* @return A string representation of the attribute key.
*/
public String toString()
@@ -193,15 +193,15 @@ public class StyleConstants
}
/**
- * Returns the alignment specified in the given attributes, or
+ * Returns the alignment specified in the given attributes, or
* {@link #ALIGN_LEFT} if no alignment is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
- * @return The alignment (typically one of {@link #ALIGN_LEFT},
- * {@link #ALIGN_RIGHT}, {@link #ALIGN_CENTER} or
+ *
+ * @return The alignment (typically one of {@link #ALIGN_LEFT},
+ * {@link #ALIGN_RIGHT}, {@link #ALIGN_CENTER} or
* {@link #ALIGN_JUSTIFIED}).
- *
+ *
* @see #setAlignment(MutableAttributeSet, int)
*/
public static int getAlignment(AttributeSet a)
@@ -210,38 +210,38 @@ public class StyleConstants
if (i != null)
return i.intValue();
else
- return ALIGN_LEFT;
- }
+ return ALIGN_LEFT;
+ }
/**
* Returns the background color specified in the given attributes, or
* {@link Color#BLACK} if no background color is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The background color.
- *
+ *
* @see #setBackground(MutableAttributeSet, Color)
*/
public static Color getBackground(AttributeSet a)
{
Color c = (Color) a.getAttribute(Background);
- if (c != null)
+ if (c != null)
return c;
else
return Color.BLACK;
- }
+ }
/**
- * Returns the bidi level specified in the given attributes, or
+ * Returns the bidi level specified in the given attributes, or
* <code>0</code> if no bidi level is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The bidi level.
- *
+ *
* @see #setBidiLevel(MutableAttributeSet, int)
- */
+ */
public static int getBidiLevel(AttributeSet a)
{
Integer i = (Integer) a.getAttribute(BidiLevel);
@@ -249,18 +249,18 @@ public class StyleConstants
return i.intValue();
else
return 0;
- }
+ }
/**
- * Returns the component specified in the given attributes, or
+ * Returns the component specified in the given attributes, or
* <code>null</code> if no component is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The component (possibly <code>null</code>).
- *
+ *
* @see #setComponent(MutableAttributeSet, Component)
- */
+ */
public static Component getComponent(AttributeSet a)
{
Component c = (Component) a.getAttribute(ComponentAttribute);
@@ -268,18 +268,18 @@ public class StyleConstants
return c;
else
return null;
- }
+ }
/**
- * Returns the indentation specified in the given attributes, or
+ * Returns the indentation specified in the given attributes, or
* <code>0.0f</code> if no indentation is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The indentation.
- *
+ *
* @see #setFirstLineIndent(MutableAttributeSet, float)
- */
+ */
public static float getFirstLineIndent(AttributeSet a)
{
Float f = (Float) a.getAttribute(FirstLineIndent);
@@ -287,18 +287,18 @@ public class StyleConstants
return f.floatValue();
else
return 0.0f;
- }
+ }
/**
- * Returns the font family specified in the given attributes, or
+ * Returns the font family specified in the given attributes, or
* <code>Monospaced</code> if no font family is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The font family.
- *
+ *
* @see #setFontFamily(MutableAttributeSet, String)
- */
+ */
public static String getFontFamily(AttributeSet a)
{
String ff = (String) a.getAttribute(FontFamily);
@@ -306,18 +306,18 @@ public class StyleConstants
return ff;
else
return "Monospaced";
- }
+ }
/**
- * Returns the font size specified in the given attributes, or
+ * Returns the font size specified in the given attributes, or
* <code>12</code> if no font size is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The font size.
- *
+ *
* @see #setFontSize(MutableAttributeSet, int)
- */
+ */
public static int getFontSize(AttributeSet a)
{
Integer i = (Integer) a.getAttribute(FontSize);
@@ -325,16 +325,16 @@ public class StyleConstants
return i.intValue();
else
return 12;
- }
+ }
/**
* Returns the foreground color specified in the given attributes, or
* {@link Color#BLACK} if no foreground color is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The foreground color.
- *
+ *
* @see #setForeground(MutableAttributeSet, Color)
*/
public static Color getForeground(AttributeSet a)
@@ -344,33 +344,33 @@ public class StyleConstants
return c;
else
return Color.BLACK;
- }
+ }
/**
- * Returns the icon specified in the given attributes, or
+ * Returns the icon specified in the given attributes, or
* <code>null</code> if no icon is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The icon (possibly <code>null</code>).
- *
+ *
* @see #setIcon(MutableAttributeSet, Icon)
- */
+ */
public static Icon getIcon(AttributeSet a)
{
return (Icon) a.getAttribute(IconAttribute);
- }
+ }
/**
- * Returns the left indentation specified in the given attributes, or
+ * Returns the left indentation specified in the given attributes, or
* <code>0.0f</code> if no left indentation is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The left indentation.
- *
+ *
* @see #setLeftIndent(MutableAttributeSet, float)
- */
+ */
public static float getLeftIndent(AttributeSet a)
{
Float f = (Float) a.getAttribute(LeftIndent);
@@ -378,18 +378,18 @@ public class StyleConstants
return f.floatValue();
else
return 0.0f;
- }
+ }
/**
- * Returns the line spacing specified in the given attributes, or
+ * Returns the line spacing specified in the given attributes, or
* <code>0.0f</code> if no line spacing is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The line spacing.
- *
+ *
* @see #setLineSpacing(MutableAttributeSet, float)
- */
+ */
public static float getLineSpacing(AttributeSet a)
{
Float f = (Float) a.getAttribute(LineSpacing);
@@ -397,18 +397,18 @@ public class StyleConstants
return f.floatValue();
else
return 0.0f;
- }
+ }
/**
- * Returns the right indentation specified in the given attributes, or
+ * Returns the right indentation specified in the given attributes, or
* <code>0.0f</code> if no right indentation is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The right indentation.
- *
+ *
* @see #setRightIndent(MutableAttributeSet, float)
- */
+ */
public static float getRightIndent(AttributeSet a)
{
Float f = (Float) a.getAttribute(RightIndent);
@@ -416,37 +416,37 @@ public class StyleConstants
return f.floatValue();
else
return 0.0f;
- }
+ }
/**
- * Returns the 'space above' specified in the given attributes, or
+ * Returns the 'space above' specified in the given attributes, or
* <code>0.0f</code> if no 'space above' is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The 'space above'.
- *
+ *
* @see #setSpaceAbove(MutableAttributeSet, float)
- */
+ */
public static float getSpaceAbove(AttributeSet a)
{
Float f = (Float) a.getAttribute(SpaceAbove);
if (f != null)
return f.floatValue();
- else
+ else
return 0.0f;
- }
+ }
/**
- * Returns the 'space below' specified in the given attributes, or
+ * Returns the 'space below' specified in the given attributes, or
* <code>0.0f</code> if no 'space below' is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The 'space below'.
- *
+ *
* @see #setSpaceBelow(MutableAttributeSet, float)
- */
+ */
public static float getSpaceBelow(AttributeSet a)
{
Float f = (Float) a.getAttribute(SpaceBelow);
@@ -454,34 +454,34 @@ public class StyleConstants
return f.floatValue();
else
return 0.0f;
- }
+ }
/**
- * Returns the tab set specified in the given attributes, or
+ * Returns the tab set specified in the given attributes, or
* <code>null</code> if no tab set is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The tab set.
- *
+ *
* @see #setTabSet(MutableAttributeSet, javax.swing.text.TabSet)
- */
+ */
public static javax.swing.text.TabSet getTabSet(AttributeSet a)
{
// I'm guessing that the fully qualified class name is to differentiate
// between the TabSet class and the TabSet (attribute) instance on some
// compiler...
return (javax.swing.text.TabSet) a.getAttribute(StyleConstants.TabSet);
- }
+ }
/**
- * Returns the value of the bold flag in the given attributes, or
+ * Returns the value of the bold flag in the given attributes, or
* <code>false</code> if no bold flag is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The bold flag.
- *
+ *
* @see #setBold(MutableAttributeSet, boolean)
*/
public static boolean isBold(AttributeSet a)
@@ -491,16 +491,16 @@ public class StyleConstants
return b.booleanValue();
else
return false;
- }
+ }
/**
- * Returns the value of the italic flag in the given attributes, or
+ * Returns the value of the italic flag in the given attributes, or
* <code>false</code> if no italic flag is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The italic flag.
- *
+ *
* @see #setItalic(MutableAttributeSet, boolean)
*/
public static boolean isItalic(AttributeSet a)
@@ -510,16 +510,16 @@ public class StyleConstants
return b.booleanValue();
else
return false;
- }
+ }
/**
- * Returns the value of the strike-through flag in the given attributes, or
+ * Returns the value of the strike-through flag in the given attributes, or
* <code>false</code> if no strike-through flag is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The strike-through flag.
- *
+ *
* @see #setStrikeThrough(MutableAttributeSet, boolean)
*/
public static boolean isStrikeThrough(AttributeSet a)
@@ -529,16 +529,16 @@ public class StyleConstants
return b.booleanValue();
else
return false;
- }
+ }
/**
- * Returns the value of the subscript flag in the given attributes, or
+ * Returns the value of the subscript flag in the given attributes, or
* <code>false</code> if no subscript flag is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The subscript flag.
- *
+ *
* @see #setSubscript(MutableAttributeSet, boolean)
*/
public static boolean isSubscript(AttributeSet a)
@@ -548,16 +548,16 @@ public class StyleConstants
return b.booleanValue();
else
return false;
- }
+ }
/**
- * Returns the value of the superscript flag in the given attributes, or
+ * Returns the value of the superscript flag in the given attributes, or
* <code>false</code> if no superscript flag is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The superscript flag.
- *
+ *
* @see #setSuperscript(MutableAttributeSet, boolean)
*/
public static boolean isSuperscript(AttributeSet a)
@@ -565,18 +565,18 @@ public class StyleConstants
Boolean b = (Boolean) a.getAttribute(Superscript);
if (b != null)
return b.booleanValue();
- else
+ else
return false;
- }
+ }
/**
- * Returns the value of the underline flag in the given attributes, or
+ * Returns the value of the underline flag in the given attributes, or
* <code>false</code> if no underline flag is specified.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- *
+ *
* @return The underline flag.
- *
+ *
* @see #setUnderline(MutableAttributeSet, boolean)
*/
public static boolean isUnderline(AttributeSet a)
@@ -586,140 +586,140 @@ public class StyleConstants
return b.booleanValue();
else
return false;
- }
+ }
/**
* Adds an alignment attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
- * @param align the alignment (typically one of
- * {@link StyleConstants#ALIGN_LEFT},
- * {@link StyleConstants#ALIGN_RIGHT},
- * {@link StyleConstants#ALIGN_CENTER} or
+ * @param align the alignment (typically one of
+ * {@link StyleConstants#ALIGN_LEFT},
+ * {@link StyleConstants#ALIGN_RIGHT},
+ * {@link StyleConstants#ALIGN_CENTER} or
* {@link StyleConstants#ALIGN_JUSTIFIED}).
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #getAlignment(AttributeSet)
*/
public static void setAlignment(MutableAttributeSet a, int align)
{
a.addAttribute(Alignment, new Integer(align));
- }
+ }
/**
* Adds a background attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param bg the background (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if either argument is <code>null</code>.
- *
+ *
* @see #getBackground(AttributeSet)
*/
public static void setBackground(MutableAttributeSet a, Color bg)
{
a.addAttribute(Background, bg);
- }
+ }
/**
* Adds a bidi-level attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param lev the level.
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #getBidiLevel(AttributeSet)
*/
public static void setBidiLevel(MutableAttributeSet a, int lev)
{
a.addAttribute(BidiLevel, new Integer(lev));
- }
+ }
/**
* Adds a bold attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param b the new value of the bold attribute.
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #isBold(AttributeSet)
*/
public static void setBold(MutableAttributeSet a, boolean b)
{
a.addAttribute(Bold, Boolean.valueOf(b));
- }
-
+ }
+
/**
* Adds a component attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param c the component (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if either argument is <code>null</code>.
- *
+ *
* @see #getComponent(AttributeSet)
*/
public static void setComponent(MutableAttributeSet a, Component c)
{
a.addAttribute(ComponentAttribute, c);
- }
+ }
/**
* Adds a first line indentation attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param i the indentation.
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #getFirstLineIndent(AttributeSet)
*/
public static void setFirstLineIndent(MutableAttributeSet a, float i)
{
a.addAttribute(FirstLineIndent, new Float(i));
- }
+ }
/**
* Adds a font family attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param fam the font family name (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if either argument is <code>null</code>.
- *
+ *
* @see #getFontFamily(AttributeSet)
*/
public static void setFontFamily(MutableAttributeSet a, String fam)
{
a.addAttribute(FontFamily, fam);
- }
+ }
/**
* Adds a font size attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param s the font size (in points).
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #getFontSize(AttributeSet)
*/
public static void setFontSize(MutableAttributeSet a, int s)
{
a.addAttribute(FontSize, new Integer(s));
- }
+ }
/**
* Adds a foreground color attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param fg the foreground color (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if either argument is <code>null</code>.
- *
+ *
* @see #getForeground(AttributeSet)
*/
public static void setForeground(MutableAttributeSet a, Color fg)
@@ -729,12 +729,12 @@ public class StyleConstants
/**
* Adds an icon attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param c the icon (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if either argument is <code>null</code>.
- *
+ *
* @see #getIcon(AttributeSet)
*/
public static void setIcon(MutableAttributeSet a, Icon c)
@@ -742,174 +742,174 @@ public class StyleConstants
a.addAttribute(AbstractDocument.ElementNameAttribute, IconElementName);
a.addAttribute(IconAttribute, c);
}
-
+
/**
* Adds an italic attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param b the new value of the italic attribute.
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #isItalic(AttributeSet)
*/
public static void setItalic(MutableAttributeSet a, boolean b)
{
a.addAttribute(Italic, Boolean.valueOf(b));
}
-
+
/**
* Adds a left indentation attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param i the indentation.
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #getLeftIndent(AttributeSet)
*/
public static void setLeftIndent(MutableAttributeSet a, float i)
{
a.addAttribute(LeftIndent, new Float(i));
- }
+ }
/**
* Adds a line spacing attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param i the line spacing.
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #getLineSpacing(AttributeSet)
*/
public static void setLineSpacing(MutableAttributeSet a, float i)
{
a.addAttribute(LineSpacing, new Float(i));
- }
+ }
/**
* Adds a right indentation attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param i the right indentation.
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #getRightIndent(AttributeSet)
*/
public static void setRightIndent(MutableAttributeSet a, float i)
{
a.addAttribute(RightIndent, new Float(i));
- }
+ }
/**
* Adds a 'space above' attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param i the space above attribute value.
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #getSpaceAbove(AttributeSet)
*/
public static void setSpaceAbove(MutableAttributeSet a, float i)
{
a.addAttribute(SpaceAbove, new Float(i));
- }
+ }
/**
* Adds a 'space below' attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param i the space below attribute value.
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #getSpaceBelow(AttributeSet)
*/
public static void setSpaceBelow(MutableAttributeSet a, float i)
{
a.addAttribute(SpaceBelow, new Float(i));
- }
+ }
/**
* Adds a strike-through attribue to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param b the strike-through attribute value.
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #isStrikeThrough(AttributeSet)
*/
public static void setStrikeThrough(MutableAttributeSet a, boolean b)
{
a.addAttribute(StrikeThrough, Boolean.valueOf(b));
- }
+ }
/**
* Adds a subscript attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param b the subscript attribute value.
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #isSubscript(AttributeSet)
*/
public static void setSubscript(MutableAttributeSet a, boolean b)
{
a.addAttribute(Subscript, Boolean.valueOf(b));
- }
+ }
/**
* Adds a superscript attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param b the superscript attribute value.
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #isSuperscript(AttributeSet)
*/
public static void setSuperscript(MutableAttributeSet a, boolean b)
{
a.addAttribute(Superscript, Boolean.valueOf(b));
- }
+ }
/**
* Adds a {@link TabSet} attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param tabs the tab set (<code>null</code> not permitted).
- *
+ *
* @throws NullPointerException if either argument is <code>null</code>.
- *
+ *
* @see #getTabSet(AttributeSet)
*/
- public static void setTabSet(MutableAttributeSet a,
+ public static void setTabSet(MutableAttributeSet a,
javax.swing.text.TabSet tabs)
{
a.addAttribute(StyleConstants.TabSet, tabs);
- }
+ }
/**
* Adds an underline attribute to the specified set.
- *
+ *
* @param a the attribute set (<code>null</code> not permitted).
* @param b the underline attribute value.
- *
+ *
* @throws NullPointerException if <code>a</code> is <code>null</code>.
- *
+ *
* @see #isUnderline(AttributeSet)
*/
public static void setUnderline(MutableAttributeSet a, boolean b)
{
a.addAttribute(Underline, Boolean.valueOf(b));
- }
+ }
- // The remainder are so-called "typesafe enumerations" which
+ // The remainder are so-called "typesafe enumerations" which
// alias subsets of the above constants.
/**
@@ -921,56 +921,56 @@ public class StyleConstants
{
/**
* Private constructor prevents new instances being created.
- *
+ *
* @param k the key name.
*/
- private CharacterConstants(String k)
+ private CharacterConstants(String k)
{
super(k);
}
-
+
/** An alias for {@link ColorConstants#Background}. */
public static final Object Background = ColorConstants.Background;
-
+
/** A key for the bidi level character attribute. */
public static final Object BidiLevel = new CharacterConstants("bidiLevel");
-
+
/** An alias for {@link FontConstants#Bold}. */
public static final Object Bold = FontConstants.Bold;
-
+
/** A key for the component character attribute. */
- public static final Object ComponentAttribute
+ public static final Object ComponentAttribute
= new CharacterConstants("component");
-
+
/** An alias for {@link FontConstants#Family}. */
public static final Object Family = FontConstants.Family;
-
+
/** An alias for {@link FontConstants#Size}. */
public static final Object Size = FontConstants.Size;
-
+
/** An alias for {@link ColorConstants#Foreground}. */
public static final Object Foreground = ColorConstants.Foreground;
-
+
/** A key for the icon character attribute. */
public static final Object IconAttribute = new CharacterConstants("icon");
-
+
/** A key for the italic character attribute. */
public static final Object Italic = FontConstants.Italic;
-
+
/** A key for the strike through character attribute. */
- public static final Object StrikeThrough
+ public static final Object StrikeThrough
= new CharacterConstants("strikethrough");
-
+
/** A key for the subscript character attribute. */
public static final Object Subscript = new CharacterConstants("subscript");
-
+
/** A key for the superscript character attribute. */
- public static final Object Superscript
+ public static final Object Superscript
= new CharacterConstants("superscript");
-
+
/** A key for the underline character attribute. */
public static final Object Underline = new CharacterConstants("underline");
-
+
}
/**
@@ -982,14 +982,14 @@ public class StyleConstants
{
/**
* Private constructor prevents new instances being created.
- *
+ *
* @param k the key name.
*/
- private ColorConstants(String k)
+ private ColorConstants(String k)
{
super(k);
}
-
+
/** A key for the foreground color attribute. */
public static final Object Foreground = new ColorConstants("foreground");
@@ -1006,23 +1006,23 @@ public class StyleConstants
{
/**
* Private constructor prevents new instances being created.
- *
+ *
* @param k the key name.
*/
- private FontConstants(String k)
+ private FontConstants(String k)
{
super(k);
}
-
+
/** A key for the bold font attribute. */
public static final Object Bold = new FontConstants("bold");
/** A key for the family font attribute. */
public static final Object Family = new FontConstants("family");
-
+
/** A key for the italic font attribute. */
public static final Object Italic = new FontConstants("italic");
-
+
/** A key for the size font attribute. */
public static final Object Size = new FontConstants("size");
}
@@ -1036,48 +1036,48 @@ public class StyleConstants
{
/**
* Private constructor prevents new instances being created.
- *
+ *
* @param k the key name.
*/
- private ParagraphConstants(String k)
+ private ParagraphConstants(String k)
{
super(k);
}
-
+
/** A key for the alignment paragraph attribute. */
public static final Object Alignment = new ParagraphConstants("Alignment");
/** A key for the first line indentation paragraph attribute. */
- public static final Object FirstLineIndent
+ public static final Object FirstLineIndent
= new ParagraphConstants("FirstLineIndent");
-
+
/** A key for the left indentation paragraph attribute. */
- public static final Object LeftIndent
+ public static final Object LeftIndent
= new ParagraphConstants("LeftIndent");
-
+
/** A key for the line spacing paragraph attribute. */
- public static final Object LineSpacing
+ public static final Object LineSpacing
= new ParagraphConstants("LineSpacing");
-
+
/** A key for the orientation paragraph attribute. */
- public static final Object Orientation
+ public static final Object Orientation
= new ParagraphConstants("Orientation");
-
+
/** A key for the right indentation paragraph attribute. */
- public static final Object RightIndent
+ public static final Object RightIndent
= new ParagraphConstants("RightIndent");
-
+
/** A key for the 'space above' paragraph attribute. */
- public static final Object SpaceAbove
+ public static final Object SpaceAbove
= new ParagraphConstants("SpaceAbove");
-
+
/** A key for the 'space below' paragraph attribute. */
- public static final Object SpaceBelow
+ public static final Object SpaceBelow
= new ParagraphConstants("SpaceBelow");
-
+
/** A key for the tabset paragraph attribute. */
public static final Object TabSet = new ParagraphConstants("TabSet");
-
+
}
}
diff --git a/libjava/classpath/javax/swing/text/StyleContext.java b/libjava/classpath/javax/swing/text/StyleContext.java
index 4dded0d..2953988 100644
--- a/libjava/classpath/javax/swing/text/StyleContext.java
+++ b/libjava/classpath/javax/swing/text/StyleContext.java
@@ -60,7 +60,7 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
-public class StyleContext
+public class StyleContext
implements Serializable, AbstractDocument.AttributeContext
{
/** The serialization UID (compatible with JDK1.5). */
@@ -74,7 +74,7 @@ public class StyleContext
protected transient ChangeEvent changeEvent;
protected EventListenerList listenerList;
-
+
private transient AttributeSet attributes;
public NamedStyle()
@@ -115,12 +115,12 @@ public class StyleContext
{
listenerList.add(ChangeListener.class, l);
}
-
+
public void removeChangeListener(ChangeListener l)
{
listenerList.remove(ChangeListener.class, l);
}
-
+
public <T extends EventListener> T[] getListeners(Class<T> listenerType)
{
return listenerList.getListeners(listenerType);
@@ -159,7 +159,7 @@ public class StyleContext
{
return attributes.containsAttribute(name, value);
}
-
+
public boolean containsAttributes(AttributeSet attrs)
{
return attributes.containsAttributes(attrs);
@@ -172,7 +172,7 @@ public class StyleContext
copy.attributes = attributes.copyAttributes();
return copy;
}
-
+
public Object getAttribute(Object attrName)
{
return attributes.getAttribute(attrName);
@@ -187,10 +187,10 @@ public class StyleContext
{
return attributes.getAttributeNames();
}
-
+
public boolean isDefined(Object attrName)
{
- return attributes.isDefined(attrName);
+ return attributes.isDefined(attrName);
}
public boolean isEqual(AttributeSet attr)
@@ -219,7 +219,7 @@ public class StyleContext
public AttributeSet getResolveParent()
{
- return attributes.getResolveParent();
+ return attributes.getResolveParent();
}
public void setResolveParent(AttributeSet parent)
@@ -229,7 +229,7 @@ public class StyleContext
else
removeAttribute(StyleConstants.ResolveAttribute);
}
-
+
public String toString()
{
return "NamedStyle:" + getName() + " " + attributes;
@@ -250,7 +250,7 @@ public class StyleContext
readAttributeSet(s, this);
}
}
-
+
public class SmallAttributeSet
implements AttributeSet
{
@@ -321,7 +321,7 @@ public class StyleContext
}
return eq;
}
-
+
public Object getAttribute(Object key)
{
Object att = null;
@@ -334,7 +334,7 @@ public class StyleContext
att = attrs[i + 1];
}
- // Check the resolve parent, unless we're looking for the
+ // Check the resolve parent, unless we're looking for the
// ResolveAttribute, which must not be looked up
if (att == null)
{
@@ -342,7 +342,7 @@ public class StyleContext
if (parent != null)
att = parent.getAttribute(key);
}
-
+
return att;
}
@@ -352,18 +352,18 @@ public class StyleContext
}
public Enumeration<?> getAttributeNames()
- {
- return new Enumeration()
+ {
+ return new Enumeration()
{
int i = 0;
- public boolean hasMoreElements()
- {
- return i < attrs.length;
+ public boolean hasMoreElements()
+ {
+ return i < attrs.length;
}
- public Object nextElement()
- {
- i += 2;
- return attrs[i-2];
+ public Object nextElement()
+ {
+ i += 2;
+ return attrs[i-2];
}
};
}
@@ -387,7 +387,7 @@ public class StyleContext
}
return false;
}
-
+
public boolean isEqual(AttributeSet attr)
{
boolean eq;
@@ -400,7 +400,7 @@ public class StyleContext
&& this.containsAttributes(attr);
return eq;
}
-
+
public String toString()
{
StringBuilder sb = new StringBuilder();
@@ -446,7 +446,7 @@ public class StyleContext
* The name of the default style.
*/
public static final String DEFAULT_STYLE = "default";
-
+
static Hashtable sharedAttributeSets = new Hashtable();
static Hashtable sharedFonts = new Hashtable();
@@ -486,7 +486,7 @@ public class StyleContext
{
return new SmallAttributeSet(a);
}
-
+
protected MutableAttributeSet createLargeAttributeSet(AttributeSet a)
{
return new SimpleAttributeSet(a);
@@ -506,7 +506,7 @@ public class StyleContext
{
return styles.getChangeListeners();
}
-
+
public Style addStyle(String name, Style parent)
{
Style newStyle = new NamedStyle(name, parent);
@@ -534,7 +534,7 @@ public class StyleContext
{
return (Style) styles.getAttribute(name);
}
-
+
/**
* Get the names of the style. The returned enumeration always
* contains at least one member, the default style.
@@ -572,7 +572,7 @@ public class StyleContext
//
// We keep a static cache mapping SimpleFontSpecs to java.awt.Fonts, so
// that we reuse Fonts between styles and style contexts.
- //
+ //
private static class SimpleFontSpec
{
@@ -600,7 +600,7 @@ public class StyleContext
return family.hashCode() + style + size;
}
}
-
+
public Font getFont(AttributeSet attr)
{
String family = StyleConstants.getFontFamily(attr);
@@ -608,7 +608,7 @@ public class StyleContext
if (StyleConstants.isBold(attr))
style += Font.BOLD;
if (StyleConstants.isItalic(attr))
- style += Font.ITALIC;
+ style += Font.ITALIC;
int size = StyleConstants.getFontSize(attr);
return getFont(family, style, size);
}
@@ -625,7 +625,7 @@ public class StyleContext
return tmp;
}
}
-
+
public FontMetrics getFontMetrics(Font f)
{
return Toolkit.getDefaultToolkit().getFontMetrics(f);
@@ -641,7 +641,7 @@ public class StyleContext
return StyleConstants.getBackground(a);
}
- protected int getCompressionThreshold()
+ protected int getCompressionThreshold()
{
return compressionThreshold;
}
@@ -749,7 +749,7 @@ public class StyleContext
}
public synchronized AttributeSet removeAttributes(AttributeSet old,
- Enumeration<?> names)
+ Enumeration<?> names)
{
AttributeSet ret;
if (old.getAttributeCount() <= getCompressionThreshold())
@@ -771,7 +771,7 @@ public class StyleContext
/**
* Gets the object previously registered with registerStaticAttributeKey.
- *
+ *
* @param key - the key that was registered.
* @return the object previously registered with registerStaticAttributeKey.
*/
@@ -781,11 +781,11 @@ public class StyleContext
return null;
return readAttributeKeys.get(key);
}
-
+
/**
* Returns the String that key will be registered with
* registerStaticAttributeKey.
- *
+ *
* @param key - the key that will be registered.
* @return the string the key will be registered with.
*/
@@ -799,7 +799,7 @@ public class StyleContext
* attempt to restore keys that were static objects by considering only the
* keys that have were registered with registerStaticAttributeKey. The
* attributes retrieved will be placed into the given set.
- *
+ *
* @param in - the stream to read from
* @param a - the set of attributes
* @throws ClassNotFoundException - may be encountered when reading from
@@ -827,12 +827,12 @@ public class StyleContext
a.addAttribute(key, val);
}
}
-
+
/**
* Serialize an attribute set in a way that is compatible with it
* being read in again by {@link #readAttributeSet(ObjectInputStream, MutableAttributeSet)}.
* In particular registered static keys are transformed properly.
- *
+ *
* @param out - stream to write to
* @param a - the attribute set
* @throws IOException - any I/O error
@@ -872,9 +872,9 @@ public class StyleContext
}
/**
- * Handles reading in the attributes.
+ * Handles reading in the attributes.
* @see #readAttributeSet(ObjectInputStream, MutableAttributeSet)
- *
+ *
* @param in - the stream to read from
* @param a - the set of attributes
* @throws ClassNotFoundException - may be encountered when reading from stream
@@ -889,7 +889,7 @@ public class StyleContext
/**
* Handles writing of the given attributes.
* @see #writeAttributeSet(ObjectOutputStream, AttributeSet)
- *
+ *
* @param out - stream to write to
* @param a - the attribute set
* @throws IOException - any I/O error
diff --git a/libjava/classpath/javax/swing/text/StyledDocument.java b/libjava/classpath/javax/swing/text/StyledDocument.java
index 168e1b1..49e471c 100644
--- a/libjava/classpath/javax/swing/text/StyledDocument.java
+++ b/libjava/classpath/javax/swing/text/StyledDocument.java
@@ -42,8 +42,8 @@ import java.awt.Font;
/**
* StyledDocument
- * @author Andrew Selkirk
- * @version 1.0
+ * @author Andrew Selkirk
+ * @version 1.0
*/
public interface StyledDocument extends Document
{
diff --git a/libjava/classpath/javax/swing/text/StyledEditorKit.java b/libjava/classpath/javax/swing/text/StyledEditorKit.java
index 5686943..744585f 100644
--- a/libjava/classpath/javax/swing/text/StyledEditorKit.java
+++ b/libjava/classpath/javax/swing/text/StyledEditorKit.java
@@ -364,8 +364,8 @@ public class StyledEditorKit extends DefaultEditorKit
{
Document doc = editor.getDocument();
if (!(doc instanceof StyledDocument))
- throw new AssertionError("The Document for StyledEditorKits is "
- + "expected to be a StyledDocument.");
+ throw new AssertionError("The Document for StyledEditorKits is "
+ + "expected to be a StyledDocument.");
return (StyledDocument) doc;
}
@@ -382,8 +382,8 @@ public class StyledEditorKit extends DefaultEditorKit
{
EditorKit kit = editor.getEditorKit();
if (!(kit instanceof StyledEditorKit))
- throw new AssertionError("The EditorKit for StyledDocuments is "
- + "expected to be a StyledEditorKit.");
+ throw new AssertionError("The EditorKit for StyledDocuments is "
+ + "expected to be a StyledEditorKit.");
return (StyledEditorKit) kit;
}
@@ -406,33 +406,33 @@ public class StyledEditorKit extends DefaultEditorKit
{
Document doc = editor.getDocument();
if (doc instanceof StyledDocument)
- {
- StyledDocument styleDoc = (StyledDocument) editor.getDocument();
- EditorKit kit = editor.getEditorKit();
- if (!(kit instanceof StyledEditorKit))
- {
- StyledEditorKit styleKit = (StyledEditorKit) kit;
- int start = editor.getSelectionStart();
- int end = editor.getSelectionEnd();
- int dot = editor.getCaret().getDot();
- if (start == dot && end == dot)
- {
- // If there is no selection, then we only update the
- // input attributes.
- MutableAttributeSet inputAttributes =
- styleKit.getInputAttributes();
- inputAttributes.addAttributes(atts);
- }
- else
- styleDoc.setParagraphAttributes(start, end, atts, replace);
- }
- else
- throw new AssertionError("The EditorKit for StyledTextActions "
- + "is expected to be a StyledEditorKit");
- }
+ {
+ StyledDocument styleDoc = (StyledDocument) editor.getDocument();
+ EditorKit kit = editor.getEditorKit();
+ if (!(kit instanceof StyledEditorKit))
+ {
+ StyledEditorKit styleKit = (StyledEditorKit) kit;
+ int start = editor.getSelectionStart();
+ int end = editor.getSelectionEnd();
+ int dot = editor.getCaret().getDot();
+ if (start == dot && end == dot)
+ {
+ // If there is no selection, then we only update the
+ // input attributes.
+ MutableAttributeSet inputAttributes =
+ styleKit.getInputAttributes();
+ inputAttributes.addAttributes(atts);
+ }
+ else
+ styleDoc.setParagraphAttributes(start, end, atts, replace);
+ }
+ else
+ throw new AssertionError("The EditorKit for StyledTextActions "
+ + "is expected to be a StyledEditorKit");
+ }
else
- throw new AssertionError("The Document for StyledTextActions is "
- + "expected to be a StyledDocument.");
+ throw new AssertionError("The Document for StyledTextActions is "
+ + "expected to be a StyledDocument.");
}
}
@@ -466,15 +466,15 @@ public class StyledEditorKit extends DefaultEditorKit
String name = element.getName();
View view = null;
if (name.equals(AbstractDocument.ContentElementName))
- view = new LabelView(element);
+ view = new LabelView(element);
else if (name.equals(AbstractDocument.ParagraphElementName))
- view = new ParagraphView(element);
+ view = new ParagraphView(element);
else if (name.equals(AbstractDocument.SectionElementName))
- view = new BoxView(element, View.Y_AXIS);
+ view = new BoxView(element, View.Y_AXIS);
else if (name.equals(StyleConstants.ComponentElementName))
- view = new ComponentView(element);
+ view = new ComponentView(element);
else if (name.equals(StyleConstants.IconElementName))
- view = new IconView(element);
+ view = new IconView(element);
else
throw new AssertionError("Unknown Element type: "
+ element.getClass().getName() + " : "
@@ -499,14 +499,14 @@ public class StyledEditorKit extends DefaultEditorKit
{
Object source = ev.getSource();
if (!(source instanceof JTextComponent))
- throw new AssertionError("CaretEvents are expected to come from a"
- + "JTextComponent.");
+ throw new AssertionError("CaretEvents are expected to come from a"
+ + "JTextComponent.");
JTextComponent text = (JTextComponent) source;
Document doc = text.getDocument();
if (!(doc instanceof StyledDocument))
- throw new AssertionError("The Document used by StyledEditorKits is"
- + "expected to be a StyledDocument");
+ throw new AssertionError("The Document used by StyledEditorKits is"
+ + "expected to be a StyledDocument");
StyledDocument styleDoc = (StyledDocument) doc;
currentRun = styleDoc.getCharacterElement(ev.getDot());
@@ -571,7 +571,7 @@ public class StyledEditorKit extends DefaultEditorKit
public Action[] getActions()
{
Action[] actions1 = super.getActions();
- Action[] myActions = new Action[] {
+ Action[] myActions = new Action[] {
new FontSizeAction("font-size-8", 8),
new FontSizeAction("font-size-10", 10),
new FontSizeAction("font-size-12", 12),
@@ -698,7 +698,7 @@ public class StyledEditorKit extends DefaultEditorKit
* @param set the inputAttributes to copy the attributes to
*/
protected void createInputAttributes(Element element,
- MutableAttributeSet set)
+ MutableAttributeSet set)
{
// FIXME: Filter out component, icon and element name attributes.
set.removeAttributes(set);
diff --git a/libjava/classpath/javax/swing/text/TabExpander.java b/libjava/classpath/javax/swing/text/TabExpander.java
index d70dd46..a1e4571 100644
--- a/libjava/classpath/javax/swing/text/TabExpander.java
+++ b/libjava/classpath/javax/swing/text/TabExpander.java
@@ -40,4 +40,4 @@ package javax.swing.text;
public interface TabExpander
{
float nextTabStop(float x, int tabOffset);
-} \ No newline at end of file
+}
diff --git a/libjava/classpath/javax/swing/text/TabSet.java b/libjava/classpath/javax/swing/text/TabSet.java
index c08a650..c325965 100644
--- a/libjava/classpath/javax/swing/text/TabSet.java
+++ b/libjava/classpath/javax/swing/text/TabSet.java
@@ -54,28 +54,28 @@ public class TabSet implements Serializable
/**
* Creates a new <code>TabSet</code> containing the specified tab stops.
- *
+ *
* @param t the tab stops (<code>null</code> permitted).
*/
- public TabSet(TabStop[] t)
+ public TabSet(TabStop[] t)
{
if (t != null)
tabs = (TabStop[]) t.clone();
- else
+ else
tabs = new TabStop[0];
}
-
+
/**
* Returns the tab stop with the specified index.
- *
+ *
* @param i the index.
- *
+ *
* @return The tab stop.
- *
- * @throws IllegalArgumentException if <code>i</code> is not in the range
+ *
+ * @throws IllegalArgumentException if <code>i</code> is not in the range
* <code>0</code> to <code>getTabCount() - 1</code>.
*/
- public TabStop getTab(int i)
+ public TabStop getTab(int i)
{
if (i < 0 || i >= tabs.length)
throw new IllegalArgumentException("Index out of bounds.");
@@ -84,38 +84,38 @@ public class TabSet implements Serializable
/**
* Returns the tab following the specified location.
- *
+ *
* @param location the location.
- *
+ *
* @return The tab following the specified location (or <code>null</code>).
*/
- public TabStop getTabAfter(float location)
+ public TabStop getTabAfter(float location)
{
int idx = getTabIndexAfter(location);
if (idx == -1)
return null;
else
- return tabs[idx];
+ return tabs[idx];
}
/**
* Returns the number of tab stops in this tab set.
- *
+ *
* @return The number of tab stops in this tab set.
*/
- public int getTabCount()
+ public int getTabCount()
{
return tabs.length;
}
/**
* Returns the index of the specified tab, or -1 if the tab is not found.
- *
+ *
* @param tab the tab (<code>null</code> permitted).
- *
+ *
* @return The index of the specified tab, or -1.
*/
- public int getTabIndex(TabStop tab)
+ public int getTabIndex(TabStop tab)
{
for (int i = 0; i < tabs.length; ++i)
if (tabs[i] == tab)
@@ -125,12 +125,12 @@ public class TabSet implements Serializable
/**
* Returns the index of the tab at or after the specified location.
- *
+ *
* @param location the tab location.
- *
+ *
* @return The index of the tab stop, or -1.
*/
- public int getTabIndexAfter(float location)
+ public int getTabIndexAfter(float location)
{
for (int i = 0; i < tabs.length; i++)
{
@@ -139,15 +139,15 @@ public class TabSet implements Serializable
}
return -1;
}
-
+
/**
* Tests this <code>TabSet</code> for equality with an arbitrary object.
- *
+ *
* @param obj the object (<code>null</code> permitted).
- *
+ *
* @return <code>true</code> if this <code>TabSet</code> is equal to
* <code>obj</code>, and <code>false</code> otherwise.
- *
+ *
* @since 1.5
*/
public boolean equals(Object obj)
@@ -167,15 +167,15 @@ public class TabSet implements Serializable
}
return true;
}
-
+
/**
* Returns a hash code for this <code>TabSet</code>.
- *
+ *
* @return A hash code.
- *
+ *
* @since 1.5
*/
- public int hashCode()
+ public int hashCode()
{
// this hash code won't match Sun's, but that shouldn't matter...
int result = 193;
@@ -191,7 +191,7 @@ public class TabSet implements Serializable
/**
* Returns a string representation of this <code>TabSet</code>.
- *
+ *
* @return A string representation of this <code>TabSet</code>.
*/
public String toString()
diff --git a/libjava/classpath/javax/swing/text/TabStop.java b/libjava/classpath/javax/swing/text/TabStop.java
index f4c3f85..03a5611 100644
--- a/libjava/classpath/javax/swing/text/TabStop.java
+++ b/libjava/classpath/javax/swing/text/TabStop.java
@@ -66,23 +66,23 @@ public class TabStop implements Serializable
/**
* Creates a new <code>TabStop</code> for the specified tab position.
- *
+ *
* @param pos the tab position.
*/
- public TabStop(float pos)
+ public TabStop(float pos)
{
this(pos, ALIGN_LEFT, LEAD_NONE);
}
-
+
/**
* Creates a new <code>TabStop</code> with the specified attributes.
- *
+ *
* @param pos the tab position.
- * @param align the alignment (one of {@link #ALIGN_LEFT},
- * {@link #ALIGN_CENTER}, {@link #ALIGN_RIGHT}, {@link #ALIGN_DECIMAL}
+ * @param align the alignment (one of {@link #ALIGN_LEFT},
+ * {@link #ALIGN_CENTER}, {@link #ALIGN_RIGHT}, {@link #ALIGN_DECIMAL}
* or {@link #ALIGN_BAR}).
- * @param leader the leader (one of {@link #LEAD_NONE}, {@link #LEAD_DOTS},
- * {@link #LEAD_EQUALS}, {@link #LEAD_HYPHENS}, {@link #LEAD_THICKLINE}
+ * @param leader the leader (one of {@link #LEAD_NONE}, {@link #LEAD_DOTS},
+ * {@link #LEAD_EQUALS}, {@link #LEAD_HYPHENS}, {@link #LEAD_THICKLINE}
* or {@link #LEAD_UNDERLINE}).
*/
public TabStop(float pos, int align, int leader)
@@ -91,16 +91,16 @@ public class TabStop implements Serializable
this.align = align;
this.leader = leader;
}
-
+
/**
* Tests this <code>TabStop</code> for equality with an arbitrary object.
- *
+ *
* @param other the other object (<code>null</code> permitted).
- *
- * @return <code>true</code> if this <code>TabStop</code> is equal to
+ *
+ * @return <code>true</code> if this <code>TabStop</code> is equal to
* the specified object, and <code>false</code> otherwise.
*/
- public boolean equals(Object other)
+ public boolean equals(Object other)
{
return (other != null)
&& (other instanceof TabStop)
@@ -110,55 +110,55 @@ public class TabStop implements Serializable
}
/**
- * Returns the tab alignment. This should be one of {@link #ALIGN_LEFT},
- * {@link #ALIGN_CENTER}, {@link #ALIGN_RIGHT}, {@link #ALIGN_DECIMAL} or
+ * Returns the tab alignment. This should be one of {@link #ALIGN_LEFT},
+ * {@link #ALIGN_CENTER}, {@link #ALIGN_RIGHT}, {@link #ALIGN_DECIMAL} or
* {@link #ALIGN_BAR}.
- *
+ *
* @return The tab alignment.
*/
- public int getAlignment()
+ public int getAlignment()
{
return align;
}
/**
- * Returns the leader type. This should be one of {@link #LEAD_NONE},
- * {@link #LEAD_DOTS}, {@link #LEAD_EQUALS}, {@link #LEAD_HYPHENS},
+ * Returns the leader type. This should be one of {@link #LEAD_NONE},
+ * {@link #LEAD_DOTS}, {@link #LEAD_EQUALS}, {@link #LEAD_HYPHENS},
* {@link #LEAD_THICKLINE} or {@link #LEAD_UNDERLINE}.
- *
+ *
* @return The leader type.
*/
- public int getLeader()
+ public int getLeader()
{
return leader;
}
/**
* Returns the tab position.
- *
+ *
* @return The tab position.
*/
- public float getPosition()
+ public float getPosition()
{
return pos;
}
/**
* Returns a hash code for this <code>TabStop</code>.
- *
+ *
* @return A hash code.
*/
- public int hashCode()
+ public int hashCode()
{
return (int) pos + (int) leader + (int) align;
}
/**
* Returns a string describing this <code>TabStop</code>.
- *
+ *
* @return A string describing this <code>TabStop</code>.
*/
- public String toString()
+ public String toString()
{
String prefix = "";
switch (align)
@@ -174,7 +174,7 @@ public class TabStop implements Serializable
case ALIGN_DECIMAL:
prefix = "decimal ";
break;
-
+
case ALIGN_BAR:
prefix = "bar ";
break;
@@ -182,8 +182,8 @@ public class TabStop implements Serializable
default:
break;
}
-
- return prefix + "tab @" + pos
+
+ return prefix + "tab @" + pos
+ ((leader == LEAD_NONE) ? "" : " (w/leaders)");
}
diff --git a/libjava/classpath/javax/swing/text/TabableView.java b/libjava/classpath/javax/swing/text/TabableView.java
index 2a96ea9..e50270b 100644
--- a/libjava/classpath/javax/swing/text/TabableView.java
+++ b/libjava/classpath/javax/swing/text/TabableView.java
@@ -1,4 +1,4 @@
-/* TabableView.java --
+/* TabableView.java --
Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/text/TableView.java b/libjava/classpath/javax/swing/text/TableView.java
index 2dcb9eb..bdf5004 100644
--- a/libjava/classpath/javax/swing/text/TableView.java
+++ b/libjava/classpath/javax/swing/text/TableView.java
@@ -51,7 +51,7 @@ import javax.swing.event.DocumentEvent;
* horizontal boxes containing the actuall cells of the table. These cells
* can be arbitrary view implementations and are fetched via the
* {@link ViewFactory} returned by {@link View#getViewFactory}.
- *
+ *
* @author Roman Kennke (kennke@aicas.com)
*/
public abstract class TableView
@@ -416,7 +416,7 @@ public abstract class TableView
/**
* Calculates the requirements of this view for the minor (== horizontal)
* axis.
- *
+ *
* This is reimplemented to calculate the requirements as the sum of the
* size requirements of the columns.
*
diff --git a/libjava/classpath/javax/swing/text/TextAction.java b/libjava/classpath/javax/swing/text/TextAction.java
index 49c49cb..70e19ef1d 100644
--- a/libjava/classpath/javax/swing/text/TextAction.java
+++ b/libjava/classpath/javax/swing/text/TextAction.java
@@ -67,9 +67,9 @@ public abstract class TextAction extends AbstractAction
* Returns the <code>JTextComponent</code> object associated with the given
* <code>ActionEvent</code>. If the source of the event is not a
* <code>JTextComponent</code> the currently focused text component is returned.
- *
+ *
* @param event the action event
- *
+ *
* @return the <code>JTextComponent</code>
*/
protected final JTextComponent getTextComponent(ActionEvent event)
@@ -88,7 +88,7 @@ public abstract class TextAction extends AbstractAction
/**
* Creates a new array of <code>Action</code> containing both given arrays.
- *
+ *
* @param list1 the first action array
* @param list2 the second action array
*
@@ -112,7 +112,7 @@ public abstract class TextAction extends AbstractAction
actions.put(name != null ? name : "", a);
}
Action[] augmented = new Action[actions.size()];
-
+
int i = 0;
for (Iterator<Action> it = actions.values().iterator(); it.hasNext(); i++)
augmented[i] = it.next();
@@ -122,7 +122,7 @@ public abstract class TextAction extends AbstractAction
/**
* Returns the current focused <code>JTextComponent</code> object.
- *
+ *
* @return the <code>JTextComponent</code>
*/
protected final JTextComponent getFocusedComponent()
@@ -135,21 +135,21 @@ public abstract class TextAction extends AbstractAction
textComp = (JTextComponent) focused;
return textComp;
}
-
+
/** Abstract helper class which implements everything needed for an
* Action implementation in <code>DefaultEditorKit</code> which
- * does horizontal movement (and selection).
+ * does horizontal movement (and selection).
*/
abstract static class HorizontalMovementAction extends TextAction
{
int dir;
-
+
HorizontalMovementAction(String name, int direction)
{
super(name);
dir = direction;
}
-
+
public void actionPerformed(ActionEvent event)
{
JTextComponent t = getTextComponent(event);
@@ -161,34 +161,34 @@ public abstract class TextAction extends AbstractAction
= Utilities.getNextVisualPositionFrom(t,
t.getCaretPosition(),
dir);
-
+
Caret c = t.getCaret();
-
+
actionPerformedImpl(c, offs);
-
+
c.setMagicCaretPosition(t.modelToView(offs).getLocation());
}
}
catch(BadLocationException ble)
{
- throw
+ throw
(InternalError) new InternalError("Illegal offset").initCause(ble);
}
-
+
}
-
+
protected abstract void actionPerformedImpl(Caret c, int offs)
throws BadLocationException;
}
-
+
/** Abstract helper class which implements everything needed for an
* Action implementation in <code>DefaultEditorKit</code> which
* does vertical movement (and selection).
- */
+ */
abstract static class VerticalMovementAction extends TextAction
{
int dir;
-
+
VerticalMovementAction(String name, int direction)
{
super(name);
@@ -215,26 +215,26 @@ public abstract class TextAction extends AbstractAction
}
else
pos = c.getDot();
-
+
pos = Utilities.getNextVisualPositionFrom(t,
t.getCaretPosition(),
dir);
-
+
if (pos > -1)
actionPerformedImpl(c, pos);
}
}
- catch(BadLocationException ble)
+ catch(BadLocationException ble)
{
- throw
+ throw
(InternalError) new InternalError("Illegal offset").initCause(ble);
}
}
-
+
protected abstract void actionPerformedImpl(Caret c, int offs)
throws BadLocationException;
-
+
}
-
-
+
+
}
diff --git a/libjava/classpath/javax/swing/text/Utilities.java b/libjava/classpath/javax/swing/text/Utilities.java
index d49d806..6221392 100644
--- a/libjava/classpath/javax/swing/text/Utilities.java
+++ b/libjava/classpath/javax/swing/text/Utilities.java
@@ -97,7 +97,7 @@ public class Utilities
int pos = s.offset;
int len = 0;
-
+
int end = s.offset + s.count;
for (int offset = s.offset; offset < end; ++offset)
@@ -138,7 +138,7 @@ public class Utilities
g.drawChars(buffer, pos, len, pixelX, y);
pixelX += metrics.charsWidth(buffer, pos, len);
}
-
+
return pixelX;
}
@@ -171,21 +171,21 @@ public class Utilities
int count = 0;
for (int offset = s.offset; offset < end; offset++)
{
- switch (buffer[offset])
- {
- case '\t':
- // In case we have a tab, we just 'jump' over the tab.
- // When we have no tab expander we just use the width of 'm'.
- if (e != null)
- pixelX = (int) e.nextTabStop(pixelX,
- startOffset + offset - s.offset);
- else
- pixelX += metrics.charWidth(' ');
- break;
- case '\n':
- // In case we have a newline, we must 'draw'
- // the buffer and jump on the next line.
- pixelX += metrics.charsWidth(buffer, offset - count, count);
+ switch (buffer[offset])
+ {
+ case '\t':
+ // In case we have a tab, we just 'jump' over the tab.
+ // When we have no tab expander we just use the width of 'm'.
+ if (e != null)
+ pixelX = (int) e.nextTabStop(pixelX,
+ startOffset + offset - s.offset);
+ else
+ pixelX += metrics.charWidth(' ');
+ break;
+ case '\n':
+ // In case we have a newline, we must 'draw'
+ // the buffer and jump on the next line.
+ pixelX += metrics.charsWidth(buffer, offset - count, count);
count = 0;
break;
default:
@@ -234,12 +234,12 @@ public class Utilities
int found = s.count;
int currentX = x0;
int nextX = currentX;
-
+
int end = s.offset + s.count;
for (int pos = s.offset; pos < end && found == s.count; pos++)
{
char nextChar = s.array[pos];
-
+
if (nextChar != '\t')
nextX += fm.charWidth(nextChar);
else
@@ -249,7 +249,7 @@ public class Utilities
else
nextX += ((int) te.nextTabStop(nextX, p0 + pos - s.offset));
}
-
+
if (x >= currentX && x < nextX)
{
// Found position.
@@ -295,10 +295,10 @@ public class Utilities
{
return getTabbedTextOffset(s, fm, x0, x, te, p0, true);
}
-
+
/**
* Finds the start of the next word for the given offset.
- *
+ *
* @param c
* the text component
* @param offs
@@ -315,7 +315,7 @@ public class Utilities
String text = c.getText();
BreakIterator wb = BreakIterator.getWordInstance();
wb.setText(text);
-
+
int last = wb.following(offs);
int current = wb.next();
int cp;
@@ -325,7 +325,7 @@ public class Utilities
for (int i = last; i < current; i++)
{
cp = text.codePointAt(i);
-
+
// Return the last found bound if there is a letter at the current
// location or is not whitespace (meaning it is a number or
// punctuation). The first case means that 'last' denotes the
@@ -338,13 +338,13 @@ public class Utilities
last = current;
current = wb.next();
}
-
+
throw new BadLocationException("no more words", offs);
}
/**
* Finds the start of the previous word for the given offset.
- *
+ *
* @param c
* the text component
* @param offs
@@ -357,10 +357,10 @@ public class Utilities
throws BadLocationException
{
String text = c.getText();
-
+
if (offs <= 0 || offs > text.length())
throw new BadLocationException("invalid offset specified", offs);
-
+
BreakIterator wb = BreakIterator.getWordInstance();
wb.setText(text);
int last = wb.preceding(offs);
@@ -372,7 +372,7 @@ public class Utilities
for (int i = last; i < offs; i++)
{
cp = text.codePointAt(i);
-
+
// Return the last found bound if there is a letter at the current
// location or is not whitespace (meaning it is a number or
// punctuation). The first case means that 'last' denotes the
@@ -385,10 +385,10 @@ public class Utilities
last = current;
current = wb.previous();
}
-
+
return 0;
}
-
+
/**
* Finds the start of a word for the given location.
* @param c the text component
@@ -400,10 +400,10 @@ public class Utilities
throws BadLocationException
{
String text = c.getText();
-
+
if (offs < 0 || offs > text.length())
throw new BadLocationException("invalid offset specified", offs);
-
+
BreakIterator wb = BreakIterator.getWordInstance();
wb.setText(text);
@@ -412,7 +412,7 @@ public class Utilities
return wb.preceding(offs);
}
-
+
/**
* Finds the end of a word for the given location.
* @param c the text component
@@ -425,20 +425,20 @@ public class Utilities
{
if (offs < 0 || offs >= c.getText().length())
throw new BadLocationException("invalid offset specified", offs);
-
+
String text = c.getText();
BreakIterator wb = BreakIterator.getWordInstance();
wb.setText(text);
return wb.following(offs);
}
-
+
/**
- * Get the model position of the end of the row that contains the
+ * Get the model position of the end of the row that contains the
* specified model position. Return null if the given JTextComponent
* does not have a size.
* @param c the JTextComponent
* @param offs the model position
- * @return the model position of the end of the row containing the given
+ * @return the model position of the end of the row containing the given
* offset
* @throws BadLocationException if the offset is invalid
*/
@@ -473,12 +473,12 @@ public class Utilities
}
}
}
-
+
/**
* Get the model position of the start of the row that contains the specified
* model position. Return null if the given JTextComponent does not have a
* size.
- *
+ *
* @param c the JTextComponent
* @param offs the model position
* @return the model position of the start of the row containing the given
@@ -516,7 +516,7 @@ public class Utilities
}
}
}
-
+
/**
* Determine where to break the text in the given Segment, attempting to find
* a word boundary.
@@ -612,23 +612,23 @@ public class Utilities
throws BadLocationException
{
int offs = getRowStart(c, offset);
-
+
if(offs == -1)
return -1;
// Effectively calculates the y value of the previous line.
Point pt = c.modelToView(offs-1).getLocation();
-
+
pt.x = x;
-
+
// Calculate a simple fitting offset.
offs = c.viewToModel(pt);
-
+
// Find out the real x positions of the calculated character and its
// neighbour.
int offsX = c.modelToView(offs).getLocation().x;
int offsXNext = c.modelToView(offs+1).getLocation().x;
-
+
// Chose the one which is nearer to us and return its offset.
if (Math.abs(offsX-x) <= Math.abs(offsXNext-x))
return offs;
@@ -653,12 +653,12 @@ public class Utilities
throws BadLocationException
{
int offs = getRowEnd(c, offset);
-
+
if(offs == -1)
return -1;
Point pt = null;
-
+
// Note: Some views represent the position after the last
// typed character others do not. Converting offset 3 in "a\nb"
// in a PlainView will return a valid rectangle while in a
@@ -673,12 +673,12 @@ public class Utilities
{
return offset;
}
-
+
pt.x = x;
-
+
// Calculate a simple fitting offset.
offs = c.viewToModel(pt);
-
+
if (offs == c.getDocument().getLength())
return offs;
@@ -686,29 +686,29 @@ public class Utilities
// neighbour.
int offsX = c.modelToView(offs).getLocation().x;
int offsXNext = c.modelToView(offs+1).getLocation().x;
-
+
// Chose the one which is nearer to us and return its offset.
if (Math.abs(offsX-x) <= Math.abs(offsXNext-x))
return offs;
else
return offs+1;
}
-
+
/** This is an internal helper method which is used by the
* <code>javax.swing.text</code> package. It simply delegates the
* call to a method with the same name on the <code>NavigationFilter</code>
* of the provided <code>JTextComponent</code> (if it has one) or its UI.
- *
+ *
* If the underlying method throws a <code>BadLocationException</code> it
* will be swallowed and the initial offset is returned.
*/
static int getNextVisualPositionFrom(JTextComponent t, int offset, int direction)
{
NavigationFilter nf = t.getNavigationFilter();
-
+
try
{
- return (nf != null)
+ return (nf != null)
? nf.getNextVisualPositionFrom(t,
offset,
Bias.Forward,
@@ -724,7 +724,7 @@ public class Utilities
{
return offset;
}
-
+
}
-
+
}
diff --git a/libjava/classpath/javax/swing/text/View.java b/libjava/classpath/javax/swing/text/View.java
index c63ddbc..e3c7957 100644
--- a/libjava/classpath/javax/swing/text/View.java
+++ b/libjava/classpath/javax/swing/text/View.java
@@ -1,4 +1,4 @@
-/* View.java --
+/* View.java --
Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -56,7 +56,7 @@ public abstract class View implements SwingConstants
public static final int X_AXIS = 0;
public static final int Y_AXIS = 1;
-
+
private Element elt;
private View parent;
@@ -104,12 +104,12 @@ public abstract class View implements SwingConstants
this.parent = parent;
}
-
+
public View getParent()
{
return parent;
}
-
+
public Container getContainer()
{
View parent = getParent();
@@ -118,12 +118,12 @@ public abstract class View implements SwingConstants
else
return parent.getContainer();
}
-
+
public Document getDocument()
{
return getElement().getDocument();
}
-
+
public Element getElement()
{
return elt;
@@ -189,12 +189,12 @@ public abstract class View implements SwingConstants
min = getPreferredSpan(axis);
return min;
}
-
+
public void setSize(float width, float height)
{
// The default implementation does nothing.
}
-
+
/**
* Returns the alignment of this view along the baseline of the parent view.
* An alignment of <code>0.0</code> will align this view with the left edge
@@ -218,7 +218,7 @@ public abstract class View implements SwingConstants
{
return getElement().getAttributes();
}
-
+
public boolean isVisible()
{
return true;
@@ -228,7 +228,7 @@ public abstract class View implements SwingConstants
{
return 0;
}
-
+
public View getView(int index)
{
return null;
@@ -274,7 +274,7 @@ public abstract class View implements SwingConstants
public void remove(int index)
{
- replace(index, 1, null);
+ replace(index, 1, null);
}
public View createFragment(int p0, int p1)
@@ -297,7 +297,7 @@ public abstract class View implements SwingConstants
{
return null;
}
-
+
/**
* @since 1.4
*/
@@ -305,7 +305,7 @@ public abstract class View implements SwingConstants
{
return -1;
}
-
+
/**
* @since 1.4
*/
@@ -674,15 +674,15 @@ public abstract class View implements SwingConstants
* listed valid values
*/
public Shape modelToView(int p1, Position.Bias b1,
- int p2, Position.Bias b2, Shape a)
+ int p2, Position.Bias b2, Shape a)
throws BadLocationException
{
if (b1 != Position.Bias.Forward && b1 != Position.Bias.Backward)
throw new IllegalArgumentException
- ("b1 must be either Position.Bias.Forward or Position.Bias.Backward");
+ ("b1 must be either Position.Bias.Forward or Position.Bias.Backward");
if (b2 != Position.Bias.Forward && b2 != Position.Bias.Backward)
throw new IllegalArgumentException
- ("b2 must be either Position.Bias.Forward or Position.Bias.Backward");
+ ("b2 must be either Position.Bias.Forward or Position.Bias.Backward");
Shape s1 = modelToView(p1, a, b1);
// Special case for p2 == end index.
@@ -867,7 +867,7 @@ public abstract class View implements SwingConstants
ret = parent.viewToModel(r.x, r.y - 1, a, biasRet);
break;
case SOUTH:
- // Try to find a suitable offset by examining the area below.
+ // Try to find a suitable offset by examining the area below.
parent = getParent();
r = parent.modelToView(pos, a, b).getBounds();
ret = parent.viewToModel(r.x + r.width, r.y + r.height, a, biasRet);
@@ -875,7 +875,7 @@ public abstract class View implements SwingConstants
default:
throw new IllegalArgumentException("Illegal value for d");
}
-
+
return ret;
}
}
diff --git a/libjava/classpath/javax/swing/text/ViewFactory.java b/libjava/classpath/javax/swing/text/ViewFactory.java
index 0794880..cb57bd8 100644
--- a/libjava/classpath/javax/swing/text/ViewFactory.java
+++ b/libjava/classpath/javax/swing/text/ViewFactory.java
@@ -1,4 +1,4 @@
-/* ViewFactory.java --
+/* ViewFactory.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/text/WrappedPlainView.java b/libjava/classpath/javax/swing/text/WrappedPlainView.java
index 00e12b1..f2a6c92 100644
--- a/libjava/classpath/javax/swing/text/WrappedPlainView.java
+++ b/libjava/classpath/javax/swing/text/WrappedPlainView.java
@@ -1,4 +1,4 @@
-/* WrappedPlainView.java --
+/* WrappedPlainView.java --
Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -56,31 +56,31 @@ public class WrappedPlainView extends BoxView implements TabExpander
{
/** The color for selected text **/
Color selectedColor;
-
+
/** The color for unselected text **/
Color unselectedColor;
-
+
/** The color for disabled components **/
Color disabledColor;
-
+
/**
* Stores the font metrics. This is package private to avoid synthetic
* accessor method.
*/
FontMetrics metrics;
-
+
/** Whether or not to wrap on word boundaries **/
boolean wordWrap;
-
+
/** A ViewFactory that creates WrappedLines **/
ViewFactory viewFactory = new WrappedLineCreator();
-
+
/** The start of the selected text **/
int selectionStart;
-
+
/** The end of the selected text **/
int selectionEnd;
-
+
/** The height of the line (used while painting) **/
int lineHeight;
@@ -98,18 +98,18 @@ public class WrappedPlainView extends BoxView implements TabExpander
* The instance returned by {@link #getLineBuffer()}.
*/
private transient Segment lineBuffer;
-
+
public WrappedPlainView (Element elem)
{
this (elem, false);
}
-
+
public WrappedPlainView (Element elem, boolean wordWrap)
{
super (elem, Y_AXIS);
- this.wordWrap = wordWrap;
- }
-
+ this.wordWrap = wordWrap;
+ }
+
/**
* Provides access to the Segment used for retrievals from the Document.
* @return the Segment.
@@ -120,12 +120,12 @@ public class WrappedPlainView extends BoxView implements TabExpander
lineBuffer = new Segment();
return lineBuffer;
}
-
+
/**
* Returns the next tab stop position after a given reference position.
*
* This implementation ignores the <code>tabStop</code> argument.
- *
+ *
* @param x the current x position in pixels
* @param tabStop the position within the text stream that the tab occured at
*/
@@ -139,12 +139,12 @@ public class WrappedPlainView extends BoxView implements TabExpander
}
return next;
}
-
+
/**
- * Returns the tab size for the Document based on
+ * Returns the tab size for the Document based on
* PlainDocument.tabSizeAttribute, defaulting to 8 if this property is
* not defined
- *
+ *
* @return the tab size.
*/
protected int getTabSize()
@@ -154,7 +154,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
return 8;
return ((Integer)tabSize).intValue();
}
-
+
/**
* Draws a line of text, suppressing white space at the end and expanding
* tabs. Calls drawSelectedText and drawUnselectedText.
@@ -175,37 +175,37 @@ public class WrappedPlainView extends BoxView implements TabExpander
// - start of range is selected, end of range is unselected
// - start of range is unselected, end of range is selected
// - middle of range is selected, start and end of range is unselected
-
- // entire range unselected:
- if ((selectionStart == selectionEnd) ||
+
+ // entire range unselected:
+ if ((selectionStart == selectionEnd) ||
(p0 > selectionEnd || p1 < selectionStart))
drawUnselectedText(g, x, y, p0, p1);
-
+
// entire range selected
else if (p0 >= selectionStart && p1 <= selectionEnd)
drawSelectedText(g, x, y, p0, p1);
-
+
// start of range selected, end of range unselected
else if (p0 >= selectionStart)
{
x = drawSelectedText(g, x, y, p0, selectionEnd);
drawUnselectedText(g, x, y, selectionEnd, p1);
}
-
+
// start of range unselected, end of range selected
else if (selectionStart > p0 && selectionEnd > p1)
{
x = drawUnselectedText(g, x, y, p0, selectionStart);
drawSelectedText(g, x, y, selectionStart, p1);
}
-
+
// middle of range selected
else if (selectionStart > p0)
{
x = drawUnselectedText(g, x, y, p0, selectionStart);
x = drawSelectedText(g, x, y, selectionStart, selectionEnd);
drawUnselectedText(g, x, y, selectionEnd, p1);
- }
+ }
}
catch (BadLocationException ble)
{
@@ -214,14 +214,14 @@ public class WrappedPlainView extends BoxView implements TabExpander
}
/**
- * Renders the range of text as selected text. Just paints the text
+ * Renders the range of text as selected text. Just paints the text
* in the color specified by the host component. Assumes the highlighter
* will render the selected background.
* @param g the graphics context
* @param x the starting X coordinate
* @param y the starting Y coordinate
* @param p0 the starting model location
- * @param p1 the ending model location
+ * @param p1 the ending model location
* @return the X coordinate of the end of the text
* @throws BadLocationException if the given range is invalid
*/
@@ -246,7 +246,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
*/
protected int drawUnselectedText(Graphics g, int x, int y, int p0, int p1)
throws BadLocationException
- {
+ {
JTextComponent textComponent = (JTextComponent) getContainer();
if (textComponent.isEnabled())
g.setColor(unselectedColor);
@@ -256,8 +256,8 @@ public class WrappedPlainView extends BoxView implements TabExpander
Segment segment = getLineBuffer();
getDocument().getText(p0, p1 - p0, segment);
return Utilities.drawTabbedText(segment, x, y, g, this, p0);
- }
-
+ }
+
/**
* Loads the children to initiate the view. Called by setParent.
* Creates a WrappedLine for each child Element.
@@ -268,17 +268,17 @@ public class WrappedPlainView extends BoxView implements TabExpander
int numChildren = root.getElementCount();
if (numChildren == 0)
return;
-
+
View[] children = new View[numChildren];
for (int i = 0; i < numChildren; i++)
children[i] = new WrappedLine(root.getElement(i));
replace(0, 0, children);
}
-
+
/**
* Calculates the break position for the text between model positions
* p0 and p1. Will break on word boundaries or character boundaries
- * depending on the break argument given in construction of this
+ * depending on the break argument given in construction of this
* WrappedPlainView. Used by the nested WrappedLine class to determine
* when to start the next logical line.
* @param p0 the start model position
@@ -307,16 +307,16 @@ public class WrappedPlainView extends BoxView implements TabExpander
false);
return pos;
}
-
+
void updateMetrics()
{
Container component = getContainer();
metrics = component.getFontMetrics(component.getFont());
tabSize = getTabSize()* metrics.charWidth('m');
}
-
+
/**
- * Determines the preferred span along the given axis. Implemented to
+ * Determines the preferred span along the given axis. Implemented to
* cache the font metrics and then call the super classes method.
*/
public float getPreferredSpan (int axis)
@@ -324,9 +324,9 @@ public class WrappedPlainView extends BoxView implements TabExpander
updateMetrics();
return super.getPreferredSpan(axis);
}
-
+
/**
- * Determines the minimum span along the given axis. Implemented to
+ * Determines the minimum span along the given axis. Implemented to
* cache the font metrics and then call the super classes method.
*/
public float getMinimumSpan (int axis)
@@ -334,9 +334,9 @@ public class WrappedPlainView extends BoxView implements TabExpander
updateMetrics();
return super.getMinimumSpan(axis);
}
-
+
/**
- * Determines the maximum span along the given axis. Implemented to
+ * Determines the maximum span along the given axis. Implemented to
* cache the font metrics and then call the super classes method.
*/
public float getMaximumSpan (int axis)
@@ -344,7 +344,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
updateMetrics();
return super.getMaximumSpan(axis);
}
-
+
/**
* Called when something was inserted. Overridden so that
* the view factory creates WrappedLine views.
@@ -361,7 +361,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
if (v != null)
v.insertUpdate(e, r, f);
}
-
+
/**
* Called when something is removed. Overridden so that
* the view factory creates WrappedLine views.
@@ -378,7 +378,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
if (v != null)
v.removeUpdate(e, r, f);
}
-
+
/**
* Called when the portion of the Document that this View is responsible
* for changes. Overridden so that the view factory creates
@@ -425,9 +425,9 @@ public class WrappedPlainView extends BoxView implements TabExpander
public View create(Element elem)
{
return new WrappedLine(elem);
- }
+ }
}
-
+
/**
* Renders the <code>Element</code> that is associated with this
* <code>View</code>. Caches the metrics and then calls
@@ -444,7 +444,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
JTextComponent comp = (JTextComponent)getContainer();
// Ensure metrics are up-to-date.
updateMetrics();
-
+
selectionStart = comp.getSelectionStart();
selectionEnd = comp.getSelectionEnd();
@@ -457,7 +457,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
super.paint(g, a);
}
-
+
/**
* Sets the size of the View. Implemented to update the metrics
* and then call super method.
@@ -469,12 +469,12 @@ public class WrappedPlainView extends BoxView implements TabExpander
preferenceChanged(null, true, true);
super.setSize(width, height);
}
-
+
class WrappedLine extends View
- {
+ {
/** Used to cache the number of lines for this View **/
int numLines = 1;
-
+
public WrappedLine(Element elem)
{
super(elem);
@@ -518,26 +518,26 @@ public class WrappedPlainView extends BoxView implements TabExpander
this);
else
lh.paintLayeredHighlights(g, currStart, currEnd, s, tc, this);
-
+
}
drawLine(currStart, currEnd, g, rect.x, rect.y + metrics.getAscent());
-
- rect.y += lineHeight;
+
+ rect.y += lineHeight;
if (currEnd == currStart)
currStart ++;
else
currStart = currEnd;
-
+
count++;
-
+
}
-
+
if (count != numLines)
{
numLines = count;
preferenceChanged(this, false, true);
}
-
+
}
/**
@@ -546,7 +546,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
* accordingly.
*/
private int determineNumLines()
- {
+ {
int nLines = 0;
int end = getEndOffset();
for (int i = getStartOffset(); i < end;)
@@ -555,7 +555,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
// careful: check that there's no off-by-one problem here
// depending on which position calculateBreakPosition returns
int breakPoint = calculateBreakPosition(i, end);
-
+
if (breakPoint == i)
i = breakPoint + 1;
else
@@ -563,12 +563,12 @@ public class WrappedPlainView extends BoxView implements TabExpander
}
return nLines;
}
-
+
/**
* Determines the preferred span for this view along the given axis.
- *
+ *
* @param axis the axis (either X_AXIS or Y_AXIS)
- *
+ *
* @return the preferred span along the given axis.
* @throws IllegalArgumentException if axis is not X_AXIS or Y_AXIS
*/
@@ -582,19 +582,19 @@ public class WrappedPlainView extends BoxView implements TabExpander
updateMetrics();
return numLines * metrics.getHeight();
}
-
+
throw new IllegalArgumentException("Invalid axis for getPreferredSpan: "
+ axis);
}
-
+
/**
* Provides a mapping from model space to view space.
- *
+ *
* @param pos the position in the model
* @param a the region into which the view is rendered
* @param b the position bias (forward or backward)
- *
- * @return a box in view space that represents the given position
+ *
+ * @return a box in view space that represents the given position
* in model space
* @throws BadLocationException if the given model position is invalid
*/
@@ -602,26 +602,26 @@ public class WrappedPlainView extends BoxView implements TabExpander
throws BadLocationException
{
Rectangle rect = a.getBounds();
-
+
// Throwing a BadLocationException is an observed behavior of the RI.
if (rect.isEmpty())
throw new BadLocationException("Unable to calculate view coordinates "
+ "when allocation area is empty.", pos);
-
+
Segment s = getLineBuffer();
int lineHeight = metrics.getHeight();
-
- // Return a rectangle with width 1 and height equal to the height
+
+ // Return a rectangle with width 1 and height equal to the height
// of the text
rect.height = lineHeight;
rect.width = 1;
int currLineStart = getStartOffset();
int end = getEndOffset();
-
+
if (pos < currLineStart || pos >= end)
throw new BadLocationException("invalid offset", pos);
-
+
while (true)
{
int currLineEnd = calculateBreakPosition(currLineStart, end);
@@ -629,7 +629,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
// the width of the text from currLineStart to pos and add that
// to rect.x
if (pos >= currLineStart && pos < currLineEnd)
- {
+ {
try
{
getDocument().getText(currLineStart, pos - currLineStart, s);
@@ -645,7 +645,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
}
// Increment rect.y so we're checking the next logical line
rect.y += lineHeight;
-
+
// Increment currLineStart to the model position of the start
// of the next logical line
if (currLineEnd == currLineStart)
@@ -658,12 +658,12 @@ public class WrappedPlainView extends BoxView implements TabExpander
/**
* Provides a mapping from view space to model space.
- *
+ *
* @param x the x coordinate in view space
* @param y the y coordinate in view space
* @param a the region into which the view is rendered
* @param b the position bias (forward or backward)
- *
+ *
* @return the location in the model that best represents the
* given point in view space
*/
@@ -672,19 +672,19 @@ public class WrappedPlainView extends BoxView implements TabExpander
Segment s = getLineBuffer();
Rectangle rect = a.getBounds();
int currLineStart = getStartOffset();
-
+
// Although calling modelToView with the last possible offset will
// cause a BadLocationException in CompositeView it is allowed
// to return that offset in viewToModel.
int end = getEndOffset();
-
+
int lineHeight = metrics.getHeight();
if (y < rect.y)
return currLineStart;
if (y > rect.y + rect.height)
return end - 1;
-
+
// Note: rect.x and rect.width do not represent the width of painted
// text but the area where text *may* be painted. This means the width
// is most of the time identical to the component's width.
@@ -705,7 +705,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
{
// Shouldn't happen
}
-
+
int offset = Utilities.getTabbedTextOffset(s, metrics, rect.x,
(int) x,
WrappedPlainView.this,
@@ -719,27 +719,27 @@ public class WrappedPlainView extends BoxView implements TabExpander
}
// Increment rect.y so we're checking the next logical line
rect.y += lineHeight;
-
+
// Increment currLineStart to the model position of the start
// of the next logical line.
currLineStart = currLineEnd;
}
-
+
return end;
- }
-
+ }
+
/**
* <p>This method is called from insertUpdate and removeUpdate.</p>
- *
+ *
* <p>If the number of lines in the document has changed, just repaint
- * the whole thing (note, could improve performance by not repainting
- * anything above the changes). If the number of lines hasn't changed,
+ * the whole thing (note, could improve performance by not repainting
+ * anything above the changes). If the number of lines hasn't changed,
* just repaint the given Rectangle.</p>
- *
+ *
* <p>Note that the <code>Rectangle</code> argument may be <code>null</code>
- * when the allocation area is empty.</code>
- *
+ * when the allocation area is empty.</code>
+ *
* @param a the Rectangle to repaint if the number of lines hasn't changed
*/
void updateDamage (Rectangle a)
@@ -754,11 +754,11 @@ public class WrappedPlainView extends BoxView implements TabExpander
else if (a != null)
getContainer().repaint(a.x, a.y, a.width, a.height);
}
-
+
/**
* This method is called when something is inserted into the Document
* that this View is displaying.
- *
+ *
* @param changes the DocumentEvent for the changes.
* @param a the allocation of the View
* @param f the ViewFactory used to rebuild
@@ -766,13 +766,13 @@ public class WrappedPlainView extends BoxView implements TabExpander
public void insertUpdate (DocumentEvent changes, Shape a, ViewFactory f)
{
Rectangle r = a instanceof Rectangle ? (Rectangle) a : a.getBounds();
- updateDamage(r);
+ updateDamage(r);
}
-
+
/**
* This method is called when something is removed from the Document
* that this View is displaying.
- *
+ *
* @param changes the DocumentEvent for the changes.
* @param a the allocation of the View
* @param f the ViewFactory used to rebuild
@@ -787,9 +787,9 @@ public class WrappedPlainView extends BoxView implements TabExpander
// makes View.forwardUpdate() skip this method call.
// However this seems to cause no trouble and as it reduces the
// number of method calls it can stay this way.
-
+
Rectangle r = a instanceof Rectangle ? (Rectangle) a : a.getBounds();
- updateDamage(r);
+ updateDamage(r);
}
}
}
diff --git a/libjava/classpath/javax/swing/text/html/BRView.java b/libjava/classpath/javax/swing/text/html/BRView.java
index 7d0d516..6f465c9 100644
--- a/libjava/classpath/javax/swing/text/html/BRView.java
+++ b/libjava/classpath/javax/swing/text/html/BRView.java
@@ -48,14 +48,14 @@ class BRView
{
/**
* Creates the new BR view.
- *
+ *
* @param elem the HTML element, representing the view.
*/
public BRView(Element elem)
{
super(elem);
}
-
+
/**
* Always return ForcedBreakWeight for the X_AXIS, BadBreakWeight for the
* Y_AXIS.
diff --git a/libjava/classpath/javax/swing/text/html/BlockView.java b/libjava/classpath/javax/swing/text/html/BlockView.java
index b05c983..1c33971 100644
--- a/libjava/classpath/javax/swing/text/html/BlockView.java
+++ b/libjava/classpath/javax/swing/text/html/BlockView.java
@@ -1,4 +1,4 @@
-/* BlockView.java --
+/* BlockView.java --
Copyright (C) 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -159,9 +159,9 @@ public class BlockView extends BoxView
private HashMap positionInfo;
/**
- * Creates a new view that represents an html box.
+ * Creates a new view that represents an html box.
* This can be used for a number of elements.
- *
+ *
* @param elem - the element to create a view for
* @param axis - either View.X_AXIS or View.Y_AXIS
*/
@@ -176,26 +176,26 @@ public class BlockView extends BoxView
* Creates the parent view for this. It is called before
* any other methods, if the parent view is working properly.
* Implemented to forward to the superclass and call
- * setPropertiesFromAttributes to set the paragraph
+ * setPropertiesFromAttributes to set the paragraph
* properties.
- *
+ *
* @param parent - the new parent, or null if the view
- * is being removed from a parent it was added to.
+ * is being removed from a parent it was added to.
*/
public void setParent(View parent)
{
super.setParent(parent);
-
+
if (parent != null)
setPropertiesFromAttributes();
}
-
+
/**
* Calculates the requirements along the major axis.
* This is implemented to call the superclass and then
* adjust it if the CSS width or height attribute is specified
* and applicable.
- *
+ *
* @param axis - the axis to check the requirements for.
* @param r - the SizeRequirements. If null, one is created.
* @return the new SizeRequirements object.
@@ -205,7 +205,7 @@ public class BlockView extends BoxView
{
if (r == null)
r = new SizeRequirements();
-
+
if (setCSSSpan(r, axis))
{
// If we have set the span from CSS, then we need to adjust
@@ -229,7 +229,7 @@ public class BlockView extends BoxView
* This is implemented to call the superclass and then
* adjust it if the CSS width or height attribute is specified
* and applicable.
- *
+ *
* @param axis - the axis to check the requirements for.
* @param r - the SizeRequirements. If null, one is created.
* @return the new SizeRequirements object.
@@ -239,7 +239,7 @@ public class BlockView extends BoxView
{
if (r == null)
r = new SizeRequirements();
-
+
if (setCSSSpan(r, axis))
{
// If we have set the span from CSS, then we need to adjust
@@ -277,7 +277,7 @@ public class BlockView extends BoxView
/**
* Sets the span on the SizeRequirements object according to the
* according CSS span value, when it is set.
- *
+ *
* @param r the size requirements
* @param axis the axis
*
@@ -325,14 +325,14 @@ public class BlockView extends BoxView
* perpendicular to the axis that it represents). The results
* of the layout are placed in the given arrays which are
* the allocations to the children along the minor axis.
- *
- * @param targetSpan - the total span given to the view, also
+ *
+ * @param targetSpan - the total span given to the view, also
* used to layout the children.
* @param axis - the minor axis
* @param offsets - the offsets from the origin of the view for
* all the child views. This is a return value and is filled in by this
* function.
- * @param spans - the span of each child view. This is a return value and is
+ * @param spans - the span of each child view. This is a return value and is
* filled in by this function.
*/
protected void layoutMinorAxis(int targetSpan, int axis,
@@ -469,7 +469,7 @@ public class BlockView extends BoxView
* Paints using the given graphics configuration and shape.
* This delegates to the css box painter to paint the
* border and background prior to the interior.
- *
+ *
* @param g - Graphics configuration
* @param a - the Shape to render into.
*/
@@ -487,7 +487,7 @@ public class BlockView extends BoxView
/**
* Fetches the attributes to use when painting.
- *
+ *
* @return the attributes of this model.
*/
public AttributeSet getAttributes()
@@ -496,10 +496,10 @@ public class BlockView extends BoxView
attributes = getStyleSheet().getViewAttributes(this);
return attributes;
}
-
+
/**
* Gets the resize weight.
- *
+ *
* @param axis - the axis to get the resize weight for.
* @return the resize weight.
* @throws IllegalArgumentException - for an invalid axis
@@ -513,10 +513,10 @@ public class BlockView extends BoxView
return 1;
throw new IllegalArgumentException("Invalid Axis");
}
-
+
/**
* Gets the alignment.
- *
+ *
* @param axis - the axis to get the alignment for.
* @return the alignment.
*/
@@ -537,11 +537,11 @@ public class BlockView extends BoxView
}
throw new IllegalArgumentException("Invalid Axis");
}
-
+
/**
* Gives notification from the document that attributes were
* changed in a location that this view is responsible for.
- *
+ *
* @param ev - the change information
* @param a - the current shape of the view
* @param f - the factory to use to rebuild if the view has children.
@@ -550,7 +550,7 @@ public class BlockView extends BoxView
Shape a, ViewFactory f)
{
super.changedUpdate(ev, a, f);
-
+
// If more elements were added, then need to set the properties for them
int currPos = ev.getOffset();
if (currPos <= getStartOffset()
@@ -560,10 +560,10 @@ public class BlockView extends BoxView
/**
* Determines the preferred span along the axis.
- *
+ *
* @param axis - the view to get the preferred span for.
* @return the span the view would like to be painted into >=0/
- * The view is usually told to paint into the span that is returned,
+ * The view is usually told to paint into the span that is returned,
* although the parent may choose to resize or break the view.
* @throws IllegalArgumentException - for an invalid axis
*/
@@ -573,13 +573,13 @@ public class BlockView extends BoxView
return super.getPreferredSpan(axis);
throw new IllegalArgumentException("Invalid Axis");
}
-
+
/**
* Determines the minimum span along the axis.
- *
+ *
* @param axis - the axis to get the minimum span for.
* @return the span the view would like to be painted into >=0/
- * The view is usually told to paint into the span that is returned,
+ * The view is usually told to paint into the span that is returned,
* although the parent may choose to resize or break the view.
* @throws IllegalArgumentException - for an invalid axis
*/
@@ -589,13 +589,13 @@ public class BlockView extends BoxView
return super.getMinimumSpan(axis);
throw new IllegalArgumentException("Invalid Axis");
}
-
+
/**
* Determines the maximum span along the axis.
- *
+ *
* @param axis - the axis to get the maximum span for.
* @return the span the view would like to be painted into >=0/
- * The view is usually told to paint into the span that is returned,
+ * The view is usually told to paint into the span that is returned,
* although the parent may choose to resize or break the view.
* @throws IllegalArgumentException - for an invalid axis
*/
@@ -605,7 +605,7 @@ public class BlockView extends BoxView
return super.getMaximumSpan(axis);
throw new IllegalArgumentException("Invalid Axis");
}
-
+
/**
* Updates any cached values that come from attributes.
*/
@@ -640,7 +640,7 @@ public class BlockView extends BoxView
/**
* Gets the default style sheet.
- *
+ *
* @return the style sheet
*/
protected StyleSheet getStyleSheet()
diff --git a/libjava/classpath/javax/swing/text/html/CSS.java b/libjava/classpath/javax/swing/text/html/CSS.java
index 77f94a6..0a77bdf 100644
--- a/libjava/classpath/javax/swing/text/html/CSS.java
+++ b/libjava/classpath/javax/swing/text/html/CSS.java
@@ -455,7 +455,7 @@ public class CSS implements Serializable
*
* @param attr the attribute string
* @param inherited if the attribute should be inherited or not
- * @param def a default value; may be <code>null</code>
+ * @param def a default value; may be <code>null</code>
*/
Attribute(String attr, boolean inherited, String def)
{
@@ -463,7 +463,7 @@ public class CSS implements Serializable
isInherited = inherited;
defaultValue = def;
if( attributeMap == null)
- attributeMap = new HashMap();
+ attributeMap = new HashMap();
attributeMap.put( attr, this );
}
diff --git a/libjava/classpath/javax/swing/text/html/CSSBorder.java b/libjava/classpath/javax/swing/text/html/CSSBorder.java
index fff6b01..23fcdcc 100644
--- a/libjava/classpath/javax/swing/text/html/CSSBorder.java
+++ b/libjava/classpath/javax/swing/text/html/CSSBorder.java
@@ -308,7 +308,7 @@ class CSSBorder
// Right border.
paintBorderLine(g, x + width - right / 2, y, x + width - right / 2,
y + height, topStyle, right, rightColor, true);
-
+
}
private void paintBorderLine(Graphics g, int x1, int y1, int x2, int y2,
diff --git a/libjava/classpath/javax/swing/text/html/CSSParser.java b/libjava/classpath/javax/swing/text/html/CSSParser.java
index d49ac3a..5024c7b 100644
--- a/libjava/classpath/javax/swing/text/html/CSSParser.java
+++ b/libjava/classpath/javax/swing/text/html/CSSParser.java
@@ -43,18 +43,18 @@ import java.io.*;
/**
* Parses a CSS document. This works by way of a delegate that implements the
* CSSParserCallback interface. The delegate is notified of the following
- * events:
- * - Import statement: handleImport
- * - Selectors handleSelector. This is invoked for each string. For example if
- * the Reader contained p, bar , a {}, the delegate would be notified 4 times,
- * for 'p,' 'bar' ',' and 'a'.
- * - When a rule starts, startRule
+ * events:
+ * - Import statement: handleImport
+ * - Selectors handleSelector. This is invoked for each string. For example if
+ * the Reader contained p, bar , a {}, the delegate would be notified 4 times,
+ * for 'p,' 'bar' ',' and 'a'.
+ * - When a rule starts, startRule
* - Properties in the rule via the handleProperty. This
* is invoked one per property/value key, eg font size: foo;, would cause the
- * delegate to be notified once with a value of 'font size'.
- * - Values in the rule via the handleValue, this is notified for the total value.
+ * delegate to be notified once with a value of 'font size'.
+ * - Values in the rule via the handleValue, this is notified for the total value.
* - When a rule ends, endRule
- *
+ *
* @author Lillian Angel (langel@redhat.com)
*/
class CSSParser
@@ -68,7 +68,7 @@ class CSSParser
{
/**
* Handles the import statment in the document.
- *
+ *
* @param imp - the import string
*/
public abstract void handleImport(String imp);
@@ -85,21 +85,21 @@ class CSSParser
/**
* Handles the selector of a rule.
- *
+ *
* @param selector - the selector in the rule
*/
public abstract void handleSelector(String selector);
/**
* Handles the properties in the document.
- *
+ *
* @param property - the property in the document.
*/
public abstract void handleProperty(String property);
/**
* Handles the values in the document.
- *
+ *
* @param value - the value to handle.
*/
public abstract void handleValue(String value);
@@ -212,7 +212,7 @@ class CSSParser
/**
* Appends a character to the token buffer.
- *
+ *
* @param c - the character to append
*/
private void append(char c)
@@ -233,7 +233,7 @@ class CSSParser
/**
* Fetches the next token.
- *
+ *
* @param c - the character to fetch.
* @return the location
* @throws IOException - any i/o error encountered while reading
@@ -276,7 +276,7 @@ class CSSParser
/**
* Reads a character from the stream.
- *
+ *
* @return the number of characters read or -1 if end of stream is reached.
* @throws IOException - any i/o encountered while reading
*/
@@ -293,19 +293,19 @@ class CSSParser
/**
* Parses the the contents of the reader using the
* callback.
- *
+ *
* @param reader - the reader to read from
* @param callback - the callback instance
* @param parsingDeclaration - true if parsing a declaration
* @throws IOException - any i/o error from the reader
*/
- void parse(Reader reader, CSSParser.CSSParserCallback callback,
+ void parse(Reader reader, CSSParser.CSSParserCallback callback,
boolean parsingDeclaration)
throws IOException
{
this.reader = reader;
this.callback = callback;
-
+
try
{
if (!parsingDeclaration)
@@ -322,7 +322,7 @@ class CSSParser
/**
* Skips any white space, returning the character after the white space.
- *
+ *
* @return the character after the whitespace
* @throws IOException - any i/o error from the reader
*/
@@ -337,7 +337,7 @@ class CSSParser
return next;
next = tempNext;
}
-
+
// Its all whitespace
return END;
}
@@ -345,7 +345,7 @@ class CSSParser
/**
* Gets the next statement, returning false if the end is reached.
* A statement is either an At-rule, or a ruleset.
- *
+ *
* @return false if the end is reached
* @throws IOException - any i/o error from the reader
*/
@@ -368,7 +368,7 @@ class CSSParser
parseAtRule();
else
parseRuleSet();
- break;
+ break;
case END:
return false;
}
@@ -377,28 +377,28 @@ class CSSParser
/**
* Parses an @ rule, stopping at a matching brace pair, or ;.
- *
+ *
* @throws IOException - any i/o error from the reader
*/
private void parseAtRule() throws IOException
- {
- // An At-Rule begins with the "@" character followed immediately by a keyword.
- // Following the keyword separated by a space is an At-rule statement appropriate
- // to the At-keyword used. If the At-Rule is a simple declarative statement
- // (charset, import, fontdef), it is terminated by a semi-colon (";".)
- // If the At-Rule is a conditional or informative statement (media, page, font-face),
- // it is followed by optional arguments and then a style declaration block inside matching
- // curly braces ("{", "}".) At-Rules are sometimes nestable, depending on the context.
+ {
+ // An At-Rule begins with the "@" character followed immediately by a keyword.
+ // Following the keyword separated by a space is an At-rule statement appropriate
+ // to the At-keyword used. If the At-Rule is a simple declarative statement
+ // (charset, import, fontdef), it is terminated by a semi-colon (";".)
+ // If the At-Rule is a conditional or informative statement (media, page, font-face),
+ // it is followed by optional arguments and then a style declaration block inside matching
+ // curly braces ("{", "}".) At-Rules are sometimes nestable, depending on the context.
// If any part of an At-Rule is not understood, it should be ignored.
-
+
// FIXME: Not Implemented
- // call handleimport
+ // call handleimport
}
/**
- * Parses the next rule set, which is a selector followed by a declaration
+ * Parses the next rule set, which is a selector followed by a declaration
* block.
- *
+ *
* @throws IOException - any i/o error from the reader
*/
private void parseRuleSet() throws IOException
@@ -411,9 +411,9 @@ class CSSParser
}
/**
- * Parses a set of selectors, returning false if the end of the stream is
+ * Parses a set of selectors, returning false if the end of the stream is
* reached.
- *
+ *
* @return false if the end of stream is reached
* @throws IOException - any i/o error from the reader
*/
@@ -421,13 +421,13 @@ class CSSParser
{
// FIXME: Not Implemented
// call handleselector
- return false;
+ return false;
}
/**
* Parses a declaration block. Which a number of declarations followed by a
* })].
- *
+ *
* @throws IOException - any i/o error from the reader
*/
private void parseDeclarationBlock() throws IOException
@@ -439,7 +439,7 @@ class CSSParser
/**
* Parses a single declaration, which is an identifier a : and another identifier.
* This returns the last token seen.
- *
+ *
* @returns the last token
* @throws IOException - any i/o error from the reader
*/
@@ -447,13 +447,13 @@ class CSSParser
{
// call handleValue
// FIXME: Not Implemented
- return 0;
+ return 0;
}
/**
* Parses identifiers until c is encountered, returning the ending token,
* which will be IDENTIFIER if c is found.
- *
+ *
* @param c - the stop character
* @param wantsBlocks - true if blocks are wanted
* @return the ending token
@@ -469,7 +469,7 @@ class CSSParser
/**
* Parses till a matching block close is encountered. This is only appropriate
* to be called at the top level (no nesting).
- *
+ *
* @param i - FIXME
* @throws IOException - any i/o error from the reader
*/
@@ -481,7 +481,7 @@ class CSSParser
/**
* Gets an identifier, returning true if the length of the string is greater
* than 0, stopping when c, whitespace, or one of {}()[] is hit.
- *
+ *
* @param c - the stop character
* @return returns true if the length of the string > 0
* @throws IOException - any i/o error from the reader
@@ -494,7 +494,7 @@ class CSSParser
/**
* Reads till c is encountered, escaping characters as necessary.
- *
+ *
* @param c - the stop character
* @throws IOException - any i/o error from the reader
*/
@@ -505,7 +505,7 @@ class CSSParser
/**
* Parses a comment block.
- *
+ *
* @throws IOException - any i/o error from the reader
*/
private void readComment() throws IOException
@@ -516,7 +516,7 @@ class CSSParser
/**
* Called when a block start is encountered ({[.
- *
+ *
* @param start of block
*/
private void startBlock(int start)
@@ -526,7 +526,7 @@ class CSSParser
/**
* Called when an end block is encountered )]}
- *
+ *
* @param end of block
*/
private void endBlock(int end)
@@ -536,18 +536,18 @@ class CSSParser
/**
* Checks if currently in a block.
- *
+ *
* @return true if currently in a block.
*/
private boolean inBlock()
{
// FIXME: Not Implemented
- return false;
+ return false;
}
/**
* Supports one character look ahead, this will throw if called twice in a row.
- *
+ *
* @param c - the character to push.
* @throws IOException - if called twice in a row
*/
@@ -559,5 +559,3 @@ class CSSParser
pushedChar = c;
}
}
-
-
diff --git a/libjava/classpath/javax/swing/text/html/FormView.java b/libjava/classpath/javax/swing/text/html/FormView.java
index ef362bd..61c568f 100644
--- a/libjava/classpath/javax/swing/text/html/FormView.java
+++ b/libjava/classpath/javax/swing/text/html/FormView.java
@@ -96,7 +96,7 @@ import javax.swing.text.StyleConstants;
* <td>JList in JScrollPane</td></tr>
* <tr><td>select, size unspecified or == 1</td><td>JComboBox</td></tr>
* <tr><td>textarea, text</td><td>JTextArea in JScrollPane</td></tr>
- * <tr><td>input, file</td><td>JTextField</td></tr>
+ * <tr><td>input, file</td><td>JTextField</td></tr>
* </table>
*
* @author Roman Kennke (kennke@aicas.com)
@@ -352,7 +352,7 @@ public class FormView
/**
* If the value attribute of an <code>&lt;input type=&quot;submit&quot;&gt>
* tag is not specified, then this string is used.
- *
+ *
* @deprecated As of JDK1.3 the value is fetched from the UIManager property
* <code>FormView.submitButtonText</code>.
*/
@@ -362,7 +362,7 @@ public class FormView
/**
* If the value attribute of an <code>&lt;input type=&quot;reset&quot;&gt>
* tag is not specified, then this string is used.
- *
+ *
* @deprecated As of JDK1.3 the value is fetched from the UIManager property
* <code>FormView.resetButtonText</code>.
*/
@@ -638,7 +638,7 @@ public class FormView
}
else
{
- data = name + ".x=" + p.x + "&" + name + ".y=" + p.y;
+ data = name + ".x=" + p.x + "&" + name + ".y=" + p.y;
}
return data;
}
diff --git a/libjava/classpath/javax/swing/text/html/HRuleView.java b/libjava/classpath/javax/swing/text/html/HRuleView.java
index 3bae5eb..9be1eff 100644
--- a/libjava/classpath/javax/swing/text/html/HRuleView.java
+++ b/libjava/classpath/javax/swing/text/html/HRuleView.java
@@ -55,15 +55,15 @@ class HRuleView extends InlineView
{
/**
* The null view, indicating, that nothing should be painted ahead the
- * breaking point.
+ * breaking point.
*/
View nullView;
-
+
/**
* The height of the horizontal dash area.
*/
static int HEIGHT = 4;
-
+
/**
* The imaginary invisible view that stays after end of line after the
* breaking procedure. It occupies on character.
@@ -74,7 +74,7 @@ class HRuleView extends InlineView
* The break offset that becomes the views start offset.
*/
int breakOffset;
-
+
/**
* Return the end offset that is always one char after the break offset.
*/
@@ -82,7 +82,7 @@ class HRuleView extends InlineView
{
return breakOffset + 1;
}
-
+
/**
* Return the start offset that has been passed in a constructor.
*/
@@ -90,10 +90,10 @@ class HRuleView extends InlineView
{
return breakOffset;
}
-
+
/**
* Create the new instance of this view.
- *
+ *
* @param element the element (inherited from the HR view)
* @param offset the position where the HR view has been broken
*/
@@ -103,7 +103,7 @@ class HRuleView extends InlineView
breakOffset = offset;
}
}
-
+
/**
* Creates the new HR view.
*/
@@ -120,11 +120,11 @@ class HRuleView extends InlineView
public int getBreakWeight(int axis, float pos, float len)
{
if (axis == X_AXIS && ((getEndOffset() - getStartOffset()) > 1))
- return ForcedBreakWeight;
+ return ForcedBreakWeight;
else
- return BadBreakWeight;
+ return BadBreakWeight;
}
-
+
/**
* Draws the double line, upped black and the lower light gray.
*/
@@ -143,7 +143,7 @@ class HRuleView extends InlineView
g.setColor(Color.black);
g.drawLine(x, y++, w, h++);
- g.setColor(Color.lightGray);
+ g.setColor(Color.lightGray);
g.drawLine(x, y, w, h);
}
@@ -160,7 +160,7 @@ class HRuleView extends InlineView
else
return this;
}
-
+
/**
* Returns the width of the container for the horizontal axis and the
* thickness of the dash area for the vertical axis.
@@ -176,7 +176,7 @@ class HRuleView extends InlineView
return 640;
}
else
- return HEIGHT;
+ return HEIGHT;
}
/**
diff --git a/libjava/classpath/javax/swing/text/html/HTMLDocument.java b/libjava/classpath/javax/swing/text/html/HTMLDocument.java
index f3d3ce3..9545be4 100644
--- a/libjava/classpath/javax/swing/text/html/HTMLDocument.java
+++ b/libjava/classpath/javax/swing/text/html/HTMLDocument.java
@@ -76,7 +76,7 @@ import javax.swing.text.html.HTML.Tag;
* data structure when it is needed to parse HTML and then obtain the content of
* the certain types of tags. This class also has methods for modifying the HTML
* content.
- *
+ *
* @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
* @author Anthony Balkissoon (abalkiss@redhat.com)
* @author Lillian Angel (langel@redhat.com)
@@ -85,7 +85,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
/** A key for document properies. The value for the key is
* a Vector of Strings of comments not found in the body.
- */
+ */
public static final String AdditionalComments = "AdditionalComments";
URL baseURL = null;
boolean preservesUnknownTags = true;
@@ -110,22 +110,22 @@ public class HTMLDocument extends DefaultStyledDocument
{
this(new GapContent(BUFFER_SIZE_DEFAULT), new StyleSheet());
}
-
+
/**
- * Constructs an HTML document with the default content storage
+ * Constructs an HTML document with the default content storage
* implementation and the specified style/attribute storage mechanism.
- *
+ *
* @param styles - the style sheet
*/
public HTMLDocument(StyleSheet styles)
{
this(new GapContent(BUFFER_SIZE_DEFAULT), styles);
}
-
+
/**
- * Constructs an HTML document with the given content storage implementation
+ * Constructs an HTML document with the given content storage implementation
* and the given style/attribute storage mechanism.
- *
+ *
* @param c - the document's content
* @param styles - the style sheet
*/
@@ -133,21 +133,21 @@ public class HTMLDocument extends DefaultStyledDocument
{
super(c, styles);
}
-
+
/**
- * Gets the style sheet with the document display rules (CSS) that were specified
+ * Gets the style sheet with the document display rules (CSS) that were specified
* in the HTML document.
- *
+ *
* @return - the style sheet
*/
public StyleSheet getStyleSheet()
{
return (StyleSheet) getAttributeContext();
}
-
+
/**
* This method creates a root element for the new document.
- *
+ *
* @return the new default root
*/
protected AbstractElement createDefaultRoot()
@@ -180,12 +180,12 @@ public class HTMLDocument extends DefaultStyledDocument
return html;
}
-
+
/**
* This method returns an HTMLDocument.RunElement object attached to
- * parent representing a run of text from p0 to p1. The run has
+ * parent representing a run of text from p0 to p1. The run has
* attributes described by a.
- *
+ *
* @param parent - the parent element
* @param a - the attributes for the element
* @param p0 - the beginning of the range >= 0
@@ -202,7 +202,7 @@ public class HTMLDocument extends DefaultStyledDocument
/**
* This method returns an HTMLDocument.BlockElement object representing the
* attribute set a and attached to parent.
- *
+ *
* @param parent - the parent element
* @param a - the attributes for the element
*
@@ -212,20 +212,20 @@ public class HTMLDocument extends DefaultStyledDocument
{
return new BlockElement(parent, a);
}
-
+
/**
* Returns the parser used by this HTMLDocument to insert HTML.
- *
+ *
* @return the parser used by this HTMLDocument to insert HTML.
*/
public HTMLEditorKit.Parser getParser()
{
- return parser;
+ return parser;
}
-
+
/**
* Sets the parser used by this HTMLDocument to insert HTML.
- *
+ *
* @param p the parser to use
*/
public void setParser (HTMLEditorKit.Parser p)
@@ -235,25 +235,25 @@ public class HTMLDocument extends DefaultStyledDocument
/**
* Sets the number of tokens to buffer before trying to display the
* Document.
- *
+ *
* @param n the number of tokens to buffer
*/
public void setTokenThreshold (int n)
{
tokenThreshold = n;
}
-
+
/**
* Returns the number of tokens that are buffered before the document
* is rendered.
- *
+ *
* @return the number of tokens buffered
*/
public int getTokenThreshold ()
{
return tokenThreshold;
}
-
+
/**
* Returns the location against which to resolve relative URLs.
* This is the document's URL if the document was loaded from a URL.
@@ -264,7 +264,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
return baseURL;
}
-
+
/**
* Sets the location against which to resolve relative URLs.
* @param u the new base URL
@@ -274,7 +274,7 @@ public class HTMLDocument extends DefaultStyledDocument
baseURL = u;
getStyleSheet().setBase(u);
}
-
+
/**
* Returns whether or not the parser preserves unknown HTML tags.
* @return true if the parser preserves unknown tags
@@ -283,7 +283,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
return preservesUnknownTags;
}
-
+
/**
* Sets the behaviour of the parser when it encounters unknown HTML tags.
* @param preservesTags true if the parser should preserve unknown tags.
@@ -292,7 +292,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
preservesUnknownTags = preservesTags;
}
-
+
/**
* An iterator to iterate through LeafElements in the document.
*/
@@ -308,7 +308,7 @@ public class HTMLDocument extends DefaultStyledDocument
tag = t;
it = new ElementIterator(doc);
}
-
+
/**
* Return the attributes for the tag associated with this iteartor
* @return the AttributeSet
@@ -464,7 +464,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
int start = el.getStartOffset();
int end = el.getEndOffset();
-
+
StringBuilder html = new StringBuilder();
html.append("<frame");
if (url != null)
@@ -499,7 +499,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
return new HTMLDocument.LeafIterator(t, this);
}
-
+
/**
* An iterator over a particular type of tag.
*/
@@ -510,26 +510,26 @@ public class HTMLDocument extends DefaultStyledDocument
* @return the <code>AttributeSet</code> (null if none found).
*/
public abstract AttributeSet getAttributes();
-
+
/**
* Get the end of the range for the current occurrence of the tag
* being defined and having the same attributes.
* @return the end of the range
*/
public abstract int getEndOffset();
-
+
/**
* Get the start of the range for the current occurrence of the tag
* being defined and having the same attributes.
* @return the start of the range (-1 if it can't be found).
*/
public abstract int getStartOffset();
-
+
/**
* Move the iterator forward.
*/
public abstract void next();
-
+
/**
* Indicates whether or not the iterator currently represents an occurrence
* of the tag.
@@ -537,33 +537,33 @@ public class HTMLDocument extends DefaultStyledDocument
* tag.
*/
public abstract boolean isValid();
-
+
/**
* Type of tag this iterator represents.
* @return the tag.
*/
public abstract HTML.Tag getTag();
}
-
+
public class BlockElement extends AbstractDocument.BranchElement
{
public BlockElement (Element parent, AttributeSet a)
{
super(parent, a);
}
-
+
/**
- * Gets the resolving parent. Since HTML attributes are not
+ * Gets the resolving parent. Since HTML attributes are not
* inherited at the model level, this returns null.
*/
public AttributeSet getResolveParent()
{
return null;
}
-
+
/**
* Gets the name of the element.
- *
+ *
* @return the name of the element if it exists, null otherwise.
*/
public String getName()
@@ -579,29 +579,29 @@ public class HTMLDocument extends DefaultStyledDocument
}
/**
- * RunElement represents a section of text that has a set of
+ * RunElement represents a section of text that has a set of
* HTML character level attributes assigned to it.
*/
public class RunElement extends AbstractDocument.LeafElement
{
-
+
/**
* Constructs an element that has no children. It represents content
* within the document.
- *
+ *
* @param parent - parent of this
* @param a - elements attributes
* @param start - the start offset >= 0
- * @param end - the end offset
+ * @param end - the end offset
*/
public RunElement(Element parent, AttributeSet a, int start, int end)
{
super(parent, a, start, end);
}
-
+
/**
* Gets the name of the element.
- *
+ *
* @return the name of the element if it exists, null otherwise.
*/
public String getName()
@@ -614,11 +614,11 @@ public class HTMLDocument extends DefaultStyledDocument
name = super.getName();
return name;
}
-
+
/**
* Gets the resolving parent. HTML attributes do not inherit at the
* model level, so this method returns null.
- *
+ *
* @return null
*/
public AttributeSet getResolveParent()
@@ -626,10 +626,10 @@ public class HTMLDocument extends DefaultStyledDocument
return null;
}
}
-
+
/**
* A reader to load an HTMLDocument with HTML structure.
- *
+ *
* @author Anthony Balkissoon abalkiss at redhat dot com
*/
public class HTMLReader extends HTMLEditorKit.ParserCallback
@@ -648,51 +648,51 @@ public class HTMLDocument extends DefaultStyledDocument
* Holds the current character attribute set *
*/
protected MutableAttributeSet charAttr = new SimpleAttributeSet();
-
- protected Vector<ElementSpec> parseBuffer = new Vector<ElementSpec>();
+
+ protected Vector<ElementSpec> parseBuffer = new Vector<ElementSpec>();
/**
* The parse stack. It holds the current element tree path.
*/
private Stack<HTML.Tag> parseStack = new Stack<HTML.Tag>();
- /**
+ /**
* A stack for character attribute sets *
*/
Stack charAttrStack = new Stack();
-
+
/** A mapping between HTML.Tag objects and the actions that handle them **/
HashMap tagToAction;
-
+
/** Tells us whether we've received the '</html>' tag yet **/
boolean endHTMLEncountered = false;
-
- /**
- * Related to the constructor with explicit insertTag
+
+ /**
+ * Related to the constructor with explicit insertTag
*/
int popDepth;
-
+
/**
* Related to the constructor with explicit insertTag
- */
+ */
int pushDepth;
-
- /**
+
+ /**
* Related to the constructor with explicit insertTag
- */
+ */
int offset;
-
+
/**
* The tag (inclusve), after that the insertion should start.
*/
HTML.Tag insertTag;
-
+
/**
* This variable becomes true after the insert tag has been encountered.
*/
boolean insertTagEncountered;
-
+
/** A temporary variable that helps with the printing out of debug information **/
boolean debug = false;
@@ -767,7 +767,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
// Nothing to do here.
}
-
+
/**
* Called when an end tag is seen for one of the types of tags associated
* with this Action. By default does nothing.
@@ -779,7 +779,7 @@ public class HTMLDocument extends DefaultStyledDocument
}
public class BlockAction extends TagAction
- {
+ {
/**
* This method is called when a start tag is seen for one of the types
* of tags associated with this Action.
@@ -789,7 +789,7 @@ public class HTMLDocument extends DefaultStyledDocument
// Tell the parse buffer to open a new block for this tag.
blockOpen(t, a);
}
-
+
/**
* Called when an end tag is seen for one of the types of tags associated
* with this Action.
@@ -800,7 +800,7 @@ public class HTMLDocument extends DefaultStyledDocument
blockClose(t);
}
}
-
+
public class CharacterAction extends TagAction
{
/**
@@ -827,7 +827,7 @@ public class HTMLDocument extends DefaultStyledDocument
public void end(HTML.Tag t)
{
popCharacterStyle();
- }
+ }
}
/**
@@ -909,7 +909,7 @@ public class HTMLDocument extends DefaultStyledDocument
super.start(t, a);
}
}
-
+
/**
* Called when an end tag is seen for one of the types of tags associated
* with this Action.
@@ -1012,7 +1012,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
super.end(t);
buttonGroups = null;
- }
+ }
}
/**
@@ -1035,7 +1035,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
blockOpen(t, a);
}
-
+
/**
* Called when an end tag is seen for one of the types of tags associated
* with this Action.
@@ -1043,7 +1043,7 @@ public class HTMLDocument extends DefaultStyledDocument
public void end(HTML.Tag t)
{
blockClose(t);
- }
+ }
}
/**
@@ -1062,7 +1062,7 @@ public class HTMLDocument extends DefaultStyledDocument
blockClose(HTML.Tag.IMPLIED);
}
}
-
+
public class ParagraphAction extends BlockAction
{
/**
@@ -1073,7 +1073,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
super.start(t, a);
}
-
+
/**
* Called when an end tag is seen for one of the types of tags associated
* with this Action.
@@ -1081,7 +1081,7 @@ public class HTMLDocument extends DefaultStyledDocument
public void end(HTML.Tag t)
{
super.end(t);
- }
+ }
}
/**
@@ -1100,7 +1100,7 @@ public class HTMLDocument extends DefaultStyledDocument
a.addAttribute(CSS.Attribute.WHITE_SPACE, "pre");
blockOpen(HTML.Tag.IMPLIED, a);
}
-
+
/**
* Called when an end tag is seen for one of the types of tags associated
* with this Action.
@@ -1110,11 +1110,11 @@ public class HTMLDocument extends DefaultStyledDocument
blockClose(HTML.Tag.IMPLIED);
inPreTag = false;
blockClose(t);
- }
+ }
}
-
+
/**
- * Inserts the elements that are represented by ths single tag with
+ * Inserts the elements that are represented by ths single tag with
* attributes (only). The closing tag, even if present, mut follow
* immediately after the starting tag without providing any additional
* information. Hence the {@link TagAction#end} method need not be
@@ -1130,7 +1130,7 @@ public class HTMLDocument extends DefaultStyledDocument
addSpecialElement(t, a);
}
}
-
+
class AreaAction extends TagAction
{
/**
@@ -1142,7 +1142,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
// FIXME: Implement.
}
-
+
/**
* Called when an end tag is seen for one of the types of tags associated
* with this Action.
@@ -1151,7 +1151,7 @@ public class HTMLDocument extends DefaultStyledDocument
throws NotImplementedException
{
// FIXME: Implement.
- }
+ }
}
/**
@@ -1200,7 +1200,7 @@ public class HTMLDocument extends DefaultStyledDocument
baseTarget = (String) a.getAttribute(HTML.Attribute.TARGET);
}
}
-
+
class HeadAction extends BlockAction
{
/**
@@ -1213,7 +1213,7 @@ public class HTMLDocument extends DefaultStyledDocument
// FIXME: Implement.
super.start(t, a);
}
-
+
/**
* Called when an end tag is seen for one of the types of tags associated
* with this Action.
@@ -1234,7 +1234,7 @@ public class HTMLDocument extends DefaultStyledDocument
super.end(t);
}
}
-
+
class LinkAction extends HiddenAction
{
/**
@@ -1295,13 +1295,13 @@ public class HTMLDocument extends DefaultStyledDocument
ex.printStackTrace();
}
}
- }
+ }
}
}
}
-
+
}
-
+
class MapAction extends TagAction
{
/**
@@ -1313,7 +1313,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
// FIXME: Implement.
}
-
+
/**
* Called when an end tag is seen for one of the types of tags associated
* with this Action.
@@ -1322,9 +1322,9 @@ public class HTMLDocument extends DefaultStyledDocument
throws NotImplementedException
{
// FIXME: Implement.
- }
+ }
}
-
+
class MetaAction extends TagAction
{
/**
@@ -1336,7 +1336,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
// FIXME: Implement.
}
-
+
/**
* Called when an end tag is seen for one of the types of tags associated
* with this Action.
@@ -1345,7 +1345,7 @@ public class HTMLDocument extends DefaultStyledDocument
throws NotImplementedException
{
// FIXME: Implement.
- }
+ }
}
class StyleAction extends TagAction
@@ -1358,7 +1358,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
inStyleTag = true;
}
-
+
/**
* Called when an end tag is seen for one of the types of tags associated
* with this Action.
@@ -1366,9 +1366,9 @@ public class HTMLDocument extends DefaultStyledDocument
public void end(HTML.Tag t)
{
inStyleTag = false;
- }
+ }
}
-
+
class TitleAction extends TagAction
{
/**
@@ -1380,7 +1380,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
// FIXME: Implement.
}
-
+
/**
* Called when an end tag is seen for one of the types of tags associated
* with this Action.
@@ -1389,14 +1389,14 @@ public class HTMLDocument extends DefaultStyledDocument
throws NotImplementedException
{
// FIXME: Implement.
- }
- }
-
+ }
+ }
+
public HTMLReader(int offset)
{
this (offset, 0, 0, null);
}
-
+
public HTMLReader(int offset, int popDepth, int pushDepth,
HTML.Tag insertTag)
{
@@ -1407,7 +1407,7 @@ public class HTMLDocument extends DefaultStyledDocument
threshold = getTokenThreshold();
initTags();
}
-
+
void initTags()
{
tagToAction = new HashMap(72);
@@ -1427,7 +1427,7 @@ public class HTMLDocument extends DefaultStyledDocument
MetaAction metaAction = new MetaAction();
StyleAction styleAction = new StyleAction();
TitleAction titleAction = new TitleAction();
-
+
ConvertAction convertAction = new ConvertAction();
tagToAction.put(HTML.Tag.A, characterAction);
tagToAction.put(HTML.Tag.ADDRESS, characterAction);
@@ -1486,7 +1486,7 @@ public class HTMLDocument extends DefaultStyledDocument
tagToAction.put(HTML.Tag.SELECT, formAction);
tagToAction.put(HTML.Tag.SMALL, characterAction);
tagToAction.put(HTML.Tag.STRIKE, characterAction);
- tagToAction.put(HTML.Tag.S, characterAction);
+ tagToAction.put(HTML.Tag.S, characterAction);
tagToAction.put(HTML.Tag.STRONG, characterAction);
tagToAction.put(HTML.Tag.STYLE, styleAction);
tagToAction.put(HTML.Tag.SUB, characterAction);
@@ -1502,7 +1502,7 @@ public class HTMLDocument extends DefaultStyledDocument
tagToAction.put(HTML.Tag.UL, blockAction);
tagToAction.put(HTML.Tag.VAR, characterAction);
}
-
+
/**
* Pushes the current character style onto the stack.
*
@@ -1511,9 +1511,9 @@ public class HTMLDocument extends DefaultStyledDocument
{
charAttrStack.push(charAttr.copyAttributes());
}
-
+
/**
- * Pops a character style off of the stack and uses it as the
+ * Pops a character style off of the stack and uses it as the
* current character style.
*
*/
@@ -1522,12 +1522,12 @@ public class HTMLDocument extends DefaultStyledDocument
if (!charAttrStack.isEmpty())
charAttr = (MutableAttributeSet) charAttrStack.pop();
}
-
+
/**
* Registers a given tag with a given Action. All of the well-known tags
* are registered by default, but this method can change their behaviour
* or add support for custom or currently unsupported tags.
- *
+ *
* @param t the Tag to register
* @param a the Action for the Tag
*/
@@ -1535,7 +1535,7 @@ public class HTMLDocument extends DefaultStyledDocument
{
tagToAction.put (t, a);
}
-
+
/**
* This is the last method called on the HTMLReader, allowing any pending
* changes to be flushed to the HTMLDocument.
@@ -1565,9 +1565,9 @@ public class HTMLDocument extends DefaultStyledDocument
}
/**
- * This method is called by the parser to indicate a block of
+ * This method is called by the parser to indicate a block of
* text was encountered. Should insert the text appropriately.
- *
+ *
* @param data the text that was inserted
* @param pos the position at which the text was inserted
*/
@@ -1589,15 +1589,15 @@ public class HTMLDocument extends DefaultStyledDocument
}
else
addContent(data, 0, data.length);
-
+
}
}
-
+
/**
* Checks if the HTML tag should be inserted. The tags before insert tag (if
* specified) are not inserted. Also, the tags after the end of the html are
* not inserted.
- *
+ *
* @return true if the tag should be inserted, false otherwise.
*/
private boolean shouldInsert()
@@ -1605,11 +1605,11 @@ public class HTMLDocument extends DefaultStyledDocument
return ! endHTMLEncountered
&& (insertTagEncountered || insertTag == null);
}
-
+
/**
* This method is called by the parser and should route the call to the
* proper handler for the tag.
- *
+ *
* @param t the HTML.Tag
* @param a the attribute set
* @param pos the position at which the tag was encountered
@@ -1626,10 +1626,10 @@ public class HTMLDocument extends DefaultStyledDocument
action.start(t, a);
}
}
-
+
/**
* This method called by parser to handle a comment block.
- *
+ *
* @param data the comment
* @param pos the position at which the comment was encountered
*/
@@ -1645,11 +1645,11 @@ public class HTMLDocument extends DefaultStyledDocument
}
}
}
-
+
/**
* This method is called by the parser and should route the call to the
* proper handler for the tag.
- *
+ *
* @param t the HTML.Tag
* @param pos the position at which the tag was encountered
*/
@@ -1666,11 +1666,11 @@ public class HTMLDocument extends DefaultStyledDocument
action.end(t);
}
}
-
+
/**
* This is a callback from the parser that should be routed to the
* appropriate handler for the tag.
- *
+ *
* @param t the HTML.Tag that was encountered
* @param a the attribute set
* @param pos the position at which the tag was encountered
@@ -1690,12 +1690,12 @@ public class HTMLDocument extends DefaultStyledDocument
}
}
}
-
+
/**
* This is invoked after the stream has been parsed but before it has been
* flushed.
- *
- * @param eol one of \n, \r, or \r\n, whichever was encountered the most in
+ *
+ * @param eol one of \n, \r, or \r\n, whichever was encountered the most in
* parsing the stream
* @since 1.3
*/
@@ -1703,11 +1703,11 @@ public class HTMLDocument extends DefaultStyledDocument
{
// FIXME: Implement.
}
-
+
/**
* Adds the given text to the textarea document. Called only when we are
- * within a textarea.
- *
+ * within a textarea.
+ *
* @param data the text to add to the textarea
*/
protected void textAreaContent(char[] data)
@@ -1726,7 +1726,7 @@ public class HTMLDocument extends DefaultStyledDocument
assert false;
}
}
-
+
/**
* Adds the given text that was encountered in a <PRE> element.
* This adds synthesized lines to hold the text runs.
@@ -1754,11 +1754,11 @@ public class HTMLDocument extends DefaultStyledDocument
addContent(data, start, data.length - start);
}
}
-
+
/**
- * Instructs the parse buffer to create a block element with the given
+ * Instructs the parse buffer to create a block element with the given
* attributes.
- *
+ *
* @param t the tag that requires opening a new block
* @param attr the attribute set for the new block
*/
@@ -1809,9 +1809,9 @@ public class HTMLDocument extends DefaultStyledDocument
}
/**
- * Instructs the parse buffer to close the block element associated with
+ * Instructs the parse buffer to close the block element associated with
* the given HTML.Tag
- *
+ *
* @param t the HTML.Tag that is closing its block
*/
protected void blockClose(HTML.Tag t)
@@ -1837,14 +1837,14 @@ public class HTMLDocument extends DefaultStyledDocument
}
element = new DefaultStyledDocument.ElementSpec(null,
- DefaultStyledDocument.ElementSpec.EndTagType);
+ DefaultStyledDocument.ElementSpec.EndTagType);
parseBuffer.addElement(element);
}
-
+
/**
* Adds text to the appropriate context using the current character
* attribute set.
- *
+ *
* @param data the text to add
* @param offs the offset at which to add it
* @param length the length of the text to add
@@ -1853,11 +1853,11 @@ public class HTMLDocument extends DefaultStyledDocument
{
addContent(data, offs, length, true);
}
-
+
/**
* Adds text to the appropriate context using the current character
* attribute set, and possibly generating an IMPLIED Tag if necessary.
- *
+ *
* @param data the text to add
* @param offs the offset at which to add it
* @param length the length of the text to add
@@ -1876,7 +1876,7 @@ public class HTMLDocument extends DefaultStyledDocument
DefaultStyledDocument.ElementSpec element;
AttributeSet attributes = null;
- // Copy the attribute set, don't use the same object because
+ // Copy the attribute set, don't use the same object because
// it may change
if (charAttr != null)
attributes = charAttr.copyAttributes();
@@ -1887,7 +1887,7 @@ public class HTMLDocument extends DefaultStyledDocument
element = new DefaultStyledDocument.ElementSpec(attributes,
DefaultStyledDocument.ElementSpec.ContentType,
data, offs, length);
-
+
// Add the element to the buffer
parseBuffer.addElement(element);
@@ -1905,10 +1905,10 @@ public class HTMLDocument extends DefaultStyledDocument
}
}
}
-
+
/**
* Adds content that is specified in the attribute set.
- *
+ *
* @param t the HTML.Tag
* @param a the attribute set specifying the special content
*/
@@ -1920,37 +1920,37 @@ public class HTMLDocument extends DefaultStyledDocument
}
a.addAttribute(StyleConstants.NameAttribute, t);
-
+
// The two spaces are required because some special elements like HR
// must be broken. At least two characters are needed to break into the
// two parts.
DefaultStyledDocument.ElementSpec spec =
new DefaultStyledDocument.ElementSpec(a.copyAttributes(),
- DefaultStyledDocument.ElementSpec.ContentType,
+ DefaultStyledDocument.ElementSpec.ContentType,
new char[] {' '}, 0, 1 );
parseBuffer.add(spec);
}
-
+
}
-
+
/**
- * Gets the reader for the parser to use when loading the document with HTML.
- *
+ * Gets the reader for the parser to use when loading the document with HTML.
+ *
* @param pos - the starting position
* @return - the reader
*/
public HTMLEditorKit.ParserCallback getReader(int pos)
{
return new HTMLReader(pos);
- }
-
+ }
+
/**
- * Gets the reader for the parser to use when loading the document with HTML.
- *
+ * Gets the reader for the parser to use when loading the document with HTML.
+ *
* @param pos - the starting position
* @param popDepth - the number of EndTagTypes to generate before inserting
- * @param pushDepth - the number of StartTagTypes with a direction
- * of JoinNextDirection that should be generated before inserting,
+ * @param pushDepth - the number of StartTagTypes with a direction
+ * of JoinNextDirection that should be generated before inserting,
* but after the end tags have been generated.
* @param insertTag - the first tag to start inserting into document
* @return - the reader
@@ -1962,13 +1962,13 @@ public class HTMLDocument extends DefaultStyledDocument
{
return new HTMLReader(pos, popDepth, pushDepth, insertTag);
}
-
+
/**
* Gets the reader for the parser to use when inserting the HTML fragment into
* the document. Checks if the parser is present, sets the parent in the
* element stack and removes any actions for BODY (it can be only one body in
* a HTMLDocument).
- *
+ *
* @param pos - the starting position
* @param popDepth - the number of EndTagTypes to generate before inserting
* @param pushDepth - the number of StartTagTypes with a direction of
@@ -2009,14 +2009,14 @@ public class HTMLDocument extends DefaultStyledDocument
super.handleEndTag(t, pos);
}
};
-
+
return reader;
- }
-
+ }
+
/**
* Gets the child element that contains the attribute with the value or null.
* Not thread-safe.
- *
+ *
* @param e - the element to begin search at
* @param attribute - the desired attribute
* @param value - the desired value
@@ -2029,14 +2029,14 @@ public class HTMLDocument extends DefaultStyledDocument
{
if (e.getAttributes().containsAttribute(attribute, value))
return e;
-
+
int count = e.getElementCount();
for (int j = 0; j < count; j++)
{
Element child = e.getElement(j);
if (child.getAttributes().containsAttribute(attribute, value))
return child;
-
+
Element grandChild = getElement(child, attribute, value);
if (grandChild != null)
return grandChild;
@@ -2044,13 +2044,13 @@ public class HTMLDocument extends DefaultStyledDocument
}
return null;
}
-
+
/**
* Returns the element that has the given id Attribute (for instance, &lt;p id
* ='my paragraph &gt;'). If it is not found, null is returned. The HTML tag,
* having this attribute, is not checked by this method and can be any. The
* method is not thread-safe.
- *
+ *
* @param attrId - the value of the attribute id to look for
* @return the element that has the given id.
*/
@@ -2059,25 +2059,25 @@ public class HTMLDocument extends DefaultStyledDocument
return getElement(getDefaultRootElement(), HTML.Attribute.ID,
attrId);
}
-
+
/**
* Replaces the children of the given element with the contents of
* the string. The document must have an HTMLEditorKit.Parser set.
* This will be seen as at least two events, n inserts followed by a remove.
- *
+ *
* @param elem - the brance element whose children will be replaced
* @param htmlText - the string to be parsed and assigned to element.
* @throws BadLocationException
* @throws IOException
- * @throws IllegalArgumentException - if elem is a leaf
+ * @throws IllegalArgumentException - if elem is a leaf
* @throws IllegalStateException - if an HTMLEditorKit.Parser has not been set
*/
- public void setInnerHTML(Element elem, String htmlText)
+ public void setInnerHTML(Element elem, String htmlText)
throws BadLocationException, IOException
{
if (elem.isLeaf())
throw new IllegalArgumentException("Element is a leaf");
-
+
int start = elem.getStartOffset();
int end = elem.getEndOffset();
@@ -2086,18 +2086,18 @@ public class HTMLDocument extends DefaultStyledDocument
// TODO charset
getParser().parse(new StringReader(htmlText), reader, true);
-
+
// Remove the previous content
remove(start, end - start);
}
-
+
/**
* Replaces the given element in the parent with the string. When replacing a
* leaf, this will attempt to make sure there is a newline present if one is
* needed. This may result in an additional element being inserted. This will
* be seen as at least two events, n inserts followed by a remove. The
* HTMLEditorKit.Parser must be set.
- *
+ *
* @param elem - the branch element whose parent will be replaced
* @param htmlText - the string to be parsed and assigned to elem
* @throws BadLocationException
@@ -2112,18 +2112,18 @@ public void setOuterHTML(Element elem, String htmlText)
int end = elem.getEndOffset();
remove(start, end-start);
-
+
HTMLEditorKit.ParserCallback reader = getInsertingReader(
start, 0, 0, HTML.Tag.BODY, elem);
// TODO charset
getParser().parse(new StringReader(htmlText), reader, true);
}
-
+
/**
* Inserts the string before the start of the given element. The parser must
* be set.
- *
+ *
* @param elem - the element to be the root for the new text.
* @param htmlText - the string to be parsed and assigned to elem
* @throws BadLocationException
@@ -2139,12 +2139,12 @@ public void setOuterHTML(Element elem, String htmlText)
// TODO charset
getParser().parse(new StringReader(htmlText), reader, true);
}
-
+
/**
* Inserts the string at the end of the element. If elem's children are
* leaves, and the character at elem.getEndOffset() - 1 is a newline, then it
* will be inserted before the newline. The parser must be set.
- *
+ *
* @param elem - the element to be the root for the new text
* @param htmlText - the text to insert
* @throws BadLocationException
@@ -2161,11 +2161,11 @@ public void setOuterHTML(Element elem, String htmlText)
getParser().parse(new StringReader(htmlText), reader, true);
}
-
+
/**
* Inserts the string after the end of the given element.
* The parser must be set.
- *
+ *
* @param elem - the element to be the root for the new text
* @param htmlText - the text to insert
* @throws BadLocationException
@@ -2181,11 +2181,11 @@ public void setOuterHTML(Element elem, String htmlText)
// TODO charset
getParser().parse(new StringReader(htmlText), reader, true);
}
-
+
/**
* Inserts the string at the start of the element.
* The parser must be set.
- *
+ *
* @param elem - the element to be the root for the new text
* @param htmlText - the text to insert
* @throws BadLocationException
diff --git a/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java b/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java
index 45381d60..e3505d3 100644
--- a/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java
+++ b/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java
@@ -89,7 +89,7 @@ public class HTMLEditorKit
extends StyledEditorKit
implements Serializable, Cloneable, Accessible
{
-
+
/**
* Fires the hyperlink events on the associated component
* when needed.
@@ -107,16 +107,16 @@ public class HTMLEditorKit
/**
* Constructor
*/
- public LinkController()
+ public LinkController()
{
super();
}
-
+
/**
* Dispatched when the mouse is clicked. If the component
* is read-only, then the clicked event is used to drive an
* attempt to follow the reference specified by a link
- *
+ *
* @param e - the mouse event
*/
public void mouseClicked(MouseEvent e)
@@ -130,20 +130,20 @@ public class HTMLEditorKit
activateLink(pos, editor, e.getX(), e.getY());
}
}
-
+
/**
* Dispatched when the mouse is dragged on a component.
- *
+ *
* @param e - the mouse event.
*/
public void mouseDragged(MouseEvent e)
{
// Nothing to do here.
}
-
+
/**
* Dispatched when the mouse cursor has moved into the component.
- *
+ *
* @param e - the mouse event.
*/
public void mouseMoved(MouseEvent e)
@@ -248,7 +248,7 @@ public class HTMLEditorKit
if (event != null)
editor.fireHyperlinkUpdate(event);
}
-
+
}
/**
@@ -275,7 +275,7 @@ public class HTMLEditorKit
{
URL base = doc.getBase();
url = new URL(base, href);
-
+
}
catch (MalformedURLException ex)
{
@@ -303,11 +303,11 @@ public class HTMLEditorKit
return ev;
}
}
-
+
/**
* This class is used to insert a string of HTML into an existing
* document. At least 2 HTML.Tags need to be supplied. The first Tag (parentTag)
- * identifies the parent in the document to add the elements to. The second, (addTag),
+ * identifies the parent in the document to add the elements to. The second, (addTag),
* identifies that the first tag should be added to the document as seen in the string.
* The parser will generate all appropriate (opening/closing tags_ even if they are not
* in the HTML string passed in.
@@ -315,28 +315,28 @@ public class HTMLEditorKit
public static class InsertHTMLTextAction
extends HTMLTextAction
{
-
+
/**
* Tag in HTML to start adding tags from.
*/
protected HTML.Tag addTag;
-
+
/**
* Alternate tag in HTML to start adding tags from if parentTag is
* not found and alternateParentTag is not found.
- */
+ */
protected HTML.Tag alternateAddTag;
-
+
/**
* Alternate tag to check if parentTag is not found.
*/
protected HTML.Tag alternateParentTag;
-
+
/**
* HTML to insert.
*/
protected String html;
-
+
/**
* Tag to check for in the document.
*/
@@ -344,21 +344,21 @@ public class HTMLEditorKit
/**
* Initializes all fields.
- *
+ *
* @param name - the name of the document.
* @param html - the html to insert
* @param parentTag - the parent tag to check for
* @param addTag - the tag to start adding from
*/
- public InsertHTMLTextAction(String name, String html,
+ public InsertHTMLTextAction(String name, String html,
HTML.Tag parentTag, HTML.Tag addTag)
{
this(name, html, parentTag, addTag, null, null);
}
-
+
/**
* Initializes all fields and calls super
- *
+ *
* @param name - the name of the document.
* @param html - the html to insert
* @param parentTag - the parent tag to check for
@@ -366,9 +366,9 @@ public class HTMLEditorKit
* @param alternateParentTag - the alternate parent tag
* @param alternateAddTag - the alternate add tag
*/
- public InsertHTMLTextAction(String name, String html, HTML.Tag parentTag,
- HTML.Tag addTag, HTML.Tag alternateParentTag,
- HTML.Tag alternateAddTag)
+ public InsertHTMLTextAction(String name, String html, HTML.Tag parentTag,
+ HTML.Tag addTag, HTML.Tag alternateParentTag,
+ HTML.Tag alternateAddTag)
{
super(name);
// Fields are for easy access when the action is applied to an actual
@@ -379,11 +379,11 @@ public class HTMLEditorKit
this.alternateParentTag = alternateParentTag;
this.alternateAddTag = alternateAddTag;
}
-
+
/**
* HTMLEditorKit.insertHTML is called. If an exception is
* thrown, it is wrapped in a RuntimeException and thrown.
- *
+ *
* @param editor - the editor to use to get the editorkit
* @param doc -
* the Document to insert the HTML into.
@@ -419,12 +419,12 @@ public class HTMLEditorKit
+ offset).initCause(ex);
}
}
-
+
/**
* Invoked when inserting at a boundary. Determines the number of pops,
* and then the number of pushes that need to be performed. The it calls
* insertHTML.
- *
+ *
* @param editor -
* the editor to use to get the editorkit
* @param doc -
@@ -449,12 +449,12 @@ public class HTMLEditorKit
insertAtBoundry(editor, doc, offset, insertElement,
html, parentTag, addTag);
}
-
+
/**
- * Invoked when inserting at a boundary. Determines the number of pops,
+ * Invoked when inserting at a boundary. Determines the number of pops,
* and then the number of pushes that need to be performed. The it calls
* insertHTML.
- *
+ *
* @param editor - the editor to use to get the editorkit
* @param doc -
* the Document to insert the HTML into.
@@ -464,7 +464,7 @@ public class HTMLEditorKit
* @param html - the html to insert
* @param parentTag - the parent tag
* @param addTag - the first tag
- *
+ *
* @deprecated as of v1.3, use insertAtBoundary
*/
protected void insertAtBoundry(JEditorPane editor,
@@ -518,10 +518,10 @@ public class HTMLEditorKit
insertHTML(editor, doc, offset, html, pops, pushes, addTag);
}
}
-
+
/**
* Inserts the HTML.
- *
+ *
* @param ae - the action performed
*/
public void actionPerformed(ActionEvent ae)
@@ -619,25 +619,25 @@ public class HTMLEditorKit
}
}
}
-
+
/**
* Abstract Action class that helps inserting HTML into an existing document.
*/
public abstract static class HTMLTextAction
extends StyledEditorKit.StyledTextAction
{
-
+
/**
* Constructor
*/
- public HTMLTextAction(String name)
+ public HTMLTextAction(String name)
{
super(name);
}
-
+
/**
* Gets the HTMLDocument from the JEditorPane.
- *
+ *
* @param e - the editor pane
* @return the html document.
*/
@@ -648,25 +648,25 @@ public class HTMLEditorKit
return (HTMLDocument) d;
throw new IllegalArgumentException("Document is not a HTMLDocument.");
}
-
+
/**
* Gets the HTMLEditorKit
- *
+ *
* @param e - the JEditorPane to get the HTMLEditorKit from.
* @return the HTMLEditorKit
*/
- protected HTMLEditorKit getHTMLEditorKit(JEditorPane e)
+ protected HTMLEditorKit getHTMLEditorKit(JEditorPane e)
{
EditorKit d = e.getEditorKit();
if (d instanceof HTMLEditorKit)
return (HTMLEditorKit) d;
throw new IllegalArgumentException("EditorKit is not a HTMLEditorKit.");
}
-
+
/**
* Returns an array of Elements that contain the offset.
* The first elements corresponds to the roots of the doc.
- *
+ *
* @param doc - the document to get the Elements from.
* @param offset - the offset the Elements must contain
* @return an array of all the elements containing the offset.
@@ -676,7 +676,7 @@ public class HTMLEditorKit
{
return getElementsAt(doc.getDefaultRootElement(), offset, 0);
}
-
+
/**
* Helper function to get all elements using recursion.
*/
@@ -697,12 +697,12 @@ public class HTMLEditorKit
}
return elements;
}
-
+
/**
* Returns the number of elements, starting at the deepest point, needed
* to get an element representing tag. -1 if no elements are found, 0 if
* the parent of the leaf at offset represents the tag.
- *
+ *
* @param doc -
* the document to search
* @param offset -
@@ -718,7 +718,7 @@ public class HTMLEditorKit
Element root = doc.getDefaultRootElement();
int num = -1;
Element next = root.getElement(root.getElementIndex(offset));
-
+
while (!next.isLeaf())
{
num++;
@@ -729,11 +729,11 @@ public class HTMLEditorKit
}
return num;
}
-
+
/**
* Gets the deepest element at offset with the
* matching tag.
- *
+ *
* @param doc - the document to search
* @param offset - the offset to check for
* @param tag - the tag to match
@@ -744,7 +744,7 @@ public class HTMLEditorKit
{
Element element = doc.getDefaultRootElement();
Element tagElement = null;
-
+
while (element != null)
{
Object otag = element.getAttributes().getAttribute(
@@ -753,11 +753,11 @@ public class HTMLEditorKit
tagElement = element;
element = element.getElement(element.getElementIndex(offset));
}
-
+
return tagElement;
}
}
-
+
/**
* A {@link ViewFactory} that is able to create {@link View}s for
* the <code>Element</code>s that are supported.
@@ -765,7 +765,7 @@ public class HTMLEditorKit
public static class HTMLFactory
implements ViewFactory
{
-
+
/**
* Constructor
*/
@@ -773,7 +773,7 @@ public class HTMLEditorKit
{
// Do Nothing here.
}
-
+
/**
* Creates a {@link View} for the specified <code>Element</code>.
*
@@ -815,7 +815,7 @@ public class HTMLEditorKit
view = new BlockView(element, View.X_AXIS);
else if (tag == HTML.Tag.IMG)
view = new ImageView(element);
-
+
else if (tag == HTML.Tag.CONTENT)
view = new InlineView(element);
else if (tag == HTML.Tag.HEAD)
@@ -847,7 +847,7 @@ public class HTMLEditorKit
return view;
}
}
-
+
/**
* The abstract HTML parser declaration.
*/
@@ -888,7 +888,7 @@ public class HTMLEditorKit
{
// Nothing to do here.
}
-
+
/**
* The parser calls this method after it finishes parsing the document.
*/
@@ -1048,9 +1048,9 @@ public class HTMLEditorKit
* The "ident paragraph right" action.
*/
public static final String PARA_INDENT_RIGHT = "html-para-indent-right";
-
+
/**
- * Actions for HTML
+ * Actions for HTML
*/
private static final Action[] defaultActions =
{
@@ -1083,43 +1083,43 @@ public class HTMLEditorKit
"<pre></pre>", HTML.Tag.BODY, HTML.Tag.PRE)
// TODO: The reference impl has an InsertHRAction too.
};
-
+
/**
* The current style sheet.
*/
private StyleSheet styleSheet;
-
+
/**
* The ViewFactory for HTMLFactory.
*/
HTMLFactory viewFactory;
-
+
/**
* The Cursor for links.
*/
Cursor linkCursor;
-
+
/**
* The default cursor.
*/
Cursor defaultCursor;
-
+
/**
* The parser.
*/
Parser parser;
-
+
/**
* The mouse listener used for links.
*/
private LinkController linkController;
-
+
/** The content type */
String contentType = "text/html";
-
+
/** The input attributes defined by default.css */
MutableAttributeSet inputAttributes;
-
+
/** The editor pane used. */
JEditorPane editorPane;
@@ -1139,11 +1139,11 @@ public class HTMLEditorKit
linkController = new LinkController();
autoFormSubmission = true;
}
-
+
/**
- * Gets a factory suitable for producing views of any
+ * Gets a factory suitable for producing views of any
* models that are produced by this kit.
- *
+ *
* @return the view factory suitable for producing views.
*/
public ViewFactory getViewFactory()
@@ -1152,7 +1152,7 @@ public class HTMLEditorKit
viewFactory = new HTMLFactory();
return viewFactory;
}
-
+
/**
* Create a text storage model for this type of editor.
*
@@ -1175,7 +1175,7 @@ public class HTMLEditorKit
/**
* Get the parser that this editor kit uses for reading HTML streams. This
* method can be overridden to use the alternative parser.
- *
+ *
* @return the HTML parser (by default, {@link ParserDelegator}).
*/
protected Parser getParser()
@@ -1186,17 +1186,17 @@ public class HTMLEditorKit
}
return parser;
}
-
+
/**
* Inserts HTML into an existing document.
- *
+ *
* @param doc - the Document to insert the HTML into.
* @param offset - where to begin inserting the HTML.
* @param html - the String to insert
- * @param popDepth - the number of ElementSpec.EndTagTypes
+ * @param popDepth - the number of ElementSpec.EndTagTypes
* to generate before inserting
- * @param pushDepth - the number of ElementSpec.StartTagTypes
- * with a direction of ElementSpec.JoinNextDirection that
+ * @param pushDepth - the number of ElementSpec.StartTagTypes
+ * with a direction of ElementSpec.JoinNextDirection that
* should be generated before
* @param insertTag - the first tag to start inserting into document
* @throws IOException - on any I/O error
@@ -1216,18 +1216,18 @@ public class HTMLEditorKit
ParserCallback pc = doc.getReader(offset, popDepth, pushDepth, insertTag);
// FIXME: What should ignoreCharSet be set to?
-
+
// parser.parse inserts html into the buffer
parser.parse(new StringReader(html), pc, false);
pc.flush();
}
-
+
/**
- * Inserts content from the given stream. Inserting HTML into a non-empty
- * document must be inside the body Element, if you do not insert into
- * the body an exception will be thrown. When inserting into a non-empty
+ * Inserts content from the given stream. Inserting HTML into a non-empty
+ * document must be inside the body Element, if you do not insert into
+ * the body an exception will be thrown. When inserting into a non-empty
* document all tags outside of the body (head, title) will be dropped.
- *
+ *
* @param in - the stream to read from
* @param doc - the destination for the insertion
* @param pos - the location in the document to place the content
@@ -1245,14 +1245,14 @@ public class HTMLEditorKit
throw new BadLocationException("Bad location", pos);
if (parser == null)
throw new IOException("Parser is null.");
-
+
HTMLDocument hd = ((HTMLDocument) doc);
if (editorPane != null)
hd.setBase(editorPane.getPage());
ParserCallback pc = hd.getReader(pos);
-
+
// FIXME: What should ignoreCharSet be set to?
-
+
// parser.parse inserts html into the buffer
parser.parse(in, pc, false);
pc.flush();
@@ -1262,11 +1262,11 @@ public class HTMLEditorKit
// the string is inserted in the document as usual.
super.read(in, doc, pos);
}
-
+
/**
- * Writes content from a document to the given stream in
+ * Writes content from a document to the given stream in
* an appropriate format.
- *
+ *
* @param out - the stream to write to
* @param doc - the source for the write
* @param pos - the location in the document to get the content.
@@ -1293,21 +1293,21 @@ public class HTMLEditorKit
else
super.write(out, doc, pos, len);
}
-
+
/**
* Gets the content type that the kit supports.
* This kit supports the type text/html.
- *
+ *
* @returns the content type supported.
*/
public String getContentType()
{
return contentType;
- }
-
+ }
+
/**
* Creates a copy of the editor kit.
- *
+ *
* @return a copy of this.
*/
public Object clone()
@@ -1317,12 +1317,12 @@ public class HTMLEditorKit
copy.linkController = new LinkController();
return copy;
}
-
+
/**
- * Copies the key/values in elements AttributeSet into set.
+ * Copies the key/values in elements AttributeSet into set.
* This does not copy component, icon, or element names attributes.
- * This is called anytime the caret moves over a different location.
- *
+ * This is called anytime the caret moves over a different location.
+ *
* @param element - the element to create the input attributes for.
* @param set - the set to copy the values into.
*/
@@ -1333,10 +1333,10 @@ public class HTMLEditorKit
set.addAttributes(element.getAttributes());
// FIXME: Not fully implemented.
}
-
+
/**
* Called when this is installed into the JEditorPane.
- *
+ *
* @param c - the JEditorPane installed into.
*/
public void install(JEditorPane c)
@@ -1346,11 +1346,11 @@ public class HTMLEditorKit
c.addMouseMotionListener(linkController);
editorPane = c;
}
-
+
/**
* Called when the this is removed from the JEditorPane.
* It unregisters any listeners.
- *
+ *
* @param c - the JEditorPane being removed from.
*/
public void deinstall(JEditorPane c)
@@ -1360,35 +1360,35 @@ public class HTMLEditorKit
c.removeMouseMotionListener(linkController);
editorPane = null;
}
-
+
/**
* Gets the AccessibleContext associated with this.
- *
+ *
* @return the AccessibleContext for this.
*/
public AccessibleContext getAccessibleContext()
{
- // FIXME: Should return an instance of
+ // FIXME: Should return an instance of
// javax.swing.text.html.AccessibleHTML$RootHTMLAccessibleContext
// Not implemented yet.
return null;
}
-
+
/**
* Gets the action list. This list is supported by the superclass
* augmented by the collection of actions defined locally for style
* operations.
- *
+ *
* @return an array of all the actions
*/
public Action[] getActions()
{
return TextAction.augmentList(super.getActions(), defaultActions);
}
-
+
/**
* Returns the default cursor.
- *
+ *
* @return the default cursor
*/
public Cursor getDefaultCursor()
@@ -1397,10 +1397,10 @@ public class HTMLEditorKit
defaultCursor = Cursor.getDefaultCursor();
return defaultCursor;
}
-
+
/**
* Returns the cursor for links.
- *
+ *
* @return the cursor for links.
*/
public Cursor getLinkCursor()
@@ -1409,42 +1409,42 @@ public class HTMLEditorKit
linkCursor = Cursor.getPredefinedCursor(Cursor.HAND_CURSOR);
return linkCursor;
}
-
+
/**
* Sets the Cursor for links.
- *
+ *
* @param cursor - the new cursor for links.
*/
public void setLinkCursor(Cursor cursor)
{
linkCursor = cursor;
}
-
+
/**
* Sets the default cursor.
- *
+ *
* @param cursor - the new default cursor.
*/
public void setDefaultCursor(Cursor cursor)
{
defaultCursor = cursor;
}
-
+
/**
* Gets the input attributes used for the styled editing actions.
- *
+ *
* @return the attribute set
*/
public MutableAttributeSet getInputAttributes()
{
return inputAttributes;
}
-
+
/**
- * Get the set of styles currently being used to render the HTML elements.
- * By default the resource specified by DEFAULT_CSS gets loaded, and is
+ * Get the set of styles currently being used to render the HTML elements.
+ * By default the resource specified by DEFAULT_CSS gets loaded, and is
* shared by all HTMLEditorKit instances.
- *
+ *
* @return the style sheet.
*/
public StyleSheet getStyleSheet()
@@ -1467,14 +1467,14 @@ public class HTMLEditorKit
}
return styleSheet;
}
-
+
/**
- * Set the set of styles to be used to render the various HTML elements.
- * These styles are specified in terms of CSS specifications. Each document
- * produced by the kit will have a copy of the sheet which it can add the
- * document specific styles to. By default, the StyleSheet specified is shared
- * by all HTMLEditorKit instances.
- *
+ * Set the set of styles to be used to render the various HTML elements.
+ * These styles are specified in terms of CSS specifications. Each document
+ * produced by the kit will have a copy of the sheet which it can add the
+ * document specific styles to. By default, the StyleSheet specified is shared
+ * by all HTMLEditorKit instances.
+ *
* @param s - the new style sheet
*/
public void setStyleSheet(StyleSheet s)
@@ -1505,7 +1505,7 @@ public class HTMLEditorKit
/**
* Sets whether or not the editor kit should automatically submit forms.
- *
+ *
* @param auto <code>true</code> when the editor kit should handle form
* submission, <code>false</code> otherwise
*
diff --git a/libjava/classpath/javax/swing/text/html/HTMLWriter.java b/libjava/classpath/javax/swing/text/html/HTMLWriter.java
index 6a5e6ed..55d25cc 100644
--- a/libjava/classpath/javax/swing/text/html/HTMLWriter.java
+++ b/libjava/classpath/javax/swing/text/html/HTMLWriter.java
@@ -1,4 +1,4 @@
-/* HTMLWriter.java --
+/* HTMLWriter.java --
Copyright (C) 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -76,7 +76,7 @@ public class HTMLWriter
/**
* We keep a reference of the HTMLDocument passed by the construct.
*/
- private HTMLDocument htmlDoc = null;
+ private HTMLDocument htmlDoc = null;
/**
* Used to keep track of which embedded has been written out.
@@ -84,10 +84,10 @@ public class HTMLWriter
private HashSet<HTML.Tag> openEmbeddedTagHashSet = null;
private String new_line_str = "" + NEWLINE;
-
+
private char[] html_entity_char_arr = {'<', '>', '&', '"'};
- private String[] html_entity_escape_str_arr = {"&lt;", "&gt;", "&amp;",
+ private String[] html_entity_escape_str_arr = {"&lt;", "&gt;", "&amp;",
"&quot;"};
// variables used to output Html Fragment
@@ -137,7 +137,7 @@ public class HTMLWriter
doc_len_remaining = len;
htmlFragmentParentHashSet = new HashSet<Element>();
} // public HTMLWriter(Writer writer, HTMLDocument doc, int pos, int len)
-
+
/**
* Call this method to start outputing HTML.
*
@@ -155,7 +155,7 @@ public class HTMLWriter
// Normal traversal.
traverse(rootElem);
} // if(doc_pos == -1 && doc_len == -1)
- else
+ else
{
// Html fragment traversal.
if (doc_pos == -1 || doc_len == -1)
@@ -164,7 +164,7 @@ public class HTMLWriter
startElem = htmlDoc.getCharacterElement(doc_pos);
- int start_offset = startElem.getStartOffset();
+ int start_offset = startElem.getStartOffset();
// Positions before start_offset will not be traversed, and thus
// will not be counted.
@@ -206,7 +206,7 @@ public class HTMLWriter
} // for(int i = 0; i < tag_arr.length; i++)
} // public void write() throws IOException, BadLocationException
-
+
/**
* Writes all the attributes in the attrSet, except for attrbutes with
* keys of <code>javax.swing.text.html.HTML.Tag</code>,
@@ -226,7 +226,7 @@ public class HTMLWriter
{
Object key = attrNameEnum.nextElement();
Object value = attrSet.getAttribute(key);
-
+
// HTML.Attribute.ENDTAG is an instance, not a class.
if (!((key instanceof HTML.Tag) || (key instanceof StyleConstants)
|| (key == HTML.Attribute.ENDTAG)))
@@ -240,7 +240,7 @@ public class HTMLWriter
} // if(!((key instanceof HTML.Tag) || (key instanceof
// StyleConstants) || (key == HTML.Attribute.ENDTAG)))
} // while(attrNameEnum.hasMoreElements())
-
+
} // protected void writeAttributes(AttributeSet attrSet) throws IOException
/**
@@ -266,10 +266,10 @@ public class HTMLWriter
{
writeRaw("</" + elem_name + ">");
} // if(isBlockTag(attrSet))
-
+
} // protected void emptyTag(Element paramElem)
// throws IOException, BadLocationException
-
+
/**
* Determines if it is a block tag or not.
*
@@ -326,7 +326,7 @@ public class HTMLWriter
writeAttributes(attrSet);
writeRaw(">");
- Document tempDocument =
+ Document tempDocument =
(Document) attrSet.getAttribute(StyleConstants.ModelAttribute);
writeRaw(tempDocument.getText(0, tempDocument.getLength()));
@@ -528,9 +528,9 @@ public class HTMLWriter
/**
* Closes out an unwanted embedded tag. The tags from the
* openEmbededTagHashSet not found in attrSet will be written out.
- *
+ *
* @param attrSet the AttributeSet of the element to write out
- *
+ *
* @throws IOException on any I/O exceptions
*/
protected void closeOutUnwantedEmbeddedTags(AttributeSet attrSet)
@@ -542,7 +542,7 @@ public class HTMLWriter
for (int i = 0; i < tag_arr.length; i++)
{
HTML.Tag key = tag_arr[i];
-
+
if (!attrSet.isDefined(key))
{
writeRaw("</" + key.toString() + ">");
@@ -592,10 +592,10 @@ public class HTMLWriter
} // protected void output(char[] chars, int off, int len)
// throws IOException
-
+
//-------------------------------------------------------------------------
// private methods
-
+
/**
* The main method used to traverse through the elements.
*
@@ -627,7 +627,7 @@ public class HTMLWriter
else if (matchNameAttribute(attrSet, HTML.Tag.IMPLIED))
{
int child_elem_count = currElem.getElementCount();
-
+
if (child_elem_count > 0)
{
for (int i = 0; i < child_elem_count; i++)
@@ -665,7 +665,7 @@ public class HTMLWriter
indent();
writeRaw("<title>");
- String title_str =
+ String title_str =
(String) htmlDoc.getProperty(HTMLDocument.TitleProperty);
if (title_str != null)
@@ -726,7 +726,7 @@ public class HTMLWriter
else
{
emptyTag(currElem);
- } // else
+ } // else
} // else
} // else
@@ -842,7 +842,7 @@ public class HTMLWriter
} // else if(matchNameAttribute(attrSet, HTML.Tag.IMPLIED))
} // if(synthesizedElement(paramElem))
else
- {
+ {
// NOTE: 20061030 - fchoong - the isLeaf() condition seems to
// generate the closest behavior to the RI.
if (paramElem.isLeaf())
@@ -880,7 +880,7 @@ public class HTMLWriter
indent();
writeRaw("<title>");
- String title_str =
+ String title_str =
(String) htmlDoc.getProperty(HTMLDocument.TitleProperty);
if (title_str != null)
@@ -941,7 +941,7 @@ public class HTMLWriter
else
{
emptyTag(currElem);
- } // else
+ } // else
} // else
} // else
diff --git a/libjava/classpath/javax/swing/text/html/ImageView.java b/libjava/classpath/javax/swing/text/html/ImageView.java
index bb6af4f..bdbe9b3 100644
--- a/libjava/classpath/javax/swing/text/html/ImageView.java
+++ b/libjava/classpath/javax/swing/text/html/ImageView.java
@@ -26,8 +26,8 @@ import javax.swing.text.html.HTML.Attribute;
/**
* A view, representing a single image, represented by the HTML IMG tag.
- *
- * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
+ *
+ * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
*/
public class ImageView extends View
{
@@ -51,7 +51,7 @@ public class ImageView extends View
boolean ret = (flags & ALLBITS) != 0;
return ret;
}
-
+
}
/**
@@ -64,7 +64,7 @@ public class ImageView extends View
* The image icon, wrapping the image,
*/
Image image;
-
+
/**
* The image state.
*/
@@ -124,7 +124,7 @@ public class ImageView extends View
/**
* Creates the image view that represents the given element.
- *
+ *
* @param element the element, represented by this image view.
*/
public ImageView(Element element)
@@ -136,7 +136,7 @@ public class ImageView extends View
reloadImage = true;
loadOnDemand = false;
}
-
+
/**
* Load or reload the image. This method initiates the image reloading. After
* the image is ready, the repaint event will be scheduled. The current image,
@@ -161,13 +161,13 @@ public class ImageView extends View
loading = false;
}
}
-
+
/**
* Get the image alignment. This method works handling standart alignment
* attributes in the HTML IMG tag (align = top bottom middle left right).
* Depending from the parameter, either horizontal or vertical alingment
* information is returned.
- *
+ *
* @param axis -
* either X_AXIS or Y_AXIS
*/
@@ -175,7 +175,7 @@ public class ImageView extends View
{
AttributeSet attrs = getAttributes();
Object al = attrs.getAttribute(Attribute.ALIGN);
-
+
// Default is top left aligned.
if (al == null)
return 0.0f;
@@ -207,7 +207,7 @@ public class ImageView extends View
else
throw new IllegalArgumentException("axis " + axis);
}
-
+
/**
* Get the text that should be shown as the image replacement and also as the
* image tool tip text. The method returns the value of the attribute, having
@@ -229,7 +229,7 @@ public class ImageView extends View
return u.getFile();
}
}
-
+
/**
* Returns the combination of the document and the style sheet attributes.
*/
@@ -239,7 +239,7 @@ public class ImageView extends View
attributes = getStyleSheet().getViewAttributes(this);
return attributes;
}
-
+
/**
* Get the image to render. May return null if the image is not yet loaded.
*/
@@ -248,13 +248,13 @@ public class ImageView extends View
updateState();
return image;
}
-
+
/**
* Get the URL location of the image to render. If this method returns null,
* the "no image" icon is rendered instead. By defaul, url must be present as
* the "src" property of the IMG tag. If it is missing, null is returned and
* the "no image" icon is rendered.
- *
+ *
* @return the URL location of the image to render.
*/
public URL getImageURL()
@@ -280,17 +280,17 @@ public class ImageView extends View
/**
* Get the icon that should be displayed while the image is loading and hence
* not yet available.
- *
+ *
* @return an icon, showing a non broken sheet of paper with image.
*/
public Icon getLoadingImageIcon()
{
return ImageViewIconFactory.getLoadingImageIcon();
}
-
+
/**
* Get the image loading strategy.
- *
+ *
* @return false (default) if the image is loaded when the view is
* constructed, true if the image is only loaded on demand when
* rendering.
@@ -302,21 +302,21 @@ public class ImageView extends View
/**
* Get the icon that should be displayed when the image is not available.
- *
+ *
* @return an icon, showing a broken sheet of paper with image.
*/
public Icon getNoImageIcon()
{
return ImageViewIconFactory.getNoImageIcon();
}
-
+
/**
* Get the preferred span of the image along the axis. The image size is first
* requested to the attributes {@link Attribute#WIDTH} and
* {@link Attribute#HEIGHT}. If they are missing, and the image is already
* loaded, the image size is returned. If there are no attributes, and the
* image is not loaded, zero is returned.
- *
+ *
* @param axis -
* either X_AXIS or Y_AXIS
* @return either width of height of the image, depending on the axis.
@@ -346,10 +346,10 @@ public class ImageView extends View
else
throw new IllegalArgumentException("axis " + axis);
}
-
+
/**
* Get the associated style sheet from the document.
- *
+ *
* @return the associated style sheet.
*/
protected StyleSheet getStyleSheet()
@@ -361,7 +361,7 @@ public class ImageView extends View
/**
* Get the tool tip text. This is overridden to return the value of the
* {@link #getAltText()}. The parameters are ignored.
- *
+ *
* @return that is returned by getAltText().
*/
public String getToolTipText(float x, float y, Shape shape)
@@ -373,7 +373,7 @@ public class ImageView extends View
* Paints the image or one of the two image state icons. The image is resized
* to the shape bounds. If there is no image available, the alternative text
* is displayed besides the image state icon.
- *
+ *
* @param g
* the Graphics, used for painting.
* @param bounds
@@ -407,7 +407,7 @@ public class ImageView extends View
{
loadOnDemand = load_on_demand;
}
-
+
/**
* Update all cached properties from the attribute set, returned by the
* {@link #getAttributes}.
@@ -429,7 +429,7 @@ public class ImageView extends View
spans[Y_AXIS].setFontBases(emBase, exBase);
}
}
-
+
/**
* Maps the picture co-ordinates into the image position in the model. As the
* image is not divideable, this is currently implemented always to return the
@@ -439,15 +439,15 @@ public class ImageView extends View
{
return getStartOffset();
}
-
+
/**
* This is currently implemented always to return the area of the image view,
* as the image is not divideable by character positions.
- *
+ *
* @param pos character position
* @param area of the image view
* @param bias bias
- *
+ *
* @return the shape, where the given character position should be mapped.
*/
public Shape modelToView(int pos, Shape area, Bias bias)
@@ -455,7 +455,7 @@ public class ImageView extends View
{
return area;
}
-
+
/**
* Starts loading the image asynchronuosly. If the image must be loaded
* synchronuosly instead, the {@link #setLoadsSynchronously} must be
@@ -465,7 +465,7 @@ public class ImageView extends View
{
updateState();
// TODO: Implement this when we have an alt view for the alt=... attribute.
- }
+ }
/**
* This makes sure that the image and properties have been loaded.
@@ -504,7 +504,7 @@ public class ImageView extends View
{
Thread.interrupted();
}
-
+
}
}
image = newImage;
diff --git a/libjava/classpath/javax/swing/text/html/InlineView.java b/libjava/classpath/javax/swing/text/html/InlineView.java
index 58edc73..5376c6b 100644
--- a/libjava/classpath/javax/swing/text/html/InlineView.java
+++ b/libjava/classpath/javax/swing/text/html/InlineView.java
@@ -158,7 +158,7 @@ public class InlineView
return attributes;
}
-
+
public int getBreakWeight(int axis, float pos, float len)
{
int weight;
diff --git a/libjava/classpath/javax/swing/text/html/ListView.java b/libjava/classpath/javax/swing/text/html/ListView.java
index 3e809bb..f05051a 100644
--- a/libjava/classpath/javax/swing/text/html/ListView.java
+++ b/libjava/classpath/javax/swing/text/html/ListView.java
@@ -1,4 +1,4 @@
-/* ListView.java --
+/* ListView.java --
Copyright (C) 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java b/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java
index 9f5f019..3dddfc3 100644
--- a/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java
+++ b/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java
@@ -1,4 +1,4 @@
-/* MinimalHTMLWriter.java --
+/* MinimalHTMLWriter.java --
Copyright (C) 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -59,7 +59,7 @@ import java.awt.Color;
*
* @author Sven de Marothy
*/
-public class MinimalHTMLWriter extends AbstractWriter
+public class MinimalHTMLWriter extends AbstractWriter
{
private StyledDocument doc;
private Deque<String> tagStack;
@@ -114,7 +114,7 @@ public class MinimalHTMLWriter extends AbstractWriter
* Ends a span tag.
*/
protected void endFontTag() throws IOException
- {
+ {
writeEndTag("</span>");
inFontTag = false;
}
@@ -153,7 +153,7 @@ public class MinimalHTMLWriter extends AbstractWriter
/**
* Write the HTML header.
*/
- protected void writeHeader() throws IOException
+ protected void writeHeader() throws IOException
{
writeStartTag("<head>");
writeStartTag("<style>");
@@ -168,7 +168,7 @@ public class MinimalHTMLWriter extends AbstractWriter
* Write a paragraph start tag.
*/
protected void writeStartParagraph(Element elem) throws IOException
- {
+ {
indent();
write("<p class=default>"+NEWLINE); // FIXME: Class value = ?
incrIndent();
@@ -185,7 +185,7 @@ public class MinimalHTMLWriter extends AbstractWriter
/**
* Writes the body of the HTML document.
- */
+ */
protected void writeBody() throws IOException, BadLocationException
{
writeStartTag("<body>");
@@ -195,27 +195,27 @@ public class MinimalHTMLWriter extends AbstractWriter
boolean inParagraph = false;
do
{
- if( e.isLeaf() )
- {
- boolean hasNL = (getText(e).indexOf(NEWLINE) != -1);
- if( !inParagraph && hasText( e ) )
- {
- writeStartParagraph(e);
- inParagraph = true;
- }
-
- if( hasText( e ) )
- writeContent(e, true);
-
- if( hasNL && inParagraph )
- {
- writeEndParagraph();
- inParagraph = false;
- }
- else
- endOpenTags();
- }
- }
+ if( e.isLeaf() )
+ {
+ boolean hasNL = (getText(e).indexOf(NEWLINE) != -1);
+ if( !inParagraph && hasText( e ) )
+ {
+ writeStartParagraph(e);
+ inParagraph = true;
+ }
+
+ if( hasText( e ) )
+ writeContent(e, true);
+
+ if( hasNL && inParagraph )
+ {
+ writeEndParagraph();
+ inParagraph = false;
+ }
+ else
+ endOpenTags();
+ }
+ }
while((e = ei.next()) != null);
writeEndTag("</body>");
@@ -233,28 +233,28 @@ public class MinimalHTMLWriter extends AbstractWriter
{
if(attr.getAttribute(StyleConstants.Bold) != null)
if(((Boolean)attr.getAttribute(StyleConstants.Bold)).booleanValue())
- {
- write("<b>");
- tagStack.push("</b>");
- }
+ {
+ write("<b>");
+ tagStack.push("</b>");
+ }
if(attr.getAttribute(StyleConstants.Italic) != null)
if(((Boolean)attr.getAttribute(StyleConstants.Italic)).booleanValue())
- {
- write("<i>");
- tagStack.push("</i>");
- }
+ {
+ write("<i>");
+ tagStack.push("</i>");
+ }
if(attr.getAttribute(StyleConstants.Underline) != null)
if(((Boolean)attr.getAttribute(StyleConstants.Underline)).booleanValue())
- {
- write("<u>");
- tagStack.push("</u>");
- }
+ {
+ write("<u>");
+ tagStack.push("</u>");
+ }
}
/**
* Returns whether the element contains text or not.
*/
- protected boolean isText(Element elem)
+ protected boolean isText(Element elem)
{
return (elem.getEndOffset() != elem.getStartOffset());
}
@@ -271,7 +271,7 @@ public class MinimalHTMLWriter extends AbstractWriter
writeHTMLTags(elem.getAttributes());
if( isText(elem) )
text(elem);
- else
+ else
writeLeaf(elem);
endOpenTags();
@@ -285,12 +285,12 @@ public class MinimalHTMLWriter extends AbstractWriter
// NOTE: Haven't tested if this is correct.
if(e.getName().equals(StyleConstants.IconElementName))
writeImage(e);
- else
+ else
writeComponent(e);
}
/**
- * Write the HTML attributes which do not have tag equivalents,
+ * Write the HTML attributes which do not have tag equivalents,
* e.g. attributes other than bold/italic/underlined.
*/
protected void writeNonHTMLAttributes(AttributeSet attr) throws IOException
@@ -300,8 +300,8 @@ public class MinimalHTMLWriter extends AbstractWriter
// Alignment? Background?
if( StyleConstants.getForeground(attr) != null )
- style = style + "color: " +
- getColor(StyleConstants.getForeground(attr)) + "; ";
+ style = style + "color: " +
+ getColor(StyleConstants.getForeground(attr)) + "; ";
style = style + "font-size: "+StyleConstants.getFontSize(attr)+"pt; ";
style = style + "font-family: "+StyleConstants.getFontFamily(attr);
@@ -316,15 +316,15 @@ public class MinimalHTMLWriter extends AbstractWriter
{
if(doc instanceof DefaultStyledDocument)
{
- Enumeration<?> styles = ((DefaultStyledDocument)doc).getStyleNames();
- while(styles.hasMoreElements())
- writeStyle(doc.getStyle((String)styles.nextElement()));
+ Enumeration<?> styles = ((DefaultStyledDocument)doc).getStyleNames();
+ while(styles.hasMoreElements())
+ writeStyle(doc.getStyle((String)styles.nextElement()));
}
else
{ // What else to do here?
- Style s = doc.getStyle("default");
- if(s != null)
- writeStyle( s );
+ Style s = doc.getStyle("default");
+ if(s != null)
+ writeStyle( s );
}
}
@@ -336,28 +336,28 @@ public class MinimalHTMLWriter extends AbstractWriter
Enumeration<?> attribs = attr.getAttributeNames();
while(attribs.hasMoreElements())
{
- Object attribName = attribs.nextElement();
- String name = attribName.toString();
- String output = getAttribute(name, attr.getAttribute(attribName));
- if( output != null )
- {
- indent();
- write( output + NEWLINE );
- }
+ Object attribName = attribs.nextElement();
+ String name = attribName.toString();
+ String output = getAttribute(name, attr.getAttribute(attribName));
+ if( output != null )
+ {
+ indent();
+ write( output + NEWLINE );
+ }
}
}
/**
* Deliberately unimplemented, handles component elements.
- */
+ */
protected void writeComponent(Element elem) throws IOException
{
}
/**
- * Deliberately unimplemented.
+ * Deliberately unimplemented.
* Writes StyleConstants.IconElementName elements.
- */
+ */
protected void writeImage(Element elem) throws IOException
{
}
@@ -381,24 +381,24 @@ public class MinimalHTMLWriter extends AbstractWriter
return "family:" + a + ";";
if(name.equals("size"))
{
- int size = ((Integer)a).intValue();
- int htmlSize;
- if( size > 24 )
- htmlSize = 7;
- else if( size > 18 )
- htmlSize = 6;
- else if( size > 14 )
- htmlSize = 5;
- else if( size > 12 )
- htmlSize = 4;
- else if( size > 10 )
- htmlSize = 3;
- else if( size > 8 )
- htmlSize = 2;
- else
- htmlSize = 1;
-
- return "size:" + htmlSize + ";";
+ int size = ((Integer)a).intValue();
+ int htmlSize;
+ if( size > 24 )
+ htmlSize = 7;
+ else if( size > 18 )
+ htmlSize = 6;
+ else if( size > 14 )
+ htmlSize = 5;
+ else if( size > 12 )
+ htmlSize = 4;
+ else if( size > 10 )
+ htmlSize = 3;
+ else if( size > 8 )
+ htmlSize = 2;
+ else
+ htmlSize = 1;
+
+ return "size:" + htmlSize + ";";
}
return null;
@@ -428,8 +428,8 @@ public class MinimalHTMLWriter extends AbstractWriter
if( inFontTag() )
{
- write(""+NEWLINE);
- endFontTag();
+ write(""+NEWLINE);
+ endFontTag();
}
}
diff --git a/libjava/classpath/javax/swing/text/html/MultiAttributeSet.java b/libjava/classpath/javax/swing/text/html/MultiAttributeSet.java
index 2961444..e7fa9f3 100644
--- a/libjava/classpath/javax/swing/text/html/MultiAttributeSet.java
+++ b/libjava/classpath/javax/swing/text/html/MultiAttributeSet.java
@@ -97,7 +97,7 @@ class MultiAttributeSet
}
return current.nextElement();
}
-
+
}
/**
diff --git a/libjava/classpath/javax/swing/text/html/MultiStyle.java b/libjava/classpath/javax/swing/text/html/MultiStyle.java
index 2f43a19..eb62150 100644
--- a/libjava/classpath/javax/swing/text/html/MultiStyle.java
+++ b/libjava/classpath/javax/swing/text/html/MultiStyle.java
@@ -48,7 +48,7 @@ import javax.swing.text.Style;
/**
* A Style implementation that is able to multiplex between several other
* Styles. This is used for CSS style resolving.
- *
+ *
* @author Roman Kennke (kennke@aicas.com)
*/
class MultiStyle
diff --git a/libjava/classpath/javax/swing/text/html/ParagraphView.java b/libjava/classpath/javax/swing/text/html/ParagraphView.java
index d149627..cab8edb 100644
--- a/libjava/classpath/javax/swing/text/html/ParagraphView.java
+++ b/libjava/classpath/javax/swing/text/html/ParagraphView.java
@@ -208,7 +208,7 @@ public class ParagraphView
/**
* Sets the span on the SizeRequirements object according to the
* according CSS span value, when it is set.
- *
+ *
* @param r the size requirements
* @param axis the axis
*
diff --git a/libjava/classpath/javax/swing/text/html/StyleSheet.java b/libjava/classpath/javax/swing/text/html/StyleSheet.java
index c4ddddb..5cf015b 100644
--- a/libjava/classpath/javax/swing/text/html/StyleSheet.java
+++ b/libjava/classpath/javax/swing/text/html/StyleSheet.java
@@ -1,4 +1,4 @@
-/* StyleSheet.java --
+/* StyleSheet.java --
Copyright (C) 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -86,17 +86,17 @@ import javax.swing.text.View;
/**
* This class adds support for defining the visual characteristics of HTML views
* being rendered. This enables views to be customized by a look-and-feel, mulitple
- * views over the same model can be rendered differently. Each EditorPane has its
+ * views over the same model can be rendered differently. Each EditorPane has its
* own StyleSheet, but by default one sheet will be shared by all of the HTMLEditorKit
* instances. An HTMLDocument can also have a StyleSheet, which holds specific CSS
- * specs.
- *
- * In order for Views to store less state and therefore be more lightweight,
- * the StyleSheet can act as a factory for painters that handle some of the
+ * specs.
+ *
+ * In order for Views to store less state and therefore be more lightweight,
+ * the StyleSheet can act as a factory for painters that handle some of the
* rendering tasks. Since the StyleSheet may be used by views over multiple
* documents the HTML attributes don't effect the selector being used.
- *
- * The rules are stored as named styles, and other information is stored to
+ *
+ * The rules are stored as named styles, and other information is stored to
* translate the context of an element to a rule.
*
* @author Lillian Angel (langel@redhat.com)
@@ -234,15 +234,15 @@ public class StyleSheet extends StyleContext
return other.precedence + other.selector.getSpecificity()
- precedence - selector.getSpecificity();
}
-
+
}
/** The base URL */
URL base;
-
+
/** Base font size (int) */
int baseFontSize;
-
+
/**
* The linked style sheets stored.
*/
@@ -273,7 +273,7 @@ public class StyleSheet extends StyleContext
* Gets the style used to render the given tag. The element represents the tag
* and can be used to determine the nesting, where the attributes will differ
* if there is nesting inside of elements.
- *
+ *
* @param t - the tag to translate to visual attributes
* @param e - the element representing the tag
* @return the set of CSS attributes to use to render the tag.
@@ -362,7 +362,7 @@ public class StyleSheet extends StyleContext
* Fetches a resolved style. If there is no resolved style for the
* specified selector, the resolve the style using
* {@link #resolveStyle(String, List, HTML.Tag)}.
- *
+ *
* @param selector the selector for which to resolve the style
* @param path the Element path, used in the resolving algorithm
* @param tag the tag for which to resolve
@@ -435,7 +435,7 @@ public class StyleSheet extends StyleContext
* @return the resolved style
*/
private Style resolveStyle(String selector, String[] tags,
- List<Map<String,String>> attributes)
+ List<Map<String,String>> attributes)
{
// FIXME: This style resolver is not correct. But it works good enough for
// the default.css.
@@ -471,9 +471,9 @@ public class StyleSheet extends StyleContext
/**
* Gets the rule that best matches the selector. selector is a space
- * separated String of element names. The attributes of the returned
+ * separated String of element names. The attributes of the returned
* Style will change as rules are added and removed.
- *
+ *
* @param selector - the element names separated by spaces
* @return the set of CSS attributes to use to render
*/
@@ -488,11 +488,11 @@ public class StyleSheet extends StyleContext
}
return best;
}
-
+
/**
* Adds a set of rules to the sheet. The rules are expected to be in valid
* CSS format. This is called as a result of parsing a <style> tag
- *
+ *
* @param rule - the rule to add to the sheet
*/
public void addRule(String rule)
@@ -514,11 +514,11 @@ public class StyleSheet extends StyleContext
// on next stylesheet request.
resolvedStyles.clear();
}
-
+
/**
* Translates a CSS declaration into an AttributeSet. This is called
* as a result of encountering an HTML style attribute.
- *
+ *
* @param decl - the declaration to get
* @return the AttributeSet representing the declaration
*/
@@ -527,13 +527,13 @@ public class StyleSheet extends StyleContext
if (decl == null)
return SimpleAttributeSet.EMPTY;
// FIXME: Not implemented.
- return null;
+ return null;
}
-
+
/**
* Loads a set of rules that have been specified in terms of CSS grammar.
* If there are any conflicts with existing rules, the new rule is added.
- *
+ *
* @param in - the stream to read the CSS grammar from.
* @param ref - the reference URL. It is the location of the stream, it may
* be null. All relative URLs specified in the stream will be based upon this
@@ -549,11 +549,11 @@ public class StyleSheet extends StyleContext
CSSParser parser = new CSSParser(in, cb);
parser.parse();
}
-
+
/**
* Gets a set of attributes to use in the view. This is a set of
* attributes that can be used for View.getAttributes
- *
+ *
* @param v - the view to get the set for
* @return the AttributeSet to use in the view.
*/
@@ -561,10 +561,10 @@ public class StyleSheet extends StyleContext
{
return new ViewAttributeSet(v, this);
}
-
+
/**
* Removes a style previously added.
- *
+ *
* @param nm - the name of the style to remove
*/
public void removeStyle(String nm)
@@ -572,12 +572,12 @@ public class StyleSheet extends StyleContext
// FIXME: Not implemented.
super.removeStyle(nm);
}
-
+
/**
* Adds the rules from ss to those of the receiver. ss's rules will
* override the old rules. An added StyleSheet will never override the rules
* of the receiving style sheet.
- *
+ *
* @param ss - the new StyleSheet.
*/
public void addStyleSheet(StyleSheet ss)
@@ -586,10 +586,10 @@ public class StyleSheet extends StyleContext
linked = new ArrayList<StyleSheet>();
linked.add(ss);
}
-
+
/**
* Removes ss from those of the receiver
- *
+ *
* @param ss - the StyleSheet to remove.
*/
public void removeStyleSheet(StyleSheet ss)
@@ -599,10 +599,10 @@ public class StyleSheet extends StyleContext
linked.remove(ss);
}
}
-
+
/**
* Returns an array of the linked StyleSheets. May return null.
- *
+ *
* @return - An array of the linked StyleSheets.
*/
public StyleSheet[] getStyleSheets()
@@ -619,12 +619,12 @@ public class StyleSheet extends StyleContext
}
return linkedSS;
}
-
+
/**
* Imports a style sheet from the url. The rules are directly added to the
* receiver. This is usually called when a <link> tag is resolved in an
* HTML document.
- *
+ *
* @param url the URL to import the StyleSheet from
*/
public void importStyleSheet(URL url)
@@ -643,11 +643,11 @@ public class StyleSheet extends StyleContext
// We can't do anything about it I guess.
}
}
-
+
/**
* Sets the base url. All import statements that are relative, will be
* relative to base.
- *
+ *
* @param base -
* the base URL.
*/
@@ -655,20 +655,20 @@ public class StyleSheet extends StyleContext
{
this.base = base;
}
-
+
/**
* Gets the base url.
- *
+ *
* @return - the base
*/
public URL getBase()
{
return base;
}
-
+
/**
* Adds a CSS attribute to the given set.
- *
+ *
* @param attr - the attribute set
* @param key - the attribute to add
* @param value - the value of the key
@@ -680,13 +680,13 @@ public class StyleSheet extends StyleContext
CSS.addInternal(attr, key, value);
attr.addAttribute(key, val);
}
-
+
/**
* Adds a CSS attribute to the given set.
- * This method parses the value argument from HTML based on key.
- * Returns true if it finds a valid value for the given key,
+ * This method parses the value argument from HTML based on key.
+ * Returns true if it finds a valid value for the given key,
* and false otherwise.
- *
+ *
* @param attr - the attribute set
* @param key - the attribute to add
* @param value - the value of the key
@@ -699,10 +699,10 @@ public class StyleSheet extends StyleContext
attr.addAttribute(key, value);
return attr.containsAttribute(key, value);
}
-
+
/**
* Converts a set of HTML attributes to an equivalent set of CSS attributes.
- *
+ *
* @param htmlAttrSet - the set containing the HTML attributes.
* @return the set of CSS attributes
*/
@@ -772,7 +772,7 @@ public class StyleSheet extends StyleContext
* Translates a HTML border attribute to a corresponding set of CSS
* attributes.
*
- * @param cssAttr the original set of CSS attributes to add to
+ * @param cssAttr the original set of CSS attributes to add to
* @param o the value of the border attribute
*
* @return the new set of CSS attributes
@@ -799,24 +799,24 @@ public class StyleSheet extends StyleContext
* to convert StyleConstants attributes to CSS before forwarding them to the superclass.
* The StyleConstants attribute do not have corresponding CSS entry, the attribute
* is stored (but will likely not be used).
- *
+ *
* @param old - the old set
* @param key - the non-null attribute key
* @param value - the attribute value
- * @return the updated set
+ * @return the updated set
*/
public AttributeSet addAttribute(AttributeSet old, Object key,
Object value)
{
// FIXME: Not implemented.
- return super.addAttribute(old, key, value);
+ return super.addAttribute(old, key, value);
}
-
+
/**
* Adds a set of attributes to the element. If any of these attributes are
- * StyleConstants, they will be converted to CSS before forwarding to the
+ * StyleConstants, they will be converted to CSS before forwarding to the
* superclass.
- *
+ *
* @param old - the old set
* @param attr - the attributes to add
* @return the updated attribute set
@@ -824,44 +824,44 @@ public class StyleSheet extends StyleContext
public AttributeSet addAttributes(AttributeSet old, AttributeSet attr)
{
// FIXME: Not implemented.
- return super.addAttributes(old, attr);
+ return super.addAttributes(old, attr);
}
-
+
/**
* Removes an attribute from the set. If the attribute is a
- * StyleConstants, it will be converted to CSS before forwarding to the
+ * StyleConstants, it will be converted to CSS before forwarding to the
* superclass.
- *
+ *
* @param old - the old set
* @param key - the non-null attribute key
- * @return the updated set
+ * @return the updated set
*/
public AttributeSet removeAttribute(AttributeSet old, Object key)
{
// FIXME: Not implemented.
- return super.removeAttribute(old, key);
+ return super.removeAttribute(old, key);
}
-
+
/**
* Removes an attribute from the set. If any of the attributes are
- * StyleConstants, they will be converted to CSS before forwarding to the
+ * StyleConstants, they will be converted to CSS before forwarding to the
* superclass.
- *
+ *
* @param old - the old set
* @param attrs - the attributes to remove
- * @return the updated set
+ * @return the updated set
*/
public AttributeSet removeAttributes(AttributeSet old, AttributeSet attrs)
{
// FIXME: Not implemented.
- return super.removeAttributes(old, attrs);
+ return super.removeAttributes(old, attrs);
}
-
+
/**
* Removes a set of attributes for the element. If any of the attributes is a
- * StyleConstants, they will be converted to CSS before forwarding to the
+ * StyleConstants, they will be converted to CSS before forwarding to the
* superclass.
- *
+ *
* @param old - the old attribute set
* @param names - the attribute names
* @return the update attribute set
@@ -871,35 +871,35 @@ public class StyleSheet extends StyleContext
// FIXME: Not implemented.
return super.removeAttributes(old, names);
}
-
+
/**
* Creates a compact set of attributes that might be shared. This is a hook
* for subclasses that want to change the behaviour of SmallAttributeSet.
- *
+ *
* @param a - the set of attributes to be represented in the compact form.
* @return the set of attributes created
*/
protected StyleContext.SmallAttributeSet createSmallAttributeSet(AttributeSet a)
{
- return super.createSmallAttributeSet(a);
+ return super.createSmallAttributeSet(a);
}
-
+
/**
* Creates a large set of attributes. This set is not shared. This is a hook
* for subclasses that want to change the behaviour of the larger attribute
* storage format.
- *
+ *
* @param a - the set of attributes to be represented in the larger form.
* @return the large set of attributes.
*/
protected MutableAttributeSet createLargeAttributeSet(AttributeSet a)
{
- return super.createLargeAttributeSet(a);
+ return super.createLargeAttributeSet(a);
}
-
+
/**
* Gets the font to use for the given set.
- *
+ *
* @param a - the set to get the font for.
* @return the font for the set
*/
@@ -978,7 +978,7 @@ public class StyleSheet extends StyleContext
AttributeSet resolver = atts.getResolveParent();
if (resolver != null)
parSize = getFontSize(resolver);
- size = fs.getValue(parSize);
+ size = fs.getValue(parSize);
}
else
{
@@ -998,7 +998,7 @@ public class StyleSheet extends StyleContext
* Takes a set of attributes and turns it into a foreground
* color specification. This is used to specify things like, brigher, more hue
* etc.
- *
+ *
* @param a - the set to get the foreground color for
* @return the foreground color for the set
*/
@@ -1008,14 +1008,14 @@ public class StyleSheet extends StyleContext
Color color = null;
if (c != null)
color = c.getValue();
- return color;
+ return color;
}
-
+
/**
* Takes a set of attributes and turns it into a background
* color specification. This is used to specify things like, brigher, more hue
* etc.
- *
+ *
* @param a - the set to get the background color for
* @return the background color for the set
*/
@@ -1025,34 +1025,34 @@ public class StyleSheet extends StyleContext
Color color = null;
if (c != null)
color = c.getValue();
- return color;
+ return color;
}
-
+
/**
* Gets the box formatter to use for the given set of CSS attributes.
- *
+ *
* @param a - the given set
* @return the box formatter
*/
public BoxPainter getBoxPainter(AttributeSet a)
{
- return new BoxPainter(a, this);
+ return new BoxPainter(a, this);
}
-
+
/**
* Gets the list formatter to use for the given set of CSS attributes.
- *
+ *
* @param a - the given set
* @return the list formatter
*/
public ListPainter getListPainter(AttributeSet a)
{
- return new ListPainter(a, this);
+ return new ListPainter(a, this);
}
-
+
/**
* Sets the base font size between 1 and 7.
- *
+ *
* @param sz - the new font size for the base.
*/
public void setBaseFontSize(int sz)
@@ -1060,12 +1060,12 @@ public class StyleSheet extends StyleContext
if (sz <= 7 && sz >= 1)
baseFontSize = sz;
}
-
+
/**
* Sets the base font size from the String. It can either identify
* a specific font size (between 1 and 7) or identify a relative
* font size such as +1 or -2.
- *
+ *
* @param size - the new font size as a String.
*/
public void setBaseFontSize(String size)
@@ -1093,10 +1093,10 @@ public class StyleSheet extends StyleContext
// Do nothing here
}
}
-
+
/**
* TODO
- *
+ *
* @param pt - TODO
* @return TODO
*/
@@ -1105,35 +1105,35 @@ public class StyleSheet extends StyleContext
// FIXME: Not implemented.
return 0;
}
-
+
/**
* Gets the point size, given a size index.
- *
+ *
* @param index - the size index
* @return the point size.
*/
public float getPointSize(int index)
{
// FIXME: Not implemented.
- return 0;
+ return 0;
}
-
+
/**
* Given the string of the size, returns the point size value.
- *
+ *
* @param size - the string representation of the size.
* @return - the point size value.
*/
public float getPointSize(String size)
{
// FIXME: Not implemented.
- return 0;
+ return 0;
}
-
+
/**
* Convert the color string represenation into java.awt.Color. The valid
* values are like "aqua" , "#00FFFF" or "rgb(1,6,44)".
- *
+ *
* @param colorName the color to convert.
* @return the matching java.awt.color
*/
@@ -1141,14 +1141,14 @@ public class StyleSheet extends StyleContext
{
return CSSColor.convertValue(colorName);
}
-
+
/**
* This class carries out some of the duties of CSS formatting. This enables views
* to present the CSS formatting while not knowing how the CSS values are cached.
- *
+ *
* This object is reponsible for the insets of a View and making sure
* the background is maintained according to the CSS attributes.
- *
+ *
* @author Lillian Angel (langel@redhat.com)
*/
public static class BoxPainter extends Object implements Serializable
@@ -1191,7 +1191,7 @@ public class StyleSheet extends StyleContext
/**
* Package-private constructor.
- *
+ *
* @param as - AttributeSet for painter
*/
BoxPainter(AttributeSet as, StyleSheet ss)
@@ -1257,12 +1257,12 @@ public class StyleSheet extends StyleContext
background = ss.getBackground(as);
}
-
-
+
+
/**
* Gets the inset needed on a given side to account for the margin, border
* and padding.
- *
+ *
* @param size - the size of the box to get the inset for. View.TOP, View.LEFT,
* View.BOTTOM or View.RIGHT.
* @param v - the view making the request. This is used to get the AttributeSet,
@@ -1304,11 +1304,11 @@ public class StyleSheet extends StyleContext
}
return inset;
}
-
+
/**
* Paints the CSS box according to the attributes given. This should
* paint the border, padding and background.
- *
+ *
* @param g - the graphics configuration
* @param x - the x coordinate
* @param y - the y coordinate
@@ -1333,12 +1333,12 @@ public class StyleSheet extends StyleContext
}
}
}
-
+
/**
* This class carries out some of the CSS list formatting duties. Implementations
* of this class enable views to present the CSS formatting while not knowing anything
* about how the CSS values are being cached.
- *
+ *
* @author Lillian Angel (langel@redhat.com)
*/
public static class ListPainter implements Serializable
@@ -1361,7 +1361,7 @@ public class StyleSheet extends StyleContext
/**
* Package-private constructor.
- *
+ *
* @param as - AttributeSet for painter
*/
ListPainter(AttributeSet as, StyleSheet ss)
@@ -1378,7 +1378,7 @@ public class StyleSheet extends StyleContext
/**
* Paints the CSS list decoration according to the attributes given.
- *
+ *
* @param g - the graphics configuration
* @param x - the x coordinate
* @param y - the y coordinate
@@ -1410,7 +1410,7 @@ public class StyleSheet extends StyleContext
{
View v1 = itemView.getView(0);
if (v1 instanceof ParagraphView && v1.getViewCount() > 0)
- {
+ {
Shape a1 = itemView.getChildAllocation(0, tmpRect);
Rectangle r1 = a1 instanceof Rectangle ? (Rectangle) a1
: a1.getBounds();
diff --git a/libjava/classpath/javax/swing/text/html/TableView.java b/libjava/classpath/javax/swing/text/html/TableView.java
index 912240c..2ad1b6d 100644
--- a/libjava/classpath/javax/swing/text/html/TableView.java
+++ b/libjava/classpath/javax/swing/text/html/TableView.java
@@ -477,7 +477,7 @@ class TableView
* Overridden to perform the table layout before calling the super
* implementation.
*/
- protected void layoutMinorAxis(int targetSpan, int axis, int[] offsets,
+ protected void layoutMinorAxis(int targetSpan, int axis, int[] offsets,
int[] spans)
{
updateGrid();
diff --git a/libjava/classpath/javax/swing/text/html/ViewAttributeSet.java b/libjava/classpath/javax/swing/text/html/ViewAttributeSet.java
index 8838646..fb57872 100644
--- a/libjava/classpath/javax/swing/text/html/ViewAttributeSet.java
+++ b/libjava/classpath/javax/swing/text/html/ViewAttributeSet.java
@@ -109,7 +109,7 @@ class ViewAttributeSet
{
HTML.Tag tag =
(HTML.Tag) elAtts.getAttribute(StyleConstants.NameAttribute);
- AttributeSet rule = styleSheet.getRule(tag, el);
+ AttributeSet rule = styleSheet.getRule(tag, el);
if (rule != null)
atts.add(rule);
}
diff --git a/libjava/classpath/javax/swing/text/html/parser/Entity.java b/libjava/classpath/javax/swing/text/html/parser/Entity.java
index 1d59df2..d40fb94 100644
--- a/libjava/classpath/javax/swing/text/html/parser/Entity.java
+++ b/libjava/classpath/javax/swing/text/html/parser/Entity.java
@@ -170,14 +170,14 @@ public final class Entity
return sdata;
}
-
+
/**
* Get the entity type.
* @return the value of the {@link #type}.
*/
- public int getType()
+ public int getType()
{
return type;
- }
-
+ }
+
}
diff --git a/libjava/classpath/javax/swing/text/html/parser/Parser.java b/libjava/classpath/javax/swing/text/html/parser/Parser.java
index a88e9ce..f3faa25 100644
--- a/libjava/classpath/javax/swing/text/html/parser/Parser.java
+++ b/libjava/classpath/javax/swing/text/html/parser/Parser.java
@@ -73,7 +73,7 @@ import javax.swing.text.SimpleAttributeSet;
* </p>
* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
*/
-public class Parser
+public class Parser
implements DTDConstants
{
/**
diff --git a/libjava/classpath/javax/swing/text/rtf/RTFParser.java b/libjava/classpath/javax/swing/text/rtf/RTFParser.java
index de1b1c6..3306056 100644
--- a/libjava/classpath/javax/swing/text/rtf/RTFParser.java
+++ b/libjava/classpath/javax/swing/text/rtf/RTFParser.java
@@ -139,7 +139,7 @@ class RTFParser
parseHeader();
parseDocument();
-
+
Token t2 = scanner.peekToken();
if (t2.type == Token.RCURLY)
{
diff --git a/libjava/classpath/javax/swing/text/rtf/RTFScanner.java b/libjava/classpath/javax/swing/text/rtf/RTFScanner.java
index 060e087..2eca159 100644
--- a/libjava/classpath/javax/swing/text/rtf/RTFScanner.java
+++ b/libjava/classpath/javax/swing/text/rtf/RTFScanner.java
@@ -50,7 +50,7 @@ import java.io.Reader;
*
* This scanner is based upon the RTF specification 1.6
* available at:
- *
+ *
* <a
* href="http://msdn.microsoft.com/library/en-us/dnrtfspec/html/rtfspec.asp">
* RTF specification at MSDN</a>
diff --git a/libjava/classpath/javax/swing/tree/AbstractLayoutCache.java b/libjava/classpath/javax/swing/tree/AbstractLayoutCache.java
index 4a6899f..29ce165 100644
--- a/libjava/classpath/javax/swing/tree/AbstractLayoutCache.java
+++ b/libjava/classpath/javax/swing/tree/AbstractLayoutCache.java
@@ -45,7 +45,7 @@ import javax.swing.event.TreeModelEvent;
/**
* class AbstractLayoutCache
- *
+ *
* @author Andrew Selkirk
*/
public abstract class AbstractLayoutCache
@@ -69,7 +69,7 @@ public abstract class AbstractLayoutCache
* the method is overridden, like if {@link FixedHeightLayoutCache}. If the
* method is not overridden and the property is not set, the InternalError is
* thrown.
- *
+ *
* @param value the last node in the path
* @param row the node row
* @param depth the indentation depth
@@ -116,7 +116,7 @@ public abstract class AbstractLayoutCache
/**
* setNodeDimensions
- *
+ *
* @param dimensions TODO
*/
public void setNodeDimensions(NodeDimensions dimensions)
@@ -126,7 +126,7 @@ public abstract class AbstractLayoutCache
/**
* getNodeDimensions
- *
+ *
* @return NodeDimensions
*/
public NodeDimensions getNodeDimensions()
@@ -139,7 +139,7 @@ public abstract class AbstractLayoutCache
* (unless the method is overridden, like if
* {@link FixedHeightLayoutCache}. If the method is not overridden and
* the property is not set, the InternalError is thrown.
- *
+ *
* @param value the last node in the path
* @param row the node row
* @param depth the indentation depth
@@ -152,13 +152,13 @@ public abstract class AbstractLayoutCache
Rectangle d = null;
if (nodeDimensions != null)
d = nodeDimensions.getNodeDimensions(value, row, depth, expanded,
- bounds);
+ bounds);
return d;
}
/**
* Sets the model that provides the tree data.
- *
+ *
* @param model the model
*/
public void setModel(TreeModel model)
@@ -168,7 +168,7 @@ public abstract class AbstractLayoutCache
/**
* Returns the model that provides the tree data.
- *
+ *
* @return the model
*/
public TreeModel getModel()
@@ -178,7 +178,7 @@ public abstract class AbstractLayoutCache
/**
* setRootVisible
- *
+ *
* @param visible <code>true</code> if root should be visible,
* <code>false</code> otherwise
*/
@@ -189,7 +189,7 @@ public abstract class AbstractLayoutCache
/**
* isRootVisible
- *
+ *
* @return <code>true</code> if root is visible,
* <code>false</code> otherwise
*/
@@ -200,7 +200,7 @@ public abstract class AbstractLayoutCache
/**
* setRowHeight
- *
+ *
* @param height the row height
*/
public void setRowHeight(int height)
@@ -211,7 +211,7 @@ public abstract class AbstractLayoutCache
/**
* getRowHeight
- *
+ *
* @return the row height
*/
public int getRowHeight()
@@ -221,7 +221,7 @@ public abstract class AbstractLayoutCache
/**
* setSelectionModel
- *
+ *
* @param model the model
*/
public void setSelectionModel(TreeSelectionModel model)
@@ -231,12 +231,12 @@ public abstract class AbstractLayoutCache
treeSelectionModel = model;
if (treeSelectionModel != null)
treeSelectionModel.setRowMapper(this);
-
+
}
/**
* getSelectionModel
- *
+ *
* @return the model
*/
public TreeSelectionModel getSelectionModel()
@@ -246,7 +246,7 @@ public abstract class AbstractLayoutCache
/**
* Get the sum of heights for all rows. This class provides a general not
- * optimized implementation that is overridded in derived classes
+ * optimized implementation that is overridded in derived classes
* ({@link VariableHeightLayoutCache}, {@link FixedHeightLayoutCache}) for
* the better performance.
*/
@@ -265,10 +265,10 @@ public abstract class AbstractLayoutCache
/**
* Get the maximal width. This class provides a general not
- * optimized implementation that is overridded in derived classes
+ * optimized implementation that is overridded in derived classes
* ({@link VariableHeightLayoutCache}, {@link FixedHeightLayoutCache}) for
* the better performance.
- *
+ *
* @param rect the rectangle that is used during the method work
*/
public int getPreferredWidth(Rectangle rect)
@@ -279,7 +279,7 @@ public abstract class AbstractLayoutCache
for (int i = 0; i < n; i++)
{
TreePath path = getPathForRow(i);
- r.setBounds(0, 0, 0, 0);
+ r.setBounds(0, 0, 0, 0);
r = getBounds(path, r);
if (r.x + r.width > maximalWidth)
maximalWidth = r.x + r.width;
@@ -292,90 +292,90 @@ public abstract class AbstractLayoutCache
}
/**
* isExpanded
- *
+ *
* @param value0 TODO
- *
+ *
* @return boolean
*/
public abstract boolean isExpanded(TreePath value0);
/**
* getBounds
- *
+ *
* @param value0 TODO
* @param value1 TODO
- *
+ *
* @return Rectangle
*/
public abstract Rectangle getBounds(TreePath value0, Rectangle value1);
/**
* getPathForRow
- *
+ *
* @param row the row
- *
+ *
* @return the tree path
*/
public abstract TreePath getPathForRow(int row);
/**
* getRowForPath
- *
+ *
* @param path the tree path
- *
+ *
* @return the row
*/
public abstract int getRowForPath(TreePath path);
/**
* getPathClosestTo
- *
+ *
* @param value0 TODO
* @param value1 TODO
- *
+ *
* @return the tree path
*/
public abstract TreePath getPathClosestTo(int value0, int value1);
/**
* getVisiblePathsFrom
- *
+ *
* @param path the tree path
- *
+ *
* @return Enumeration
*/
public abstract Enumeration<TreePath> getVisiblePathsFrom(TreePath path);
/**
* getVisibleChildCount
- *
+ *
* @param path the tree path
- *
+ *
* @return int
*/
public abstract int getVisibleChildCount(TreePath path);
/**
* setExpandedState
- *
+ *
* @param value0 TODO
- *
+ *
* @param value1 TODO
*/
public abstract void setExpandedState(TreePath value0, boolean value1);
/**
* getExpandedState
- *
+ *
* @param path the tree path
- *
+ *
* @return boolean
*/
public abstract boolean getExpandedState(TreePath path);
/**
* getRowCount
- *
+ *
* @return the number of rows
*/
public abstract int getRowCount();
@@ -387,35 +387,35 @@ public abstract class AbstractLayoutCache
/**
* invalidatePathBounds
- *
+ *
* @param path the tree path
*/
public abstract void invalidatePathBounds(TreePath path);
/**
* treeNodesChanged
- *
+ *
* @param event the event to send
*/
public abstract void treeNodesChanged(TreeModelEvent event);
/**
* treeNodesInserted
- *
+ *
* @param event the event to send
*/
public abstract void treeNodesInserted(TreeModelEvent event);
/**
* treeNodesRemoved
- *
+ *
* @param event the event to send
*/
public abstract void treeNodesRemoved(TreeModelEvent event);
/**
* treeStructureChanged
- *
+ *
* @param event the event to send
*/
public abstract void treeStructureChanged(TreeModelEvent event);
@@ -426,7 +426,7 @@ public abstract class AbstractLayoutCache
* one. To have the benefit from the bulk conversion, the method must be
* overridden in the derived classes. The default method delegates work
* to the {@link #getRowForPath(TreePath)}.
- *
+ *
* @param paths the tree paths the array of the tree pathes.
* @return the array of the matching tree rows.
*/
@@ -445,7 +445,7 @@ public abstract class AbstractLayoutCache
/**
* Returns true if this layout supposes that all rows have the fixed
* height.
- *
+ *
* @return boolean true if all rows in the tree must have the fixed
* height (false by default).
*/
diff --git a/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java b/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java
index e4cc978..260c385 100644
--- a/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java
@@ -101,7 +101,7 @@ public class DefaultMutableTreeNode
/**
* Creates a <code>DefaultMutableTreeNode</code> object with the given
- * user object attached to it. This is equivalent to
+ * user object attached to it. This is equivalent to
* <code>DefaultMutableTreeNode(userObject, true)</code>.
*
* @param userObject the user object (<code>null</code> permitted).
@@ -126,7 +126,7 @@ public class DefaultMutableTreeNode
}
/**
- * Returns a clone of the node. The clone contains a shallow copy of the
+ * Returns a clone of the node. The clone contains a shallow copy of the
* user object, and does not copy the parent node or the child nodes.
*
* @return A clone of the node.
@@ -159,24 +159,24 @@ public class DefaultMutableTreeNode
*
* @param child the child node (<code>null</code> not permitted).
*
- * @throws IllegalStateException if {@link #getAllowsChildren()} returns
+ * @throws IllegalStateException if {@link #getAllowsChildren()} returns
* <code>false</code>.
* @throws IllegalArgumentException if {@link #isNodeAncestor} returns
- * <code>true</code>.
- * @throws IllegalArgumentException if <code>child</code> is
+ * <code>true</code>.
+ * @throws IllegalArgumentException if <code>child</code> is
* <code>null</code>.
*/
public void add(MutableTreeNode child)
{
if (! allowsChildren)
throw new IllegalStateException();
-
+
if (child == null)
throw new IllegalArgumentException();
if (isNodeAncestor(child))
throw new IllegalArgumentException("Cannot add ancestor node.");
-
+
children.add(child);
child.setParent(this);
}
@@ -194,10 +194,10 @@ public class DefaultMutableTreeNode
/**
* Removes the child with the given index from this node.
*
- * @param index the index (in the range <code>0</code> to
+ * @param index the index (in the range <code>0</code> to
* <code>getChildCount() - 1</code>).
- *
- * @throws ArrayIndexOutOfBoundsException if <code>index</code> is outside
+ *
+ * @throws ArrayIndexOutOfBoundsException if <code>index</code> is outside
* the valid range.
*/
public void remove(int index)
@@ -207,12 +207,12 @@ public class DefaultMutableTreeNode
}
/**
- * Removes the given child from this node and sets its parent to
+ * Removes the given child from this node and sets its parent to
* <code>null</code>.
*
* @param node the child node (<code>null</code> not permitted).
- *
- * @throws IllegalArgumentException if <code>node</code> is not a child of
+ *
+ * @throws IllegalArgumentException if <code>node</code> is not a child of
* this node.
* @throws IllegalArgumentException if <code>node</code> is null.
*/
@@ -259,8 +259,8 @@ public class DefaultMutableTreeNode
*
* @param node the child node (<code>null</code> not permitted).
* @param index the index.
- *
- * @throws IllegalArgumentException if <code>node</code> is
+ *
+ * @throws IllegalArgumentException if <code>node</code> is
* </code>null</code>.
*/
public void insert(MutableTreeNode node, int index)
@@ -270,7 +270,7 @@ public class DefaultMutableTreeNode
if (node == null)
throw new IllegalArgumentException("Null 'node' argument.");
-
+
if (isNodeAncestor(node))
throw new IllegalArgumentException("Cannot insert ancestor node.");
@@ -298,7 +298,7 @@ public class DefaultMutableTreeNode
{
if (children.size() == 0)
return EMPTY_ENUMERATION;
-
+
return children.elements();
}
@@ -337,11 +337,11 @@ public class DefaultMutableTreeNode
/**
* Returns the index of the specified child node, or -1 if the node is not
* in fact a child of this node.
- *
+ *
* @param node the node (<code>null</code> not permitted).
- *
+ *
* @return The index of the specified child node, or -1.
- *
+ *
* @throws IllegalArgumentException if <code>node</code> is <code>null</code>.
*/
public int getIndex(TreeNode node)
@@ -352,7 +352,7 @@ public class DefaultMutableTreeNode
}
/**
- * Sets the flag that controls whether or not this node allows the addition /
+ * Sets the flag that controls whether or not this node allows the addition /
* insertion of child nodes. If the flag is set to <code>false</code>, any
* existing children are removed.
*
@@ -422,9 +422,9 @@ public class DefaultMutableTreeNode
* <li>the parent node (if there is one);</li>
* <li>any ancestor of the parent node;</li>
* </ul>
- * If <code>node</code> is <code>null</code>, this method returns
+ * If <code>node</code> is <code>null</code>, this method returns
* <code>false</code>.
- *
+ *
* @param node the node (<code>null</code> permitted).
*
* @return A boolean.
@@ -450,9 +450,9 @@ public class DefaultMutableTreeNode
* <li>the child nodes belonging to this tree node, if there are any;</li>
* <li>any descendants of the child nodes;</li>
* </ul>
- * If <code>node</code> is <code>null</code>, this method returns
+ * If <code>node</code> is <code>null</code>, this method returns
* <code>false</code>.
- *
+ *
* @param node the node (<code>null</code> permitted).
*
* @return A boolean.
@@ -463,7 +463,7 @@ public class DefaultMutableTreeNode
return false;
TreeNode current = node;
-
+
while (current != null
&& current != this)
current = current.getParent();
@@ -533,7 +533,7 @@ public class DefaultMutableTreeNode
TreeNode node = getChildAt(0);
int depth = 0;
int current = 1;
-
+
while (! stack.empty())
{
if (node.getChildCount() != 0)
@@ -549,7 +549,7 @@ public class DefaultMutableTreeNode
int size;
int index;
-
+
do
{
node = node.getParent();
@@ -606,7 +606,7 @@ public class DefaultMutableTreeNode
{
if (depth == 0)
return null;
-
+
return new TreeNode[depth];
}
@@ -624,7 +624,7 @@ public class DefaultMutableTreeNode
{
TreeNode[] path = getPathToRoot(this, 0);
Object[] object = new Object[path.length];
-
+
for (int index = 0; index < path.length; ++index)
object[index] = ((DefaultMutableTreeNode) path[index]).getUserObject();
@@ -640,7 +640,7 @@ public class DefaultMutableTreeNode
{
TreeNode current = this;
TreeNode check = current.getParent();
-
+
while (check != null)
{
current = check;
@@ -675,7 +675,7 @@ public class DefaultMutableTreeNode
// Return next sibling (if needed the sibling of some parent).
DefaultMutableTreeNode node = this;
DefaultMutableTreeNode sibling;
-
+
do
{
sibling = node.getNextSibling();
@@ -683,7 +683,7 @@ public class DefaultMutableTreeNode
}
while (sibling == null &&
node != null);
-
+
// Return sibling.
return sibling;
}
@@ -698,7 +698,7 @@ public class DefaultMutableTreeNode
// Return null if no parent.
if (parent == null)
return null;
-
+
DefaultMutableTreeNode sibling = getPreviousSibling();
// Return parent if no sibling.
@@ -769,7 +769,7 @@ public class DefaultMutableTreeNode
{
if (node == null)
throw new IllegalArgumentException();
-
+
TreeNode parent = this;
Vector<TreeNode> nodes = new Vector<TreeNode>();
nodes.add(this);
@@ -782,13 +782,13 @@ public class DefaultMutableTreeNode
if (parent != node)
throw new IllegalArgumentException();
-
+
return nodes.elements();
}
/**
- * Returns <code>true</code> if <code>node</code> is a child of this tree
- * node, and <code>false</code> otherwise. If <code>node</code> is
+ * Returns <code>true</code> if <code>node</code> is a child of this tree
+ * node, and <code>false</code> otherwise. If <code>node</code> is
* <code>null</code>, this method returns <code>false</code>.
*
* @param node the node (<code>null</code> permitted).
@@ -807,7 +807,7 @@ public class DefaultMutableTreeNode
* Returns the first child node belonging to this tree node.
*
* @return The first child node.
- *
+ *
* @throws NoSuchElementException if this tree node has no children.
*/
public TreeNode getFirstChild()
@@ -819,7 +819,7 @@ public class DefaultMutableTreeNode
* Returns the last child node belonging to this tree node.
*
* @return The last child node.
- *
+ *
* @throws NoSuchElementException if this tree node has no children.
*/
public TreeNode getLastChild()
@@ -828,15 +828,15 @@ public class DefaultMutableTreeNode
}
/**
- * Returns the next child after the specified <code>node</code>, or
- * <code>null</code> if there is no child after the specified
+ * Returns the next child after the specified <code>node</code>, or
+ * <code>null</code> if there is no child after the specified
* <code>node</code>.
*
* @param node a child of this node (<code>null</code> not permitted).
*
* @return The next child, or <code>null</code>.
- *
- * @throws IllegalArgumentException if <code>node</code> is not a child of
+ *
+ * @throws IllegalArgumentException if <code>node</code> is not a child of
* this node, or is <code>null</code>.
*/
public TreeNode getChildAfter(TreeNode node)
@@ -853,15 +853,15 @@ public class DefaultMutableTreeNode
}
/**
- * Returns the previous child before the specified <code>node</code>, or
- * <code>null</code> if there is no child before the specified
+ * Returns the previous child before the specified <code>node</code>, or
+ * <code>null</code> if there is no child before the specified
* <code>node</code>.
*
* @param node a child of this node (<code>null</code> not permitted).
*
* @return The previous child, or <code>null</code>.
- *
- * @throws IllegalArgumentException if <code>node</code> is not a child of
+ *
+ * @throws IllegalArgumentException if <code>node</code> is not a child of
* this node, or is <code>null</code>.
*/
public TreeNode getChildBefore(TreeNode node)
@@ -913,8 +913,8 @@ public class DefaultMutableTreeNode
/**
* Returns the next sibling for this tree node. If this node has no parent,
- * or this node is the last child of its parent, this method returns
- * <code>null</code>.
+ * or this node is the last child of its parent, this method returns
+ * <code>null</code>.
*
* @return The next sibling, or <code>null</code>.
*/
@@ -924,7 +924,7 @@ public class DefaultMutableTreeNode
return null;
int index = parent.getIndex(this) + 1;
-
+
if (index == parent.getChildCount())
return null;
@@ -932,9 +932,9 @@ public class DefaultMutableTreeNode
}
/**
- * Returns the previous sibling for this tree node. If this node has no
- * parent, or this node is the first child of its parent, this method returns
- * <code>null</code>.
+ * Returns the previous sibling for this tree node. If this node has no
+ * parent, or this node is the first child of its parent, this method returns
+ * <code>null</code>.
*
* @return The previous sibling, or <code>null</code>.
*/
@@ -952,7 +952,7 @@ public class DefaultMutableTreeNode
}
/**
- * Returns <code>true</code> if this tree node is a lead node (that is, it
+ * Returns <code>true</code> if this tree node is a lead node (that is, it
* has no children), and <code>false</otherwise>.
*
* @return A boolean.
@@ -963,8 +963,8 @@ public class DefaultMutableTreeNode
}
/**
- * Returns the first leaf node that is a descendant of this node. Recall
- * that a node is its own descendant, so if this node has no children then
+ * Returns the first leaf node that is a descendant of this node. Recall
+ * that a node is its own descendant, so if this node has no children then
* it is returned as the first leaf.
*
* @return The first leaf node.
@@ -972,7 +972,7 @@ public class DefaultMutableTreeNode
public DefaultMutableTreeNode getFirstLeaf()
{
TreeNode current = this;
-
+
while (current.getChildCount() > 0)
current = current.getChildAt(0);
@@ -980,8 +980,8 @@ public class DefaultMutableTreeNode
}
/**
- * Returns the last leaf node that is a descendant of this node. Recall
- * that a node is its own descendant, so if this node has no children then
+ * Returns the last leaf node that is a descendant of this node. Recall
+ * that a node is its own descendant, so if this node has no children then
* it is returned as the last leaf.
*
* @return The first leaf node.
@@ -990,7 +990,7 @@ public class DefaultMutableTreeNode
{
TreeNode current = this;
int size = current.getChildCount();
-
+
while (size > 0)
{
current = current.getChildAt(size - 1);
@@ -1001,7 +1001,7 @@ public class DefaultMutableTreeNode
}
/**
- * Returns the next leaf node after this tree node.
+ * Returns the next leaf node after this tree node.
*
* @return The next leaf node, or <code>null</code>.
*/
@@ -1047,7 +1047,7 @@ public class DefaultMutableTreeNode
while (e.hasMoreElements())
{
TreeNode current = (TreeNode) e.nextElement();
-
+
if (current.isLeaf())
count++;
}
@@ -1082,7 +1082,7 @@ public class DefaultMutableTreeNode
TreeNode node = queue.removeFirst();
Enumeration<TreeNode> children =
- (Enumeration<TreeNode>) node.children();
+ (Enumeration<TreeNode>) node.children();
while (children.hasMoreElements())
queue.add(children.nextElement());
@@ -1095,10 +1095,10 @@ public class DefaultMutableTreeNode
*/
static class PreorderEnumeration implements Enumeration<TreeNode>
{
- TreeNode next;
+ TreeNode next;
Stack<Enumeration<TreeNode>> childrenEnums =
- new Stack<Enumeration<TreeNode>>();
+ new Stack<Enumeration<TreeNode>>();
@SuppressWarnings("unchecked")
PreorderEnumeration(TreeNode node)
@@ -1138,7 +1138,7 @@ public class DefaultMutableTreeNode
return child;
}
-
+
// If no children are left, we return to a higher level.
childrenEnums.pop();
@@ -1161,7 +1161,7 @@ public class DefaultMutableTreeNode
Stack<TreeNode> nodes = new Stack<TreeNode>();
Stack<Enumeration<TreeNode>> childrenEnums =
- new Stack<Enumeration<TreeNode>>();
+ new Stack<Enumeration<TreeNode>>();
@SuppressWarnings("unchecked")
PostorderEnumeration(TreeNode node)
@@ -1194,7 +1194,7 @@ public class DefaultMutableTreeNode
nodes.push(node);
Enumeration<TreeNode> newChildren =
- (Enumeration<TreeNode>) node.children();
+ (Enumeration<TreeNode>) node.children();
childrenEnums.push(newChildren);
return traverse(newChildren);
diff --git a/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java b/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java
index 0489798..9ee0a14 100644
--- a/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java
+++ b/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java
@@ -68,7 +68,7 @@ import javax.swing.event.TreeSelectionListener;
/**
* Participates in the tree cell editing.
- *
+ *
* @author Andrew Selkirk
* @author Audrius Meskauskas
*/
@@ -77,8 +77,8 @@ public class DefaultTreeCellEditor
{
/**
* This container that appears on the tree during editing session.
- * It contains the editing component displays various other editor -
- * specific parts like editing icon.
+ * It contains the editing component displays various other editor -
+ * specific parts like editing icon.
*/
public class EditorContainer extends Container
{
@@ -86,7 +86,7 @@ public class DefaultTreeCellEditor
* Use v 1.5 serial version UID for interoperability.
*/
static final long serialVersionUID = 6470339600449699810L;
-
+
/**
* Creates an <code>EditorContainer</code> object.
*/
@@ -103,11 +103,11 @@ public class DefaultTreeCellEditor
{
// Do nothing here.
}
-
+
/**
* Overrides Container.paint to paint the node's icon and use the selection
* color for the background.
- *
+ *
* @param g -
* the specified Graphics window
*/
@@ -175,8 +175,8 @@ public class DefaultTreeCellEditor
/**
* Use v 1.5 serial version UID for interoperability.
*/
- static final long serialVersionUID = -6629304544265300143L;
-
+ static final long serialVersionUID = -6629304544265300143L;
+
/**
* The border of the text field.
*/
@@ -194,9 +194,9 @@ public class DefaultTreeCellEditor
/**
* Gets the font of this component.
- * @return this component's font; if a font has not been set for
+ * @return this component's font; if a font has not been set for
* this component, the font of its parent is returned (if the parent
- * is not null, otherwise null is returned).
+ * is not null, otherwise null is returned).
*/
public Font getFont()
{
@@ -222,9 +222,9 @@ public class DefaultTreeCellEditor
}
/**
- * Overrides JTextField.getPreferredSize to return the preferred size
+ * Overrides JTextField.getPreferredSize to return the preferred size
* based on current font, if set, or else use renderer's font.
- *
+ *
* @return the Dimension of this textfield.
*/
public Dimension getPreferredSize()
@@ -237,9 +237,9 @@ public class DefaultTreeCellEditor
return renderer.getPreferredSize();
}
}
-
+
private EventListenerList listenerList = new EventListenerList();
-
+
/**
* Editor handling the editing.
*/
@@ -261,8 +261,8 @@ public class DefaultTreeCellEditor
protected transient Component editingComponent;
/**
- * As of Java 2 platform v1.4 this field should no longer be used.
- * If you wish to provide similar behavior you should directly
+ * As of Java 2 platform v1.4 this field should no longer be used.
+ * If you wish to provide similar behavior you should directly
* override isCellEditable.
*/
protected boolean canEdit;
@@ -306,12 +306,12 @@ public class DefaultTreeCellEditor
* Font to paint with, null indicates font of renderer is to be used.
*/
protected Font font;
-
+
/**
- * Constructs a DefaultTreeCellEditor object for a JTree using the
- * specified renderer and a default editor. (Use this constructor
+ * Constructs a DefaultTreeCellEditor object for a JTree using the
+ * specified renderer and a default editor. (Use this constructor
* for normal editing.)
- *
+ *
* @param tree - a JTree object
* @param renderer - a DefaultTreeCellRenderer object
*/
@@ -321,10 +321,10 @@ public class DefaultTreeCellEditor
}
/**
- * Constructs a DefaultTreeCellEditor object for a JTree using the specified
- * renderer and the specified editor. (Use this constructor
+ * Constructs a DefaultTreeCellEditor object for a JTree using the specified
+ * renderer and the specified editor. (Use this constructor
* for specialized editing.)
- *
+ *
* @param tree - a JTree object
* @param renderer - a DefaultTreeCellRenderer object
* @param editor - a TreeCellEditor object
@@ -341,10 +341,10 @@ public class DefaultTreeCellEditor
Color c = UIManager.getColor("Tree.editorBorderSelectionColor");
setBorderSelectionColor(c);
}
-
+
/**
* writeObject
- *
+ *
* @param value0
* TODO
* @exception IOException
@@ -386,12 +386,12 @@ public class DefaultTreeCellEditor
}
/**
- * Sets the font to edit with. null indicates the renderers
- * font should be used. This will NOT override any font you have
- * set in the editor the receiver was instantied with. If null for
- * an editor was passed in, a default editor will be created that
+ * Sets the font to edit with. null indicates the renderers
+ * font should be used. This will NOT override any font you have
+ * set in the editor the receiver was instantied with. If null for
+ * an editor was passed in, a default editor will be created that
* will pick up this font.
- *
+ *
* @param font - the editing Font
*/
public void setFont(Font font)
@@ -404,7 +404,7 @@ public class DefaultTreeCellEditor
/**
* Gets the font used for editing.
- *
+ *
* @return the editing font
*/
public Font getFont()
@@ -414,20 +414,20 @@ public class DefaultTreeCellEditor
/**
* Configures the editor. Passed onto the realEditor.
- * Sets an initial value for the editor. This will cause
- * the editor to stopEditing and lose any partially edited value
- * if the editor is editing when this method is called.
- * Returns the component that should be added to the client's Component
- * hierarchy. Once installed in the client's hierarchy this component will
- * then be able to draw and receive user input.
- *
+ * Sets an initial value for the editor. This will cause
+ * the editor to stopEditing and lose any partially edited value
+ * if the editor is editing when this method is called.
+ * Returns the component that should be added to the client's Component
+ * hierarchy. Once installed in the client's hierarchy this component will
+ * then be able to draw and receive user input.
+ *
* @param tree - the JTree that is asking the editor to edit; this parameter can be null
* @param value - the value of the cell to be edited
* @param isSelected - true is the cell is to be rendered with selection highlighting
* @param expanded - true if the node is expanded
* @param leaf - true if the node is a leaf node
* @param row - the row index of the node being edited
- *
+ *
* @return the component for editing
*/
public Component getTreeCellEditorComponent(JTree tree, Object value,
@@ -461,19 +461,19 @@ public class DefaultTreeCellEditor
/**
* Returns the value currently being edited (requests it from the
* {@link #realEditor}.
- *
+ *
* @return the value currently being edited
*/
public Object getCellEditorValue()
{
return realEditor.getCellEditorValue();
}
-
+
/**
- * If the realEditor returns true to this message, prepareForEditing
+ * If the realEditor returns true to this message, prepareForEditing
* is messaged and true is returned.
- *
- * @param event - the event the editor should use to consider whether to
+ *
+ * @param event - the event the editor should use to consider whether to
* begin editing or not
* @return true if editing can be started
*/
@@ -507,7 +507,7 @@ public class DefaultTreeCellEditor
}
if (! realEditor.isCellEditable(event))
ret = false;
- else
+ else
{
if (canEditImmediately(event))
ret = true;
@@ -519,12 +519,12 @@ public class DefaultTreeCellEditor
if (ret)
prepareForEditing();
return ret;
-
+
}
/**
* Messages the realEditor for the return value.
- *
+ *
* @param event -
* the event the editor should use to start editing
* @return true if the editor would like the editing cell to be selected;
@@ -570,7 +570,7 @@ public class DefaultTreeCellEditor
/**
* Adds a <code>CellEditorListener</code> object to this editor.
- *
+ *
* @param listener
* the listener to add
*/
@@ -603,7 +603,7 @@ public class DefaultTreeCellEditor
/**
* Resets lastPath.
- *
+ *
* @param e - the event that characterizes the change.
*/
public void valueChanged(TreeSelectionEvent e)
@@ -621,10 +621,10 @@ public class DefaultTreeCellEditor
// if (timer != null)
// timer.stop();
}
-
+
/**
* Messaged when the timer fires.
- *
+ *
* @param e the event that characterizes the action.
*/
public void actionPerformed(ActionEvent e)
@@ -636,7 +636,7 @@ public class DefaultTreeCellEditor
/**
* Sets the tree currently editing for. This is needed to add a selection
* listener.
- *
+ *
* @param newTree -
* the new tree to be edited
*/
@@ -657,7 +657,7 @@ public class DefaultTreeCellEditor
/**
* Returns true if event is a MouseEvent and the click count is 1.
- *
+ *
* @param event - the event being studied
* @return true if editing should start
*/
@@ -674,7 +674,7 @@ public class DefaultTreeCellEditor
}
/**
- * Starts the editing timer (if one installed).
+ * Starts the editing timer (if one installed).
*/
protected void startEditingTimer()
{
@@ -687,33 +687,33 @@ public class DefaultTreeCellEditor
}
/**
- * Returns true if event is null, or it is a MouseEvent with
+ * Returns true if event is null, or it is a MouseEvent with
* a click count > 2 and inHitRegion returns true.
- *
+ *
* @param event - the event being studied
- * @return true if event is null, or it is a MouseEvent with
- * a click count > 2 and inHitRegion returns true
+ * @return true if event is null, or it is a MouseEvent with
+ * a click count > 2 and inHitRegion returns true
*/
protected boolean canEditImmediately(EventObject event)
{
if (event == null || !(event instanceof MouseEvent) || (((MouseEvent) event).
- getClickCount() > 2 && inHitRegion(((MouseEvent) event).getX(),
+ getClickCount() > 2 && inHitRegion(((MouseEvent) event).getX(),
((MouseEvent) event).getY())))
return true;
return false;
}
/**
- * Returns true if the passed in location is a valid mouse location
+ * Returns true if the passed in location is a valid mouse location
* to start editing from. This is implemented to return false if x is
- * less than or equal to the width of the icon and icon
- * gap displayed by the renderer. In other words this returns true if
- * the user clicks over the text part displayed by the renderer, and
+ * less than or equal to the width of the icon and icon
+ * gap displayed by the renderer. In other words this returns true if
+ * the user clicks over the text part displayed by the renderer, and
* false otherwise.
- *
+ *
* @param x - the x-coordinate of the point
* @param y - the y-coordinate of the point
- *
+ *
* @return true if the passed in location is a valid mouse location
*/
protected boolean inHitRegion(int x, int y)
@@ -725,11 +725,11 @@ public class DefaultTreeCellEditor
/**
* determineOffset
* @param tree -
- * @param value -
- * @param isSelected -
- * @param expanded -
- * @param leaf -
- * @param row -
+ * @param value -
+ * @param isSelected -
+ * @param expanded -
+ * @param leaf -
+ * @param row -
*/
protected void determineOffset(JTree tree, Object value, boolean isSelected,
boolean expanded, boolean leaf, int row)
@@ -755,7 +755,7 @@ public class DefaultTreeCellEditor
}
/**
- * Invoked just before editing is to start. Will add the
+ * Invoked just before editing is to start. Will add the
* editingComponent to the editingContainer.
*/
protected void prepareForEditing()
@@ -766,7 +766,7 @@ public class DefaultTreeCellEditor
/**
* Creates the container to manage placement of editingComponent.
- *
+ *
* @return the container to manage the placement of the editingComponent.
*/
protected Container createContainer()
@@ -775,9 +775,9 @@ public class DefaultTreeCellEditor
}
/**
- * This is invoked if a TreeCellEditor is not supplied in the constructor.
+ * This is invoked if a TreeCellEditor is not supplied in the constructor.
* It returns a TextField editor.
- *
+ *
* @return a new TextField editor
*/
protected TreeCellEditor createTreeCellEditor()
diff --git a/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java b/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java
index b9c8401..a2c8fc2 100644
--- a/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java
+++ b/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java
@@ -1,6 +1,6 @@
-/* DefaultTreeCellRenderer.java
+/* DefaultTreeCellRenderer.java
Copyright (C) 2002, 2004, 2006, Free Software Foundation, Inc.
-
+
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
@@ -54,7 +54,7 @@ import javax.swing.plaf.UIResource;
/**
* A default implementation of the {@link TreeCellRenderer} interface.
- *
+ *
* @author Andrew Selkirk
*/
public class DefaultTreeCellRenderer
@@ -79,62 +79,62 @@ public class DefaultTreeCellRenderer
/**
* The icon used to represent non-leaf nodes that are closed.
- *
+ *
* @see #setClosedIcon(Icon)
*/
protected transient Icon closedIcon;
/**
* The icon used to represent leaf nodes.
- *
+ *
* @see #setLeafIcon(Icon)
*/
protected transient Icon leafIcon;
/**
* The icon used to represent non-leaf nodes that are open.
- *
+ *
* @see #setOpenIcon(Icon)
*/
protected transient Icon openIcon;
/**
* The color used for text in selected cells.
- *
+ *
* @see #setTextSelectionColor(Color)
*/
protected Color textSelectionColor;
/**
* The color used for text in non-selected cells.
- *
+ *
* @see #setTextNonSelectionColor(Color)
*/
protected Color textNonSelectionColor;
/**
* The background color for selected cells.
- *
+ *
* @see #setBackgroundSelectionColor(Color)
*/
protected Color backgroundSelectionColor;
/**
* The background color for non-selected cells.
- *
+ *
* @see #setBackgroundNonSelectionColor(Color)
*/
protected Color backgroundNonSelectionColor;
/**
* The border color for selected tree cells.
- *
+ *
* @see #setBorderSelectionColor(Color)
*/
protected Color borderSelectionColor;
/**
- * Creates a new tree cell renderer with defaults appropriate for the
+ * Creates a new tree cell renderer with defaults appropriate for the
* current {@link LookAndFeel}.
*/
public DefaultTreeCellRenderer()
@@ -154,9 +154,9 @@ public class DefaultTreeCellRenderer
/**
* Returns the default icon for non-leaf tree cells that are open (expanded).
- * The icon is fetched from the defaults table for the current
+ * The icon is fetched from the defaults table for the current
* {@link LookAndFeel} using the key <code>Tree.openIcon</code>.
- *
+ *
* @return The default icon.
*/
public Icon getDefaultOpenIcon()
@@ -165,10 +165,10 @@ public class DefaultTreeCellRenderer
}
/**
- * Returns the default icon for non-leaf tree cells that are closed (not
- * expanded). The icon is fetched from the defaults table for the current
+ * Returns the default icon for non-leaf tree cells that are closed (not
+ * expanded). The icon is fetched from the defaults table for the current
* {@link LookAndFeel} using the key <code>Tree.closedIcon</code>.
- *
+ *
* @return The default icon.
*/
public Icon getDefaultClosedIcon()
@@ -177,10 +177,10 @@ public class DefaultTreeCellRenderer
}
/**
- * Returns the default icon for leaf tree cells. The icon is fetched from
- * the defaults table for the current {@link LookAndFeel} using the key
+ * Returns the default icon for leaf tree cells. The icon is fetched from
+ * the defaults table for the current {@link LookAndFeel} using the key
* <code>Tree.leafIcon</code>.
- *
+ *
* @return The default icon.
*/
public Icon getDefaultLeafIcon()
@@ -191,9 +191,9 @@ public class DefaultTreeCellRenderer
/**
* Sets the icon to be displayed for non-leaf nodes that are open (expanded).
* Set this to <code>null</code> if no icon is required.
- *
+ *
* @param icon the icon (<code>null</code> permitted).
- *
+ *
* @see #getOpenIcon()
*/
public void setOpenIcon(Icon icon)
@@ -202,11 +202,11 @@ public class DefaultTreeCellRenderer
}
/**
- * Returns the icon displayed for non-leaf nodes that are open (expanded).
+ * Returns the icon displayed for non-leaf nodes that are open (expanded).
* The default value is initialised from the {@link LookAndFeel}.
- *
+ *
* @return The open icon (possibly <code>null</code>).
- *
+ *
* @see #setOpenIcon(Icon)
*/
public Icon getOpenIcon()
@@ -215,11 +215,11 @@ public class DefaultTreeCellRenderer
}
/**
- * Sets the icon to be displayed for non-leaf nodes that are closed. Set
+ * Sets the icon to be displayed for non-leaf nodes that are closed. Set
* this to <code>null</code> if no icon is required.
- *
+ *
* @param icon the icon (<code>null</code> permitted).
- *
+ *
* @see #getClosedIcon()
*/
public void setClosedIcon(Icon icon)
@@ -228,11 +228,11 @@ public class DefaultTreeCellRenderer
}
/**
- * Returns the icon displayed for non-leaf nodes that are closed. The
+ * Returns the icon displayed for non-leaf nodes that are closed. The
* default value is initialised from the {@link LookAndFeel}.
- *
+ *
* @return The closed icon (possibly <code>null</code>).
- *
+ *
* @see #setClosedIcon(Icon)
*/
public Icon getClosedIcon()
@@ -241,11 +241,11 @@ public class DefaultTreeCellRenderer
}
/**
- * Sets the icon to be displayed for leaf nodes. Set this to
+ * Sets the icon to be displayed for leaf nodes. Set this to
* <code>null</code> if no icon is required.
- *
+ *
* @param icon the icon (<code>null</code> permitted).
- *
+ *
* @see #getLeafIcon()
*/
public void setLeafIcon(Icon icon)
@@ -254,11 +254,11 @@ public class DefaultTreeCellRenderer
}
/**
- * Returns the icon displayed for leaf nodes. The default value is
+ * Returns the icon displayed for leaf nodes. The default value is
* initialised from the {@link LookAndFeel}.
- *
+ *
* @return The leaf icon (possibly <code>null</code>).
- *
+ *
* @see #setLeafIcon(Icon)
*/
public Icon getLeafIcon()
@@ -268,9 +268,9 @@ public class DefaultTreeCellRenderer
/**
* Sets the text color for tree cells that are selected.
- *
+ *
* @param c the color (<code>null</code> permitted).
- *
+ *
* @see #getTextSelectionColor()
*/
public void setTextSelectionColor(Color c)
@@ -282,9 +282,9 @@ public class DefaultTreeCellRenderer
* Returns the text color for tree cells that are selected.
* The default value is obtained from the {@link LookAndFeel} defaults
* table using the key <code>Tree.selectionForeground</code>.
- *
+ *
* @return The text color for tree cells that are selected.
- *
+ *
* @see #setTextSelectionColor(Color)
*/
public Color getTextSelectionColor()
@@ -294,9 +294,9 @@ public class DefaultTreeCellRenderer
/**
* Sets the text color for tree cells that are not selected.
- *
+ *
* @param c the color (<code>null</code> permitted).
- *
+ *
* @see #getTextNonSelectionColor()
*/
public void setTextNonSelectionColor(Color c)
@@ -308,9 +308,9 @@ public class DefaultTreeCellRenderer
* Returns the text color for tree cells that are not selected.
* The default value is obtained from the {@link LookAndFeel} defaults
* table using the key <code>Tree.selectionForeground</code>.
- *
+ *
* @return The background color for tree cells that are not selected.
- *
+ *
* @see #setTextgroundNonSelectionColor(Color)
*/
public Color getTextNonSelectionColor()
@@ -320,9 +320,9 @@ public class DefaultTreeCellRenderer
/**
* Sets the background color for tree cells that are selected.
- *
+ *
* @param c the color (<code>null</code> permitted).
- *
+ *
* @see #getBackgroundSelectionColor()
*/
public void setBackgroundSelectionColor(Color c)
@@ -334,9 +334,9 @@ public class DefaultTreeCellRenderer
* Returns the background color for tree cells that are selected.
* The default value is obtained from the {@link LookAndFeel} defaults
* table using the key <code>Tree.selectionBackground</code>.
- *
+ *
* @return The background color for tree cells that are selected.
- *
+ *
* @see #setBackgroundSelectionColor(Color)
*/
public Color getBackgroundSelectionColor()
@@ -346,9 +346,9 @@ public class DefaultTreeCellRenderer
/**
* Sets the background color for tree cells that are not selected.
- *
+ *
* @param c the color (<code>null</code> permitted).
- *
+ *
* @see #getBackgroundNonSelectionColor()
*/
public void setBackgroundNonSelectionColor(Color c)
@@ -360,9 +360,9 @@ public class DefaultTreeCellRenderer
* Returns the background color for tree cells that are not selected.
* The default value is obtained from the {@link LookAndFeel} defaults
* table using the key <code>Tree.textBackground</code>.
- *
+ *
* @return The background color for tree cells that are not selected.
- *
+ *
* @see #setBackgroundNonSelectionColor(Color)
*/
public Color getBackgroundNonSelectionColor()
@@ -372,9 +372,9 @@ public class DefaultTreeCellRenderer
/**
* Sets the border color for tree cells that are selected.
- *
+ *
* @param c the color (<code>null</code> permitted).
- *
+ *
* @see #getBorderSelectionColor()
*/
public void setBorderSelectionColor(Color c)
@@ -386,9 +386,9 @@ public class DefaultTreeCellRenderer
* Returns the border color for tree cells that are selected.
* The default value is obtained from the {@link LookAndFeel} defaults
* table using the key <code>Tree.selectionBorderColor</code>.
- *
+ *
* @return The border color for tree cells that are selected.
- *
+ *
* @see #setBorderSelectionColor(Color)
*/
public Color getBorderSelectionColor()
@@ -398,9 +398,9 @@ public class DefaultTreeCellRenderer
/**
* Sets the font.
- *
+ *
* @param f the font.
- *
+ *
* @see #getFont()
*/
public void setFont(Font f)
@@ -412,7 +412,7 @@ public class DefaultTreeCellRenderer
/**
* Sets the background color.
- *
+ *
* @param c the color.
*/
public void setBackground(Color c)
@@ -425,7 +425,7 @@ public class DefaultTreeCellRenderer
/**
* Returns a component (in fact <code>this</code>) that can be used to
* render a tree cell with the specified state.
- *
+ *
* @param tree the tree that the cell belongs to.
* @param val the cell value.
* @param selected indicates whether or not the cell is selected.
@@ -433,7 +433,7 @@ public class DefaultTreeCellRenderer
* @param leaf indicates whether or not the cell is a leaf in the tree.
* @param row the row index.
* @param hasFocus indicates whether or not the cell has the focus.
- *
+ *
* @return <code>this</code>.
*/
public Component getTreeCellRendererComponent(JTree tree, Object val,
@@ -461,7 +461,7 @@ public class DefaultTreeCellRenderer
{
super.setBackground(getBackgroundSelectionColor());
setForeground(getTextSelectionColor());
-
+
if (hasFocus)
setBorderSelectionColor(UIManager.getLookAndFeelDefaults().
getColor("Tree.selectionBorderColor"));
@@ -480,9 +480,9 @@ public class DefaultTreeCellRenderer
/**
* Returns the current font.
- *
+ *
* @return The current font.
- *
+ *
* @see #setFont(Font)
*/
public Font getFont()
@@ -492,7 +492,7 @@ public class DefaultTreeCellRenderer
/**
* Paints the value. The background is filled based on selected.
- *
+ *
* @param g the graphics device.
*/
public void paint(Graphics g)
@@ -504,25 +504,25 @@ public class DefaultTreeCellRenderer
else
{
bgColor = getBackgroundNonSelectionColor();
- if (bgColor == null)
+ if (bgColor == null)
bgColor = getBackground();
}
// Paint background.
int xOffset = -1;
if (bgColor != null)
{
- xOffset = getXOffset();
- g.setColor(bgColor);
- g.fillRect(xOffset, 0, getWidth() - xOffset, getHeight());
+ xOffset = getXOffset();
+ g.setColor(bgColor);
+ g.fillRect(xOffset, 0, getWidth() - xOffset, getHeight());
}
if (hasFocus)
{
if (drawsFocusBorderAroundIcon)
xOffset = 0;
- else if (xOffset == -1)
+ else if (xOffset == -1)
xOffset = getXOffset();
- paintFocus(g, xOffset, 0, getWidth() - xOffset, getHeight());
+ paintFocus(g, xOffset, 0, getWidth() - xOffset, getHeight());
}
super.paint(g);
}
@@ -536,7 +536,7 @@ public class DefaultTreeCellRenderer
if (col != null)
{
g.setColor(col);
- g.drawRect(x, y, w - 1, h - 1);
+ g.drawRect(x, y, w - 1, h - 1);
}
}
@@ -557,7 +557,7 @@ public class DefaultTreeCellRenderer
/**
* Returns the preferred size of the cell.
- *
+ *
* @return The preferred size of the cell.
*/
public Dimension getPreferredSize()
@@ -565,7 +565,7 @@ public class DefaultTreeCellRenderer
Dimension size = super.getPreferredSize();
size.width += 3;
return size;
- }
+ }
/**
* For performance reasons, this method is overridden to do nothing.
@@ -573,7 +573,7 @@ public class DefaultTreeCellRenderer
public void validate()
{
// Overridden for performance reasons.
- }
+ }
/**
* For performance reasons, this method is overridden to do nothing.
@@ -581,11 +581,11 @@ public class DefaultTreeCellRenderer
public void revalidate()
{
// Overridden for performance reasons.
- }
+ }
/**
* For performance reasons, this method is overridden to do nothing.
- *
+ *
* @param tm ignored
* @param x coordinate of the region to mark as dirty
* @param y coordinate of the region to mark as dirty
@@ -595,26 +595,26 @@ public class DefaultTreeCellRenderer
public void repaint(long tm, int x, int y, int width, int height)
{
// Overridden for performance reasons.
- }
+ }
/**
* For performance reasons, this method is overridden to do nothing.
- *
+ *
* @param area the area to repaint.
*/
public void repaint(Rectangle area)
{
// Overridden for performance reasons.
- }
+ }
/**
* For performance reasons, this method is overridden to do nothing.
- *
+ *
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
*/
- protected void firePropertyChange(String name, Object oldValue,
+ protected void firePropertyChange(String name, Object oldValue,
Object newValue)
{
// Overridden for performance reasons.
@@ -622,7 +622,7 @@ public class DefaultTreeCellRenderer
/**
* For performance reasons, this method is overridden to do nothing.
- *
+ *
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
@@ -634,7 +634,7 @@ public class DefaultTreeCellRenderer
/**
* For performance reasons, this method is overridden to do nothing.
- *
+ *
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
@@ -646,7 +646,7 @@ public class DefaultTreeCellRenderer
/**
* For performance reasons, this method is overridden to do nothing.
- *
+ *
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
@@ -654,11 +654,11 @@ public class DefaultTreeCellRenderer
public void firePropertyChange(String name, short oldValue, short newValue)
{
// Overridden for performance reasons.
- }
+ }
/**
* For performance reasons, this method is overridden to do nothing.
- *
+ *
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
@@ -670,7 +670,7 @@ public class DefaultTreeCellRenderer
/**
* For performance reasons, this method is overridden to do nothing.
- *
+ *
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
@@ -682,7 +682,7 @@ public class DefaultTreeCellRenderer
/**
* For performance reasons, this method is overridden to do nothing.
- *
+ *
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
@@ -694,7 +694,7 @@ public class DefaultTreeCellRenderer
/**
* For performance reasons, this method is overridden to do nothing.
- *
+ *
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
@@ -706,15 +706,15 @@ public class DefaultTreeCellRenderer
/**
* For performance reasons, this method is overridden to do nothing.
- *
+ *
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
*/
- public void firePropertyChange(String name, boolean oldValue,
+ public void firePropertyChange(String name, boolean oldValue,
boolean newValue)
{
// Overridden for performance reasons.
- }
+ }
-}
+}
diff --git a/libjava/classpath/javax/swing/tree/DefaultTreeModel.java b/libjava/classpath/javax/swing/tree/DefaultTreeModel.java
index afee7ea..0fa4445 100644
--- a/libjava/classpath/javax/swing/tree/DefaultTreeModel.java
+++ b/libjava/classpath/javax/swing/tree/DefaultTreeModel.java
@@ -1,6 +1,6 @@
-/* DefaultTreeModel.java --
+/* DefaultTreeModel.java --
Copyright (C) 2002, 2004, 2005, 2006, Free Software Foundation, Inc.
-
+
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
@@ -49,7 +49,7 @@ import javax.swing.event.TreeModelListener;
/**
* DefaultTreeModel
- *
+ *
* @author Andrew Selkirk
*/
public class DefaultTreeModel
@@ -74,7 +74,7 @@ public class DefaultTreeModel
/**
* Constructor DefaultTreeModel where any node can have children.
- *
+ *
* @param root the tree root.
*/
public DefaultTreeModel(TreeNode root)
@@ -85,9 +85,9 @@ public class DefaultTreeModel
/**
* Create the DefaultTreeModel that may check if the nodes can have
* children or not.
- *
+ *
* @param aRoot the tree root.
- * @param asksAllowsChildren if true, each node is asked if it can have
+ * @param asksAllowsChildren if true, each node is asked if it can have
* children. If false, the model does not care about this, supposing, that
* any node can have children.
*/
@@ -101,7 +101,7 @@ public class DefaultTreeModel
/**
* writeObject
- *
+ *
* @param obj the object.
* @exception IOException TODO
*/
@@ -112,7 +112,7 @@ public class DefaultTreeModel
/**
* readObject
- *
+ *
* @param value0 TODO
* @exception IOException TODO
* @exception ClassNotFoundException TODO
@@ -125,7 +125,7 @@ public class DefaultTreeModel
/**
* asksAllowsChildren
- *
+ *
* @return boolean
*/
public boolean asksAllowsChildren()
@@ -135,7 +135,7 @@ public class DefaultTreeModel
/**
* setAsksAllowsChildren
- *
+ *
* @param value TODO
*/
public void setAsksAllowsChildren(boolean value)
@@ -145,7 +145,7 @@ public class DefaultTreeModel
/**
* setRoot
- *
+ *
* @param root the root node.
*/
public void setRoot(TreeNode root)
@@ -155,7 +155,7 @@ public class DefaultTreeModel
/**
* getRoot
- *
+ *
* @return Object
*/
public Object getRoot()
@@ -165,7 +165,7 @@ public class DefaultTreeModel
/**
* getIndexOfChild
- *
+ *
* @param parent TODO
* @param child TODO
* @return int
@@ -182,7 +182,7 @@ public class DefaultTreeModel
/**
* getChild
- *
+ *
* @param node TODO
* @param idx TODO
* @return Object
@@ -197,7 +197,7 @@ public class DefaultTreeModel
/**
* getChildCount
- *
+ *
* @param node TODO
* @return int
*/
@@ -214,7 +214,7 @@ public class DefaultTreeModel
* {@link #asksAllowsChildren} is true, then this checks if the TreeNode
* allows children, otherwise it returns the TreeNode's <code>leaf</code>
* property.
- *
+ *
* @param node the node to check
*
* @return boolean <code>true</code> if the node is a leaf node,
@@ -275,7 +275,7 @@ public class DefaultTreeModel
* changed. It will fire the events, necessary to update the layout caches and
* repaint the tree. The tree will <i>not</i> be properly refreshed if you
* call the JTree.repaint instead.
- *
+ *
* @param node - the tree node, from which the tree nodes have changed
* (inclusive). If you do not know this node, call {@link #reload()}
* instead.
@@ -296,14 +296,14 @@ public class DefaultTreeModel
}
/**
- * Messaged when the user has altered the value for the item
- * identified by path to newValue. If newValue signifies a truly new
+ * Messaged when the user has altered the value for the item
+ * identified by path to newValue. If newValue signifies a truly new
* value the model should post a treeNodesChanged event.
- * This sets the user object of the TreeNode identified by
- * path and posts a node changed. If you use custom user objects
- * in the TreeModel you're going to need to subclass this and set
+ * This sets the user object of the TreeNode identified by
+ * path and posts a node changed. If you use custom user objects
+ * in the TreeModel you're going to need to subclass this and set
* the user object of the changed node to something meaningful.
- *
+ *
* @param path - path to the node that the user has altered
* @param newValue - the new value from the TreeCellEditor
*/
@@ -314,7 +314,7 @@ public class DefaultTreeModel
{
((MutableTreeNode) node).setUserObject(newValue);
int[] ci = null;
- Object[] c = null;
+ Object[] c = null;
Object[] parentPath = path.getPath();
if (path.getPathCount() > 1)
{
@@ -327,17 +327,17 @@ public class DefaultTreeModel
c[0] = node;
parentPath = path.getParentPath().getPath();
}
-
+
fireTreeNodesChanged(this, parentPath, ci, c);
}
}
/**
* Invoked this to insert newChild at location index in parents children.
- * This will then message nodesWereInserted to create the appropriate event.
- * This is the preferred way to add children as it will create the
+ * This will then message nodesWereInserted to create the appropriate event.
+ * This is the preferred way to add children as it will create the
* appropriate event.
- *
+ *
* @param newChild is the node to add to the parent's children
* @param parent is the parent of the newChild
* @param index is the index of the newChild
@@ -353,10 +353,10 @@ public class DefaultTreeModel
}
/**
- * Message this to remove node from its parent. This will message
- * nodesWereRemoved to create the appropriate event. This is the preferred
+ * Message this to remove node from its parent. This will message
+ * nodesWereRemoved to create the appropriate event. This is the preferred
* way to remove a node as it handles the event creation for you.
- *
+ *
* @param node to be removed
*/
public void removeNodeFromParent(MutableTreeNode node)
@@ -373,7 +373,7 @@ public class DefaultTreeModel
/**
* Invoke this method after you've changed how node is to be represented
* in the tree.
- *
+ *
* @param node that was changed
*/
public void nodeChanged(TreeNode node)
@@ -387,10 +387,10 @@ public class DefaultTreeModel
}
/**
- * Invoke this method after you've inserted some TreeNodes
- * into node. childIndices should be the index of the new elements and must
+ * Invoke this method after you've inserted some TreeNodes
+ * into node. childIndices should be the index of the new elements and must
* be sorted in ascending order.
- *
+ *
* @param parent that had a child added to
* @param childIndices of the children added
*/
@@ -403,26 +403,26 @@ public class DefaultTreeModel
}
/**
- * Invoke this method after you've removed some TreeNodes from node.
- * childIndices should be the index of the removed elements and
- * must be sorted in ascending order. And removedChildren should be the
+ * Invoke this method after you've removed some TreeNodes from node.
+ * childIndices should be the index of the removed elements and
+ * must be sorted in ascending order. And removedChildren should be the
* array of the children objects that were removed.
- *
+ *
* @param parent that had a child added to
* @param childIndices of the children added
* @param removedChildren are all the children removed from parent.
*/
- public void nodesWereRemoved(TreeNode parent, int[] childIndices,
+ public void nodesWereRemoved(TreeNode parent, int[] childIndices,
Object[] removedChildren)
{
- fireTreeNodesRemoved(this, getPathToRoot(parent), childIndices,
+ fireTreeNodesRemoved(this, getPathToRoot(parent), childIndices,
removedChildren);
}
/**
- * Invoke this method after you've changed how the children identified by
+ * Invoke this method after you've changed how the children identified by
* childIndices are to be represented in the tree.
- *
+ *
* @param node that is the parent of the children that changed in a tree.
* @param childIndices are the child nodes that changed.
*/
@@ -435,9 +435,9 @@ public class DefaultTreeModel
}
/**
- * Invoke this method if you've totally changed the children of node and
+ * Invoke this method if you've totally changed the children of node and
* its childrens children. This will post a treeStructureChanged event.
- *
+ *
* @param node that had its children and grandchildren changed.
*/
public void nodeStructureChanged(TreeNode node)
@@ -456,10 +456,10 @@ public class DefaultTreeModel
}
/**
- * Builds the parents of node up to and including the root node, where
- * the original node is the last element in the returned array. The
+ * Builds the parents of node up to and including the root node, where
+ * the original node is the last element in the returned array. The
* length of the returned array gives the node's depth in the tree.
- *
+ *
* @param node - the TreeNode to get the path for
* @return TreeNode[] - the path from node to the root
*/
@@ -469,14 +469,14 @@ public class DefaultTreeModel
}
/**
- * Builds the parents of node up to and including the root node, where
- * the original node is the last element in the returned array. The
+ * Builds the parents of node up to and including the root node, where
+ * the original node is the last element in the returned array. The
* length of the returned array gives the node's depth in the tree.
- *
+ *
* @param node - the TreeNode to get the path for
- * @param depth - an int giving the number of steps already taken
+ * @param depth - an int giving the number of steps already taken
* towards the root (on recursive calls), used to size the returned array
- * @return an array of TreeNodes giving the path from the root to the
+ * @return an array of TreeNodes giving the path from the root to the
* specified node
*/
protected TreeNode[] getPathToRoot(TreeNode node, int depth)
@@ -485,7 +485,7 @@ public class DefaultTreeModel
{
if (depth == 0)
return null;
-
+
return new TreeNode[depth];
}
@@ -496,7 +496,7 @@ public class DefaultTreeModel
/**
* Registers a listere to the model.
- *
+ *
* @param listener the listener to add
*/
public void addTreeModelListener(TreeModelListener listener)
@@ -506,7 +506,7 @@ public class DefaultTreeModel
/**
* Removes a listener from the model.
- *
+ *
* @param listener the listener to remove
*/
public void removeTreeModelListener(TreeModelListener listener)
@@ -516,9 +516,9 @@ public class DefaultTreeModel
/**
* Returns all registered <code>TreeModelListener</code> listeners.
- *
+ *
* @return an array of listeners.
- *
+ *
* @since 1.4
*/
public TreeModelListener[] getTreeModelListeners()
@@ -528,10 +528,10 @@ public class DefaultTreeModel
}
/**
- * Notifies all listeners that have registered interest for notification
- * on this event type. The event instance is lazily created using the parameters
+ * Notifies all listeners that have registered interest for notification
+ * on this event type. The event instance is lazily created using the parameters
* passed into the fire method.
- *
+ *
* @param source the node being changed
* @param path the path to the root node
* @param childIndices the indices of the changed elements
@@ -551,7 +551,7 @@ public class DefaultTreeModel
/**
* fireTreeNodesInserted
- *
+ *
* @param source the node where new nodes got inserted
* @param path the path to the root node
* @param childIndices the indices of the new elements
@@ -570,7 +570,7 @@ public class DefaultTreeModel
/**
* fireTreeNodesRemoved
- *
+ *
* @param source the node where nodes got removed-
* @param path the path to the root node
* @param childIndices the indices of the removed elements
@@ -589,7 +589,7 @@ public class DefaultTreeModel
/**
* fireTreeStructureChanged
- *
+ *
* @param source the node where the model has changed
* @param path the path to the root node
* @param childIndices the indices of the affected elements
diff --git a/libjava/classpath/javax/swing/tree/DefaultTreeSelectionModel.java b/libjava/classpath/javax/swing/tree/DefaultTreeSelectionModel.java
index b2806f2..29add0e 100644
--- a/libjava/classpath/javax/swing/tree/DefaultTreeSelectionModel.java
+++ b/libjava/classpath/javax/swing/tree/DefaultTreeSelectionModel.java
@@ -1,6 +1,6 @@
-/* DefaultTreeSelectionModel.java
+/* DefaultTreeSelectionModel.java
Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
-
+
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
@@ -63,7 +63,7 @@ import javax.swing.event.TreeSelectionListener;
* listeners are notified about the path and not the row changes. If you
* specifically need to track the row changes, register the listener for the
* expansion events.
- *
+ *
* @author Andrew Selkirk
* @author Audrius Meskauskas
*/
@@ -195,13 +195,13 @@ public class DefaultTreeSelectionModel
* Creates a clone of this DefaultTreeSelectionModel with the same selection.
* The cloned instance will have the same registered listeners, the listeners
* themselves will not be cloned. The selection will be cloned.
- *
+ *
* @exception CloneNotSupportedException should not be thrown here
* @return a copy of this DefaultTreeSelectionModel
*/
public Object clone() throws CloneNotSupportedException
{
- DefaultTreeSelectionModel cloned =
+ DefaultTreeSelectionModel cloned =
(DefaultTreeSelectionModel) super.clone();
cloned.changeSupport = null;
cloned.selection = (TreePath[]) selection.clone();
@@ -217,10 +217,10 @@ public class DefaultTreeSelectionModel
/**
* Returns a string that shows this object's properties.
* The returned string lists the selected tree rows, if any.
- *
+ *
* @return a string that shows this object's properties
*/
- public String toString()
+ public String toString()
{
if (isSelectionEmpty())
return "[selection empty]";
@@ -239,7 +239,7 @@ public class DefaultTreeSelectionModel
/**
* writeObject
- *
+ *
* @param value0 TODO
* @exception IOException TODO
*/
@@ -250,7 +250,7 @@ public class DefaultTreeSelectionModel
/**
* readObject
- *
+ *
* @param value0 TODO
* @exception IOException TODO
* @exception ClassNotFoundException TODO
@@ -263,7 +263,7 @@ public class DefaultTreeSelectionModel
/**
* Sets the RowMapper that should be used to map between paths and their rows.
- *
+ *
* @param mapper the RowMapper to set
* @see RowMapper
*/
@@ -276,7 +276,7 @@ public class DefaultTreeSelectionModel
/**
* Returns the RowMapper that is currently used to map between paths and their
* rows.
- *
+ *
* @return the current RowMapper
* @see RowMapper
*/
@@ -289,7 +289,7 @@ public class DefaultTreeSelectionModel
* Sets the current selection mode. Possible values are
* {@link #SINGLE_TREE_SELECTION}, {@link #CONTIGUOUS_TREE_SELECTION} and
* {@link #DISCONTIGUOUS_TREE_SELECTION}.
- *
+ *
* @param mode the selection mode to be set
* @see #getSelectionMode
* @see #SINGLE_TREE_SELECTION
@@ -314,7 +314,7 @@ public class DefaultTreeSelectionModel
/**
* Returns the current selection mode.
- *
+ *
* @return the current selection mode
* @see #setSelectionMode
* @see #SINGLE_TREE_SELECTION
@@ -329,7 +329,7 @@ public class DefaultTreeSelectionModel
/**
* Sets this path as the only selection. If this changes the selection the
* registered TreeSelectionListeners are notified.
- *
+ *
* @param path the path to set as selection
*/
public void setSelectionPath(TreePath path)
@@ -339,10 +339,10 @@ public class DefaultTreeSelectionModel
paths = new TreePath[]{ path };
setSelectionPaths(paths);
}
-
+
/**
* Get the number of the tree row for the given path.
- *
+ *
* @param path the tree path
* @return the tree row for this path or -1 if the path is not visible.
*/
@@ -373,7 +373,7 @@ public class DefaultTreeSelectionModel
* Sets the paths as selection. This method checks for duplicates and removes
* them. If this changes the selection the registered TreeSelectionListeners
* are notified.
- *
+ *
* @param paths the paths to set as selection
*/
public void setSelectionPaths(TreePath[] paths)
@@ -468,10 +468,10 @@ public class DefaultTreeSelectionModel
* Adds a path to the list of selected paths. This method checks if the path
* is already selected and doesn't add the same path twice. If this changes
* the selection the registered TreeSelectionListeners are notified.
- *
- * The lead path is changed to the added path. This also happen if the
+ *
+ * The lead path is changed to the added path. This also happen if the
* passed path was already selected before.
- *
+ *
* @param path the path to add to the selection
*/
public void addSelectionPath(TreePath path)
@@ -487,7 +487,7 @@ public class DefaultTreeSelectionModel
* Adds the paths to the list of selected paths. This method checks if the
* paths are already selected and doesn't add the same path twice. If this
* changes the selection the registered TreeSelectionListeners are notified.
- *
+ *
* @param paths the paths to add to the selection
*/
public void addSelectionPaths(TreePath[] paths)
@@ -568,7 +568,7 @@ public class DefaultTreeSelectionModel
/**
* Removes the path from the selection. If this changes the selection the
* registered TreeSelectionListeners are notified.
- *
+ *
* @param path the path to remove
*/
public void removeSelectionPath(TreePath path)
@@ -580,7 +580,7 @@ public class DefaultTreeSelectionModel
/**
* Removes the paths from the selection. If this changes the selection the
* registered TreeSelectionListeners are notified.
- *
+ *
* @param paths the paths to remove
*/
public void removeSelectionPaths(TreePath[] paths)
@@ -639,7 +639,7 @@ public class DefaultTreeSelectionModel
/**
* Returns the first path in the selection. This is especially useful when the
* selectionMode is {@link #SINGLE_TREE_SELECTION}.
- *
+ *
* @return the first path in the selection
*/
public TreePath getSelectionPath()
@@ -652,7 +652,7 @@ public class DefaultTreeSelectionModel
/**
* Returns the complete selection.
- *
+ *
* @return the complete selection
*/
public TreePath[] getSelectionPaths()
@@ -662,7 +662,7 @@ public class DefaultTreeSelectionModel
/**
* Returns the number of paths in the selection.
- *
+ *
* @return the number of paths in the selection
*/
public int getSelectionCount()
@@ -675,7 +675,7 @@ public class DefaultTreeSelectionModel
/**
* Checks if a given path is in the selection.
- *
+ *
* @param path the path to check
* @return <code>true</code> if the path is in the selection,
* <code>false</code> otherwise
@@ -695,7 +695,7 @@ public class DefaultTreeSelectionModel
/**
* Checks if the selection is empty.
- *
+ *
* @return <code>true</code> if the selection is empty, <code>false</code>
* otherwise
*/
@@ -729,7 +729,7 @@ public class DefaultTreeSelectionModel
/**
* Adds a <code>TreeSelectionListener</code> object to this model.
- *
+ *
* @param listener the listener to add
*/
public void addTreeSelectionListener(TreeSelectionListener listener)
@@ -739,7 +739,7 @@ public class DefaultTreeSelectionModel
/**
* Removes a <code>TreeSelectionListener</code> object from this model.
- *
+ *
* @param listener the listener to remove
*/
public void removeTreeSelectionListener(TreeSelectionListener listener)
@@ -749,7 +749,7 @@ public class DefaultTreeSelectionModel
/**
* Returns all <code>TreeSelectionListener</code> added to this model.
- *
+ *
* @return an array of listeners
* @since 1.4
*/
@@ -760,7 +760,7 @@ public class DefaultTreeSelectionModel
/**
* fireValueChanged
- *
+ *
* @param event the event to fire.
*/
protected void fireValueChanged(TreeSelectionEvent event)
@@ -773,7 +773,7 @@ public class DefaultTreeSelectionModel
/**
* Returns all added listeners of a special type.
- *
+ *
* @param listenerType the listener type
* @return an array of listeners
* @since 1.3
@@ -785,7 +785,7 @@ public class DefaultTreeSelectionModel
/**
* Returns the currently selected rows.
- *
+ *
* @return the currently selected rows
*/
public int[] getSelectionRows()
@@ -802,7 +802,7 @@ public class DefaultTreeSelectionModel
{
if (rows[i] == -1)
invisible++;
-
+
}
// Clean up invisible rows.
if (invisible > 0)
@@ -831,7 +831,7 @@ public class DefaultTreeSelectionModel
/**
* Returns the smallest row index from the selection.
- *
+ *
* @return the smallest row index from the selection
*/
public int getMinSelectionRow()
@@ -841,7 +841,7 @@ public class DefaultTreeSelectionModel
/**
* Returns the largest row index from the selection.
- *
+ *
* @return the largest row index from the selection
*/
public int getMaxSelectionRow()
@@ -851,7 +851,7 @@ public class DefaultTreeSelectionModel
/**
* Checks if a particular row is selected.
- *
+ *
* @param row the index of the row to check
* @return <code>true</code> if the row is in this selection,
* <code>false</code> otherwise
@@ -899,7 +899,7 @@ public class DefaultTreeSelectionModel
/**
* getLeadSelectionRow
- *
+ *
* @return int
*/
public int getLeadSelectionRow()
@@ -909,7 +909,7 @@ public class DefaultTreeSelectionModel
/**
* getLeadSelectionPath
- *
+ *
* @return TreePath
*/
public TreePath getLeadSelectionPath()
@@ -919,7 +919,7 @@ public class DefaultTreeSelectionModel
/**
* Adds a <code>PropertyChangeListener</code> object to this model.
- *
+ *
* @param listener the listener to add.
*/
public void addPropertyChangeListener(PropertyChangeListener listener)
@@ -931,7 +931,7 @@ public class DefaultTreeSelectionModel
/**
* Removes a <code>PropertyChangeListener</code> object from this model.
- *
+ *
* @param listener the listener to remove.
*/
public void removePropertyChangeListener(PropertyChangeListener listener)
@@ -942,7 +942,7 @@ public class DefaultTreeSelectionModel
/**
* Returns all added <code>PropertyChangeListener</code> objects.
- *
+ *
* @return an array of listeners.
* @since 1.4
*/
@@ -1000,12 +1000,12 @@ public class DefaultTreeSelectionModel
&& selection.length > 1)
setSelectionPath(selection[0]);
}
-
+
/**
* Returns <code>true</code> if the paths are contiguous (take subsequent
* rows in the diplayed tree view. The method returns <code>true</code> if
* we have no RowMapper assigned.
- *
+ *
* @param paths the paths to check for continuity
* @return <code>true</code> if the paths are contiguous or we have no
* RowMapper assigned
@@ -1038,7 +1038,7 @@ public class DefaultTreeSelectionModel
selected.set(row);
valid++;
}
-
+
}
}
int max = valid + min;
@@ -1057,7 +1057,7 @@ public class DefaultTreeSelectionModel
* <li>selectionMode is {@link #DISCONTIGUOUS_TREE_SELECTION}</li>
* <li>adding the paths to the selection still results in a contiguous set of
* paths</li>
- *
+ *
* @param paths the paths to check
* @return <code>true</code> if the paths can be added with respect to the
* selectionMode
@@ -1107,11 +1107,11 @@ public class DefaultTreeSelectionModel
return false;
return true;
}
-
+
/**
* Checks if the paths can be removed without breaking the continuity of the
* selection according to selectionMode.
- *
+ *
* @param paths the paths to check
* @return <code>true</code> if the paths can be removed with respect to the
* selectionMode
@@ -1121,20 +1121,20 @@ public class DefaultTreeSelectionModel
if (rowMapper == null || isSelectionEmpty()
|| selectionMode == DISCONTIGUOUS_TREE_SELECTION)
return true;
-
+
HashSet<TreePath> set = new HashSet<TreePath>();
for (int i = 0; i < selection.length; i++)
set.add(selection[i]);
-
+
for (int i = 0; i < paths.length; i++)
set.remove(paths[i]);
-
+
TreePath[] remaining = new TreePath[set.size()];
Iterator<TreePath> iter = set.iterator();
-
+
for (int i = 0; i < remaining.length; i++)
remaining[i] = iter.next();
-
+
return arePathsContiguous(remaining);
}
@@ -1142,12 +1142,12 @@ public class DefaultTreeSelectionModel
* Notify the installed listeners that the given patches have changed. This
* method will call listeners if invoked, but it is not called from the
* implementation of this class.
- *
+ *
* @param vPaths the vector of the changed patches
* @param oldLeadSelection the old selection index
*/
protected void notifyPathChange(Vector<PathPlaceHolder> vPaths,
- TreePath oldLeadSelection)
+ TreePath oldLeadSelection)
{
int numChangedPaths = vPaths.size();
diff --git a/libjava/classpath/javax/swing/tree/ExpandVetoException.java b/libjava/classpath/javax/swing/tree/ExpandVetoException.java
index 57531d5..fd6330c 100644
--- a/libjava/classpath/javax/swing/tree/ExpandVetoException.java
+++ b/libjava/classpath/javax/swing/tree/ExpandVetoException.java
@@ -43,7 +43,7 @@ import javax.swing.event.TreeExpansionEvent;
* ExpandVetoException
* @author Andrew Selkirk
*/
-public class ExpandVetoException extends Exception
+public class ExpandVetoException extends Exception
{
/**
@@ -56,21 +56,21 @@ public class ExpandVetoException extends Exception
* Constructor ExpandVetoException
* @param event Tree Expansion Event
*/
- public ExpandVetoException(TreeExpansionEvent event)
+ public ExpandVetoException(TreeExpansionEvent event)
{
super();
this.event = event;
- }
+ }
/**
* Constructor ExpandVetoException
* @param event Tree Expansion Event
* @param message Message
*/
- public ExpandVetoException(TreeExpansionEvent event, String message)
+ public ExpandVetoException(TreeExpansionEvent event, String message)
{
super(message);
this.event = event;
- }
+ }
-}
+}
diff --git a/libjava/classpath/javax/swing/tree/FixedHeightLayoutCache.java b/libjava/classpath/javax/swing/tree/FixedHeightLayoutCache.java
index 89f05d3..6ff2e35 100644
--- a/libjava/classpath/javax/swing/tree/FixedHeightLayoutCache.java
+++ b/libjava/classpath/javax/swing/tree/FixedHeightLayoutCache.java
@@ -55,13 +55,13 @@ import javax.swing.event.TreeModelEvent;
* have the same fixed height. This may be not the case, for instance, if leaves
* and branches have different height, of if the tree rows may have arbitrary
* variable height. This class will also work if the NodeDimensions are not
- * set.
- *
+ * set.
+ *
* @author Audrius Meskauskas
- * @author Andrew Selkirk
+ * @author Andrew Selkirk
*/
public class FixedHeightLayoutCache
- extends VariableHeightLayoutCache
+ extends VariableHeightLayoutCache
{
/**
* The cached node record.
@@ -74,47 +74,47 @@ public class FixedHeightLayoutCache
depth = aDepth;
parent = aParent;
node = aNode;
-
- isExpanded = expanded.contains(aNode);
+
+ isExpanded = expanded.contains(aNode);
}
-
+
/**
* The row, where the tree node is displayed.
*/
- final int row;
-
+ final int row;
+
/**
* The nesting depth
*/
final int depth;
-
+
/**
* The parent of the given node, null for the root node.
*/
final Object parent;
-
+
/**
* This node.
*/
final Object node;
-
+
/**
* True for the expanded nodes. The value is calculated in constructor.
* Using this field saves one hashtable access operation.
*/
final boolean isExpanded;
-
+
/**
* The cached bounds of the tree row.
*/
Rectangle bounds;
-
+
/**
* The path from the tree top to the given node (computed under first
* demand)
*/
private TreePath path;
-
+
/**
* Get the path for this node. The derived class is returned,
* making check for the last child of some parent easier.
@@ -155,7 +155,7 @@ public class FixedHeightLayoutCache
}
return path;
}
-
+
/**
* Get the rectangle bounds (compute, if required).
*/
@@ -164,37 +164,37 @@ public class FixedHeightLayoutCache
// This method may be called in the context when the tree rectangle is
// not known. To work around this, it is assumed near infinitely large.
if (bounds == null)
- bounds = getNodeDimensions(node, row, depth, isExpanded,
+ bounds = getNodeDimensions(node, row, depth, isExpanded,
new Rectangle());
- return bounds;
+ return bounds;
}
}
-
+
/**
* The set of all expanded tree nodes.
*/
Set<Object> expanded = new HashSet<Object>();
-
+
/**
* Maps nodes to the row numbers.
*/
Hashtable<Object,NodeRecord> nodes = new Hashtable<Object,NodeRecord>();
-
+
/**
* Maps row numbers to nodes.
*/
Hashtable<Integer,Object> row2node = new Hashtable<Integer,Object>();
-
+
/**
* If true, the row map must be recomputed before using.
*/
boolean dirty;
-
+
/**
* The cumulative height of all rows.
*/
int totalHeight;
-
+
/**
* The maximal width.
*/
@@ -208,21 +208,21 @@ public class FixedHeightLayoutCache
public FixedHeightLayoutCache()
{
// Nothing to do here.
- }
+ }
/**
* Get the total number of rows in the tree. Every displayed node occupies the
* single row. The root node row is included if the root node is set as
* visible (false by default).
- *
+ *
* @return int the number of the displayed rows.
*/
public int getRowCount()
{
if (dirty) update();
return row2node.size();
- }
-
+ }
+
/**
* Refresh the row map.
*/
@@ -230,7 +230,7 @@ public class FixedHeightLayoutCache
{
nodes.clear();
row2node.clear();
-
+
totalHeight = maximalWidth = 0;
Object root = treeModel.getRoot();
@@ -250,7 +250,7 @@ public class FixedHeightLayoutCache
}
dirty = false;
}
-
+
/**
* Recursively counts all rows in the tree.
*/
@@ -258,10 +258,10 @@ public class FixedHeightLayoutCache
{
Integer n = new Integer(row2node.size());
row2node.put(n, node);
-
+
NodeRecord nr = new NodeRecord(n.intValue(), depth, node, parent);
nodes.put(node, nr);
-
+
// For expanded nodes and for the root node.
if (expanded.contains(node))
{
@@ -277,7 +277,7 @@ public class FixedHeightLayoutCache
/**
* Discard the bound information for the given path.
- *
+ *
* @param path the path, for that the bound information must be recomputed.
*/
public void invalidatePathBounds(TreePath path)
@@ -285,7 +285,7 @@ public class FixedHeightLayoutCache
NodeRecord r = (NodeRecord) nodes.get(path.getLastPathComponent());
if (r != null)
r.bounds = null;
- }
+ }
/**
* Mark all cached information as invalid.
@@ -293,11 +293,11 @@ public class FixedHeightLayoutCache
public void invalidateSizes()
{
dirty = true;
- }
+ }
/**
* Set the expanded state of the given path. The expansion states must be
- * always updated when expanding and colapsing the tree nodes. Otherwise
+ * always updated when expanding and colapsing the tree nodes. Otherwise
* other methods will not work correctly after the nodes are collapsed or
* expanded.
*
@@ -310,23 +310,23 @@ public class FixedHeightLayoutCache
expanded.add(path.getLastPathComponent());
else
expanded.remove(path.getLastPathComponent());
-
+
dirty = true;
}
-
+
/**
* Get the expanded state for the given tree path.
- *
+ *
* @return true if the given path is expanded, false otherwise.
*/
public boolean isExpanded(TreePath path)
{
return expanded.contains(path.getLastPathComponent());
- }
+ }
/**
* Get bounds for the given tree path.
- *
+ *
* @param path the tree path
* @param rect the rectangle that will be reused to return the result.
* @return Rectangle the bounds of the last line, defined by the given path.
@@ -356,11 +356,11 @@ public class FixedHeightLayoutCache
rect.setRect(r.bounds);
}
return rect;
- }
+ }
/**
* Get the path, the last element of that is displayed in the given row.
- *
+ *
* @param row the row
* @return TreePath the path
*/
@@ -376,11 +376,11 @@ public class FixedHeightLayoutCache
NodeRecord r = nodes.get(last);
return r.getPath();
}
- }
+ }
/**
* Get the row, displaying the last node of the given path.
- *
+ *
* @param path the path
* @return int the row number or -1 if the end of the path is not visible.
*/
@@ -388,7 +388,7 @@ public class FixedHeightLayoutCache
{
if (path == null)
return -1;
-
+
if (dirty) update();
NodeRecord r = nodes.get(path.getLastPathComponent());
@@ -396,11 +396,11 @@ public class FixedHeightLayoutCache
return - 1;
else
return r.row;
- }
+ }
/**
* Get the path, closest to the given point.
- *
+ *
* @param x the point x coordinate
* @param y the point y coordinate
* @return the tree path, closest to the the given point
@@ -414,7 +414,7 @@ public class FixedHeightLayoutCache
NodeRecord best = null;
NodeRecord r;
Enumeration<NodeRecord> en = nodes.elements();
-
+
int dist = Integer.MAX_VALUE;
while (en.hasMoreElements() && dist > 0)
@@ -440,8 +440,8 @@ public class FixedHeightLayoutCache
return null;
else
return best.getPath();
- }
-
+ }
+
/**
* Get the closest distance from this point till the given rectangle. Only
* vertical distance is taken into consideration.
@@ -461,22 +461,22 @@ public class FixedHeightLayoutCache
* is not expanded, 0 is returned. Otherwise, the number of children is
* obtained from the model as the number of children for the last path
* component.
- *
+ *
* @param path the tree path
* @return int the number of the visible childs (for row).
*/
- public int getVisibleChildCount(TreePath path)
+ public int getVisibleChildCount(TreePath path)
{
if (isExpanded(path))
- return 0;
+ return 0;
else
return treeModel.getChildCount(path.getLastPathComponent());
- }
+ }
/**
* Get the enumeration over all visible paths that start from the given
* parent path.
- *
+ *
* @param parentPath the parent path
* @return the enumeration over pathes
*/
@@ -500,9 +500,9 @@ public class FixedHeightLayoutCache
/**
* Return the expansion state of the given tree path. The expansion state
- * must be previously set with the
+ * must be previously set with the
* {@link #setExpandedState(TreePath, boolean)}
- *
+ *
* @param path the path being checked
* @return true if the last node of the path is expanded, false otherwise.
*/
@@ -513,44 +513,44 @@ public class FixedHeightLayoutCache
/**
* The listener method, called when the tree nodes are changed.
- *
+ *
* @param event the change event
*/
public void treeNodesChanged(TreeModelEvent event)
{
dirty = true;
- }
+ }
/**
* The listener method, called when the tree nodes are inserted.
- *
+ *
* @param event the change event
*/
public void treeNodesInserted(TreeModelEvent event)
{
dirty = true;
- }
+ }
/**
* The listener method, called when the tree nodes are removed.
- *
+ *
* @param event the change event
*/
public void treeNodesRemoved(TreeModelEvent event)
{
dirty = true;
- }
+ }
/**
- * Called when the tree structure has been changed.
- *
+ * Called when the tree structure has been changed.
+ *
* @param event the change event
*/
public void treeStructureChanged(TreeModelEvent event)
{
dirty = true;
- }
-
+ }
+
/**
* Set the tree model that will provide the data.
*/
@@ -561,11 +561,11 @@ public class FixedHeightLayoutCache
expanded.add(treeModel.getRoot());
dirty = true;
}
-
+
/**
* Inform the instance if the tree root node is visible. If this method
* is not called, it is assumed that the tree root node is not visible.
- *
+ *
* @param visible true if the tree root node is visible, false
* otherwise.
*/
@@ -600,7 +600,7 @@ public class FixedHeightLayoutCache
{
if (dirty)
update();
-
+
maximalWidth = 0;
Enumeration<NodeRecord> en = nodes.elements();
while (en.hasMoreElements())
@@ -612,17 +612,17 @@ public class FixedHeightLayoutCache
}
return maximalWidth;
}
-
+
/**
* Returns true if this layout supposes that all rows have the fixed
* height.
- *
+ *
* @return boolean true if all rows in the tree must have the fixed
* height (true by default).
*/
protected boolean isFixedRowHeight()
{
- return true;
+ return true;
}
-
+
}
diff --git a/libjava/classpath/javax/swing/tree/MutableTreeNode.java b/libjava/classpath/javax/swing/tree/MutableTreeNode.java
index 9f0ff4d..4a0f4b6 100644
--- a/libjava/classpath/javax/swing/tree/MutableTreeNode.java
+++ b/libjava/classpath/javax/swing/tree/MutableTreeNode.java
@@ -39,7 +39,7 @@ package javax.swing.tree;
/**
* MutableTreeNode public interface
-
+
* @author Andrew Selkirk
*/
public interface MutableTreeNode extends TreeNode
@@ -79,7 +79,7 @@ public interface MutableTreeNode extends TreeNode
void remove(MutableTreeNode node);
/**
- * Sets a user object, the data represented by the node.
+ * Sets a user object, the data represented by the node.
*
* @param object the data
*/
diff --git a/libjava/classpath/javax/swing/tree/RowMapper.java b/libjava/classpath/javax/swing/tree/RowMapper.java
index 59eb1e3..d62b703 100644
--- a/libjava/classpath/javax/swing/tree/RowMapper.java
+++ b/libjava/classpath/javax/swing/tree/RowMapper.java
@@ -41,7 +41,7 @@ package javax.swing.tree;
* RowMapper public interface
* @author Andrew Selkirk
*/
-public interface RowMapper
+public interface RowMapper
{
/**
@@ -51,4 +51,4 @@ public interface RowMapper
*/
int[] getRowsForPaths(TreePath[] path);
-} \ No newline at end of file
+}
diff --git a/libjava/classpath/javax/swing/tree/TreeCellEditor.java b/libjava/classpath/javax/swing/tree/TreeCellEditor.java
index 8951f31..614f98d 100644
--- a/libjava/classpath/javax/swing/tree/TreeCellEditor.java
+++ b/libjava/classpath/javax/swing/tree/TreeCellEditor.java
@@ -46,26 +46,26 @@ import javax.swing.JTree;
/**
* A <code>TreeCellEditor</code> is used by the {@link JTree} component to
* edit individual tree elements (nodes).
- *
+ *
* @author Andrew Selkirk
*/
public interface TreeCellEditor extends CellEditor
{
/**
- * Returns a component that has been configured to edit one element (or
+ * Returns a component that has been configured to edit one element (or
* node) in a {@link JTree} component. The arguments to this method are used
* to pass in the value and state of the element to be edited.
- *
+ *
* @param tree the tree.
* @param value the value to render.
* @param isSelected is the tree element selected?
* @param expanded is the tree element expanded?
* @param leaf is the tree element a leaf node?
* @param row the row index.
- *
+ *
* @return A component that is configured for editing the tree element.
*/
Component getTreeCellEditorComponent(JTree tree, Object value,
- boolean isSelected, boolean expanded,
- boolean leaf, int row);
+ boolean isSelected, boolean expanded,
+ boolean leaf, int row);
}
diff --git a/libjava/classpath/javax/swing/tree/TreeCellRenderer.java b/libjava/classpath/javax/swing/tree/TreeCellRenderer.java
index b7eeb9c..fdfc0a1 100644
--- a/libjava/classpath/javax/swing/tree/TreeCellRenderer.java
+++ b/libjava/classpath/javax/swing/tree/TreeCellRenderer.java
@@ -45,16 +45,16 @@ import javax.swing.JTree;
/**
* A <code>TreeCellRenderer</code> is used by the {@link JTree} component to
* paint individual tree elements (nodes).
- *
+ *
* @author Andrew Selkirk
*/
public interface TreeCellRenderer
{
/**
- * Returns a component that has been configured to display one element (or
+ * Returns a component that has been configured to display one element (or
* node) in a {@link JTree} component. The arguments to this method are used
* to pass in the value and state of the element to be rendered.
- *
+ *
* @param tree the tree.
* @param value the value to render.
* @param selected is the tree element selected?
@@ -62,7 +62,7 @@ public interface TreeCellRenderer
* @param leaf is the tree element a leaf node?
* @param row the row index.
* @param hasFocus does the tree element have the focus?
- *
+ *
* @return A component that is configured for rendering the tree element.
*/
Component getTreeCellRendererComponent(JTree tree, Object value,
diff --git a/libjava/classpath/javax/swing/tree/TreeNode.java b/libjava/classpath/javax/swing/tree/TreeNode.java
index 53d52f0a..b68b498 100644
--- a/libjava/classpath/javax/swing/tree/TreeNode.java
+++ b/libjava/classpath/javax/swing/tree/TreeNode.java
@@ -42,16 +42,16 @@ import java.util.Enumeration;
/**
* A tree node.
- *
+ *
* @author Andrew Selkirk
*/
-public interface TreeNode
+public interface TreeNode
{
/**
* Returns the parent node for this tree node, or <code>null</code> if this
* node has no parent.
- *
+ *
* @return The parent node (possibly <code>null</code>).
*/
TreeNode getParent();
@@ -59,56 +59,55 @@ public interface TreeNode
/**
* Returns the index of the specified child node, or -1 if the node is not
* in fact a child of this node.
- *
+ *
* @param node the node (<code>null</code> not permitted).
- *
+ *
* @return The index of the specified child node, or -1.
- *
+ *
* @throws IllegalArgumentException if <code>node</code> is <code>null</code>.
*/
int getIndex(TreeNode node);
/**
* Returns the child node at the given index.
- *
- * @param index the index (in the range <code>0</code> to
+ *
+ * @param index the index (in the range <code>0</code> to
* <code>getChildCount() - 1</code>).
- *
+ *
* @return The child node at the given index.
*/
TreeNode getChildAt(int index);
/**
* Returns the number of children for this node.
- *
+ *
* @return The number of children for this node.
*/
int getChildCount();
/**
- * Returns <code>true</code> if this node allows children, and
+ * Returns <code>true</code> if this node allows children, and
* <code>false</code> otherwise.
- *
+ *
* @return A boolean.
*/
boolean getAllowsChildren();
/**
- * Returns <code>true</code> if this node is a leaf node, and
+ * Returns <code>true</code> if this node is a leaf node, and
* <code>false</code> otherwise.
- *
+ *
* @return A boolean.
*/
boolean isLeaf();
/**
- * Returns an enumeration of the children of this node, or an empty
+ * Returns an enumeration of the children of this node, or an empty
* enumeration if this node has no children.
- *
+ *
* @return An enumeration of the children of this node.
*/
@SuppressWarnings("unchecked") // Required for API compatibility
Enumeration children();
-}
-
+}
diff --git a/libjava/classpath/javax/swing/tree/TreePath.java b/libjava/classpath/javax/swing/tree/TreePath.java
index 1c4d787..7649706 100644
--- a/libjava/classpath/javax/swing/tree/TreePath.java
+++ b/libjava/classpath/javax/swing/tree/TreePath.java
@@ -45,7 +45,7 @@ import java.util.Arrays;
* A <code>TreePath</code> represents a sequence of tree elements that form
* a path starting from the root of a tree. A tree element can be represented
* by any {@link Object}.
- *
+ *
* @author Andrew Selkirk
*/
public class TreePath implements Serializable
@@ -57,7 +57,7 @@ public class TreePath implements Serializable
* assumes that the TreePath is immutable, so it is marked final here.
*/
private final Object[] path;
-
+
/**
* The parent path (to be reused).
*/
@@ -68,9 +68,9 @@ public class TreePath implements Serializable
* Creates a path from the list of objects representing tree elements. The
* incoming array is copied so that subsequent changes do not affect this
* tree path.
- *
+ *
* @param path the elements in the path (<code>null</code> not permitted).
- *
+ *
* @throws IllegalArgumentException if <code>path</code> is <code>null</code>.
*/
public TreePath(Object[] path)
@@ -83,10 +83,10 @@ public class TreePath implements Serializable
/**
* Creates a new path from a single element.
- *
+ *
* @param element the element (<code>null</code> not permitted).
- *
- * @throws IllegalArgumentException if <code>element</code> is
+ *
+ * @throws IllegalArgumentException if <code>element</code> is
* <code>null</code>.
*/
public TreePath(Object element)
@@ -98,7 +98,7 @@ public class TreePath implements Serializable
/**
* Creates a new tree path by adding the specified <code>element</code> to
* the <code>path</code>.
- *
+ *
* @param path a tree path.
* @param element a path element.
*/
@@ -117,7 +117,7 @@ public class TreePath implements Serializable
/**
* Creates a new tree path using the first <code>length</code> elements
* from the given array.
- *
+ *
* @param path the path elements.
* @param length the path length.
*/
@@ -139,7 +139,7 @@ public class TreePath implements Serializable
/**
* Returns a hashcode for the path.
- *
+ *
* @return A hashcode.
*/
public int hashCode()
@@ -148,7 +148,7 @@ public class TreePath implements Serializable
}
/**
- * Tests this path for equality with an arbitrary object. An object is
+ * Tests this path for equality with an arbitrary object. An object is
* considered equal to this path if and only if:
* <ul>
* <li>the object is not <code>null</code>;</li>
@@ -156,9 +156,9 @@ public class TreePath implements Serializable
* <li>the object contains the same elements in the same order as this
* {@link TreePath};</li>
* </ul>
- *
+ *
* @param object the object (<code>null</code> permitted).
- *
+ *
* @return <code>true</code> if <code>obj</code> is equal to this tree path,
* and <code>false</code> otherwise.
*/
@@ -188,7 +188,7 @@ public class TreePath implements Serializable
/**
* Returns a string representation of this path.
- *
+ *
* @return A string representation of this path.
*/
public String toString()
@@ -201,7 +201,7 @@ public class TreePath implements Serializable
/**
* Returns an array containing the path elements.
- *
+ *
* @return An array containing the path elements.
*/
public Object[] getPath()
@@ -211,7 +211,7 @@ public class TreePath implements Serializable
/**
* Returns the last object in the path.
- *
+ *
* @return The last object in the path.
*/
public Object getLastPathComponent()
@@ -221,7 +221,7 @@ public class TreePath implements Serializable
/**
* Returns the number of elements in the path.
- *
+ *
* @return The number of elements in the path.
*/
public int getPathCount()
@@ -231,29 +231,29 @@ public class TreePath implements Serializable
/**
* Returns the element at the specified position in the path.
- *
- * @param position the element position (<code>0 &lt N - 1</code>, where
+ *
+ * @param position the element position (<code>0 &lt N - 1</code>, where
* <code>N</code> is the number of elements in the path).
- *
+ *
* @return The element at the specified position.
- *
+ *
* @throws IllegalArgumentException if <code>position</code> is outside the
* valid range.
*/
public Object getPathComponent(int position)
{
- if (position < 0 || position >= getPathCount())
+ if (position < 0 || position >= getPathCount())
throw new IllegalArgumentException("Invalid position: " + position);
return path[position];
}
/**
* Returns <code>true</code> if <code>path</code> is a descendant of this
- * path, and <code>false</code> otherwise. If <code>path</code> is
+ * path, and <code>false</code> otherwise. If <code>path</code> is
* <code>null</code>, this method returns <code>false</code>.
- *
+ *
* @param path the path to check (<code>null</code> permitted).
- *
+ *
* @return <code>true</code> if <code>path</code> is a descendant of this
* path, and <code>false</code> otherwise
*/
@@ -270,16 +270,16 @@ public class TreePath implements Serializable
otherPathLength--;
path = path.getParentPath();
}
-
+
return equals(path);
}
/**
* Creates a new path that is equivalent to this path plus the specified
* element.
- *
+ *
* @param element the element.
- *
+ *
* @return A tree path.
*/
public TreePath pathByAddingChild(Object element)
@@ -291,7 +291,7 @@ public class TreePath implements Serializable
* Returns the parent path, which is a path containing all the same elements
* as this path, except for the last one. If this path contains only one
* element, the method returns <code>null</code>.
- *
+ *
* @return The parent path, or <code>null</code> if this path has only one
* element.
*/
@@ -301,12 +301,12 @@ public class TreePath implements Serializable
// is what the JDK does.
if (path.length <= 1)
return null;
-
+
// Reuse the parent path, if possible. The parent path is requested
// during the tree repainting, so reusing generates a lot less garbage.
if (parentPath == null)
parentPath = new TreePath(this.getPath(), path.length - 1);
-
+
return parentPath;
}
}
diff --git a/libjava/classpath/javax/swing/tree/TreeSelectionModel.java b/libjava/classpath/javax/swing/tree/TreeSelectionModel.java
index 9bdc99b..f2ba02a 100644
--- a/libjava/classpath/javax/swing/tree/TreeSelectionModel.java
+++ b/libjava/classpath/javax/swing/tree/TreeSelectionModel.java
@@ -46,7 +46,7 @@ import javax.swing.event.TreeSelectionListener;
* TreeSelectionModel public interface
* @author Andrew Selkirk
*/
-public interface TreeSelectionModel
+public interface TreeSelectionModel
{
int SINGLE_TREE_SELECTION = 1;
diff --git a/libjava/classpath/javax/swing/tree/VariableHeightLayoutCache.java b/libjava/classpath/javax/swing/tree/VariableHeightLayoutCache.java
index aac6869..0887061 100644
--- a/libjava/classpath/javax/swing/tree/VariableHeightLayoutCache.java
+++ b/libjava/classpath/javax/swing/tree/VariableHeightLayoutCache.java
@@ -53,11 +53,11 @@ import javax.swing.event.TreeModelEvent;
/**
* The fixed height tree layout. This class requires the NodeDimensions to be
* set and ignores the row height property.
- *
+ *
* @specnote the methods, of this class, returning TreePath, actually returns
* the derived class GnuPath that provides additional information for optimized
* painting. See the GnuPath code for details.
- *
+ *
* @author Audrius Meskauskas
*/
public class VariableHeightLayoutCache
@@ -80,27 +80,27 @@ public class VariableHeightLayoutCache
isExpanded = expanded.contains(aNode);
bounds = new Rectangle(0, -1, 0, 0);
}
-
+
/**
* The row, where the tree node is displayed.
*/
- final int row;
-
+ final int row;
+
/**
* The nesting depth
*/
final int depth;
-
+
/**
* The parent of the given node, null for the root node.
*/
final Object parent;
-
+
/**
* This node.
*/
final Object node;
-
+
/**
* True for the expanded nodes. The value is calculated in constructor.
* Using this field saves one hashtable access operation.
@@ -111,13 +111,13 @@ public class VariableHeightLayoutCache
* The cached bounds of the tree row.
*/
Rectangle bounds;
-
+
/**
* The path from the tree top to the given node (computed under first
* demand)
*/
private TreePath path;
-
+
/**
* Get the path for this node. The derived class is returned, making check
* for the last child of some parent easier.
@@ -158,41 +158,41 @@ public class VariableHeightLayoutCache
}
return path;
}
-
+
/**
* Get the rectangle bounds (compute, if required).
*/
Rectangle getBounds()
{
- return bounds;
+ return bounds;
}
}
-
+
/**
* The set of all expanded tree nodes.
*/
Set<Object> expanded = new HashSet<Object>();
-
+
/**
* Maps nodes to the row numbers.
*/
Hashtable<Object,NodeRecord> nodes = new Hashtable<Object,NodeRecord>();
-
+
/**
* Maps row numbers to nodes.
*/
ArrayList<Object> row2node = new ArrayList<Object>();
-
+
/**
* If true, the row map must be recomputed before using.
*/
boolean dirty;
-
+
/**
* The cumulative height of all rows.
*/
int totalHeight;
-
+
/**
* The maximal width.
*/
@@ -206,21 +206,21 @@ public class VariableHeightLayoutCache
public VariableHeightLayoutCache()
{
// Nothing to do here.
- }
+ }
/**
* Get the total number of rows in the tree. Every displayed node occupies the
* single row. The root node row is included if the root node is set as
* visible (false by default).
- *
+ *
* @return int the number of the displayed rows.
*/
public int getRowCount()
{
if (dirty) update();
return row2node.size();
- }
-
+ }
+
/**
* Refresh the row map.
*/
@@ -228,7 +228,7 @@ public class VariableHeightLayoutCache
{
nodes.clear();
row2node.clear();
-
+
totalHeight = maximalWidth = 0;
if (treeModel == null)
@@ -238,7 +238,7 @@ public class VariableHeightLayoutCache
countRows(root, null, 0, 0);
dirty = false;
}
-
+
/**
* Recursively counts all rows in the tree.
*/
@@ -287,7 +287,7 @@ public class VariableHeightLayoutCache
/**
* Discard the bound information for the given path.
- *
+ *
* @param path the path, for that the bound information must be recomputed.
*/
public void invalidatePathBounds(TreePath path)
@@ -295,7 +295,7 @@ public class VariableHeightLayoutCache
NodeRecord r = nodes.get(path.getLastPathComponent());
if (r != null)
r.bounds = null;
- }
+ }
/**
* Mark all cached information as invalid.
@@ -303,11 +303,11 @@ public class VariableHeightLayoutCache
public void invalidateSizes()
{
dirty = true;
- }
+ }
/**
* Set the expanded state of the given path. The expansion states must be
- * always updated when expanding and colapsing the tree nodes. Otherwise
+ * always updated when expanding and colapsing the tree nodes. Otherwise
* other methods will not work correctly after the nodes are collapsed or
* expanded.
*
@@ -327,20 +327,20 @@ public class VariableHeightLayoutCache
dirty = true;
}
-
+
/**
* Get the expanded state for the given tree path.
- *
+ *
* @return true if the given path is expanded, false otherwise.
*/
public boolean isExpanded(TreePath path)
{
return expanded.contains(path.getLastPathComponent());
- }
+ }
/**
* Get bounds for the given tree path.
- *
+ *
* @param path the tree path
* @param rect the rectangle that will be reused to return the result.
* @return Rectangle the bounds of the last line, defined by the given path.
@@ -366,11 +366,11 @@ public class VariableHeightLayoutCache
result.setBounds(r.bounds);
}
return result;
- }
+ }
/**
* Get the path, the last element of that is displayed in the given row.
- *
+ *
* @param row the row
* @return TreePath the path
*/
@@ -389,11 +389,11 @@ public class VariableHeightLayoutCache
path = record.getPath();
}
return path;
- }
+ }
/**
* Get the row, displaying the last node of the given path.
- *
+ *
* @param path the path
* @return int the row number or -1 if the end of the path is not visible.
*/
@@ -410,11 +410,11 @@ public class VariableHeightLayoutCache
return - 1;
else
return r.row;
- }
+ }
/**
* Get the path, closest to the given point.
- *
+ *
* @param x the point x coordinate
* @param y the point y coordinate
* @return the tree path, closest to the the given point
@@ -428,7 +428,7 @@ public class VariableHeightLayoutCache
NodeRecord best = null;
NodeRecord r;
Enumeration<NodeRecord> en = nodes.elements();
-
+
int dist = Integer.MAX_VALUE;
while (en.hasMoreElements() && dist > 0)
@@ -454,8 +454,8 @@ public class VariableHeightLayoutCache
return null;
else
return best.getPath();
- }
-
+ }
+
/**
* Get the closest distance from this point till the given rectangle. Only
* vertical distance is taken into consideration.
@@ -475,22 +475,22 @@ public class VariableHeightLayoutCache
* is not expanded, 0 is returned. Otherwise, the number of children is
* obtained from the model as the number of children for the last path
* component.
- *
+ *
* @param path the tree path
* @return int the number of the visible childs (for row).
*/
- public int getVisibleChildCount(TreePath path)
+ public int getVisibleChildCount(TreePath path)
{
if (! isExpanded(path) || treeModel == null)
- return 0;
+ return 0;
else
return treeModel.getChildCount(path.getLastPathComponent());
- }
+ }
/**
* Get the enumeration over all visible paths that start from the given
* parent path.
- *
+ *
* @param parentPath the parent path
* @return the enumeration over pathes
*/
@@ -514,9 +514,9 @@ public class VariableHeightLayoutCache
/**
* Return the expansion state of the given tree path. The expansion state
- * must be previously set with the
+ * must be previously set with the
* {@link #setExpandedState(TreePath, boolean)}
- *
+ *
* @param path the path being checked
* @return true if the last node of the path is expanded, false otherwise.
*/
@@ -527,44 +527,44 @@ public class VariableHeightLayoutCache
/**
* The listener method, called when the tree nodes are changed.
- *
+ *
* @param event the change event
*/
public void treeNodesChanged(TreeModelEvent event)
{
dirty = true;
- }
+ }
/**
* The listener method, called when the tree nodes are inserted.
- *
+ *
* @param event the change event
*/
public void treeNodesInserted(TreeModelEvent event)
{
dirty = true;
- }
+ }
/**
* The listener method, called when the tree nodes are removed.
- *
+ *
* @param event the change event
*/
public void treeNodesRemoved(TreeModelEvent event)
{
dirty = true;
- }
+ }
/**
- * Called when the tree structure has been changed.
- *
+ * Called when the tree structure has been changed.
+ *
* @param event the change event
*/
public void treeStructureChanged(TreeModelEvent event)
{
dirty = true;
- }
-
+ }
+
/**
* Set the tree model that will provide the data.
*/
@@ -578,11 +578,11 @@ public class VariableHeightLayoutCache
expanded.add(treeModel.getRoot());
}
}
-
+
/**
* Inform the instance if the tree root node is visible. If this method
* is not called, it is assumed that the tree root node is not visible.
- *
+ *
* @param visible true if the tree root node is visible, false
* otherwise.
*/
@@ -616,7 +616,7 @@ public class VariableHeightLayoutCache
{
if (dirty)
update();
-
+
maximalWidth = 0;
Enumeration<NodeRecord> en = nodes.elements();
while (en.hasMoreElements())
diff --git a/libjava/classpath/javax/swing/undo/AbstractUndoableEdit.java b/libjava/classpath/javax/swing/undo/AbstractUndoableEdit.java
index 34c41ae..fc58660 100644
--- a/libjava/classpath/javax/swing/undo/AbstractUndoableEdit.java
+++ b/libjava/classpath/javax/swing/undo/AbstractUndoableEdit.java
@@ -130,8 +130,8 @@ public class AbstractUndoableEdit
throw new CannotUndoException();
hasBeenDone = false;
}
-
-
+
+
/**
* Determines whether it would be possible to undo this editing
* action.
@@ -146,8 +146,8 @@ public class AbstractUndoableEdit
{
return alive && hasBeenDone;
}
-
-
+
+
/**
* Redoes this editing action.
*
@@ -165,8 +165,8 @@ public class AbstractUndoableEdit
throw new CannotRedoException();
hasBeenDone = true;
}
-
-
+
+
/**
* Determines whether it would be possible to redo this editing
* action.
@@ -208,8 +208,8 @@ public class AbstractUndoableEdit
{
return false;
}
-
-
+
+
/**
* Incorporates another editing action into this one, thus forming a
* combined action that replaces the argument action.
@@ -223,8 +223,8 @@ public class AbstractUndoableEdit
{
return false;
}
-
-
+
+
/**
* Determines whether this editing action is significant enough for
* being seperately undoable by the user. A typical significant
@@ -242,8 +242,8 @@ public class AbstractUndoableEdit
{
return true;
}
-
-
+
+
/**
* Returns a human-readable, localized name that describes this
* editing action and can be displayed to the user.
diff --git a/libjava/classpath/javax/swing/undo/CompoundEdit.java b/libjava/classpath/javax/swing/undo/CompoundEdit.java
index fbff2a2..64e5174 100644
--- a/libjava/classpath/javax/swing/undo/CompoundEdit.java
+++ b/libjava/classpath/javax/swing/undo/CompoundEdit.java
@@ -82,7 +82,7 @@ public class CompoundEdit
* Indicates whether the creation of this CompoundEdit is still in
* progress. Initially, the value of this flag is
* <code>true</code>. The {@link #end()} method changes the flag to
- * <code>false</code>.
+ * <code>false</code>.
*/
private boolean inProgress;
@@ -95,7 +95,7 @@ public class CompoundEdit
edits = new Vector<UndoableEdit>();
inProgress = true;
}
-
+
/**
* Undoes all edits that are part of of this
@@ -146,7 +146,7 @@ public class CompoundEdit
edits.elementAt(i).redo();
}
-
+
/**
* Returns the the <code>UndoableEdit</code> that was last added to
* this compound.
@@ -191,7 +191,7 @@ public class CompoundEdit
* UndoableEdit#replaceEdit(UndoableEdit) replace} the last added
* edit. If this fails as well, <code>edit</code> gets added as a
* new compound to {@link #edits}.
- *
+ *
* @param edit the editing action being added.
*
* @return <code>true</code> if <code>edit</code> could somehow be
@@ -321,7 +321,7 @@ public class CompoundEdit
return false;
}
-
+
/**
* Returns a human-readable, localized name that describes this
@@ -386,8 +386,8 @@ public class CompoundEdit
else
return last.getRedoPresentationName();
}
-
-
+
+
/**
* Calculates a string that may be useful for debugging.
*/
diff --git a/libjava/classpath/javax/swing/undo/StateEdit.java b/libjava/classpath/javax/swing/undo/StateEdit.java
index a032d02..819d052 100644
--- a/libjava/classpath/javax/swing/undo/StateEdit.java
+++ b/libjava/classpath/javax/swing/undo/StateEdit.java
@@ -251,15 +251,15 @@ public class StateEdit
Iterator<Object> i = preState.keySet().iterator();
while (i.hasNext())
{
- Object key = i.next();
- if (postState.containsKey(key))
- {
- if (preState.get(key).equals(postState.get(key)))
- {
- i.remove();
- postState.remove(key);
- }
- }
+ Object key = i.next();
+ if (postState.containsKey(key))
+ {
+ if (preState.get(key).equals(postState.get(key)))
+ {
+ i.remove();
+ postState.remove(key);
+ }
+ }
}
}
}
diff --git a/libjava/classpath/javax/swing/undo/UndoManager.java b/libjava/classpath/javax/swing/undo/UndoManager.java
index 1f47d51..9b10cc5 100644
--- a/libjava/classpath/javax/swing/undo/UndoManager.java
+++ b/libjava/classpath/javax/swing/undo/UndoManager.java
@@ -356,7 +356,7 @@ public class UndoManager
}
}
-
+
/**
* Undoes or redoes the last action. If the last action has already
* been undone, it will be re-done, and vice versa.
@@ -598,8 +598,8 @@ public class UndoManager
else
return edit.getRedoPresentationName();
}
-
-
+
+
/**
* Registers the edit action of an {@link UndoableEditEvent}
* with this UndoManager.
diff --git a/libjava/classpath/javax/swing/undo/UndoableEdit.java b/libjava/classpath/javax/swing/undo/UndoableEdit.java
index 9938af7..1a08eca 100644
--- a/libjava/classpath/javax/swing/undo/UndoableEdit.java
+++ b/libjava/classpath/javax/swing/undo/UndoableEdit.java
@@ -39,10 +39,10 @@ package javax.swing.undo;
/**
* An editing operation that supports undo/redoability.
- *
+ *
* @author Andrew Selkirk
*/
-public interface UndoableEdit
+public interface UndoableEdit
{
/**
@@ -50,8 +50,8 @@ public interface UndoableEdit
* combined action.
*
* @param edit the editing action to be incorporated.
- *
- * @return <code>true</code> if the edit was combined successfully, and
+ *
+ * @return <code>true</code> if the edit was combined successfully, and
* <code>false</code> if it could not be combined.
*/
boolean addEdit(UndoableEdit edit);
@@ -98,14 +98,14 @@ public interface UndoableEdit
/**
* Returns the redo presentation name.
- *
+ *
* @return The redo presentation name.
*/
String getRedoPresentationName();
/**
* Returns the undo presentation name.
- *
+ *
* @return The undo presentation name.
*/
String getUndoPresentationName();
@@ -138,8 +138,8 @@ public interface UndoableEdit
* combined action that replaces the argument action.
*
* @param edit the editing action to be replaced.
- *
- * @return <code>true</code> if the edit is successfully replaced, and
+ *
+ * @return <code>true</code> if the edit is successfully replaced, and
* <code>false</code> otherwise.
*/
boolean replaceEdit(UndoableEdit edit);
generated by cgit v1.1 at 2025-03-21 05:10:20 +0000