← Back to branch summary

~ubuntu-branches/ubuntu/natty/libswingx-java/natty

~ubuntu-branches/ubuntu/natty/libswingx-java/natty

« back to all changes in this revision

Viewing changes to src/java/org/jdesktop/swingx/search/AbstractSearchable.java

Committer: Bazaar Package Importer
Author(s): Damien Raude-Morvan
Date: 2010-07-26 12:11:27 UTC
mfrom: (4.1.4 sid)
Revision ID: james.westby@ubuntu.com-20100726121127-k0d3b21nhja0dn93

Tags: 1:1.6.1-1

* New upstream release.
* Switch to 3.0 (quilt) format.
* Bump Standards-Version to 3.9.1: no changes needed.
* Drop Depends on JRE: not requested anymore by new Java Policy.

files added:
.pc

.pc/.version

.pc/applied-patches

.pc/pom.diff

.pc/pom.diff/pom.xml

.pc/pom.diff/swingx-beaninfo

.pc/pom.diff/swingx-beaninfo/pom.xml

.pc/pom.diff/swingx-core

.pc/pom.diff/swingx-core/pom.xml

debian/source

debian/source/format

src/beaninfo/org/jdesktop/swingx/JXFormattedTextFieldBeanInfo.java

src/beaninfo/org/jdesktop/swingx/JXPromptBeanInfo.java

src/beaninfo/org/jdesktop/swingx/JXSearchFieldBeanInfo.java

src/beaninfo/org/jdesktop/swingx/JXTextAreaBeanInfo.java

src/beaninfo/org/jdesktop/swingx/JXTextFieldBeanInfo.java

src/java/org/jdesktop/swingx/JXFormattedTextField.java

src/java/org/jdesktop/swingx/JXSearchField.java

src/java/org/jdesktop/swingx/JXTextArea.java

src/java/org/jdesktop/swingx/JXTextField.java

src/java/org/jdesktop/swingx/ScrollableSizeHint.java

src/java/org/jdesktop/swingx/autocomplete/AutoComplete.java

src/java/org/jdesktop/swingx/decorator/AlignmentHighlighter.java

src/java/org/jdesktop/swingx/decorator/EnabledHighlighter.java

src/java/org/jdesktop/swingx/decorator/FontHighlighter.java

src/java/org/jdesktop/swingx/decorator/ToolTipHighlighter.java

src/java/org/jdesktop/swingx/painter/Painters.java

src/java/org/jdesktop/swingx/plaf/AbstractUIChangeHandler.java

src/java/org/jdesktop/swingx/plaf/BuddyLayoutAndBorder.java

src/java/org/jdesktop/swingx/plaf/BuddyTextFieldUI.java

src/java/org/jdesktop/swingx/plaf/PromptTextAreaUI.java

src/java/org/jdesktop/swingx/plaf/PromptTextFieldUI.java

src/java/org/jdesktop/swingx/plaf/PromptTextUI.java

src/java/org/jdesktop/swingx/plaf/SearchFieldAddon.java

src/java/org/jdesktop/swingx/plaf/SearchFieldUI.java

src/java/org/jdesktop/swingx/plaf/TextUIWrapper.java

src/java/org/jdesktop/swingx/plaf/UIDependent.java

src/java/org/jdesktop/swingx/plaf/basic/resources/SearchField.properties

src/java/org/jdesktop/swingx/plaf/basic/resources/SearchField_de.properties

src/java/org/jdesktop/swingx/plaf/basic/resources/clear.gif

src/java/org/jdesktop/swingx/plaf/basic/resources/clear_pressed.gif

src/java/org/jdesktop/swingx/plaf/basic/resources/clear_rollover.gif

src/java/org/jdesktop/swingx/plaf/basic/resources/search.gif

src/java/org/jdesktop/swingx/plaf/basic/resources/search_popup.gif

src/java/org/jdesktop/swingx/plaf/linux/SafeBorder.java

src/java/org/jdesktop/swingx/plaf/macosx/resources/clear.png

src/java/org/jdesktop/swingx/plaf/macosx/resources/clear_pressed.png

src/java/org/jdesktop/swingx/plaf/macosx/resources/clear_rollover.png

src/java/org/jdesktop/swingx/plaf/macosx/resources/search.png

