December 2010 - Nuiton-widgets-commits - mailman.cloud.codelutin.com

r322 - trunk
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 10:59:40 +0100 (Thu, 23 Dec 2010) New Revision: 322 Url: http://nuiton.org/repositories/revision/nuiton-widgets/322 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-23 09:59:39 UTC (rev 321) +++ trunk/pom.xml 2010-12-23 09:59:40 UTC (rev 322) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-widgets</artifactId> - <version>1.1</version> + <version>1.1.1-SNAPSHOT</version> <dependencies> <dependency> @@ -152,9 +152,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-widgets/tags/nuiton-widgets-1.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-widgets/tags/nuiton-widgets-1.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-widgets/tags/nuiton-widget…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-widgets/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-widgets/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-widgets/trunk</url> </scm> <profiles>

1 0

r321 - in tags: . nuiton-widgets-1.1
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 10:59:39 +0100 (Thu, 23 Dec 2010) New Revision: 321 Url: http://nuiton.org/repositories/revision/nuiton-widgets/321 Log: [maven-release-plugin] copy for tag nuiton-widgets-1.1 Added: tags/nuiton-widgets-1.1/ Property changes on: tags/nuiton-widgets-1.1 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project .settings *.ipr *.iws *.iml bin Added: svn:mergeinfo +

1 0

r320 - trunk
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 10:59:37 +0100 (Thu, 23 Dec 2010) New Revision: 320 Url: http://nuiton.org/repositories/revision/nuiton-widgets/320 Log: [maven-release-plugin] prepare release nuiton-widgets-1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-23 09:57:10 UTC (rev 319) +++ trunk/pom.xml 2010-12-23 09:59:37 UTC (rev 320) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-widgets</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> <dependencies> <dependency> @@ -152,9 +152,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-widgets/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-widgets/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-widgets/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-widgets/tags/nuiton-widgets-1.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-widgets/tags/nuiton-widgets-1.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-widgets/tags/nuiton-widget…</url> </scm> <profiles>

1 0

