This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository libjide-oss-java.
commit e11713bd7a2e1985d74f2a32cbd301dbe149d9f7 Author: Markus Koschany <[email protected]> Date: Sun Aug 4 12:46:31 2013 +0200 Imported Upstream version 3.5.7 --- ChangeLog | 70 ++++++++++++++++++++ README.txt | 2 +- build.properties | 2 +- pom.xml | 2 +- properties/com/jidesoft/swing/swing_fr.properties | 14 ++-- src/com/jidesoft/dialog/PageList.java | 2 - .../jidesoft/plaf/basic/BasicJideTabbedPaneUI.java | 17 +++-- src/com/jidesoft/popup/JidePopup.java | 31 +-------- .../jidesoft/swing/CheckBoxTreeSelectionModel.java | 12 +++- src/com/jidesoft/swing/JideTabbedPane.java | 46 ++----------- src/com/jidesoft/swing/SearchableBar.java | 2 +- src/com/jidesoft/swing/swing.properties | 2 +- src/com/jidesoft/utils/PortingUtils.java | 2 +- 13 files changed, 112 insertions(+), 92 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec8529e..af7b6a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,73 @@ +2013-08-01 jidesoft <[email protected]> + + * build.properties, pom.xml: release 3.5.7 + +2013-07-31 frankxu <[email protected]> + + * src/com/jidesoft/utils/PortingUtils.java: + Common,B,PortingUtils,Fixed the issue in + PortingUtils#ensureOnScreen(),,no + +2013-07-03 jidesoft <[email protected]> + + * src/com/jidesoft/popup/JidePopup.java: remove setAutoRequestFocus + call + +2013-06-27 jidesoft <[email protected]> + + * src/com/jidesoft/popup/JidePopup.java: Common,B,JidePopup,Added + setAutoRequestFocus call before making the popup visible,,no + +2013-06-26 jidesoft <[email protected]> + + * src/com/jidesoft/plaf/basic/BasicJideTabbedPaneUI.java: + Common,B,BasicJideTabbedPaneUI,Fixed the actionCommand is not passed + to the ActionEvent,,no + +2013-06-13 yangxiaoze <[email protected]> + + * README.txt, build.properties, pom.xml: common layer 3.5.6 + +2013-06-13 frankxu <[email protected]> + + * src/com/jidesoft/swing/SearchableBar.java: + Common,B,SearchableBar,Fixed the issue that the matching count could + not be cleared while clearing the searching text in + SearchableBar,72195,no + +2013-06-12 frankxu <[email protected]> + + * src/com/jidesoft/swing/CheckBoxTreeSelectionModel.java: + Common,B,Fixed the StackOverflowError when removing a tree node that + all its siblings are selected in a CheckBoxTree,71912,no + +2013-06-11 frankxu <[email protected]> + + * properties/com/jidesoft/swing/swing_fr.properties: misc, no + +2013-06-04 frankxu <[email protected]> + + * properties/com/jidesoft/swing/swing_fr.properties, + src/com/jidesoft/swing/swing.properties: French translation, 72194, + no + +2013-05-27 jidesoft <[email protected]> + + * src/com/jidesoft/plaf/basic/BasicJideTabbedPaneUI.java, + src/com/jidesoft/swing/JideTabbedPane.java: + Common,B,JideTabbedPane,Fixed a regression of the selected tab text + color,72028,no Backward Compatible: the ColorProvider's + getForegroudAt method had a typo and renamed to getForegroundAt + +2013-05-24 frankxu <[email protected]> + + * src/com/jidesoft/dialog/PageList.java: Common,B,PageList,Fixed so that the PageList could fire correct + PAGE_OPENED event on switching the page,72012,no + +2013-05-24 frankxu <[email protected]> + + * : Merge remote-tracking branch 'origin/master' + 2013-05-17 yangxiaoze <[email protected]> * build.properties, pom.xml, diff --git a/README.txt b/README.txt index 099ba5e..6c46a37 100644 --- a/README.txt +++ b/README.txt @@ -58,7 +58,7 @@ If you just want to use JIDE Common Layer in your project which used Maven, you <dependency> <groupId>com.jidesoft</groupId> <artifactId>jide-oss</artifactId> - <version>3.4.0</version> + <version>3.5.6</version> </dependency> You can specify different versions if you want to use that version. You can find all available version numbers at http://search.maven.org by searching jide-oss. diff --git a/build.properties b/build.properties index a6e34a3..a14e0ee 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ # USER DEFINED VALUES # company_name=JIDE Software, Inc. -jide_version=3.5.5 +jide_version=3.5.7 base_dir=. output_dir=${basedir}/classes diff --git a/pom.xml b/pom.xml index 5c8f069..b38dbd4 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ <groupId>com.jidesoft</groupId> <artifactId>jide-oss</artifactId> <name>JIDE Common Layer</name> - <version>3.5.5</version> + <version>3.5.7</version> <packaging>jar</packaging> <description>JIDE Common Layer (Professional Swing Components)</description> <url>https://github.com/jidesoft/jide-oss</url> diff --git a/properties/com/jidesoft/swing/swing_fr.properties b/properties/com/jidesoft/swing/swing_fr.properties index 64b7e5c..5fa686c 100644 --- a/properties/com/jidesoft/swing/swing_fr.properties +++ b/properties/com/jidesoft/swing/swing_fr.properties @@ -2,7 +2,7 @@ # Strings for Searchable classes # Searchable.searchFor=Rechercher : -Searchable.noMatch=(aucun r\u00e9sultat) +Searchable.noMatch=(aucun r\u00E9sultat) # # Strings for SearchableBar classes @@ -12,21 +12,23 @@ SearchableBar.find.mnemonic=R SearchableBar.findNext=Rechercher suivante SearchableBar.findNext.mnemonic=S SearchableBar.findNext.tooltip=Rechercher l'occurrence suivante de l'expression -SearchableBar.findPrevious=Rechercher pr\u00e9c\u00e9dente +SearchableBar.findPrevious=Rechercher pr\u00E9c\u00E9dente SearchableBar.findPrevious.mnemonic=P -SearchableBar.findPrevious.tooltip=Rechercher l'occurrence pr\u00e9c\u00e9dente de l'expression +SearchableBar.findPrevious.tooltip=Rechercher l'occurrence pr\u00E9c\u00E9dente de l'expression SearchableBar.highlights=Surbrillance SearchableBar.highlights.mnemonic=S SearchableBar.highlights.tooltip=Met en surbrillance toutes les occurrences de l'expression SearchableBar.matchCase=Respecter la casse SearchableBar.matchCase.mnemonic=C -SearchableBar.repeats=R\u00e9p\u00e9titions +SearchableBar.repeats=R\u00E9p\u00E9titions SearchableBar.repeats.mnemonic=R +SearchableBar.matches = occurrence(s) +SearchableBar.wholeWords = Mots entiers SearchableBar.reachedBottom=Bas de la page atteint SearchableBar.reachedTop=Haut de la page atteint -SearchableBar.reachedBottomRepeat=Bas de la page atteint, reprise \u00e0 partir du haut -SearchableBar.reachedTopRepeat=Haut de la page atteint, reprise \u00e0 partir du bas +SearchableBar.reachedBottomRepeat=Bas de la page atteint, reprise \u00E0 partir du haut +SearchableBar.reachedTopRepeat=Haut de la page atteint, reprise \u00E0 partir du bas SearchableBar.notFound=Expression introuvable # diff --git a/src/com/jidesoft/dialog/PageList.java b/src/com/jidesoft/dialog/PageList.java index 1cbd29c..6b55489 100644 --- a/src/com/jidesoft/dialog/PageList.java +++ b/src/com/jidesoft/dialog/PageList.java @@ -155,8 +155,6 @@ public class PageList extends DefaultComboBoxModel { if (!JideSwingUtilities.equals(oldPage, page)) { setSelectedItem(page); - } - else { AbstractDialogPage newPage = getCurrentPage(); if (newPage != null) { newPage.firePageEvent(source, PageEvent.PAGE_OPENED); diff --git a/src/com/jidesoft/plaf/basic/BasicJideTabbedPaneUI.java b/src/com/jidesoft/plaf/basic/BasicJideTabbedPaneUI.java index dbea181..3271be0 100644 --- a/src/com/jidesoft/plaf/basic/BasicJideTabbedPaneUI.java +++ b/src/com/jidesoft/plaf/basic/BasicJideTabbedPaneUI.java @@ -1368,8 +1368,8 @@ public class BasicJideTabbedPaneUI extends JideTabbedPaneUI implements SwingCons color = ((TabColorProvider) comp).getTabForeground(); } if (_tabPane.isEnabled() && _tabPane.isEnabledAt(tabIndex)) { - if (color == null && colorProvider != null) { - g2d.setColor(colorProvider.getForegroudAt(tabIndex)); + if (color == null && colorProvider != null && colorProvider.getForegroundAt(tabIndex) != null) { + g2d.setColor(colorProvider.getForegroundAt(tabIndex)); } else { if (color == null) { @@ -4651,8 +4651,8 @@ public class BasicJideTabbedPaneUI extends JideTabbedPaneUI implements SwingCons } /** - * Returns if the point resides in the empty tab area, which means it is in the tab area however no real tab contains - * that point. + * Returns if the point resides in the empty tab area, which means it is in the tab area however no real tab + * contains that point. * * @param x x value of the point * @param y y value of the point @@ -5689,6 +5689,7 @@ public class BasicJideTabbedPaneUI extends JideTabbedPaneUI implements SwingCons } if (pane.getCloseAction() != null) { + e2 = new ActionEvent(e2.getSource(), e2.getID(), (String) pane.getCloseAction().getValue(Action.ACTION_COMMAND_KEY), e2.getWhen(), e2.getModifiers()); pane.getCloseAction().actionPerformed(e2); } else { @@ -8768,6 +8769,9 @@ public class BasicJideTabbedPaneUI extends JideTabbedPaneUI implements SwingCons private class ContainerHandler implements ContainerListener { public void componentAdded(ContainerEvent e) { + if (_tabPane == null) { + return; + } JideTabbedPane tp = (JideTabbedPane) e.getContainer(); // updateTabPanel(); Component child = e.getChild(); @@ -8805,6 +8809,9 @@ public class BasicJideTabbedPaneUI extends JideTabbedPaneUI implements SwingCons } public void componentRemoved(ContainerEvent e) { + if (_tabPane == null) { + return; + } JideTabbedPane tp = (JideTabbedPane) e.getContainer(); // updateTabPanel(); Component child = e.getChild(); @@ -9375,7 +9382,7 @@ public class BasicJideTabbedPaneUI extends JideTabbedPaneUI implements SwingCons // setBorder(BorderFactory.createEmptyBorder()); setBorder(BorderFactory .createCompoundBorder(new PartialLineBorder(Color.BLACK, 1, true), - BorderFactory.createEmptyBorder(0, 2, 0, 2))); + BorderFactory.createEmptyBorder(0, 2, 0, 2))); } public boolean stopEditing() { diff --git a/src/com/jidesoft/popup/JidePopup.java b/src/com/jidesoft/popup/JidePopup.java index 8494825..bc0d49d 100644 --- a/src/com/jidesoft/popup/JidePopup.java +++ b/src/com/jidesoft/popup/JidePopup.java @@ -274,7 +274,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Called by the constructor to set up the <code>JRootPane</code>. * * @return a new <code>JRootPane</code> - * * @see javax.swing.JRootPane */ protected JRootPane createRootPane() { @@ -329,7 +328,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Returns the name of the look-and-feel class that renders this component. * * @return the string "PopupUI" - * * @see javax.swing.JComponent#getUIClassID * @see javax.swing.UIDefaults#getUI */ @@ -342,7 +340,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Returns whether calls to <code>add</code> and <code>setLayout</code> cause an exception to be thrown. * * @return <code>true</code> if <code>add</code> and <code>setLayout</code> are checked - * * @see #addImpl * @see #setLayout * @see #setRootPaneCheckingEnabled @@ -356,7 +353,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * * @param enabled a boolean value, <code>true</code> if checking is to be enabled, which cause the exceptions to be * thrown - * * @see #addImpl * @see #setLayout * @see #isRootPaneCheckingEnabled @@ -377,7 +373,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * @param comp the <code>Component</code> to be added * @param constraints the object containing the constraints, if any * @param index the index - * * @throws Error if called with <code>isRootPaneChecking</code> <code>true</code> * @see #setRootPaneCheckingEnabled */ @@ -395,7 +390,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Removes the specified component from this container. * * @param comp the component to be removed - * * @see #add */ @Override @@ -420,7 +414,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * disable this behavior. * * @param manager the <code>LayoutManager</code> - * * @throws Error if called with <code>isRootPaneChecking</code> <code>true</code> * @see #setRootPaneCheckingEnabled */ @@ -443,7 +436,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * been set. * * @return the <code>JMenuBar</code> used by this Popup. - * * @see #setJMenuBar */ public JMenuBar getJMenuBar() { @@ -454,7 +446,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Sets the <code>menuBar</code> property for this <code>Popup</code>. * * @param m the <code>JMenuBar</code> to use in this Popup. - * * @see #getJMenuBar */ public void setJMenuBar(JMenuBar m) { @@ -479,7 +470,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Sets this <code>Popup</code>'s <code>contentPane</code> property. * * @param c the content pane for this popup. - * * @throws java.awt.IllegalComponentStateException * (a runtime exception) if the content pane parameter is <code>null</code> * @see javax.swing.RootPaneContainer#getContentPane @@ -494,7 +484,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Returns the layered pane for this popup. * * @return a <code>JLayeredPane</code> object - * * @see javax.swing.RootPaneContainer#setLayeredPane * @see javax.swing.RootPaneContainer#getLayeredPane */ @@ -506,7 +495,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Sets this <code>Popup</code>'s <code>layeredPane</code> property. * * @param layered the <code>JLayeredPane</code> for this popup - * * @throws java.awt.IllegalComponentStateException * (a runtime exception) if the layered pane parameter is <code>null</code> * @see javax.swing.RootPaneContainer#setLayeredPane @@ -521,7 +509,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Returns the glass pane for this popup. * * @return the glass pane - * * @see javax.swing.RootPaneContainer#setGlassPane */ public Component getGlassPane() { @@ -532,7 +519,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Sets this <code>Popup</code>'s <code>glassPane</code> property. * * @param glass the glass pane for this popup - * * @see javax.swing.RootPaneContainer#getGlassPane */ public void setGlassPane(Component glass) { @@ -545,7 +531,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Returns the <code>rootPane</code> object for this popup. * * @return the <code>rootPane</code> property - * * @see javax.swing.RootPaneContainer#getRootPane */ @Override @@ -600,7 +585,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * * @return an <code>AccessiblePopup</code> that serves as the <code>AccessibleContext</code> of this * <code>Popup</code> - * * @see com.jidesoft.popup.JidePopup.AccessiblePopup */ @Override @@ -667,7 +651,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Get the accessible name of this object. * * @return the localized name of the object -- can be <code>null</code> if this object does not have a name - * * @see #setAccessibleName */ @Override @@ -684,7 +667,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Get the role of this object. * * @return an instance of AccessibleRole describing the role of the object - * * @see javax.accessibility.AccessibleRole */ @Override @@ -818,7 +800,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * @param point owner is top-left coordinate relative to screen. * @param size the size of the popup window. * @param owner the owner - * * @return new popup location. By default, it will return the coordinate of the bottom-left corner of owner. */ protected Point getPopupLocation(Point point, Dimension size, Component owner) { @@ -973,7 +954,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Set the display start location of the popup. * * @param startLocation the display start location. - * * @see #getDisplayStartLocation(java.awt.Rectangle, java.awt.Dimension, int) */ public void setDisplayStartLocation(Point startLocation) { @@ -988,7 +968,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * @param screenDim the dimension of the screen * @param size the size of the popup * @param location the direction to show the popup - * * @return the display start location. */ protected Point getDisplayStartLocation(Rectangle screenDim, Dimension size, int location) { @@ -1082,8 +1061,8 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants } /** - * Gets the rectangle adjusted by preferred size and the monitor device settings. The client property "useAllMonitorDevices" - * could be registered in any ancestor component of the owner component to take effect. + * Gets the rectangle adjusted by preferred size and the monitor device settings. The client property + * "useAllMonitorDevices" could be registered in any ancestor component of the owner component to take effect. * * @param x the original x * @param y the original y @@ -1221,7 +1200,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants /** * @param owner the owner for this popup container. It will be used to find the top level ancestor and use it as the * parent for this popup window. - * * @return a ResizableWindow. */ protected ResizableWindow createHeavyweightPopupContainer(Component owner) { @@ -1262,7 +1240,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * @param owner the owner for this popup container. This parameter is not used in this method. It was there mainly * because the corresponding {@link #createHeavyweightPopupContainer(java.awt.Component)} has this * parameter. - * * @return a ResizablePanel */ @SuppressWarnings({"UnusedDeclaration"}) @@ -2449,7 +2426,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Checks if the popup is transient. * * @return true if transient. - * * @see #setTransient(boolean) */ public boolean isTransient() { @@ -2558,7 +2534,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * Removes a <code>PopupMenuListener</code>. * * @param l the <code>PopupMenuListener</code> to remove - * * @see #addPopupMenuListener * @since 1.4 */ @@ -2703,7 +2678,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * hide the popup. By default, owner is always the excluded component. * * @param component a component. - * * @return true if the component is an excluded component. */ public boolean isExcludedComponent(Component component) { @@ -2765,7 +2739,6 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants * the mouse click is outside the popup. * * @param e the mouse event - * * @return true or false. */ public boolean isClickOnPopup(MouseEvent e) { diff --git a/src/com/jidesoft/swing/CheckBoxTreeSelectionModel.java b/src/com/jidesoft/swing/CheckBoxTreeSelectionModel.java index b497d93..1a7f53f 100644 --- a/src/com/jidesoft/swing/CheckBoxTreeSelectionModel.java +++ b/src/com/jidesoft/swing/CheckBoxTreeSelectionModel.java @@ -247,9 +247,11 @@ public class CheckBoxTreeSelectionModel extends DefaultTreeSelectionModel implem */ @Override public void addSelectionPaths(TreePath[] paths) { - addSelectionPaths(paths, true); + addSelectionPaths(paths, !_avoidCheckPathSelection); } + private boolean _avoidCheckPathSelection = false; + /** * Add the selection paths. * @@ -357,7 +359,13 @@ public class CheckBoxTreeSelectionModel extends DefaultTreeSelectionModel implem } if (temp != null) { if (temp.getParentPath() != null) { - addSelectionPath(temp.getParentPath()); + try { + _avoidCheckPathSelection = true; + addSelectionPath(temp.getParentPath()); + } + finally { + _avoidCheckPathSelection = false; + } } else { if (!isSelectionEmpty()) { diff --git a/src/com/jidesoft/swing/JideTabbedPane.java b/src/com/jidesoft/swing/JideTabbedPane.java index 1a60b6e..f1a44a0 100644 --- a/src/com/jidesoft/swing/JideTabbedPane.java +++ b/src/com/jidesoft/swing/JideTabbedPane.java @@ -266,7 +266,6 @@ public class JideTabbedPane extends JTabbedPane { * <code>JTabbedPane.RIGHT</code>. * * @param tabPlacement the placement for the tabs relative to the content - * * @see #addTab */ public JideTabbedPane(int tabPlacement) { @@ -282,7 +281,6 @@ public class JideTabbedPane extends JTabbedPane { * * @param tabPlacement the placement for the tabs relative to the content * @param tabLayoutPolicy the policy for laying out tabs when all tabs will not fit on one run - * * @throws IllegalArgumentException if tab placement or tab layout policy are not one of the above supported values * @see #addTab */ @@ -298,7 +296,6 @@ public class JideTabbedPane extends JTabbedPane { * Returns the UI object which implements the L&F for this component. * * @return a <code>TabbedPaneUI</code> object - * * @see #setUI */ @Override @@ -310,7 +307,6 @@ public class JideTabbedPane extends JTabbedPane { * Sets the UI object which implements the L&F for this component. * * @param ui the new UI object - * * @see UIDefaults#getUI */ @Override @@ -336,7 +332,6 @@ public class JideTabbedPane extends JTabbedPane { * Returns the name of the UI class that implements the L&F for this component. * * @return the string "TabbedPaneUI" - * * @see JComponent#getUIClassID * @see UIDefaults#getUI */ @@ -674,7 +669,6 @@ public class JideTabbedPane extends JTabbedPane { * Be default, the flag is false. If you want to connect visibility of those two components, please set it to true. * * @return true if the trailing component would be hidden while no buttons are visible. Otherwise false. - * * @see #isShowTabArea() * @see #isShowTabButtons() * @see #setHideTrailingWhileNoButtons(boolean) @@ -687,7 +681,6 @@ public class JideTabbedPane extends JTabbedPane { * Set the flag that if the trailing component should be hidden while no buttons are visible. * * @param hideTrailingWhileNoButtons the flag - * * @see #isHideTrailingWhileNoButtons() */ public void setHideTrailingWhileNoButtons(boolean hideTrailingWhileNoButtons) { @@ -698,7 +691,6 @@ public class JideTabbedPane extends JTabbedPane { * Gets the flag indicating if the trailing component should be layout before the default buttons. * * @return true if the trailing component should be layout to the left/up. Otherwise false. - * * @see #setLayoutTrailingComponentBeforeButtons(boolean) */ public boolean isLayoutTrailingComponentBeforeButtons() { @@ -1008,7 +1000,6 @@ public class JideTabbedPane extends JTabbedPane { * Sets the string converter. * * @param stringConverter the StringConverter. - * * @see #getStringConverter() */ public void setStringConverter(StringConverter stringConverter) { @@ -1021,7 +1012,6 @@ public class JideTabbedPane extends JTabbedPane { * converter. * * @param index the index to display - * * @return the display title. */ public String getDisplayTitleAt(int index) { @@ -1129,9 +1119,7 @@ public class JideTabbedPane extends JTabbedPane { * By default, this method always return true. Subclass can override this method to return a different value. * * @param tabIndex the tab index - * * @return the flag. - * * @throws IndexOutOfBoundsException if index is out of range (index < 0 || index >= tab count) */ public boolean isTabClosableAt(int tabIndex) { @@ -1148,7 +1136,6 @@ public class JideTabbedPane extends JTabbedPane { * * @param tabIndex the tab index * @param closable the flag indicating if the tab is clossable - * * @throws IndexOutOfBoundsException if index is out of range (index < 0 || index >= tab count) */ public void setTabClosableAt(int tabIndex, boolean closable) { @@ -1169,7 +1156,6 @@ public class JideTabbedPane extends JTabbedPane { * Gets the last focused component of a particular page. * * @param pageComponent the page component - * * @return the last focused component of a particular page. */ @@ -1376,7 +1362,6 @@ public class JideTabbedPane extends JTabbedPane { * note, you must implement UIResource for the component you want to use as tab leading component. * * @param component the tab leading component - * * @throws IllegalArgumentException if the component doesn't implement UIResource. */ public void setTabLeadingComponent(Component component) { @@ -1397,7 +1382,6 @@ public class JideTabbedPane extends JTabbedPane { * note, you must implement UIResource for the component you want to use as tab trailing component. * * @param component the tab trailing component - * * @throws IllegalArgumentException if the component doesn't implement UIResource. */ public void setTabTrailingComponent(Component component) { @@ -1442,7 +1426,6 @@ public class JideTabbedPane extends JTabbedPane { * Gets the flag indicating if the close button should only be displayed when the mouse is over the tab. * * @return true if the close button should only be displayed when the mouse is over the tab. Otherwise false. - * * @see #setShowCloseButtonOnMouseOver(boolean) * @since 3.3.3 */ @@ -1456,7 +1439,6 @@ public class JideTabbedPane extends JTabbedPane { * The default value of the flag is false to keep default behavior not changed. * * @param showCloseButtonOnMouseOverOnly the flag - * * @since 3.3.3 */ public void setShowCloseButtonOnMouseOver(boolean showCloseButtonOnMouseOverOnly) { @@ -1478,7 +1460,6 @@ public class JideTabbedPane extends JTabbedPane { * Gets the tab background for the tab at the specified index. * * @param tabIndex the index of the tab - * * @return the tab background for the tab at the specified index. */ Color getBackgroundAt(int tabIndex); @@ -1487,18 +1468,16 @@ public class JideTabbedPane extends JTabbedPane { * Gets the tab foreground for the tab at the specified index. * * @param tabIndex the index of the tab - * * @return the tab foreground for the tab at the specified index. */ - Color getForegroudAt(int tabIndex); + Color getForegroundAt(int tabIndex); /** * Gets the gradient ratio. We will use this ratio to provide another color in order to paint gradient. * * @param tabIndex the index of the tab - * * @return the gradient ratio. The value should be between 0 and 1. 0 will produce the darkest and color and 1 - * will produce the lighest color. 0.5 will provide the same color. + * will produce the lightest color. 0.5 will provide the same color. */ float getGradientRatio(int tabIndex); } @@ -1506,7 +1485,7 @@ public class JideTabbedPane extends JTabbedPane { /** * A ColorProvider that can supports gradient tab background. The ColorProvider can also do gradient but the other * color has to be be a lighter or darker version of the color of getBackgroundAt. GradientColorProvider allows you - * to specify an indenpendent color as the start color. + * to specify an independent color as the start color. */ public static interface GradientColorProvider extends ColorProvider { /** @@ -1514,7 +1493,6 @@ public class JideTabbedPane extends JTabbedPane { * JideTabbedPaneUI will paint a gradient using this color and the color of getBackgroundAt. * * @param tabIndex the index of the tab - * * @return the top background color. */ Color getTopBackgroundAt(int tabIndex); @@ -1537,7 +1515,7 @@ public class JideTabbedPane extends JTabbedPane { return ONENOTE_COLORS[index % ONENOTE_COLORS.length]; } - public Color getForegroudAt(int index) { + public Color getForegroundAt(int index) { return Color.BLACK; } @@ -1712,7 +1690,6 @@ public class JideTabbedPane extends JTabbedPane { * pressed. * * @return the tab list cell renderer. - * * @see #setTabListCellRenderer(javax.swing.ListCellRenderer) */ public ListCellRenderer getTabListCellRenderer() { @@ -1853,7 +1830,6 @@ public class JideTabbedPane extends JTabbedPane { * Checks the dragOverDisabled property. By default it is false. * * @return true or false. - * * @see #setDragOverDisabled(boolean) */ public boolean isDragOverDisabled() { @@ -1891,7 +1867,6 @@ public class JideTabbedPane extends JTabbedPane { * Adds a <code>TabEditingListener</code> to this tabbedpane. * * @param l the <code>TabEditingListener</code> to add - * * @see #fireTabEditing * @see #removeTabEditingListener(TabEditingListener) * @see #getTabEditingListeners() @@ -1904,7 +1879,6 @@ public class JideTabbedPane extends JTabbedPane { * Removes a <code>TabEditingListener</code> from this tabbedpane. * * @param l the <code>TabEditingListener</code> to remove - * * @see #fireTabEditing * @see #addTabEditingListener */ @@ -1959,7 +1933,6 @@ public class JideTabbedPane extends JTabbedPane { * because the two flags above. * * @param tabIndex the tab index. - * * @return the icon for the tab at the specified index. */ public Icon getIconForTab(int tabIndex) { @@ -2024,7 +1997,6 @@ public class JideTabbedPane extends JTabbedPane { * Returns the alignment of the tabs for this tabbed pane. * * @return the alignment of the tabs for this tabbed pane. - * * @see #setTabAlignment(int) */ public int getTabAlignment() { @@ -2037,7 +2009,6 @@ public class JideTabbedPane extends JTabbedPane { * default value, if not set, is <code>JideTabbedPane.LEADING</code>. * * @param tabAlignment the alignment for the tabs relative to the content - * * @throws IllegalArgumentException if tab alignment value isn't one of the above valid values */ public void setTabAlignment(int tabAlignment) { @@ -2057,7 +2028,6 @@ public class JideTabbedPane extends JTabbedPane { * Gets the resource string used in JideTabbedPane. Subclass can override it to provide their own strings. * * @param key the resource key - * * @return the localized string. */ public String getResourceString(String key) { @@ -2068,7 +2038,6 @@ public class JideTabbedPane extends JTabbedPane { * Creates tab list popup. * * @return the tab list popup instance. - * * @since 3.2.2 */ protected JidePopup createTabListPopup() { @@ -2079,7 +2048,6 @@ public class JideTabbedPane extends JTabbedPane { * Checks if the tab list popup is visible. * * @return true if the tab list popup is visible. Otherwise false. - * * @since 3.2.2 */ public boolean isTabListPopupVisible() { @@ -2104,7 +2072,6 @@ public class JideTabbedPane extends JTabbedPane { * Shows the tab list popup by clicking on the list button. * * @param listButton the list button being clicked. - * * @since 3.2.2 */ public void showTabListPopup(JButton listButton) { @@ -2140,9 +2107,7 @@ public class JideTabbedPane extends JTabbedPane { * Calculates the position where the tab list popup is to be displayed based on the list button being clicked. * * @param listButton the list button being clicked. - * * @return the point. - * * @since 3.2.2 */ protected Point calculateTabListPopupPosition(JButton listButton) { @@ -2209,9 +2174,7 @@ public class JideTabbedPane extends JTabbedPane { * Creates the tab list. * * @param insets the insets of its parent container which helps determine the visible row count of the list. - * * @return the created list instance. - * * @since 3.2.2 */ protected JList createTabList(Insets insets) { @@ -2419,7 +2382,6 @@ public class JideTabbedPane extends JTabbedPane { * * @param type the button type, it could be {@link #BUTTON_LIST}, {@link #BUTTON_CLOSE}, {@link #BUTTON_EAST}, * {@link #BUTTON_WEST}, {@link #BUTTON_NORTH} or {@link #BUTTON_SOUTH} - * * @return the button instance. */ public NoFocusButton createNoFocusButton(int type) { diff --git a/src/com/jidesoft/swing/SearchableBar.java b/src/com/jidesoft/swing/SearchableBar.java index 5a98383..219bd13 100644 --- a/src/com/jidesoft/swing/SearchableBar.java +++ b/src/com/jidesoft/swing/SearchableBar.java @@ -710,7 +710,7 @@ public class SearchableBar extends JToolBar implements SearchableProvider { _statusLabel.setIcon(null); _textField.setBackground(UIDefaultsLookup.getColor("TextField.background")); _comboBox.getEditor().getEditorComponent().setBackground(UIDefaultsLookup.getColor("TextField.background")); - if (isShowMatchCount() && (_textField.getText().length() > 0 || (_comboBox.getEditor().getEditorComponent() instanceof JTextField && ((JTextField) _comboBox.getEditor().getEditorComponent()).getText().length() > 0))) { + if (isShowMatchCount() && (_textField.getText().length() > 0 || (_comboBox.isVisible() && _comboBox.getEditor().getEditorComponent() instanceof JTextField && ((JTextField) _comboBox.getEditor().getEditorComponent()).getText().length() > 0))) { _statusLabel.setText(getSearchable().getMatchCount() + " " + getResourceString("SearchableBar.matches")); } else { diff --git a/src/com/jidesoft/swing/swing.properties b/src/com/jidesoft/swing/swing.properties index 8d6d077..f0a483f 100644 --- a/src/com/jidesoft/swing/swing.properties +++ b/src/com/jidesoft/swing/swing.properties @@ -30,7 +30,7 @@ SearchableBar.reachedTop=Reached top of the page SearchableBar.reachedBottomRepeat=Reached bottom of the page, continued from top SearchableBar.reachedTopRepeat=Reached top of the page, continued from bottom SearchableBar.notFound=Phrase not found -SearchableBar.matches=Matches +SearchableBar.matches=Match(es) # # CheckBoxList diff --git a/src/com/jidesoft/utils/PortingUtils.java b/src/com/jidesoft/utils/PortingUtils.java index 22b43f6..f00e65f 100644 --- a/src/com/jidesoft/utils/PortingUtils.java +++ b/src/com/jidesoft/utils/PortingUtils.java @@ -394,7 +394,7 @@ public class PortingUtils { if (containgScreen == null) { // it was not on any of the screens so center it on the first screen rect.x = (SCREENS[0].width - rect.width) / 2; - rect.y = (SCREENS[0].width - rect.width) / 2; + rect.y = (SCREENS[0].height - rect.height) / 2; return rect; } else { -- Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-java/libjide-oss-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