src/java/org/jdesktop/swingx/plaf/macosx/resources/search_popup.png

src/java/org/jdesktop/swingx/plaf/windows/resources/clear.gif

src/java/org/jdesktop/swingx/plaf/windows/resources/clear_pressed.gif

src/java/org/jdesktop/swingx/plaf/windows/resources/clear_rollover.gif

src/java/org/jdesktop/swingx/plaf/windows/resources/search.gif

src/java/org/jdesktop/swingx/plaf/windows/resources/search_popup.gif

src/java/org/jdesktop/swingx/plaf/windows/resources/search_popup_pressed.gif

src/java/org/jdesktop/swingx/plaf/windows/resources/search_popup_rollover.gif

src/java/org/jdesktop/swingx/plaf/windows/resources/search_pressed.gif

src/java/org/jdesktop/swingx/plaf/windows/resources/search_rollover.gif

src/java/org/jdesktop/swingx/prompt

src/java/org/jdesktop/swingx/prompt/BuddyButton.java

src/java/org/jdesktop/swingx/prompt/BuddySupport.java

src/java/org/jdesktop/swingx/prompt/PromptSupport.java

src/java/org/jdesktop/swingx/renderer/MappedValues.java

src/java/org/jdesktop/swingx/search/NativeSearchFieldSupport.java

src/java/org/jdesktop/swingx/search/PatternMatcher.java

src/java/org/jdesktop/swingx/search/RecentSearches.java

src/test/org/jdesktop/beans/BeanEventsTest_Ignore.java

src/test/org/jdesktop/swingx/JTreeIssues.java

src/test/org/jdesktop/swingx/JXGraphVisualCheck.java

src/test/org/jdesktop/swingx/JXSearchFieldTest.java

src/test/org/jdesktop/swingx/plaf/AbstractUIChangeHandlerTest.java

src/test/org/jdesktop/swingx/plaf/BuddyLayoutAndBorderTest.java

src/test/org/jdesktop/swingx/plaf/PromptTextAreaUITest.java

src/test/org/jdesktop/swingx/plaf/PromptTextFieldUITest.java

src/test/org/jdesktop/swingx/plaf/PromptTextUITest_Base.java

src/test/org/jdesktop/swingx/plaf/TextUIWrapperTest.java

src/test/org/jdesktop/swingx/plaf/WindowsLookAndFeelAddonIssues.java

src/test/org/jdesktop/swingx/plaf/basic/BasicErrorPaneUIIssues.java

src/test/org/jdesktop/swingx/plaf/basic/BasicSearchFieldUITest.java

src/test/org/jdesktop/swingx/prompt

src/test/org/jdesktop/swingx/prompt/BuddySupportTest.java

src/test/org/jdesktop/swingx/prompt/PromptSupportTest.java

src/test/org/jdesktop/swingx/renderer/RelativePainterHighlighter.java

src/test/org/jdesktop/swingx/renderer/StringValuesIssues.java

src/test/org/jdesktop/swingx/search/NativeSearchFieldSupportTest.java

src/test/org/jdesktop/swingx/search/RecentSearchesTest.java

src/test/org/jdesktop/swingx/sort/DefaultRowSorterIssues.java

src/test/org/jdesktop/swingx/sort/DefaultSortControllerIssues.java

src/test/org/jdesktop/swingx/sort/DefaultSortControllerTest.java

src/test/org/jdesktop/swingx/util/OSTest.java

src/waitingroom/java/org/jdesktop/swingx/plaf/ContextLAFCheck.java

files removed:
src/demo

src/demo/org

src/demo/org/jdesktop

src/demo/org/jdesktop/swingx

src/demo/org/jdesktop/swingx/JXButtonDemo.java

src/demo/org/jdesktop/swingx/JXErrorPaneDemo.form

src/demo/org/jdesktop/swingx/JXErrorPaneDemo.java

src/demo/org/jdesktop/swingx/JXGradientChooserDemo.java

src/demo/org/jdesktop/swingx/JXHeaderDemo.java

src/demo/org/jdesktop/swingx/JXLabelDemo.java

src/demo/org/jdesktop/swingx/JXLoginPaneDemo.java

src/demo/org/jdesktop/swingx/JXStatusBarDemo.java

