March 2010 - Sandbox-commits - mailman.cloud.codelutin.com

r402 - testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree
by echatellier＠users.nuiton.org 15 Mar '10

15 Mar '10

Author: echatellier Date: 2010-03-15 12:48:25 +0100 (Mon, 15 Mar 2010) New Revision: 402 Log: Remove dependency on swingx. Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/FilterTreeModel.java Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/FilterTreeModel.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/FilterTreeModel.java 2010-03-15 11:00:06 UTC (rev 401) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/FilterTreeModel.java 2010-03-15 11:48:25 UTC (rev 402) @@ -18,12 +18,15 @@ package org.nuiton.test.tree; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + +import javax.swing.event.TreeModelEvent; import javax.swing.event.TreeModelListener; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import org.jdesktop.swingx.tree.TreeModelSupport; - /** * TODO add comment here. * @@ -37,7 +40,7 @@ */ public class FilterTreeModel implements TreeModel { - protected TreeModelSupport support; + protected Collection<TreeModelListener> treeModelListeners; protected TreeModel delegateModel; @@ -46,15 +49,29 @@ public FilterTreeModel(TreeModel delegateModel, TreeFilter filter) { this.delegateModel = delegateModel; this.treeFilter = filter; - this.support = new TreeModelSupport(delegateModel); + treeModelListeners = new ArrayList<TreeModelListener>(); } public void setFilter(TreeFilter treeFilter) { this.treeFilter = treeFilter; TreePath path = new TreePath(delegateModel.getRoot()); - support.fireTreeStructureChanged(path); + fireTreeStructureChanged(path); } + /** + * @param path + */ + protected void fireTreeStructureChanged(TreePath path) { + + TreeModelEvent event = new TreeModelEvent(delegateModel, path); + Iterator<TreeModelListener> itTreeModelListener = treeModelListeners.iterator(); + while(itTreeModelListener.hasNext()) { + TreeModelListener current = itTreeModelListener.next(); + current.treeStructureChanged(event); + } + + } + @Override public int getChildCount(Object parent) { int realCount = delegateModel.getChildCount(parent); @@ -122,7 +139,7 @@ @Override public void addTreeModelListener(TreeModelListener l) { delegateModel.addTreeModelListener(l); - support.addTreeModelListener(l); + treeModelListeners.add(l); } /* @@ -131,6 +148,6 @@ @Override public void removeTreeModelListener(TreeModelListener l) { delegateModel.removeTreeModelListener(l); - support.addTreeModelListener(l); + treeModelListeners.remove(l); } }

1 0

r401 - testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip
by echatellier＠users.nuiton.org 15 Mar '10

15 Mar '10

Author: echatellier Date: 2010-03-15 12:00:06 +0100 (Mon, 15 Mar 2010) New Revision: 401 Log: Allow tooltip on all JComponent Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip.java Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip.java 2010-03-12 14:26:53 UTC (rev 400) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip.java 2010-03-15 11:00:06 UTC (rev 401) @@ -60,7 +60,7 @@ private JComponent attachedComponent; private TipWindow tipWindow; private URL imageBase; - private TextAreaListener textAreaListener; + private AttachedComponentListener attachedComponentListener; private HyperlinkListener hyperlinkListener; private String lastText; @@ -82,7 +82,7 @@ public FocusableTip(JComponent attachedComponent, HyperlinkListener listener) { setAttachedComponent(attachedComponent); this.hyperlinkListener = listener; - textAreaListener = new TextAreaListener(); + attachedComponentListener = new AttachedComponentListener(); tipVisibleBounds = new Rectangle(); } @@ -149,7 +149,7 @@ tipWindow.setVisible(true); tipWindow.toFront(); computeTipVisibleBounds(); // Do after tip is visible - textAreaListener.install(attachedComponent); + attachedComponentListener.install(attachedComponent); lastText = text; } @@ -187,7 +187,7 @@ if (tipWindow != null) { tipWindow.dispose(); tipWindow = null; - textAreaListener.uninstall(); + attachedComponentListener.uninstall(); tipVisibleBounds.setBounds(-1, -1, 0, 0); lastText = null; attachedComponent.requestFocus(); @@ -197,7 +197,7 @@ void removeListeners() { //System.out.println("DEBUG: Removing text area listeners"); - textAreaListener.uninstall(); + attachedComponentListener.uninstall(); } @@ -236,7 +236,7 @@ } - private class TextAreaListener extends MouseInputAdapter implements + private class AttachedComponentListener extends MouseInputAdapter implements CaretListener, ComponentListener, FocusListener, KeyListener { public void caretUpdate(CaretEvent e) {

1 0

r400 - in testTreeTooltipSession/trunk: . src/main/java/org/nuiton/test src/main/java/org/nuiton/test/focusabletip
by echatellier＠users.nuiton.org 12 Mar '10

12 Mar '10

Author: echatellier Date: 2010-03-12 15:26:53 +0100 (Fri, 12 Mar 2010) New Revision: 400 Log: Add eclipse-like tooltip from rsynthaxtextarea Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip.java testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip.properties testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip_fr.properties testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/SizeGrip.java testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/TipUtil.java testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/TipWindow.java Modified: testTreeTooltipSession/trunk/pom.xml testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/MainPanel.java Modified: testTreeTooltipSession/trunk/pom.xml =================================================================== --- testTreeTooltipSession/trunk/pom.xml 2010-03-11 15:13:06 UTC (rev 399) +++ testTreeTooltipSession/trunk/pom.xml 2010-03-12 14:26:53 UTC (rev 400) @@ -106,6 +106,13 @@ <type>jar</type> <scope>compile</scope> </dependency> +  </dependencies> <repositories> Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/MainPanel.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/MainPanel.java 2010-03-11 15:13:06 UTC (rev 399) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/MainPanel.java 2010-03-12 14:26:53 UTC (rev 400) @@ -21,6 +21,7 @@ import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.Insets; +import java.awt.event.MouseEvent; import java.io.File; import java.io.IOException; @@ -29,15 +30,15 @@ import javax.swing.JScrollPane; import javax.swing.JSplitPane; import javax.swing.JTable; +import javax.swing.JTextArea; import javax.swing.JTextField; -import javax.swing.PopupFactory; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import org.jdesktop.swingx.JXTree; +import org.nuiton.test.focusabletip.FocusableTip; import org.nuiton.test.table.BasicTableModel; import org.nuiton.test.table.BasicTableRenderer; -import org.nuiton.test.tooltip.BalloonPopupFactory; import org.nuiton.test.tree.BasicTreeModel; import org.nuiton.test.tree.BasicTreeRenderer; import org.nuiton.test.tree.FilterTreeModel; @@ -69,7 +70,7 @@ super(new BorderLayout()); - PopupFactory.setSharedInstance(new BalloonPopupFactory()); + //PopupFactory.setSharedInstance(new BalloonPopupFactory()); // label filter JPanel leftPanel = new JPanel(new GridBagLayout()); @@ -117,7 +118,23 @@ BasicTableModel tableModel = new BasicTableModel(new File("."). getCanonicalFile().getParentFile()); - JTable table = new JTable(tableModel); + JTable table = new JTable(tableModel) { + + protected FocusableTip focusableTip; + @Override + public String getToolTipText(MouseEvent e) { + + System.out.println("called ?"); + String text = super.getToolTipText(e); + if (focusableTip==null) { + focusableTip = new FocusableTip(this, null); + } + focusableTip.toolTipRequested(e, text); + + return null; + } + }; + table.setDefaultRenderer(String.class, new BasicTableRenderer()); table.setName("table"); rigthPanel.add(new JScrollPane(table), new GridBagConstraints(0, 1, 1, @@ -131,7 +148,31 @@ } catch (IOException e1) { e1.printStackTrace(); } + + + // text area tootip + JTextArea textareaTT = new JTextArea("Public java main blah blah blah") { + protected FocusableTip focusableTip; + @Override + public String getToolTipText(MouseEvent e) { + + System.out.println("called ?"); + String text = super.getToolTipText(e); + if (focusableTip==null) { + focusableTip = new FocusableTip(this, null); + } + //focusableTip.setImageBase(imageBase); + focusableTip.toolTipRequested(e, text); + return null; + } + }; + textareaTT.setToolTipText("Balh"); + + rigthPanel.add(textareaTT, new GridBagConstraints(0, 2, 1, 1, 1, 1, + GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets( + 2, 2, 2, 2), 0, 0)); + // end UI JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftPanel, rigthPanel); @@ -139,7 +180,10 @@ // OR - /*Split modelRoot = new ColSplit(new RowSplit(new Leaf("left"), new Divider(), new Leaf("right")), new Divider(), new Leaf("bottom")); + /*Split modelRoot = new ColSplit( + new RowSplit(new Leaf("left"), new Divider(), new Leaf("right")), + new Divider(), + new Leaf("bottom")); MultiSplitLayout mpLayout = new MultiSplitLayout(modelRoot); mpLayout.setDividerSize(2); JXMultiSplitPane pane = new JXMultiSplitPane(mpLayout); Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip.java (rev 0) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip.java 2010-03-12 14:26:53 UTC (rev 400) @@ -0,0 +1,335 @@ +/* + * 07/29/2009 + * + * FocusableTip.java - A focusable tool tip, like those in Eclipse. + * Copyright (C) 2009 Robert Futrell + * robert_futrell at users.sourceforge.net + * http://fifesoft.com/rsyntaxtextarea + * + * This library 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 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +package org.nuiton.test.focusabletip; + +import java.awt.Component; +import java.awt.ComponentOrientation; +import java.awt.Dimension; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Window; +import java.awt.event.ComponentEvent; +import java.awt.event.ComponentListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.net.URL; +import java.util.ResourceBundle; + +import javax.swing.JComponent; +//import javax.swing.JTextArea; +import javax.swing.SwingUtilities; +import javax.swing.ToolTipManager; +import javax.swing.event.CaretEvent; +import javax.swing.event.CaretListener; +import javax.swing.event.HyperlinkListener; +import javax.swing.event.MouseInputAdapter; + + +/** + * A focusable tool tip, similar to those found in Eclipse. The user + * can click in the tip and it becomes a "real," resizable window. + * + * @author Robert Futrell + * @version 1.0 + */ +public class FocusableTip { + + private JComponent attachedComponent; + private TipWindow tipWindow; + private URL imageBase; + private TextAreaListener textAreaListener; + private HyperlinkListener hyperlinkListener; + private String lastText; + + /** + * The screen bounds in which the mouse has to stay for the currently + * displayed tip to stay visible. + */ + private Rectangle tipVisibleBounds; + + /** + * Margin from mouse cursor at which to draw focusable tip. + */ + private static final int MARGIN = 10; + + private static final String MSG = "org.nuiton.test.focusabletip.FocusableTip"; + private static final ResourceBundle msg = ResourceBundle.getBundle(MSG); + + + public FocusableTip(JComponent attachedComponent, HyperlinkListener listener) { + setAttachedComponent(attachedComponent); + this.hyperlinkListener = listener; + textAreaListener = new TextAreaListener(); + tipVisibleBounds = new Rectangle(); + } + + + /** + * Compute the bounds in which the user can move the mouse without the + * tip window disappearing. + */ + private void computeTipVisibleBounds() { + // Compute area that the mouse can move in without hiding the + // tip window. Note that Java 1.4 can only detect mouse events + // in Java windows, not globally. + Rectangle r = tipWindow.getBounds(); + Point p = r.getLocation(); + SwingUtilities.convertPointFromScreen(p, attachedComponent); + r.setLocation(p); + tipVisibleBounds.setBounds(r.x,r.y-15, r.width,r.height+15*2); + } + + + private void createAndShowTipWindow(final MouseEvent e, final String text) { + + Window owner = SwingUtilities.getWindowAncestor(attachedComponent); + tipWindow = new TipWindow(owner, this, text); + 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. + // See http://forums.sun.com/thread.jspa?forumID=57&threadID=574810 + // for a discussion. + SwingUtilities.invokeLater(new Runnable() { + public void run() { + + // If a new FocusableTip is requested while another one is + // *focused* and visible, the focused tip (i.e. "tipWindow") + // will be disposed of. If this Runnable is run after the + // dispose(), tipWindow will be null. All of this is done on + // the EDT so no synchronization should be necessary. + if (tipWindow==null) { + return; + } + + tipWindow.fixSize(); + ComponentOrientation o = attachedComponent.getComponentOrientation(); + + Point p = e.getPoint(); + SwingUtilities.convertPointToScreen(p, attachedComponent); + int x = o.isLeftToRight() ? (p.x-10) : + (p.x - tipWindow.getWidth() + MARGIN); + int y = p.y + MARGIN; + + // Ensure tooltip is in the window bounds. + Dimension ss = tipWindow.getToolkit().getScreenSize(); + x = Math.max(x, 0); + if (x+tipWindow.getWidth()>=ss.width) { + x = ss.width - tipWindow.getWidth(); + } + if (y+tipWindow.getHeight()>=ss.height) { // Go above cursor + y = p.y - tipWindow.getHeight() - MARGIN; + } + + tipWindow.setLocation(x, y); + tipWindow.setVisible(true); + tipWindow.toFront(); + computeTipVisibleBounds(); // Do after tip is visible + textAreaListener.install(attachedComponent); + lastText = text; + + } + }); + + } + + + /** + * Returns the base URL to use when loading images in this focusable tip. + * + * @return The base URL to use. + * @see #setImageBase(URL) + */ + public URL getImageBase() { + return imageBase; + } + + + /** + * Returns localized text for the given key. + * + * @param key The key into the resource bundle. + * @return The localized text. + */ + static String getString(String key) { + return msg.getString(key); + } + + + /** + * Disposes of the focusable tip currently displayed, if any. + */ + public void possiblyDisposeOfTipWindow() { + if (tipWindow != null) { + tipWindow.dispose(); + tipWindow = null; + textAreaListener.uninstall(); + tipVisibleBounds.setBounds(-1, -1, 0, 0); + lastText = null; + attachedComponent.requestFocus(); + } + } + + + void removeListeners() { + //System.out.println("DEBUG: Removing text area listeners"); + textAreaListener.uninstall(); + } + + + /** + * Sets the base URL to use when loading images in this focusable tip. + * + * @param url The base URL to use. + * @see #getImageBase() + */ + public void setImageBase(URL url) { + imageBase = url; + } + + + private void setAttachedComponent(JComponent attachedComponent) { + this.attachedComponent = attachedComponent; + // Is okay to do multiple times. + ToolTipManager.sharedInstance().registerComponent(attachedComponent); + } + + + public void toolTipRequested(MouseEvent e, String text) { + + if (text==null || text.length()==0) { + possiblyDisposeOfTipWindow(); + lastText = text; + return; + } + + if (lastText==null || text.length()!=lastText.length() + || !text.equals(lastText)) { + possiblyDisposeOfTipWindow(); + createAndShowTipWindow(e, text); + } + + } + + + private class TextAreaListener extends MouseInputAdapter implements + CaretListener, ComponentListener, FocusListener, KeyListener { + + public void caretUpdate(CaretEvent e) { + Object source = e.getSource(); + if (source == attachedComponent) { + possiblyDisposeOfTipWindow(); + } + } + + public void componentHidden(ComponentEvent e) { + handleComponentEvent(e); + } + + public void componentMoved(ComponentEvent e) { + handleComponentEvent(e); + } + + public void componentResized(ComponentEvent e) { + handleComponentEvent(e); + } + + public void componentShown(ComponentEvent e) { + handleComponentEvent(e); + } + + public void focusGained(FocusEvent e) { + } + + public void focusLost(FocusEvent e) { + // Only dispose of tip if it wasn't the TipWindow that was clicked + // "c" can be null, at least on OS X, so we must check that before + // calling SwingUtilities.getWindowAncestor() to guard against an + // NPE. + Component c = e.getOppositeComponent(); + boolean tipClicked = (c instanceof TipWindow) || + (c!=null && + SwingUtilities.getWindowAncestor(c) instanceof TipWindow); + if (!tipClicked) { + possiblyDisposeOfTipWindow(); + } + } + + private void handleComponentEvent(ComponentEvent e) { + possiblyDisposeOfTipWindow(); + } + + public void install(JComponent attachedComponent) { + //attachedComponent.addCaretListener(this); + attachedComponent.addComponentListener(this); + attachedComponent.addFocusListener(this); + attachedComponent.addKeyListener(this); + attachedComponent.addMouseListener(this); + attachedComponent.addMouseMotionListener(this); + } + + public void keyPressed(KeyEvent e) { + if (e.getKeyCode()==KeyEvent.VK_ESCAPE) { + possiblyDisposeOfTipWindow(); + } + else if (e.getKeyCode()==KeyEvent.VK_F2) { + if (tipWindow!=null && !tipWindow.getFocusableWindowState()) { + tipWindow.actionPerformed(null); + e.consume(); // Don't do bookmarking stuff + } + } + } + + public void keyReleased(KeyEvent e) { + } + + public void keyTyped(KeyEvent e) { + } + + public void mouseExited(MouseEvent e) { + // possiblyDisposeOfTipWindow(); + } + + public void mouseMoved(MouseEvent e) { + if (tipVisibleBounds==null || + !tipVisibleBounds.contains(e.getPoint())) { + possiblyDisposeOfTipWindow(); + } + } + + public void uninstall() { + //attachedComponent.removeCaretListener(this); + attachedComponent.removeComponentListener(this); + attachedComponent.removeFocusListener(this); + attachedComponent.removeKeyListener(this); + attachedComponent.removeMouseListener(this); + attachedComponent.removeMouseMotionListener(this); + } + + } + +} \ No newline at end of file Property changes on: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip.properties =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip.properties (rev 0) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip.properties 2010-03-12 14:26:53 UTC (rev 400) @@ -0,0 +1 @@ +FocusHotkey=Press 'F2' for focus \ No newline at end of file Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip_fr.properties =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip_fr.properties (rev 0) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/FocusableTip_fr.properties 2010-03-12 14:26:53 UTC (rev 400) @@ -0,0 +1 @@ +FocusHotkey=Appuyez sur 'F2' pour agrandir \ No newline at end of file Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/SizeGrip.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/SizeGrip.java (rev 0) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/SizeGrip.java 2010-03-12 14:26:53 UTC (rev 400) @@ -0,0 +1,266 @@ +/* + * 12/23/2008 + * + * SizeGrip.java - A size grip component that sits at the bottom of the window, + * allowing the user to easily resize that window. + * Copyright (C) 2008 Robert Futrell + * robert_futrell at users.sourceforge.net + * http://fifesoft.com/rsyntaxtextarea + * + * This library 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 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +package org.nuiton.test.focusabletip; + +import java.awt.Color; +import java.awt.ComponentOrientation; +import java.awt.Cursor; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.Point; +import java.awt.Window; +import java.awt.event.MouseEvent; +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import javax.imageio.ImageIO; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.event.MouseInputAdapter; + + +/** + * A component that allows its parent window to be resizable, similar to the + * size grip seen on status bars. + * + * @author Robert Futrell + * @version 1.0 + */ +class SizeGrip extends JPanel { + + /** + * The size grip to use if we're on OS X. + */ + private Image osxSizeGrip; + + + public SizeGrip() { + MouseHandler adapter = new MouseHandler(); + addMouseListener(adapter); + addMouseMotionListener(adapter); + setPreferredSize(new Dimension(16, 16)); + } + + + /** + * Overridden to ensure that the cursor for this component is appropriate + * for the orientation. + * + * @param o The new orientation. + */ + public void applyComponentOrientation(ComponentOrientation o) { + possiblyFixCursor(o.isLeftToRight()); + super.applyComponentOrientation(o); + } + + + /** + * Creates and returns the OS X size grip image. + * + * @return The OS X size grip. + */ + private Image createOSXSizeGrip() { + ClassLoader cl = getClass().getClassLoader(); + URL url = cl.getResource("org/fife/ui/autocomplete/osx_sizegrip.png"); + if (url==null) { + // We're not running in a jar - we may be debugging in Eclipse, + // for example + File f = new File("../AutoComplete/src/org/fife/ui/autocomplete/osx_sizegrip.png"); + if (f.isFile()) { + try { + url = f.toURI().toURL(); + } catch (MalformedURLException mue) { // Never happens + mue.printStackTrace(); + return null; + } + } + else { + return null; // Can't find resource or image file + } + } + Image image = null; + try { + image = ImageIO.read(url); + } catch (IOException ioe) { // Never happens + ioe.printStackTrace(); + } + return image; + } + + + /** + * Paints this panel. + * + * @param g The graphics context. + */ + protected void paintComponent(Graphics g) { + + super.paintComponent(g); + + Dimension dim = getSize(); + Color c1 = UIManager.getColor("Label.disabledShadow"); + Color c2 = UIManager.getColor("Label.disabledForeground"); + + if (osxSizeGrip!=null) { + g.drawImage(osxSizeGrip, dim.width-16, dim.height-16, null); + return; + } + + ComponentOrientation orientation = getComponentOrientation(); + + if (orientation.isLeftToRight()) { + int width = dim.width -= 3; + int height = dim.height -= 3; + g.setColor(c1); + g.fillRect(width-9,height-1, 3,3); + g.fillRect(width-5,height-1, 3,3); + g.fillRect(width-1,height-1, 3,3); + g.fillRect(width-5,height-5, 3,3); + g.fillRect(width-1,height-5, 3,3); + g.fillRect(width-1,height-9, 3,3); + g.setColor(c2); + g.fillRect(width-9,height-1, 2,2); + g.fillRect(width-5,height-1, 2,2); + g.fillRect(width-1,height-1, 2,2); + g.fillRect(width-5,height-5, 2,2); + g.fillRect(width-1,height-5, 2,2); + g.fillRect(width-1,height-9, 2,2); + } + else { + int height = dim.height -= 3; + g.setColor(c1); + g.fillRect(10,height-1, 3,3); + g.fillRect(6,height-1, 3,3); + g.fillRect(2,height-1, 3,3); + g.fillRect(6,height-5, 3,3); + g.fillRect(2,height-5, 3,3); + g.fillRect(2,height-9, 3,3); + g.setColor(c2); + g.fillRect(10,height-1, 2,2); + g.fillRect(6,height-1, 2,2); + g.fillRect(2,height-1, 2,2); + g.fillRect(6,height-5, 2,2); + g.fillRect(2,height-5, 2,2); + g.fillRect(2,height-9, 2,2); + } + + } + + + /** + * Ensures that the cursor for this component is appropriate for the + * orientation. + * + * @param ltr Whether the current component orientation is LTR. + */ + protected void possiblyFixCursor(boolean ltr) { + int cursor = Cursor.NE_RESIZE_CURSOR; + if (ltr) { + cursor = Cursor.NW_RESIZE_CURSOR; + } + if (cursor!=getCursor().getType()) { + setCursor(Cursor.getPredefinedCursor(cursor)); + } + } + + + public void updateUI() { + super.updateUI(); + // TODO: Key off of Aqua LaF, not just OS X, as this size grip looks + // bad on other LaFs on Mac such as Nimbus. + if (System.getProperty("os.name").indexOf("OS X")>-1) { + if (osxSizeGrip==null) { + osxSizeGrip = createOSXSizeGrip(); + } + } + else { // Clear memory in case of runtime LaF change. + osxSizeGrip = null; + } + + } + + + /** + * Listens for mouse events on this panel and resizes the parent window + * appropriately. + * + * @author Robert Futrell + * @version 1.0 + */ + /* + * NOTE: We use SwingUtilities.convertPointToScreen() instead of just using + * the locations relative to the corner component because the latter proved + * buggy - stretch the window too wide and some kind of arithmetic error + * started happening somewhere - our window would grow way too large. + */ + private class MouseHandler extends MouseInputAdapter { + + private Point origPos; + + public void mouseDragged(MouseEvent e) { + Point newPos = e.getPoint(); + SwingUtilities.convertPointToScreen(newPos, SizeGrip.this); + int xDelta = newPos.x - origPos.x; + int yDelta = newPos.y - origPos.y; + Window wind = SwingUtilities.getWindowAncestor(SizeGrip.this); + if (wind!=null) { // Should always be true + if (getComponentOrientation().isLeftToRight()) { + int w = wind.getWidth(); + if (newPos.x>=wind.getX()) { + w += xDelta; + } + int h = wind.getHeight(); + if (newPos.y>=wind.getY()) { + h += yDelta; + } + wind.setSize(w,h); + } + else { // RTL + int newW = Math.max(1, wind.getWidth()-xDelta); + int newH = Math.max(1, wind.getHeight()+yDelta); + wind.setBounds(newPos.x, wind.getY(), newW, newH); + } + // invalidate()/validate() needed pre-1.6. + wind.invalidate(); + wind.validate(); + } + origPos.setLocation(newPos); + } + + public void mousePressed(MouseEvent e) { + origPos = e.getPoint(); + SwingUtilities.convertPointToScreen(origPos, SizeGrip.this); + } + + public void mouseReleased(MouseEvent e) { + origPos = null; + } + + } + + +} \ No newline at end of file Property changes on: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/SizeGrip.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/TipUtil.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/TipUtil.java (rev 0) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/TipUtil.java 2010-03-12 14:26:53 UTC (rev 400) @@ -0,0 +1,117 @@ +/* + * 08/13/2009 + * + * TipUtil.java - Utility methods for homemade tool tips. + * Copyright (C) 2009 Robert Futrell + * robert_futrell at users.sourceforge.net + * http://fifesoft.com/rsyntaxtextarea + * + * This library 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 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +package org.nuiton.test.focusabletip; + +import java.awt.Color; +import java.awt.Font; +import java.awt.SystemColor; +import javax.swing.BorderFactory; +import javax.swing.JEditorPane; +import javax.swing.UIManager; +import javax.swing.plaf.ColorUIResource; +import javax.swing.text.html.HTMLDocument; + + +/** + * Static utility methods for focusable tips. + * + * @author Robert Futrell + * @version 1.0 + */ +class TipUtil { + + + private TipUtil() { + } + + + /** + * Returns the default background color to use for tool tip windows. + * + * @return The default background color. + */ + public static Color getToolTipBackground() { + + Color c = UIManager.getColor("ToolTip.background"); + + // Tooltip.background is wrong color on Nimbus (!) + if (c==null || UIManager.getLookAndFeel().getName().equals("Nimbus")) { + c = UIManager.getColor("info"); // Used by Nimbus (and others) + if (c==null) { + c = SystemColor.info; // System default + } + } + + // Workaround for a bug (?) with Nimbus - calling JLabel.setBackground() + // with a ColorUIResource does nothing, must be a normal Color + if (c instanceof ColorUIResource) { + c = new Color(c.getRGB()); + } + + return c; + + } + + + /** + * Tweaks a <code>JEditorPane</code> so it can be used to render the + * content in a focusable pseudo-tool tip. It is assumed that the editor + * pane is using an <code>HTMLDocument</code>. + * + * @param textArea The editor pane to tweak. + */ + public static void tweakTipEditorPane(JEditorPane textArea) { + + // Jump through a few hoops to get things looking nice in Nimbus + if (UIManager.getLookAndFeel().getName().equals("Nimbus")) { + Color selBG = textArea.getSelectionColor(); + Color selFG = textArea.getSelectedTextColor(); + textArea.setUI(new javax.swing.plaf.basic.BasicEditorPaneUI()); + textArea.setSelectedTextColor(selFG); + textArea.setSelectionColor(selBG); + } + + textArea.setEditable(false); // Required for links to work! + textArea.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); + + // Make selection visible even though we are not (initially) focusable. + textArea.getCaret().setSelectionVisible(true); + + // Make it use the "tool tip" background color. + textArea.setBackground(TipUtil.getToolTipBackground()); + + // Force JEditorPane to use a certain font even in HTML. + // All standard LookAndFeels, even Nimbus (!), define Label.font. + Font font = UIManager.getFont("Label.font"); + if (font == null) { // Try to make a sensible default + font = new Font("SansSerif", Font.PLAIN, 12); + } + HTMLDocument doc = (HTMLDocument) textArea.getDocument(); + doc.getStyleSheet().addRule( + "body { font-family: " + font.getFamily() + "; font-size: " + + font.getSize() + "pt; }"); + + } + + +} \ No newline at end of file Property changes on: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/TipUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/TipWindow.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/TipWindow.java (rev 0) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/TipWindow.java 2010-03-12 14:26:53 UTC (rev 400) @@ -0,0 +1,328 @@ +/* + * 07/29/2009 + * + * TipWindow.java - The actual window component representing the tool tip. + * Copyright (C) 2009 Robert Futrell + * robert_futrell at users.sourceforge.net + * http://fifesoft.com/rsyntaxtextarea + * + * This library 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 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +package org.nuiton.test.focusabletip; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Window; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.BorderFactory; +import javax.swing.JEditorPane; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JSeparator; +import javax.swing.JWindow; +import javax.swing.SwingConstants; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.event.HyperlinkEvent; +import javax.swing.event.HyperlinkListener; +import javax.swing.event.MouseInputAdapter; +import javax.swing.text.BadLocationException; +import javax.swing.text.html.HTMLDocument; + + +/** + * The actual tool tip component. + * + * @author Robert Futrell + * @version 1.0 + */ +class TipWindow extends JWindow implements ActionListener { + + private FocusableTip ft; + private JEditorPane textArea; + private String text; + private TipListener tipListener; + private HyperlinkListener userHyperlinkListener; + + private static TipWindow visibleInstance; + + + /** + * Constructor. + * + * @param owner The parent window. + * @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); + TipUtil.tweakTipEditorPane(textArea); + if (ft.getImageBase()!=null) { // Base URL for images + ((HTMLDocument)textArea.getDocument()).setBase(ft.getImageBase()); + } + textArea.addMouseListener(tipListener); + textArea.addHyperlinkListener(new HyperlinkListener() { + public void hyperlinkUpdate(HyperlinkEvent e) { + if (e.getEventType()==HyperlinkEvent.EventType.ACTIVATED) { + TipWindow.this.ft.possiblyDisposeOfTipWindow(); + } + } + }); + cp.add(textArea); + + setFocusableWindowState(false); + setContentPane(cp); + setBottomPanel(); // Must do after setContentPane() + pack(); + + // InputMap/ActionMap combo doesn't work for JWindows (even when + // using the JWindow's JRootPane), so we'll resort to KeyListener + KeyAdapter ka = new KeyAdapter() { + public void keyPressed(KeyEvent e) { + if (e.getKeyCode()==KeyEvent.VK_ESCAPE) { + TipWindow.this.ft.possiblyDisposeOfTipWindow(); + } + } + }; + addKeyListener(ka); + textArea.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 + // synchronization isn't necessary, but we'll be extra safe. + synchronized (TipWindow.class) { + if (visibleInstance!=null) { + visibleInstance.dispose(); + } + visibleInstance = this; + } + + } + + + public void actionPerformed(ActionEvent e) { + + if (!getFocusableWindowState()) { + setFocusableWindowState(true); + setBottomPanel(); + textArea.removeMouseListener(tipListener); + pack(); + addWindowFocusListener(new WindowAdapter() { + public void windowLostFocus(WindowEvent e) { + ft.possiblyDisposeOfTipWindow(); + } + }); + ft.removeListeners(); + if (e==null) { // Didn't get here via our mouseover timer + requestFocus(); + } + } + + } + + + /** + * Disposes of this window. + */ + public void dispose() { + //System.out.println("[DEBUG]: Disposing..."); + Container cp = getContentPane(); + for (int i=0; i<cp.getComponentCount(); i++) { + // Okay if listener is already removed + cp.getComponent(i).removeMouseListener(tipListener); + } + ft.removeListeners(); + super.dispose(); + } + + + /** + * Workaround for JEditorPane not returning its proper preferred size + * when rendering HTML until after layout already done. See + * http://forums.sun.com/thread.jspa?forumID=57&threadID=574810 for a + * discussion. + */ + void fixSize() { + + Dimension d = textArea.getPreferredSize(); + Rectangle r = null; + 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, 320); + d.height = Math.min(d.height, 150); + + textArea.setPreferredSize(d); + + } catch (BadLocationException ble) { // Never happens + ble.printStackTrace(); + } + + pack(); // Must re-pack to calculate proper size. + + } + + + public String getText() { + return text; + } + + + private void setBottomPanel() { + + final JPanel panel = new JPanel(new BorderLayout()); + panel.add(new JSeparator(), BorderLayout.NORTH); + + boolean focusable = getFocusableWindowState(); + if (focusable) { + SizeGrip sg = new SizeGrip(); + sg.applyComponentOrientation(sg.getComponentOrientation()); // Workaround + panel.add(sg, BorderLayout.LINE_END); + MouseInputAdapter adapter = new MouseInputAdapter() { + private Point lastPoint; + public void mouseDragged(MouseEvent e) { + Point p = e.getPoint(); + SwingUtilities.convertPointToScreen(p, panel); + if (lastPoint==null) { + lastPoint = p; + } + else { + int dx = p.x - lastPoint.x; + int dy = p.y - lastPoint.y; + setLocation(getX()+dx, getY()+dy); + lastPoint = p; + } + } + public void mousePressed(MouseEvent e) { + lastPoint = e.getPoint(); + SwingUtilities.convertPointToScreen(lastPoint, panel); + } + }; + panel.addMouseListener(adapter); + panel.addMouseMotionListener(adapter); + // Don't add tipListener to the panel or SizeGrip + } + else { + panel.setOpaque(false); + JLabel label = new JLabel(FocusableTip.getString("FocusHotkey")); + Color fg = UIManager.getColor("Label.disabledForeground"); + Font font = textArea.getFont(); + font = font.deriveFont(font.getSize2D() - 1.0f); + label.setFont(font); + if (fg==null) { // Non BasicLookAndFeel-derived Looks + fg = Color.GRAY; + } + label.setOpaque(true); + Color bg = TipUtil.getToolTipBackground(); + label.setBackground(bg); + label.setForeground(fg); + label.setHorizontalAlignment(SwingConstants.TRAILING); + label.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5)); + panel.add(label); + panel.addMouseListener(tipListener); + } + + // Replace the previous SOUTH Component with the new one. + Container cp = getContentPane(); + if (cp.getComponentCount()==2) { // Skip first time through + Component comp = cp.getComponent(0); + cp.remove(0); + JScrollPane sp = new JScrollPane(comp); + sp.setViewportBorder(BorderFactory.createEmptyBorder()); + sp.setBackground(textArea.getBackground()); + sp.getViewport().setBackground(textArea.getBackground()); + cp.add(sp); + // What was component 1 is now 0. + cp.getComponent(0).removeMouseListener(tipListener); + cp.remove(0); + } + + cp.add(panel, BorderLayout.SOUTH); + + } + + + /** + * Sets the listener for hyperlink events in this tip window. + * + * @param listener The new listener. The old listener (if any) is + * 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); + } + } + + + /** + * Listens for events in this window. + */ + private class TipListener extends MouseAdapter { + + public TipListener() { + } + + public void mousePressed(MouseEvent e) { + actionPerformed(null); // Manually create "real" window + } + + public void mouseExited(MouseEvent e) { + // Since we registered this listener on the child components of + // the JWindow, not the JWindow iteself, we have to be careful. + Component source = (Component)e.getSource(); + Point p = e.getPoint(); + SwingUtilities.convertPointToScreen(p, source); + if (!TipWindow.this.getBounds().contains(p)) { + ft.possiblyDisposeOfTipWindow(); + } + } + + } + +} \ No newline at end of file Property changes on: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/focusabletip/TipWindow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r399 - in testTreeTooltipSession/trunk/src/main/java/org/nuiton/test: . resources table tooltip tree
by echatellier＠users.nuiton.org 11 Mar '10

11 Mar '10

Author: echatellier Date: 2010-03-11 16:13:06 +0100 (Thu, 11 Mar 2010) New Revision: 399 Log: Update persistent toolip display (need to be fixed for trees and tables) Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tooltip/BalloonPopupFactory.java testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/BasicTreeRenderer.java Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/MainPanel.java testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/resources/MyApplication.properties testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/table/BasicTableModel.java testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/table/BasicTableRenderer.java testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/BasicTreeModel.java testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/FilterTreeModel.java Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/MainPanel.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/MainPanel.java 2010-03-08 19:03:09 UTC (rev 398) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/MainPanel.java 2010-03-11 15:13:06 UTC (rev 399) @@ -18,12 +18,9 @@ package org.nuiton.test; import java.awt.BorderLayout; -import java.awt.Color; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.Insets; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; import java.io.File; import java.io.IOException; @@ -33,19 +30,16 @@ import javax.swing.JSplitPane; import javax.swing.JTable; import javax.swing.JTextField; -import javax.swing.JToolTip; -import javax.swing.JTree; +import javax.swing.PopupFactory; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import net.java.balloontip.BalloonTip; -import net.java.balloontip.styles.RoundedBalloonStyle; -import net.java.balloontip.utils.ToolTipUtils; - +import org.jdesktop.swingx.JXTree; import org.nuiton.test.table.BasicTableModel; import org.nuiton.test.table.BasicTableRenderer; -import org.nuiton.test.tooltip.ViewTooltips; +import org.nuiton.test.tooltip.BalloonPopupFactory; import org.nuiton.test.tree.BasicTreeModel; +import org.nuiton.test.tree.BasicTreeRenderer; import org.nuiton.test.tree.FilterTreeModel; import org.nuiton.test.tree.MyFilter; import org.slf4j.Logger; @@ -75,6 +69,8 @@ super(new BorderLayout()); + PopupFactory.setSharedInstance(new BalloonPopupFactory()); + // label filter JPanel leftPanel = new JPanel(new GridBagLayout()); JLabel filterLabel = new JLabel("Filtre : "); @@ -95,7 +91,8 @@ .getCanonicalFile()); filterModel = new FilterTreeModel(treeModel, new MyFilter("")); - JTree tree = new JTree(filterModel); + JXTree tree = new JXTree(filterModel); + tree.setCellRenderer(new BasicTreeRenderer()); tree.setName("tree"); leftPanel.add(new JScrollPane(tree), new GridBagConstraints(0, 1, 2, 1, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH, @@ -108,57 +105,17 @@ JPanel rigthPanel = new JPanel(new GridBagLayout()); // label tootip - JLabel testToottip = new JLabel("Over me !!!!!") { - @Override - public JToolTip createToolTip() { - JToolTip tt = new JToolTip(); - /*BalloonTip bt = new BalloonTip(this, this.getToolTipText(), new RoundedBalloonStyle(5,5,Color.WHITE, Color.BLACK), false); - bt.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - - BalloonTip source = (BalloonTip)e.getSource(); - source.closeBalloon(); - - BalloonTip bt = new BalloonTip(source, source.getToolTipText(), new RoundedBalloonStyle(5,5,Color.WHITE, Color.BLACK), true); - bt.setVisible(true); - } - - }); - //ToolTipUtils.balloonToToolTip(bt, 500, 3000); - tt.setComponent(this);*/ - return tt; - } - }; - testToottip.setToolTipText("Alors ?"); + JLabel testToottip = new JLabel("Over me !!!!!"); + testToottip.setToolTipText("Then click on Me !!!"); - BalloonTip bt = new BalloonTip(testToottip, testToottip - .getToolTipText(), new RoundedBalloonStyle(5, 5, Color.WHITE, - Color.BLACK), false); - bt.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - logger.debug("Called"); - BalloonTip source = (BalloonTip) e.getSource(); - source.setVisible(false); - source.setEnabled(false); - BalloonTip bt = new BalloonTip( - source.getAttachedComponent(), - source.getAttachedComponent().getToolTipText(), - new RoundedBalloonStyle(5, 5, Color.WHITE, Color.BLACK), - true); - bt.setVisible(true); - } - }); - ToolTipUtils.balloonToToolTip(bt, 500, 3000); rigthPanel.add(testToottip, new GridBagConstraints(0, 0, 1, 1, 1, 0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets( 2, 2, 2, 2), 0, 0)); // table try { - BasicTableModel tableModel = new BasicTableModel(new File(".") - .getCanonicalFile()); + BasicTableModel tableModel = new BasicTableModel(new File("."). + getCanonicalFile().getParentFile()); JTable table = new JTable(tableModel); table.setDefaultRenderer(String.class, new BasicTableRenderer()); @@ -169,6 +126,8 @@ DataTipManager.get().register(table); //ViewTooltips.register(table); + + //table.addMouseMotionListener(new TableTooltipListener()); } catch (IOException e1) { e1.printStackTrace(); } @@ -178,6 +137,16 @@ JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftPanel, rigthPanel); pane.setName("mainViewPane"); + // OR + + /*Split modelRoot = new ColSplit(new RowSplit(new Leaf("left"), new Divider(), new Leaf("right")), new Divider(), new Leaf("bottom")); + MultiSplitLayout mpLayout = new MultiSplitLayout(modelRoot); + mpLayout.setDividerSize(2); + JXMultiSplitPane pane = new JXMultiSplitPane(mpLayout); + pane.add(leftPanel, "left"); + pane.add(rigthPanel, "right"); + pane.add(new JLabel("Test bottom"), "bottom");*/ + add(pane, BorderLayout.CENTER); } Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/resources/MyApplication.properties =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/resources/MyApplication.properties 2010-03-08 19:03:09 UTC (rev 398) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/resources/MyApplication.properties 2010-03-11 15:13:06 UTC (rev 399) @@ -2,3 +2,4 @@ Application.title = My frame title Application.vendor = CodeLutin Application.vendorId = codelutin +Application.lookAndFeel = com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/table/BasicTableModel.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/table/BasicTableModel.java 2010-03-08 19:03:09 UTC (rev 398) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/table/BasicTableModel.java 2010-03-11 15:13:06 UTC (rev 399) @@ -19,14 +19,10 @@ import java.io.File; -import javax.swing.event.TreeModelListener; import javax.swing.table.AbstractTableModel; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.w3c.dom.views.AbstractView; /** * BasicTableModel Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/table/BasicTableRenderer.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/table/BasicTableRenderer.java 2010-03-08 19:03:09 UTC (rev 398) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/table/BasicTableRenderer.java 2010-03-11 15:13:06 UTC (rev 399) @@ -19,8 +19,6 @@ package org.nuiton.test.table; import java.awt.Component; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; import javax.swing.JComponent; import javax.swing.JTable; @@ -35,8 +33,11 @@ * Last update : $Date$ * By : $Author$ */ -public class BasicTableRenderer extends DefaultTableCellRenderer implements MouseListener { +public class BasicTableRenderer extends DefaultTableCellRenderer { + /** serialVersionUID. */ + private static final long serialVersionUID = 6448391469600567754L; + /* * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) */ @@ -46,77 +47,8 @@ JComponent c = (JComponent)super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - /*JLabel b = new JLabel(value.toString()) { - @Override - public JToolTip createToolTip() { - JToolTip tt = super.createToolTip(); - - //TablecellBalloonTip tip = new TablecellBalloonTip(table, "etst", row, column, new RoundedBalloonStyle(5,5 - // , Color.WHITE, Color.BLACK), Orientation.RIGHT_ABOVE, AttachLocation.ALIGNED, 5, 5, true); - BalloonTip bt = new BalloonTip(this, this.getToolTipText(), new RoundedBalloonStyle(5,5,Color.WHITE, Color.BLACK), false); - /*bt.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - - BalloonTip source = (BalloonTip)e.getSource(); - source.closeBalloon(); - - BalloonTip bt = new BalloonTip(source, source.getToolTipText(), new RoundedBalloonStyle(5,5,Color.WHITE, Color.BLACK), true); - bt.setVisible(true); - } - - }); - ToolTipUtils.balloonToToolTip(bt, 500, 3000); - tt.setComponent(bt); - - return tt; - } - }; - b.setToolTipText("Tooltip = " + value.toString());*/ + c.setToolTipText("<html><body>Un test de texte Enorme, avec du gras, des saut de lignes, etc...un nouveau paragraphe...et le contenu réel : " + value + "</body></html>"); - this.addMouseListener(new BasicTableRenderer()); - return this; } - - /* - * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) - */ - @Override - public void mouseClicked(MouseEvent e) { - System.out.println("mouseClicked"); - } - - /* - * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) - */ - @Override - public void mousePressed(MouseEvent e) { - System.out.println("mousePressed"); - } - - /* - * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent) - */ - @Override - public void mouseReleased(MouseEvent e) { - System.out.println("mouseReleased"); - } - - /* - * @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent) - */ - @Override - public void mouseEntered(MouseEvent e) { - System.out.println("mouseEntered"); - } - - /* - * @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent) - */ - @Override - public void mouseExited(MouseEvent e) { - System.out.println("mouseExited"); - } - } Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tooltip/BalloonPopupFactory.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tooltip/BalloonPopupFactory.java (rev 0) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tooltip/BalloonPopupFactory.java 2010-03-11 15:13:06 UTC (rev 399) @@ -0,0 +1,273 @@ +/* *##% + * Copyright (C) 2010 Code Lutin, Chatellier Eric + * + * This program 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 + * 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.nuiton.test.tooltip; + +import java.awt.Color; +import java.awt.Component; +import java.awt.MouseInfo; +import java.awt.Point; +import java.awt.PointerInfo; +import java.awt.Rectangle; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionListener; + +import javax.swing.JComponent; +import javax.swing.JLayeredPane; +import javax.swing.JTable; +import javax.swing.JToolTip; +import javax.swing.JWindow; +import javax.swing.Popup; +import javax.swing.PopupFactory; +import javax.swing.Timer; + +import net.java.balloontip.BalloonTip; +import net.java.balloontip.TablecellBalloonTip; +import net.java.balloontip.BalloonTip.AttachLocation; +import net.java.balloontip.BalloonTip.Orientation; +import net.java.balloontip.positioners.BalloonTipPositioner; +import net.java.balloontip.styles.RoundedBalloonStyle; + +public class BalloonPopupFactory extends PopupFactory { + + protected static BalloonTip bt; + + @Override + public Popup getPopup(Component owner, Component contents, int x, int y) + throws IllegalArgumentException { + // A more complete implementation would cache and reuse + // popups + return new BalloonPopup(owner, contents, x, y); + } + + private class BalloonPopup extends Popup implements MouseListener, MouseMotionListener { + protected JLayeredPane topLevelContainer = null; // The balloon is drawn on this pane + private JWindow popupWindow; + private boolean toFade = true; + private int currOpacity; + private Timer fadeInTimer; + private Timer fadeOutTimer; + private Component contents; + private Component owner; + private int ownerX, ownerY; + + + //Will need to keep track of the component... I only want JToolTips to behave in this strange way and combo-box drop-down lists and menus will be affected. + + public BalloonPopup(Component owner, Component contents, int ownerX, int ownerY) { + + /*Container parent = owner.getParent(); + // Follow the path of parents of the attached component until you find the top level container + while (true) { + // If you're a top level container (JFrame, JDialog, JInternalFrame, JApplet or JWindow) + if (parent instanceof RootPaneContainer) { + topLevelContainer = ((RootPaneContainer)parent).getLayeredPane(); + // Exit the infinite loop + break; + // If you're a tab + } else if (parent instanceof JTabbedPane) { + + ((JTabbedPane)parent).addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent e) { + //checkVisibility(); + } + }); + } + parent = parent.getParent(); + }*/ + + /*// We use the popup layer of the top level container (frame or dialog) to show the balloon tip + topLevelContainer.add(contents, JLayeredPane.POPUP_LAYER); + // If the attached component is moved/hidden/shown, the balloon tip should act accordingly + owner.addComponentListener(this); + // If the window is resized, we should check if the balloon still fits + topLevelContainer.addComponentListener(this); + // Don't allow to click 'through' the component; will also enable to close the balloon when it's clicked + topLevelContainer.addMouseListener(this);*/ + + // create a new heavyweight window + //this.popupWindow = new JWindow(); + this.contents = contents; + this.owner = owner; + this.ownerX = ownerX; + this.ownerY = ownerY; + // determine the popup location + //popupWindow.setLocation(ownerX, ownerY); + // add the contents to the popup + //popupWindow.getContentPane().add(contents, BorderLayout.CENTER); + //contents.invalidate(); + //JComponent parent = (JComponent) contents.getParent(); + + //popupWindow.setAlwaysOnTop(true); //Since the main frame is set to always be on top, I need to set this on the popupWindow... or it will stay behind the frame. + } + + @Override + public void show() { + + /*// We use the popup layer of the top level container (frame or dialog) to show the balloon tip + topLevelContainer.add(new JLabel("Hoho"), JLayeredPane.POPUP_LAYER); + // If the attached component is moved/hidden/shown, the balloon tip should act accordingly + topLevelContainer.addComponentListener(this); + // If the window is resized, we should check if the balloon still fits + topLevelContainer.addComponentListener(this); + // Don't allow to click 'through' the component; will also enable to close the balloon when it's clicked + topLevelContainer.addMouseListener(this); + + topLevelContainer.setVisible(true);*/ + + if (bt != null && bt.isVisible()) { + bt.closeBalloon(); + } + + JToolTip contentTooltip = (JToolTip)contents; + //JComponent cc = contentTooltip.getComponent(); + + if (contentTooltip.getComponent() instanceof JTable) { + JTable srcTable = (JTable)contentTooltip.getComponent(); + + //Point p = new Point(ownerX - (int)srcTable.getLocation().getX(), ownerY - (int)srcTable.getLocation().getY()); + + Point mouseLocation = MouseInfo.getPointerInfo().getLocation(); + Point p = new Point((int)(mouseLocation.getX() - srcTable.getLocationOnScreen().getX()), + (int)(mouseLocation.getY() - srcTable.getLocationOnScreen().getY())); + int row = srcTable.rowAtPoint(p); + int column = srcTable.columnAtPoint(p); + if (row >= 0 && column >= 0 ) { + bt = new TablecellBalloonTip(srcTable, contentTooltip.getTipText(), + row, column, new RoundedBalloonStyle(5,5, Color.WHITE, Color.BLACK), + Orientation.LEFT_ABOVE, AttachLocation.CENTER, 0, 0, false); + //bt.setLocation(new Point((int)(ownerX - owner.getLocationOnScreen().getX()), (int)(ownerY - owner.getLocationOnScreen().getY()))); + bt.addMouseListener(this); + } + + } + else { + bt = new BalloonTip((JComponent)owner, contentTooltip.getTipText(), + new RoundedBalloonStyle(5,5, Color.WHITE, Color.BLACK), Orientation.LEFT_ABOVE, AttachLocation.ALIGNED, 5, 5, false); + //bt.setLocation(new Point((int)(ownerX - owner.getLocationOnScreen().getX()), (int)(ownerY - owner.getLocationOnScreen().getY()))); + + bt.addMouseListener(this); + } + } + + @Override + public void hide() { + + if (bt != null) { + fadeOutTimer = new Timer(500, new CloseBalloonTimer(bt)); + fadeOutTimer.start(); + } + } + + class CloseBalloonTimer implements ActionListener { + public BalloonTip bt; + + public CloseBalloonTimer(BalloonTip bt) { + this.bt = bt; + } + + @Override + public void actionPerformed(ActionEvent e) { + if (bt.isVisible()) { + bt.closeBalloon(); + } + } + } + + /* + * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) + */ + @Override + public void mouseClicked(MouseEvent e) { + + /*BalloonTip btSource = (BalloonTip)e.getSource(); + btSource.closeBalloon(); + BalloonTip newBt = new BalloonTip((JComponent)owner, btSource.getText(), + new RoundedBalloonStyle(5,5, Color.WHITE, Color.BLACK), Orientation.LEFT_ABOVE, AttachLocation.ALIGNED, 0, 0, true); + newBt.addMouseMotionListener(this);*/ + + BalloonTip btSource = (BalloonTip)e.getSource(); + + BalloonTip newBt; + if (btSource.getAttachedComponent() instanceof JTable) { + JTable srcTable = (JTable)btSource.getAttachedComponent(); + + Point mouseLocation = MouseInfo.getPointerInfo().getLocation(); + Point p = new Point((int)(mouseLocation.getX() - srcTable.getLocationOnScreen().getX()), + (int)(mouseLocation.getY() - srcTable.getLocationOnScreen().getY())); + int row = srcTable.rowAtPoint(p); + int column = srcTable.columnAtPoint(p); + if (row >= 0 && column >= 0 ) { + newBt = new TablecellBalloonTip(srcTable, btSource.getText(), + row, column, new RoundedBalloonStyle(5,5, Color.WHITE, Color.BLACK), + Orientation.LEFT_ABOVE, AttachLocation.ALIGNED, 0, + 0, true); + newBt.addMouseMotionListener(this); + newBt.setLocation(new Point(ownerX, ownerY)); + } + } + else { + newBt = new BalloonTip((JComponent)owner, btSource.getText(), + new RoundedBalloonStyle(5,5, Color.WHITE, Color.BLACK), Orientation.LEFT_ABOVE, AttachLocation.ALIGNED, 5, 5, true); + newBt.addMouseMotionListener(this); + } + } + + @Override + public void mousePressed(MouseEvent e) {} + + @Override + public void mouseReleased(MouseEvent e) {} + + @Override + public void mouseEntered(MouseEvent e) {} + + @Override + public void mouseExited(MouseEvent e) {} + + /* + * @see java.awt.event.MouseMotionListener#mouseDragged(java.awt.event.MouseEvent) + */ + @Override + public void mouseDragged(MouseEvent e) { + + BalloonTip btSource = (BalloonTip)e.getSource(); + BalloonTipPositioner positioner = btSource.getPositioner(); + //positioner.determineAndSetLocation( + // new Rectangle((int)e.getPoint().getX(), (int)e.getPoint().getY(), + // btSource.getAttachedComponent().getWidth(), btSource.getAttachedComponent().getHeight())); + + //Component attachedComponent = btSource.getAttachedComponent(); + positioner.determineAndSetLocation( + new Rectangle((int)btSource.getLocation().getX() + (int)e.getPoint().getX(), + (int)btSource.getLocation().getY() + (int)e.getPoint().getY(), + btSource.getAttachedComponent().getWidth(), btSource.getAttachedComponent().getHeight())); + } + + /* + * @see java.awt.event.MouseMotionListener#mouseMoved(java.awt.event.MouseEvent) + */ + @Override + public void mouseMoved(MouseEvent e) { + + } + } +} Property changes on: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tooltip/BalloonPopupFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/BasicTreeModel.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/BasicTreeModel.java 2010-03-08 19:03:09 UTC (rev 398) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/BasicTreeModel.java 2010-03-11 15:13:06 UTC (rev 399) @@ -114,6 +114,4 @@ // TODO Auto-generated method stub } - - } Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/BasicTreeRenderer.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/BasicTreeRenderer.java (rev 0) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/BasicTreeRenderer.java 2010-03-11 15:13:06 UTC (rev 399) @@ -0,0 +1,57 @@ +/* *##% + * Copyright (C) 2010 Code Lutin, Chatellier Eric + * + * This program 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 + * 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.nuiton.test.tree; + +import java.awt.Component; + +import javax.swing.JComponent; +import javax.swing.JTree; +import javax.swing.tree.DefaultTreeCellRenderer; + +/** + * TODO add comment here. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class BasicTreeRenderer extends DefaultTreeCellRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6448391469600567754L; + + /* + * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) + */ + @Override + public Component getTreeCellRendererComponent(JTree tree, Object value, + boolean isSelected, + boolean expanded, + boolean leaf, int row, + boolean hasFocus) { + + JComponent c = (JComponent)super.getTreeCellRendererComponent(tree, value, isSelected, expanded, leaf, row, hasFocus); + + c.setToolTipText("<html><body>Un test de texte Enorme, avec du gras, des saut de lignes, etc...un nouveau paragraphe...et le contenu réel : " + value + " (" + row + ")</body></html>"); + + return this; + } +} \ No newline at end of file Property changes on: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/BasicTreeRenderer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/FilterTreeModel.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/FilterTreeModel.java 2010-03-08 19:03:09 UTC (rev 398) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/FilterTreeModel.java 2010-03-11 15:13:06 UTC (rev 399) @@ -18,9 +18,6 @@ package org.nuiton.test.tree; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - import javax.swing.event.TreeModelListener; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath;

1 0

r398 - javabeans/branches/test-release
by tchemit＠users.nuiton.org 08 Mar '10

08 Mar '10

Author: tchemit Date: 2010-03-08 20:03:09 +0100 (Mon, 08 Mar 2010) New Revision: 398 Log: [maven-release-plugin] rollback the release of javabeans-1.0.0 Modified: javabeans/branches/test-release/pom.xml Modified: javabeans/branches/test-release/pom.xml =================================================================== --- javabeans/branches/test-release/pom.xml 2010-03-08 19:01:20 UTC (rev 397) +++ javabeans/branches/test-release/pom.xml 2010-03-08 19:03:09 UTC (rev 398) @@ -14,7 +14,7 @@ </parent> <artifactId>javabeans</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <dependencies>

1 0

r397 - javabeans/branches/test-release
by tchemit＠users.nuiton.org 08 Mar '10

08 Mar '10

Author: tchemit Date: 2010-03-08 20:01:20 +0100 (Mon, 08 Mar 2010) New Revision: 397 Log: [maven-release-plugin] prepare for next development iteration Modified: javabeans/branches/test-release/pom.xml Modified: javabeans/branches/test-release/pom.xml =================================================================== --- javabeans/branches/test-release/pom.xml 2010-03-08 19:01:18 UTC (rev 396) +++ javabeans/branches/test-release/pom.xml 2010-03-08 19:01:20 UTC (rev 397) @@ -14,7 +14,7 @@ </parent> <artifactId>javabeans</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> <dependencies> @@ -53,9 +53,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/javabeans/tags/javabeans-1.0.0</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/javabeans/tags/javabeans-1.0.0</developerConnection> - <url>http://www.nuiton.org/repositories/browse/sandobx/javabeans/tags/javabeans-…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/javabeans/branches/test-release</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/javabeans/branches/test-release</developerConnection> + <url>http://www.nuiton.org/repositories/browse/sandobx/javabeans/branches/test-r…</url> </scm> </project>

1 0

r396 - javabeans/tags
by tchemit＠users.nuiton.org 08 Mar '10

08 Mar '10

Author: tchemit Date: 2010-03-08 20:01:18 +0100 (Mon, 08 Mar 2010) New Revision: 396 Log: [maven-release-plugin] copy for tag javabeans-1.0.0 Added: javabeans/tags/javabeans-1.0.0/

1 0

r395 - javabeans/branches/test-release
by tchemit＠users.nuiton.org 08 Mar '10

08 Mar '10

Author: tchemit Date: 2010-03-08 20:01:13 +0100 (Mon, 08 Mar 2010) New Revision: 395 Log: [maven-release-plugin] prepare release javabeans-1.0.0 Modified: javabeans/branches/test-release/pom.xml Modified: javabeans/branches/test-release/pom.xml =================================================================== --- javabeans/branches/test-release/pom.xml 2010-03-08 18:59:56 UTC (rev 394) +++ javabeans/branches/test-release/pom.xml 2010-03-08 19:01:13 UTC (rev 395) @@ -14,7 +14,7 @@ </parent> <artifactId>javabeans</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> <dependencies> @@ -53,9 +53,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/javabeans/branches/test-release</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/javabeans/branches/test-release</developerConnection> - <url>http://www.nuiton.org/repositories/browse/sandobx/javabeans/branches/test-r…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/javabeans/tags/javabeans-1.0.0</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/javabeans/tags/javabeans-1.0.0</developerConnection> + <url>http://www.nuiton.org/repositories/browse/sandobx/javabeans/tags/javabeans-…</url> </scm> </project>

1 0

r394 - in javabeans/branches/test-release: . src src/site src/site/apt
by tchemit＠users.nuiton.org 08 Mar '10

08 Mar '10

Author: tchemit Date: 2010-03-08 19:59:56 +0100 (Mon, 08 Mar 2010) New Revision: 394 Log: ready for a release Added: javabeans/branches/test-release/src/site/ javabeans/branches/test-release/src/site/apt/ javabeans/branches/test-release/src/site/apt/index.apt javabeans/branches/test-release/src/site/site_fr.xml Modified: javabeans/branches/test-release/pom.xml Modified: javabeans/branches/test-release/pom.xml =================================================================== --- javabeans/branches/test-release/pom.xml 2010-03-08 18:43:06 UTC (rev 393) +++ javabeans/branches/test-release/pom.xml 2010-03-08 18:59:56 UTC (rev 394) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom</artifactId> + <artifactId>mavenpom4redmine</artifactId> <version>2.0.5</version> </parent> @@ -43,15 +43,19 @@ <packaging>jar</packaging> + <properties> + <projectId>sandbox</projectId> + </properties> +     <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/javabeans/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/javabeans/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/sandobx/javabeans/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/javabeans/branches/test-release</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/javabeans/branches/test-release</developerConnection> + <url>http://www.nuiton.org/repositories/browse/sandobx/javabeans/branches/test-r…</url> </scm> </project> Added: javabeans/branches/test-release/src/site/apt/index.apt =================================================================== --- javabeans/branches/test-release/src/site/apt/index.apt (rev 0) +++ javabeans/branches/test-release/src/site/apt/index.apt 2010-03-08 18:59:56 UTC (rev 394) @@ -0,0 +1,11 @@ +---- +JavaBeans +---- +---- +2010-03-08 +---- + + +Présentation + + Test de page d'accueil pour le site. Added: javabeans/branches/test-release/src/site/site_fr.xml =================================================================== --- javabeans/branches/test-release/src/site/site_fr.xml (rev 0) +++ javabeans/branches/test-release/src/site/site_fr.xml 2010-03-08 18:59:56 UTC (rev 394) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> + </poweredBy> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu ref="reports"/> + </body> +</project>

1 0

r393 - javabeans/branches
by tchemit＠users.nuiton.org 08 Mar '10

08 Mar '10

Author: tchemit Date: 2010-03-08 19:43:06 +0100 (Mon, 08 Mar 2010) New Revision: 393 Log: test pour faire des release a partir d'une branche Added: javabeans/branches/test-release/

1 0