r319 - in trunk/src: license main/resources/i18n test/java/org/nuiton/widget/toolTip
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 10:57:10 +0100 (Thu, 23 Dec 2010) New Revision: 319 Url: http://nuiton.org/repositories/revision/nuiton-widgets/319 Log: Update file header and svn keywords Modified: trunk/src/license/THIRD-PARTY.properties trunk/src/main/resources/i18n/nuiton-widgets_en_GB.properties trunk/src/main/resources/i18n/nuiton-widgets_fr_FR.properties trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java Modified: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties 2010-12-23 09:55:41 UTC (rev 318) +++ trunk/src/license/THIRD-PARTY.properties 2010-12-23 09:57:10 UTC (rev 319) @@ -1,45 +1,16 @@ -### -# #%L -# Graphical Widget -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2004 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program 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 General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License -# - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - GNU GENERAL PUBLIC LICENSE version 2 or higher -# - Lesser General Public License (LGPL) +# - GNU Lesser General Public License # - Lesser General Public License (LGPL) v 3.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Sep 10 15:25:20 CEST 2010 -commons-beanutils--commons-beanutils--1.8.0=The Apache Software License, Version 2.0 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -jgoodies--looks--1.2.2=The Apache Software License, Version 2.0 -org.nuiton.thirdparty--l2fprod-common--0.1=The Apache Software License, Version 2.0 -org.nuiton.thirdparty--rsyntaxtextarea--1.4.1=Lesser General Public License (LGPL) v 3.0 -org.nuiton.thirdparty--sdoc--0.5.0-beta-patchcl=Lesser General Public License (LGPL) v 3.0 +#Thu Dec 23 10:56:36 CET 2010 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +org.nuiton.thirdparty--sdoc--0.5.0-beta-patchcl--jar=Lesser General Public License (LGPL) v 3.0 Property changes on: trunk/src/main/resources/i18n/nuiton-widgets_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/i18n/nuiton-widgets_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r318 - in trunk: . src/main/java/org/nuiton/widget/tooltip src/main/resources/i18n src/test/java/org/nuiton/widget/editor src/test/java/org/nuiton/widget/toolTip
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 10:55:41 +0100 (Thu, 23 Dec 2010) New Revision: 318 Url: http://nuiton.org/repositories/revision/nuiton-widgets/318 Log: - Up i18n to 2.0.1 version - Up nuiton-util to 1.5.2 Added: trunk/src/main/resources/i18n/nuiton-widgets_en_GB.properties trunk/src/main/resources/i18n/nuiton-widgets_fr_FR.properties Removed: trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java trunk/src/test/java/org/nuiton/widget/editor/EditorTest.java trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-13 18:09:11 UTC (rev 317) +++ trunk/pom.xml 2010-12-23 09:55:41 UTC (rev 318) @@ -20,14 +20,14 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.5.1</version> + <version>${nuitonUtilsVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> - <version>1.2.2</version> + <version>${nuitonI18nVersion}</version> <scope>compile</scope> </dependency> @@ -95,7 +95,8 @@ <properties> - <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <nuitonI18nVersion>2.0.1</nuitonI18nVersion> + <nuitonUtilsVersion>1.5.2</nuitonUtilsVersion>  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> Modified: trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java 2010-12-13 18:09:11 UTC (rev 317) +++ trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java 2010-12-23 09:55:41 UTC (rev 318) @@ -25,6 +25,7 @@ package org.nuiton.widget.tooltip; import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import java.awt.BorderLayout; import java.awt.Color; Deleted: trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties 2010-12-13 18:09:11 UTC (rev 317) +++ trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties 2010-12-23 09:55:41 UTC (rev 318) @@ -1,30 +0,0 @@ -nuitonwidgets.aboutframe.about=About -nuitonwidgets.aboutframe.license=License -nuitonwidgets.aboutframe.ok=OK -nuitonwidgets.common.copy=Copy -nuitonwidgets.editor.saveorcancel=Do you want to save current opened file ? -nuitonwidgets.editor.syntax.java=Java -nuitonwidgets.editor.syntax.r=R -nuitonwidgets.editor.syntax.sql=SQL -nuitonwidgets.editor.syntax.xml=XML -nuitonwidgets.message.file=File -nuitonwidgets.message.folder=Folder -nuitonwidgets.message.nofile=No file -nuitonwidgets.message.statusbar.memory=%d/%dMb -nuitonwidgets.monitor.button.mail=Send by email -nuitonwidgets.monitor.button.reset=Reset -nuitonwidgets.monitor.information.application=Application information -nuitonwidgets.monitor.information.system=System information -nuitonwidgets.monitor.mail.failed=Can't send report by mail. Is your mail server up ? (I'm trying to contact the < %s > smtp server) -nuitonwidgets.monitor.mail.report=A report has been sent to %s -nuitonwidgets.monitor.mail.stream.all=All streams \: -nuitonwidgets.monitor.mail.stream.error=Standard Error \: -nuitonwidgets.monitor.mail.stream.log=Logging system -nuitonwidgets.monitor.mail.stream.output=Standard Output \: -nuitonwidgets.monitor.mail.subject=Report from logging console -nuitonwidgets.monitor.stream.all=All streams -nuitonwidgets.monitor.stream.error=Error stream -nuitonwidgets.monitor.stream.log=Log stream -nuitonwidgets.monitor.stream.output=Output stream -nuitonwidgets.monitor.title=Application console -nuitonwidgets.tootilp.focushotkey=Press 'F2' for focus Deleted: trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties 2010-12-13 18:09:11 UTC (rev 317) +++ trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties 2010-12-23 09:55:41 UTC (rev 318) @@ -1,30 +0,0 @@ -nuitonwidgets.aboutframe.about=\u00C0 propos -nuitonwidgets.aboutframe.license=Licence -nuitonwidgets.aboutframe.ok=OK -nuitonwidgets.common.copy=Copier -nuitonwidgets.editor.saveorcancel=Voulez vous sauver le fichier modifi\u00E9 ? -nuitonwidgets.editor.syntax.java=Java -nuitonwidgets.editor.syntax.r=R -nuitonwidgets.editor.syntax.sql=SQL -nuitonwidgets.editor.syntax.xml=XML -nuitonwidgets.message.file=Fichier -nuitonwidgets.message.folder=R\u00E9pertoire -nuitonwidgets.message.nofile=Aucun fichier -nuitonwidgets.message.statusbar.memory=%d/%dMo -nuitonwidgets.monitor.button.mail=Envoyer par courriel -nuitonwidgets.monitor.button.reset=Reset -nuitonwidgets.monitor.information.application=Information sur l'application -nuitonwidgets.monitor.information.system=Information syst\u00E8me -nuitonwidgets.monitor.mail.failed=Impossible d'envoyer le rapport par courriel. Le serveur smtp fonctionne ? (J'essai de contacter < %s > smtp server) -nuitonwidgets.monitor.mail.report=Le rapport a \u00E9t\u00E9 envoy\u00E9 \u00E0 %s -nuitonwidgets.monitor.mail.stream.all=Tous les flux \: -nuitonwidgets.monitor.mail.stream.error=Sortie d'erreur \: -nuitonwidgets.monitor.mail.stream.log=Log syst\u00E8me -nuitonwidgets.monitor.mail.stream.output=Sortie standard \: -nuitonwidgets.monitor.mail.subject=Rapport de la console -nuitonwidgets.monitor.stream.all=Toutes les sorties -nuitonwidgets.monitor.stream.error=Sortie d'erreur -nuitonwidgets.monitor.stream.log=Logs -nuitonwidgets.monitor.stream.output=Sortie standard -nuitonwidgets.monitor.title=Moniteur de l'application -nuitonwidgets.tootilp.focushotkey=Appuyez sur 'F2' pour agrandir Added: trunk/src/main/resources/i18n/nuiton-widgets_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-widgets_en_GB.properties (rev 0) +++ trunk/src/main/resources/i18n/nuiton-widgets_en_GB.properties 2010-12-23 09:55:41 UTC (rev 318) @@ -0,0 +1,30 @@ +nuitonwidgets.aboutframe.about=About +nuitonwidgets.aboutframe.license=License +nuitonwidgets.aboutframe.ok=OK +nuitonwidgets.common.copy=Copy +nuitonwidgets.editor.saveorcancel=Do you want to save current opened file ? +nuitonwidgets.editor.syntax.java=Java +nuitonwidgets.editor.syntax.r=R +nuitonwidgets.editor.syntax.sql=SQL +nuitonwidgets.editor.syntax.xml=XML +nuitonwidgets.message.file=File +nuitonwidgets.message.folder=Folder +nuitonwidgets.message.nofile=No file +nuitonwidgets.message.statusbar.memory=%d/%dMb +nuitonwidgets.monitor.button.mail=Send by email +nuitonwidgets.monitor.button.reset=Reset +nuitonwidgets.monitor.information.application=Application information +nuitonwidgets.monitor.information.system=System information +nuitonwidgets.monitor.mail.failed=Can't send report by mail. Is your mail server up ? (I'm trying to contact the < %s > smtp server) +nuitonwidgets.monitor.mail.report=A report has been sent to %s +nuitonwidgets.monitor.mail.stream.all=All streams \: +nuitonwidgets.monitor.mail.stream.error=Standard Error \: +nuitonwidgets.monitor.mail.stream.log=Logging system +nuitonwidgets.monitor.mail.stream.output=Standard Output \: +nuitonwidgets.monitor.mail.subject=Report from logging console +nuitonwidgets.monitor.stream.all=All streams +nuitonwidgets.monitor.stream.error=Error stream +nuitonwidgets.monitor.stream.log=Log stream +nuitonwidgets.monitor.stream.output=Output stream +nuitonwidgets.monitor.title=Application console +nuitonwidgets.tootilp.focushotkey=Press 'F2' for focus Added: trunk/src/main/resources/i18n/nuiton-widgets_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-widgets_fr_FR.properties (rev 0) +++ trunk/src/main/resources/i18n/nuiton-widgets_fr_FR.properties 2010-12-23 09:55:41 UTC (rev 318) @@ -0,0 +1,30 @@ +nuitonwidgets.aboutframe.about=\u00C0 propos +nuitonwidgets.aboutframe.license=Licence +nuitonwidgets.aboutframe.ok=OK +nuitonwidgets.common.copy=Copier +nuitonwidgets.editor.saveorcancel=Voulez vous sauver le fichier modifi\u00E9 ? +nuitonwidgets.editor.syntax.java=Java +nuitonwidgets.editor.syntax.r=R +nuitonwidgets.editor.syntax.sql=SQL +nuitonwidgets.editor.syntax.xml=XML +nuitonwidgets.message.file=Fichier +nuitonwidgets.message.folder=R\u00E9pertoire +nuitonwidgets.message.nofile=Aucun fichier +nuitonwidgets.message.statusbar.memory=%d/%dMo +nuitonwidgets.monitor.button.mail=Envoyer par courriel +nuitonwidgets.monitor.button.reset=Reset +nuitonwidgets.monitor.information.application=Information sur l'application +nuitonwidgets.monitor.information.system=Information syst\u00E8me +nuitonwidgets.monitor.mail.failed=Impossible d'envoyer le rapport par courriel. Le serveur smtp fonctionne ? (J'essai de contacter < %s > smtp server) +nuitonwidgets.monitor.mail.report=Le rapport a \u00E9t\u00E9 envoy\u00E9 \u00E0 %s +nuitonwidgets.monitor.mail.stream.all=Tous les flux \: +nuitonwidgets.monitor.mail.stream.error=Sortie d'erreur \: +nuitonwidgets.monitor.mail.stream.log=Log syst\u00E8me +nuitonwidgets.monitor.mail.stream.output=Sortie standard \: +nuitonwidgets.monitor.mail.subject=Rapport de la console +nuitonwidgets.monitor.stream.all=Toutes les sorties +nuitonwidgets.monitor.stream.error=Sortie d'erreur +nuitonwidgets.monitor.stream.log=Logs +nuitonwidgets.monitor.stream.output=Sortie standard +nuitonwidgets.monitor.title=Moniteur de l'application +nuitonwidgets.tootilp.focushotkey=Appuyez sur 'F2' pour agrandir Modified: trunk/src/test/java/org/nuiton/widget/editor/EditorTest.java =================================================================== --- trunk/src/test/java/org/nuiton/widget/editor/EditorTest.java 2010-12-13 18:09:11 UTC (rev 317) +++ trunk/src/test/java/org/nuiton/widget/editor/EditorTest.java 2010-12-23 09:55:41 UTC (rev 318) @@ -37,7 +37,6 @@ package org.nuiton.widget.editor; -import org.nuiton.widget.editor.Editor; import java.awt.BorderLayout; import java.io.File; Modified: trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java =================================================================== --- trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java 2010-12-13 18:09:11 UTC (rev 317) +++ trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java 2010-12-23 09:55:41 UTC (rev 318) @@ -24,6 +24,7 @@ */ package org.nuiton.widget.toolTip; +import java.util.Locale; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JTree; @@ -34,6 +35,8 @@ import java.awt.event.MouseEvent; import junit.framework.TestCase; +import org.nuiton.i18n.I18n; + /** * @author sletellier */ @@ -43,6 +46,10 @@ } public static void main(String[] args) throws Exception { + + // init i18n + I18n.init(Locale.FRANCE); + JFrame frame = new JFrame("FocusableToolTip"); frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); frame.getContentPane().setLayout(new BorderLayout());