src/demo/org/jdesktop/swingx/JXTaskPaneDemo.java

src/demo/org/jdesktop/swingx/JXTitledSeparatorDemo.java

src/demo/org/jdesktop/swingx/painter

src/demo/org/jdesktop/swingx/painter/AlphaPainterDemo.java

src/demo/org/jdesktop/swingx/painter/BorderAndPainterDemo.java

src/demo/org/jdesktop/swingx/painter/demo

src/demo/org/jdesktop/swingx/painter/demo/PainterDemoSet.form

src/demo/org/jdesktop/swingx/painter/demo/PainterDemoSet.java

src/demo/org/jdesktop/swingx/painter/demo/PainterDemoSet.jnlp

src/demo/org/jdesktop/swingx/painter/demo/PainterToXMLTest.java

src/demo/org/jdesktop/swingx/painter/demo/URLPainterTest.java

src/demo/org/jdesktop/swingx/painter/demo/URLPainterTest1.xml

src/demo/org/jdesktop/swingx/painter/demo/URLPainterTest2.xml

src/demo/org/jdesktop/swingx/painter/demo/a-glyph.png

src/demo/org/jdesktop/swingx/painter/demo/border.gif

src/demo/org/jdesktop/swingx/painter/demo/moon.jpg

src/demo/org/jdesktop/swingx/painter/resources

src/demo/org/jdesktop/swingx/painter/resources/border.png

src/demo/org/jdesktop/swingx/renderer

src/demo/org/jdesktop/swingx/renderer/AnimatedRendererDemo.java

src/demo/org/jdesktop/swingx/renderer/BarRendererDemo.java

src/demo/org/jdesktop/swingx/renderer/CustomBooleanRendering.java

src/demo/org/jdesktop/swingx/renderer/CustomComponentProviderDemo.java

src/demo/org/jdesktop/swingx/renderer/SimpleRendererDemo.java

src/demo/org/jdesktop/swingx/renderer/resources

src/demo/org/jdesktop/swingx/renderer/resources/bronze-star.gif

src/demo/org/jdesktop/swingx/renderer/resources/contributors.txt

src/demo/org/jdesktop/swingx/renderer/resources/exit.png

src/demo/org/jdesktop/swingx/renderer/resources/gold-star.gif

src/demo/org/jdesktop/swingx/renderer/resources/green-orb.png

src/demo/org/jdesktop/swingx/renderer/resources/platinum-star.gif

src/demo/org/jdesktop/swingx/renderer/resources/silver-star.gif

src/demo/org/jdesktop/swingx/resources

src/demo/org/jdesktop/swingx/resources/dataset.xml

src/demo/org/jdesktop/swingx/resources/exit.png

src/demo/org/jdesktop/swingx/resources/green-orb.png

src/demo/org/jdesktop/swingx/resources/header-image.png

src/demo/org/jdesktop/swingx/resources/weather.txt

src/java/org/jdesktop/swingx/autocomplete/AutoCompleteFocusAdapter.java

src/java/org/jdesktop/swingx/autocomplete/AutoCompleteKeyAdapter.java

src/test/org/jdesktop/beans/BeanEventsTest.java

swingx-demos

swingx-demos/pom.xml

files modified:
README

debian/README.source

debian/changelog

debian/control

debian/orig-tar.sh *

debian/patches/pom.diff

debian/rules

docs/README

docs/README.html

pom.xml

src/beaninfo/org/jdesktop/swingx/JXMultiSplitPaneBeanInfo.java

src/beaninfo/org/jdesktop/swingx/JXPanelBeanInfo.java

src/beaninfo/org/jdesktop/swingx/JXTitledPanelBeanInfo.java

src/java/org/jdesktop/swingx/ForwardingRepaintManager.java

src/java/org/jdesktop/swingx/JXCollapsiblePane.java

src/java/org/jdesktop/swingx/JXDatePicker.java

src/java/org/jdesktop/swingx/JXEditorPane.java

src/java/org/jdesktop/swingx/JXGlassBox.java

src/java/org/jdesktop/swingx/JXGraph.java

src/java/org/jdesktop/swingx/JXList.java

src/java/org/jdesktop/swingx/JXMonthView.java

src/java/org/jdesktop/swingx/JXPanel.java

src/java/org/jdesktop/swingx/JXSearchPanel.java

src/java/org/jdesktop/swingx/JXStatusBar.java

src/java/org/jdesktop/swingx/JXTable.java

src/java/org/jdesktop/swingx/JXTableHeader.java

src/java/org/jdesktop/swingx/JXTaskPaneContainer.java

src/java/org/jdesktop/swingx/JXTree.java

src/java/org/jdesktop/swingx/JXTreeTable.java

src/java/org/jdesktop/swingx/auth/LoginService.java

src/java/org/jdesktop/swingx/autocomplete/AutoCompleteComboBoxEditor.java

src/java/org/jdesktop/swingx/autocomplete/AutoCompleteDecorator.java

src/java/org/jdesktop/swingx/autocomplete/AutoCompleteDocument.java

src/java/org/jdesktop/swingx/autocomplete/AutoCompletePropertyChangeListener.java

src/java/org/jdesktop/swingx/autocomplete/package-info.java

src/java/org/jdesktop/swingx/calendar/CalendarUtils.java

src/java/org/jdesktop/swingx/color/ColorUtil.java

src/java/org/jdesktop/swingx/color/GradientThumbRenderer.java

src/java/org/jdesktop/swingx/decorator/ColorHighlighter.java

src/java/org/jdesktop/swingx/decorator/ComponentAdapter.java

src/java/org/jdesktop/swingx/decorator/CompoundHighlighter.java

src/java/org/jdesktop/swingx/decorator/HighlightPredicate.java

src/java/org/jdesktop/swingx/decorator/HighlighterFactory.java

src/java/org/jdesktop/swingx/decorator/IconHighlighter.java

src/java/org/jdesktop/swingx/decorator/PatternMatcher.java

src/java/org/jdesktop/swingx/decorator/PatternPredicate.java

src/java/org/jdesktop/swingx/decorator/SearchPredicate.java

src/java/org/jdesktop/swingx/decorator/UIDependent.java

src/java/org/jdesktop/swingx/geom/Morphing2D.java

src/java/org/jdesktop/swingx/hyperlink/HyperlinkAction.java

src/java/org/jdesktop/swingx/package-info.java

src/java/org/jdesktop/swingx/painter/AbstractAreaPainter.java

src/java/org/jdesktop/swingx/painter/AbstractLayoutPainter.java

src/java/org/jdesktop/swingx/painter/AbstractPainter.java

src/java/org/jdesktop/swingx/painter/ImagePainter.java

src/java/org/jdesktop/swingx/painter/MattePainter.java

src/java/org/jdesktop/swingx/painter/RectanglePainter.java

src/java/org/jdesktop/swingx/painter/ShapePainter.java

src/java/org/jdesktop/swingx/plaf/TableHeaderAddon.java

src/java/org/jdesktop/swingx/plaf/TaskPaneAddon.java

src/java/org/jdesktop/swingx/plaf/basic/BasicCalendarHeaderHandler.java

src/java/org/jdesktop/swingx/plaf/basic/BasicCalendarRenderingHandler.java

src/java/org/jdesktop/swingx/plaf/basic/BasicDatePickerUI.java

src/java/org/jdesktop/swingx/plaf/basic/BasicLookAndFeelAddons.java

src/java/org/jdesktop/swingx/plaf/basic/BasicMonthViewUI.java

src/java/org/jdesktop/swingx/plaf/basic/CalendarAdapter.java

src/java/org/jdesktop/swingx/plaf/basic/core/BasicXListUI.java

src/java/org/jdesktop/swingx/plaf/basic/core/ListSortUI.java

src/java/org/jdesktop/swingx/plaf/linux/LinuxLookAndFeelAddons.java

src/java/org/jdesktop/swingx/plaf/synth/SynthXListUI.java

src/java/org/jdesktop/swingx/plaf/windows/WindowsLookAndFeelAddons.java

src/java/org/jdesktop/swingx/renderer/CellContext.java

src/java/org/jdesktop/swingx/renderer/DefaultVisuals.java

src/java/org/jdesktop/swingx/renderer/StringValues.java

src/java/org/jdesktop/swingx/renderer/WrappingProvider.java

src/java/org/jdesktop/swingx/rollover/RolloverProducer.java