1 0

r317 - in trunk/src: main/java/org/nuiton/widget/tooltip test/java/org/nuiton/widget/toolTip
by sletellier＠users.nuiton.org 13 Dec '10

13 Dec '10

Author: sletellier Date: 2010-12-13 19:09:11 +0100 (Mon, 13 Dec 2010) New Revision: 317 Url: http://nuiton.org/repositories/revision/nuiton-widgets/317 Log: Clean code if focusable toolTip Modified: trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java Modified: trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java 2010-12-02 11:47:45 UTC (rev 316) +++ trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java 2010-12-13 18:09:11 UTC (rev 317) @@ -24,6 +24,7 @@ */ package org.nuiton.widget.tooltip; +import org.apache.commons.lang.StringUtils; import java.awt.Component; import java.awt.ComponentOrientation; import java.awt.Dimension; @@ -295,7 +296,7 @@ public void toolTipRequested(MouseEvent e, String text) { - if (text==null || text.length()==0) { + if (StringUtils.isEmpty(text)) { possiblyDisposeOfTipWindow(); lastText = text; return; Modified: trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java =================================================================== --- trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java 2010-12-02 11:47:45 UTC (rev 316) +++ trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java 2010-12-13 18:09:11 UTC (rev 317) @@ -1,3 +1,27 @@ +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.widget.toolTip; import javax.swing.JFrame; @@ -63,6 +87,26 @@ complexeToolTipLabel.setToolTipText(FocusableTip.DUMMY_TOOL_TIP); frame.getContentPane().add(complexeToolTipLabel, BorderLayout.CENTER); + JLabel emptyToolTipLabel = new JLabel("Empty tool tip text") { + protected FocusableTip focusableTip; + + @Override + public String getToolTipText(MouseEvent event) { + String toolTipText = super.getToolTipText(event); + + // display it into persistant tooltip + if (focusableTip == null) { + focusableTip = new FocusableTip(this, true); + focusableTip.setSize(600, 400); + } + focusableTip.toolTipRequested(event, toolTipText); + + return null; + } + }; + emptyToolTipLabel.setToolTipText(null); + frame.getContentPane().add(emptyToolTipLabel, BorderLayout.SOUTH); + frame.setVisible(true); frame.pack(); }