src/java/org/jdesktop/swingx/rollover/TableRolloverController.java

src/java/org/jdesktop/swingx/search/AbstractSearchable.java

src/java/org/jdesktop/swingx/sort/DefaultSortController.java

src/java/org/jdesktop/swingx/sort/ListSortController.java

src/java/org/jdesktop/swingx/sort/TableSortController.java

src/java/org/jdesktop/swingx/table/ColumnFactory.java

src/java/org/jdesktop/swingx/table/NumberEditorExt.java

src/java/org/jdesktop/swingx/table/TableColumnExt.java

src/java/org/jdesktop/swingx/tree/DefaultXTreeCellEditor.java

src/java/org/jdesktop/swingx/util/OS.java

src/test/org/jdesktop/swingx/InteractiveTestCase.java

src/test/org/jdesktop/swingx/JListIssues.java

src/test/org/jdesktop/swingx/JTableIssues.java

src/test/org/jdesktop/swingx/JXCollapsiblePaneVisualCheck.java

src/test/org/jdesktop/swingx/JXDatePickerIssues.java

src/test/org/jdesktop/swingx/JXDatePickerTest.java

src/test/org/jdesktop/swingx/JXDatePickerVisualCheck.java

src/test/org/jdesktop/swingx/JXEditorPaneVisualCheck.java

src/test/org/jdesktop/swingx/JXHyperlinkVisualCheck.java

src/test/org/jdesktop/swingx/JXListIssues.java

src/test/org/jdesktop/swingx/JXListSortRevamp.java

src/test/org/jdesktop/swingx/JXListTest.java

src/test/org/jdesktop/swingx/JXListVisualCheck.java

src/test/org/jdesktop/swingx/JXMonthViewTest.java

src/test/org/jdesktop/swingx/JXMonthViewVisualCheck.java

src/test/org/jdesktop/swingx/JXPanelTest.java

src/test/org/jdesktop/swingx/JXPanelVisualCheck.java

src/test/org/jdesktop/swingx/JXTableHeaderVisualCheck.java

src/test/org/jdesktop/swingx/JXTableIssues.java

src/test/org/jdesktop/swingx/JXTableUnitTest.java

src/test/org/jdesktop/swingx/JXTableVisualCheck.java

src/test/org/jdesktop/swingx/JXTaskPaneContainerTest.java

src/test/org/jdesktop/swingx/JXTaskPaneIssues.java

src/test/org/jdesktop/swingx/JXTitledPanelTest.java

src/test/org/jdesktop/swingx/JXTreeIssues.java

src/test/org/jdesktop/swingx/JXTreeTableIssues.java

src/test/org/jdesktop/swingx/JXTreeTableUnitTest.java

src/test/org/jdesktop/swingx/JXTreeTableVisualCheck.java

src/test/org/jdesktop/swingx/JXTreeUnitTest.java

src/test/org/jdesktop/swingx/JXTreeVisualCheck.java

src/test/org/jdesktop/swingx/SandboxTest.java

src/test/org/jdesktop/swingx/SerializableIssues.java

src/test/org/jdesktop/swingx/XLocalizeIssues.java

src/test/org/jdesktop/swingx/action/ActionIssues.java

src/test/org/jdesktop/swingx/action/ActionTest.java

src/test/org/jdesktop/swingx/autocomplete/AutoCompleteDecoratorTest.java

src/test/org/jdesktop/swingx/autocomplete/AutoCompleteDecoratorVisualCheck.java

src/test/org/jdesktop/swingx/border/MatteBorderExtUnitTest.java

src/test/org/jdesktop/swingx/calendar/CalendarUtilsTest.java

src/test/org/jdesktop/swingx/calendar/DateSelectionModelIssues.java

src/test/org/jdesktop/swingx/color/ColorUtilTest.java

src/test/org/jdesktop/swingx/decorator/AbstractTestHighlighterClient.java

src/test/org/jdesktop/swingx/decorator/ComponentAdapterIssues.java

src/test/org/jdesktop/swingx/decorator/CompoundHighlighterTest.java

src/test/org/jdesktop/swingx/decorator/HighlightPredicateTest.java

src/test/org/jdesktop/swingx/decorator/HighlighterClientVisualCheck.java

src/test/org/jdesktop/swingx/decorator/HighlighterIssues.java

src/test/org/jdesktop/swingx/decorator/HighlighterTest.java

src/test/org/jdesktop/swingx/decorator/UIColorHighlighterTest.java

src/test/org/jdesktop/swingx/graphics/BlenderVisualCheck.java

src/test/org/jdesktop/swingx/hyperlink/HyperlinkActionTest.java

src/test/org/jdesktop/swingx/plaf/LookAndFeelAddonsTest.java

src/test/org/jdesktop/swingx/plaf/basic/BasicMonthViewUITest.java

src/test/org/jdesktop/swingx/plaf/synth/SynthTableColors.java

src/test/org/jdesktop/swingx/renderer/CellContextTest.java

src/test/org/jdesktop/swingx/renderer/DNDRendererVisualCheck.java

src/test/org/jdesktop/swingx/renderer/HighlighterClientVisualCheck.java

src/test/org/jdesktop/swingx/renderer/PainterVisualCheck.java

src/test/org/jdesktop/swingx/renderer/RendererIssues.java

src/test/org/jdesktop/swingx/renderer/RendererVisualCheck.java

src/test/org/jdesktop/swingx/renderer/StringValuesTest.java

src/test/org/jdesktop/swingx/rollover/RolloverTest.java

src/test/org/jdesktop/swingx/search/SearchableTest.java

src/test/org/jdesktop/swingx/sort/AbstractTestSortController.java

src/test/org/jdesktop/swingx/sort/TableSortControllerTest.java

src/test/org/jdesktop/swingx/table/ColumnFactoryTest.java

src/test/org/jdesktop/swingx/table/NumberEditorExtIssues.java

src/test/org/jdesktop/swingx/table/NumberEditorExtTest.java

src/test/org/jdesktop/swingx/table/TableColumnExtTest.java

src/test/org/jdesktop/test/PropertyChangeReport.java

src/test/org/jdesktop/test/TestUtils.java

src/test/org/jdesktop/test/VerticalLayoutPref.java

swingx-beaninfo/pom.xml

swingx-core/pom.xml

Show diffs side-by-side

added added

removed removed

src/java/org/jdesktop/swingx/search/AbstractSearchable.java

1

1

/*

2

* $Id: AbstractSearchable.java 3194 2009-01-21 11:39:19Z kleopatra $

2

* $Id: AbstractSearchable.java 3561 2009-11-30 12:33:56Z kleopatra $

3

3

*

4

4

* Copyright 2004 Sun Microsystems, Inc., 4150 Network Circle,

5

5

* Santa Clara, California 95054, U.S.A. All rights reserved.

457

457

protected boolean hasMatch() {

458

458

return hasMatch(lastSearchResult);

459

459

}

460

460

461

/**

461

* Returns a boolean indicating whether a match should be marked with a Highlighter.

462

* Returns a boolean indicating whether a match should be marked with a

463

* Highlighter. Typically, if true, the match highlighter is used, otherwise

464

* a match is indicated by selection.

462

465

* <p>

463

* This implementation returns true if the target component has a client property for

464

* key MATCH_HIGHLIGHTER with value Boolean.TRUE, false otherwise.

465

*

466

* @return a boolean indicating whether a match should be marked by a using a Highlighter.

466

*

467

* This implementation returns true if the target component has a client

468

* property for key MATCH_HIGHLIGHTER with value Boolean.TRUE, false

469

* otherwise. The SearchFactory sets that client property in incremental

470

* search mode, that is when triggering a search via the JXFindBar as

471

* installed by the factory.

472

*

473

* @return a boolean indicating whether a match should be marked by a using

474

* a Highlighter.

475

*

476

* @see SearchFactory

467

477

*/

468

478

protected boolean markByHighlighter() {

469

return Boolean.TRUE.equals(getTarget().getClientProperty(MATCH_HIGHLIGHTER));

479

return Boolean.TRUE.equals(getTarget().getClientProperty(

480

MATCH_HIGHLIGHTER));

470

481

}

471

482

472

483

/**

479

490

removeHighlighter(matchHighlighter);

480

491

matchHighlighter = hl;

481

492

if (markByHighlighter()) {

482

getConfiguredMatchHighlighter();

493

moveMatchMarker();

483

494

}

484

495

}

485

496

Older »