1 0

r316 - trunk/src/test/java/org/nuiton/widget/toolTip
by sletellier＠users.nuiton.org 02 Dec '10

02 Dec '10

Author: sletellier Date: 2010-12-02 12:47:45 +0100 (Thu, 02 Dec 2010) New Revision: 316 Url: http://nuiton.org/repositories/revision/nuiton-widgets/316 Log: Fix test Modified: trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java Modified: trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java =================================================================== --- trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java 2010-12-01 16:42:44 UTC (rev 315) +++ trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java 2010-12-02 11:47:45 UTC (rev 316) @@ -8,11 +8,12 @@ import java.awt.BorderLayout; import java.awt.event.MouseEvent; +import junit.framework.TestCase; /** * @author sletellier */ -public class FocusableToolTipTest { +public class FocusableToolTipTest extends TestCase { public void testDummy() { }

1 0

r315 - in trunk/src: main/java/org/nuiton/widget/tooltip test/java/org/nuiton/widget test/java/org/nuiton/widget/toolTip
by sletellier＠users.nuiton.org 01 Dec '10

01 Dec '10

Author: sletellier Date: 2010-12-01 17:42:44 +0100 (Wed, 01 Dec 2010) New Revision: 315 Url: http://nuiton.org/repositories/revision/nuiton-widgets/315 Log: Allow to create a focusable tooltip with a specific component inside Added: trunk/src/test/java/org/nuiton/widget/toolTip/ trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java Modified: trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java trunk/src/main/java/org/nuiton/widget/tooltip/TipUtil.java trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java Modified: trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java 2010-11-21 14:30:46 UTC (rev 314) +++ trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java 2010-12-01 16:42:44 UTC (rev 315) @@ -57,12 +57,15 @@ */ public class FocusableTip { + public static final String DUMMY_TOOL_TIP = "DUMMY"; + protected JComponent attachedComponent; protected TipWindow tipWindow; protected URL imageBase; protected AttachedComponentListener attachedComponentListener; protected HyperlinkListener hyperlinkListener; protected String lastText; + protected Component lastComponent; protected boolean showCopyContextMenu; /** Width with default value. */ @@ -124,6 +127,8 @@ attachedComponentListener = new AttachedComponentListener(); tipVisibleBounds = new Rectangle(); this.showCopyContextMenu = showCopyContextMenu; + + attachedComponent.setToolTipText(" "); } /** @@ -162,12 +167,17 @@ } - protected void createAndShowTipWindow(final MouseEvent e, final String text) { + protected void createAndShowTipWindow(final MouseEvent e, final Component component, final String text) { Window owner = SwingUtilities.getWindowAncestor(attachedComponent); - tipWindow = new TipWindow(owner, this, text); - tipWindow.setHyperlinkListener(hyperlinkListener); + if (component == null) { + tipWindow = new TipWindow(owner, this, text); + } else { + tipWindow = new TipWindow(owner, this, component); + } + tipWindow.setHyperlinkListener(hyperlinkListener); + // TODO: Position tip window better (handle RTL, edges of screen, etc.). // Wrap in an invokeLater() to work around a JEditorPane issue where it // doesn't return its proper preferred size until after it is displayed. @@ -186,7 +196,7 @@ } // Add copy context menu - if (showCopyContextMenu) { + if (showCopyContextMenu && component == null) { TipUtil.addCopyContextMenu(tipWindow); } @@ -215,7 +225,7 @@ computeTipVisibleBounds(); // Do after tip is visible attachedComponentListener.install(attachedComponent); lastText = text; - + lastComponent = component; } }); @@ -254,6 +264,7 @@ attachedComponentListener.uninstall(); tipVisibleBounds.setBounds(-1, -1, 0, 0); lastText = null; + lastComponent = null; attachedComponent.requestFocus(); } } @@ -282,7 +293,6 @@ ToolTipManager.sharedInstance().registerComponent(attachedComponent); } - public void toolTipRequested(MouseEvent e, String text) { if (text==null || text.length()==0) { @@ -294,12 +304,32 @@ if (lastText==null || text.length()!=lastText.length() || !text.equals(lastText)) { possiblyDisposeOfTipWindow(); - createAndShowTipWindow(e, text); + createAndShowTipWindow(e, null, text); } } + /* + * To display specific component in toolTip + * + * Note : Be carfull, set toolTipText of attachedComponent.setToolTipText(FocusableTip.DUMMY_TOOL_TIP); + */ + public void toolTipRequested(MouseEvent e, Component component) { + if (component == null) { + possiblyDisposeOfTipWindow(); + lastComponent = component; + return; + } + + if (lastComponent==null || !lastComponent.equals(component)) { + possiblyDisposeOfTipWindow(); + createAndShowTipWindow(e, component, null); + } + + } + + protected class AttachedComponentListener extends MouseInputAdapter implements CaretListener, ComponentListener, FocusListener, KeyListener { Modified: trunk/src/main/java/org/nuiton/widget/tooltip/TipUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/TipUtil.java 2010-11-21 14:30:46 UTC (rev 314) +++ trunk/src/main/java/org/nuiton/widget/tooltip/TipUtil.java 2010-12-01 16:42:44 UTC (rev 315) @@ -25,6 +25,7 @@ package org.nuiton.widget.tooltip; import java.awt.Color; +import java.awt.Component; import java.awt.Font; import java.awt.SystemColor; import java.awt.Toolkit; @@ -148,8 +149,8 @@ throw new NullPointerException("TipWindows must be non null"); } - JEditorPane textArea = tipWindows.getTextArea(); - textArea.addMouseListener(new MouseAdapter(){ + Component component = tipWindows.getComponent(); + component.addMouseListener(new MouseAdapter(){ @Override public void mouseClicked(MouseEvent e) { Modified: trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java 2010-11-21 14:30:46 UTC (rev 314) +++ trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java 2010-12-01 16:42:44 UTC (rev 315) @@ -69,34 +69,26 @@ public class TipWindow extends JWindow implements ActionListener { protected FocusableTip ft; - protected JEditorPane textArea; + protected Component component; protected String text; protected TipListener tipListener; protected HyperlinkListener userHyperlinkListener; protected static TipWindow visibleInstance; - /** - * Constructor. + * Constructor, by default, is JEditorPane will be used for toolTip. * * @param owner The parent window. * @param ft Focusable tip * @param msg The text of the tool tip. This can be HTML. */ public TipWindow(Window owner, FocusableTip ft, String msg) { - super(owner); this.ft = ft; - this.text = msg; tipListener = new TipListener(); - JPanel cp = new JPanel(new BorderLayout()); - cp.setBorder(BorderFactory.createCompoundBorder(BorderFactory - .createLineBorder(Color.BLACK), BorderFactory - .createEmptyBorder())); - cp.setBackground(TipUtil.getToolTipBackground()); - textArea = new JEditorPane("text/html", msg); + JEditorPane textArea = new JEditorPane("text/html", msg); TipUtil.tweakTipEditorPane(textArea); if (ft.getImageBase()!=null) { // Base URL for images ((HTMLDocument)textArea.getDocument()).setBase(ft.getImageBase()); @@ -109,8 +101,34 @@ } } }); - cp.add(textArea); + init(ft, textArea); + } + /** + * To specify component to display + * + * @param owner The parent window. + * @param ft Focusable tip + * @param component custom component to display + */ + public TipWindow(Window owner, FocusableTip ft, Component component) { + super(owner); + init(ft, component); + } + + protected void init(FocusableTip ft, Component component) { + this.ft = ft; + tipListener = new TipListener(); + this.component = component; + + JPanel cp = new JPanel(new BorderLayout()); + cp.setBorder(BorderFactory.createCompoundBorder(BorderFactory + .createLineBorder(Color.BLACK), BorderFactory + .createEmptyBorder())); + cp.setBackground(TipUtil.getToolTipBackground()); + component.addMouseListener(tipListener); + cp.add(component); + setFocusableWindowState(false); setContentPane(cp); setBottomPanel(); // Must do after setContentPane() @@ -126,7 +144,7 @@ } }; addKeyListener(ka); - textArea.addKeyListener(ka); + component.addKeyListener(ka); // Ensure only 1 TipWindow is ever visible. If the caller does what // they're supposed to and only creates these on the EDT, the @@ -137,16 +155,15 @@ } visibleInstance = this; } + } - } - /** * Return textArea of TipWindow * * @return textArea */ - public JEditorPane getTextArea() { - return textArea; + public Component getComponent() { + return component; } public void actionPerformed(ActionEvent e) { @@ -154,7 +171,7 @@ if (!getFocusableWindowState()) { setFocusableWindowState(true); setBottomPanel(); - textArea.removeMouseListener(tipListener); + component.removeMouseListener(tipListener); pack(); addWindowFocusListener(new WindowAdapter() { public void windowLostFocus(WindowEvent e) { @@ -196,26 +213,33 @@ */ public void fixSize(int width, int height) { - Dimension d = textArea.getPreferredSize(); - Rectangle r; - try { +// Dimension d = textArea.getPreferredSize(); +// Rectangle r; +// try { +// +// r = textArea.modelToView(textArea.getDocument().getLength()-1); +// d.height = r.y + r.height; +// +// // Ensure the text area doesn't start out too tall or wide. +// d = textArea.getPreferredSize(); +// d.width = Math.min(d.width+25, width); +// d.height = Math.min(d.height, height); +// +// textArea.setPreferredSize(d); +// +// } catch (BadLocationException ble) { // Never happens +// ble.printStackTrace(); +// } +// +// pack(); // Must re-pack to calculate proper size. - r = textArea.modelToView(textArea.getDocument().getLength()-1); - d.height = r.y + r.height; - - // Ensure the text area doesn't start out too tall or wide. - d = textArea.getPreferredSize(); - d.width = Math.min(d.width+25, width); - d.height = Math.min(d.height, height); - - textArea.setPreferredSize(d); - - } catch (BadLocationException ble) { // Never happens - ble.printStackTrace(); - } - - pack(); // Must re-pack to calculate proper size. - + // Use specified size + Dimension d = component.getPreferredSize(); + d.height = width; + d.width = height; + component.setPreferredSize(d); + component.setSize(d); + pack(); } @@ -262,7 +286,7 @@ panel.setOpaque(false); JLabel label = new JLabel(_("nuitonwidgets.tootilp.focushotkey")/*FocusableTip.getString("FocusHotkey")*/); Color fg = UIManager.getColor("Label.disabledForeground"); - Font font = textArea.getFont(); + Font font = component.getFont(); font = font.deriveFont(font.getSize2D() - 1.0f); label.setFont(font); if (fg==null) { // Non BasicLookAndFeel-derived Looks @@ -285,8 +309,8 @@ cp.remove(0); JScrollPane sp = new JScrollPane(comp); sp.setViewportBorder(BorderFactory.createEmptyBorder()); - sp.setBackground(textArea.getBackground()); - sp.getViewport().setBackground(textArea.getBackground()); + sp.setBackground(component.getBackground()); + sp.getViewport().setBackground(component.getBackground()); cp.add(sp); // What was component 1 is now 0. cp.getComponent(0).removeMouseListener(tipListener); @@ -305,14 +329,18 @@ * removed. A value of <code>null</code> means "no listener." */ public void setHyperlinkListener(HyperlinkListener listener) { - // We've added a separate listener, so remove only the user's. - if (userHyperlinkListener!=null) { - textArea.removeHyperlinkListener(userHyperlinkListener); - } - userHyperlinkListener = listener; - if (userHyperlinkListener!=null) { - textArea.addHyperlinkListener(userHyperlinkListener); - } + if (component instanceof JEditorPane) { + JEditorPane textArea = (JEditorPane)component; + + // We've added a separate listener, so remove only the user's. + if (userHyperlinkListener!=null) { + textArea.removeHyperlinkListener(userHyperlinkListener); + } + userHyperlinkListener = listener; + if (userHyperlinkListener!=null) { + textArea.addHyperlinkListener(userHyperlinkListener); + } + } } Added: trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java =================================================================== --- trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/widget/toolTip/FocusableToolTipTest.java 2010-12-01 16:42:44 UTC (rev 315) @@ -0,0 +1,68 @@ +package org.nuiton.widget.toolTip; + +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JTree; +import javax.swing.WindowConstants; +import org.nuiton.widget.tooltip.FocusableTip; + +import java.awt.BorderLayout; +import java.awt.event.MouseEvent; + +/** + * @author sletellier + */ +public class FocusableToolTipTest { + + public void testDummy() { + } + + public static void main(String[] args) throws Exception { + JFrame frame = new JFrame("FocusableToolTip"); + frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + frame.getContentPane().setLayout(new BorderLayout()); + + JLabel simpleToolTipLabel = new JLabel("Simple tool tip text") { + protected FocusableTip focusableTip; + + @Override + public String getToolTipText(MouseEvent event) { + String toolTipText = super.getToolTipText(event); + + // display it into persistant tooltip + if (focusableTip == null) { + focusableTip = new FocusableTip(this, true); + focusableTip.setSize(600, 400); + } + focusableTip.toolTipRequested(event, toolTipText); + + return null; + } + }; + simpleToolTipLabel.setToolTipText("Simple tool tip text<p><b>is Working !</b>"); + frame.getContentPane().add(simpleToolTipLabel, BorderLayout.NORTH); + + JLabel complexeToolTipLabel = new JLabel("Complexe tool tip text") { + protected FocusableTip focusableTip; + + @Override + public String getToolTipText(MouseEvent event) { + super.getToolTipText(event); + + // display it into persistant tooltip + if (focusableTip == null) { + focusableTip = new FocusableTip(this, true); + focusableTip.setSize(600, 400); + } + focusableTip.toolTipRequested(event, new JTree()); + + return null; + } + }; + complexeToolTipLabel.setToolTipText(FocusableTip.DUMMY_TOOL_TIP); + frame.getContentPane().add(complexeToolTipLabel, BorderLayout.CENTER); + + frame.setVisible(true); + frame.pack(); + } +}

1 0