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

r398 - javabeans/branches/test-release
by tchemit＠users.nuiton.org March 8, 2010

March 8, 2010

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 March 8, 2010

March 8, 2010

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 March 8, 2010

March 8, 2010

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 March 8, 2010

March 8, 2010

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 March 8, 2010

March 8, 2010

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 March 8, 2010

March 8, 2010

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

r392 - javabeans/trunk
by tchemit＠users.nuiton.org March 8, 2010

March 8, 2010

Author: tchemit Date: 2010-03-08 19:41:50 +0100 (Mon, 08 Mar 2010) New Revision: 392 Log: update pom Modified: javabeans/trunk/pom.xml Modified: javabeans/trunk/pom.xml =================================================================== --- javabeans/trunk/pom.xml 2010-03-08 10:16:08 UTC (rev 391) +++ javabeans/trunk/pom.xml 2010-03-08 18:41:50 UTC (rev 392) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0-rc-2</version> + <version>2.0.5</version> </parent> <artifactId>javabeans</artifactId> @@ -21,7 +21,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.6</version> + <version>4.7</version> <scope>test</scope> </dependency>

1 0

r391 - in testTreeTooltipSession/trunk/src/main/java/org/nuiton/test: . tooltip
by echatellier＠users.nuiton.org March 8, 2010

March 8, 2010

Author: echatellier Date: 2010-03-08 11:16:08 +0100 (Mon, 08 Mar 2010) New Revision: 391 Log: Test another implementation (not fully implemented) Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tooltip/ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tooltip/ViewTooltips.java Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/MainPanel.java Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/MainPanel.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/MainPanel.java 2010-03-05 14:08:58 UTC (rev 390) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/MainPanel.java 2010-03-08 10:16:08 UTC (rev 391) @@ -44,6 +44,7 @@ import org.nuiton.test.table.BasicTableModel; import org.nuiton.test.table.BasicTableRenderer; +import org.nuiton.test.tooltip.ViewTooltips; import org.nuiton.test.tree.BasicTreeModel; import org.nuiton.test.tree.FilterTreeModel; import org.nuiton.test.tree.MyFilter; @@ -100,6 +101,7 @@ 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(2, 2, 2, 2), 0, 0)); DataTipManager.get().register(tree); + //ViewTooltips.register(tree); } catch (IOException e1) { e1.printStackTrace(); } @@ -166,6 +168,7 @@ new Insets(2, 2, 2, 2), 0, 0)); DataTipManager.get().register(table); + //ViewTooltips.register(table); } catch (IOException e1) { e1.printStackTrace(); } Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tooltip/ViewTooltips.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tooltip/ViewTooltips.java (rev 0) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tooltip/ViewTooltips.java 2010-03-08 10:16:08 UTC (rev 391) @@ -0,0 +1,746 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ + +package org.nuiton.test.tooltip; + +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Insets; +import java.awt.KeyboardFocusManager; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.event.ComponentEvent; +import java.awt.event.ComponentListener; +import java.awt.event.HierarchyBoundsListener; +import java.awt.event.HierarchyEvent; +import java.awt.event.HierarchyListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseMotionListener; +import java.awt.geom.AffineTransform; +import java.awt.image.BufferedImage; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + +import javax.swing.JComponent; +import javax.swing.JList; +import javax.swing.JScrollPane; +import javax.swing.JTree; +import javax.swing.ListCellRenderer; +import javax.swing.Popup; +import javax.swing.PopupFactory; +import javax.swing.SwingUtilities; +import javax.swing.border.Border; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import javax.swing.event.TreeModelEvent; +import javax.swing.event.TreeModelListener; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.TreePath; + +/** + * Displays pseudo-tooltips for tree and list views which don't have enough + * space. This class is not NB specific, and can be used with any + * JTree or JList. + * + * @author Tim Boudreau + */ +public class ViewTooltips extends MouseAdapter implements MouseMotionListener { + /** The default instance, reference counted */ + private static ViewTooltips INSTANCE = null; + /** A reference count for number of comps listened to */ + private int refcount = 0; + /** The last known component we were invoked against, nulled on hide() */ + private JComponent inner = null; + /** The last row we were invoked against */ + private int row = -1; + /** An array of currently visible popups */ + private Popup[] popups = new Popup[2]; + /** A component we'll reuse to paint into the popups */ + private ImgComp painter = new ImgComp(); + + /** Nobody should instantiate this */ + private ViewTooltips() { + } + + /** + * Register a child of a JScrollPane (only JList or JTree supported + * for now) which should show helper tooltips. Should be called + * from the component's addNotify() method. + */ + public static void register(JComponent comp) { + if (INSTANCE == null) { + INSTANCE = new ViewTooltips(); + } + INSTANCE.attachTo(comp); + } + + /** + * Unregister a child of a JScrollPane (only JList or JTree supported + * for now) which should show helper tooltips. Should be called + * from the component's removeNotify() method. + */ + public static void unregister(JComponent comp) { + assert INSTANCE != null : "Unregister asymmetrically called"; + if (INSTANCE.detachFrom(comp) == 0) { + INSTANCE.hide(); + INSTANCE = null; + } + } + + /** Start listening to mouse motion on the passed component */ + private void attachTo(JComponent comp) { + assert comp instanceof JTree || comp instanceof JList; + comp.addMouseListener(this); + comp.addMouseMotionListener(this); + refcount++; + } + + /** Stop listening to mouse motion on the passed component */ + private int detachFrom(JComponent comp) { + assert comp instanceof JTree || comp instanceof JList; + comp.removeMouseMotionListener(this); + comp.removeMouseListener(this); + return refcount--; + } + + public void mouseMoved(MouseEvent e) { + Point p = e.getPoint(); + JComponent comp = (JComponent) e.getSource(); + JScrollPane jsp = (JScrollPane) SwingUtilities.getAncestorOfClass( + JScrollPane.class, comp); + if (jsp != null) { + p = SwingUtilities.convertPoint(comp, p, jsp); + show(jsp, p); + } + } + + public void mouseDragged(MouseEvent e) { + hide(); + } + + public void mouseEntered(MouseEvent e) { + hide(); + } + + public void mouseExited(MouseEvent e) { + hide(); + } + + /** Shows the appropriate popups given the state of the scroll pane and + * its view. + * @param view The scroll pane owning the component the event happened on + * @param pt The point at which the mouse event happened, in the coordinate + * space of the scroll pane. + */ + void show(JScrollPane view, Point pt) { + if (view.getViewport().getView() instanceof JTree) { + showJTree(view, pt); + } else if (view.getViewport().getView() instanceof JList) { + showJList(view, pt); + } else { + assert false : "Bad component type registered: " + + view.getViewport().getView(); + } + } + + private void showJList(JScrollPane view, Point pt) { + JList list = (JList) view.getViewport().getView(); + Point p = SwingUtilities.convertPoint(view, pt.x, pt.y, list); + int row = list.locationToIndex(p); + if (row == -1) { + hide(); + return; + } + Rectangle bds = list.getCellBounds(row, row); + //GetCellBounds returns a width that is the + //full component width; we want only what + //the renderer really needs. + ListCellRenderer ren = list.getCellRenderer(); + Dimension rendererSize = ren.getListCellRendererComponent(list, + list.getModel().getElementAt(row), row, false, false) + .getPreferredSize(); + + bds.width = rendererSize.width; + if (bds == null || !bds.contains(p)) { + hide(); + return; + } + if (setCompAndRow(list, row)) { + Rectangle visible = getShowingRect(view); + Rectangle[] rects = getRects(bds, visible); + if (rects.length > 0) { + ensureOldPopupsHidden(); + painter.configure(list.getModel().getElementAt(row), view, + list, row); + showPopups(rects, bds, visible, list, view); + } else { + hide(); + } + } + } + + private void showJTree(JScrollPane view, Point pt) { + JTree tree = (JTree) view.getViewport().getView(); + Point p = SwingUtilities.convertPoint(view, pt.x, pt.y, tree); + + int row = tree.getClosestRowForLocation(p.x, p.y); + + TreePath path = tree.getClosestPathForLocation(p.x, p.y); + + Rectangle bds = tree.getPathBounds(path); + if (bds == null || !bds.contains(p)) { + hide(); + return; + } + if (setCompAndRow(tree, row)) { + Rectangle visible = getShowingRect(view); + Rectangle[] rects = getRects(bds, visible); + if (rects.length > 0) { + ensureOldPopupsHidden(); + painter.configure(path.getLastPathComponent(), view, tree, + path, row); + showPopups(rects, bds, visible, tree, view); + } else { + hide(); + } + } + } + + /** + * Set the currently shown component and row, returning true if they are + * not the same as the last known values. + */ + private boolean setCompAndRow(JComponent inner, int row) { + boolean rowChanged = row != this.row; + boolean compChanged = inner != this.inner; + this.inner = inner; + this.row = row; + return (rowChanged || compChanged); + } + + /** + * Hide all popups and discard any references to the components the + * popups were showing for. + */ + void hide() { + ensureOldPopupsHidden(); + if (painter != null) { + painter.clear(); + } + setHideComponent(null, null); + inner = null; + row = -1; + } + + private void ensureOldPopupsHidden() { + for (int i = 0; i < popups.length; i++) { + if (popups[i] != null) { + popups[i].hide(); + popups[i] = null; + } + } + } + + /** + * Gets the sub-rectangle of a JScrollPane's area that + * is actually showing the view + */ + private Rectangle getShowingRect(JScrollPane pane) { + Insets ins1 = pane.getViewport().getInsets(); + Border inner = pane.getViewportBorder(); + Insets ins2; + if (inner != null) { + ins2 = inner.getBorderInsets(pane); + } else { + ins2 = new Insets(0, 0, 0, 0); + } + Insets ins3 = new Insets(0, 0, 0, 0); + if (pane.getBorder() != null) { + ins3 = pane.getBorder().getBorderInsets(pane); + } + + Rectangle r = pane.getViewportBorderBounds(); + r.translate(-r.x, -r.y); + r.width -= ins1.left + ins1.right; + r.width -= ins2.left + ins2.right; + r.height -= ins1.top + ins1.bottom; + r.height -= ins2.top + ins2.bottom; + r.x -= ins2.left; + r.x -= ins3.left; + Point p = pane.getViewport().getViewPosition(); + r.translate(p.x, p.y); + r = SwingUtilities.convertRectangle(pane.getViewport(), r, pane); + return r; + } + + /** + * Fetches an array or rectangles representing the non-overlapping + * portions of a cell rect against the visible portion of the component. + * @bds The cell's bounds, in the coordinate space of the tree or list + * @vis The visible area of the tree or list, in the tree or list's coordinate space + */ + private static final Rectangle[] getRects(final Rectangle bds, + final Rectangle vis) { + Rectangle[] result; + if (vis.contains(bds)) { + result = new Rectangle[0]; + } else { + if (bds.x < vis.x && bds.x + bds.width > vis.x + vis.width) { + Rectangle a = new Rectangle(bds.x, bds.y, vis.x - bds.x, + bds.height); + Rectangle b = new Rectangle(vis.x + vis.width, bds.y, + (bds.x + bds.width) - (vis.x + vis.width), bds.height); + result = new Rectangle[] { a, b }; + } else if (bds.x < vis.x) { + result = new Rectangle[] { new Rectangle(bds.x, bds.y, vis.x + - bds.x, bds.height) }; + } else if (bds.x + bds.width > vis.x + vis.width) { + result = new Rectangle[] { new Rectangle(vis.x + vis.width, + bds.y, (bds.x + bds.width) - (vis.x + vis.width), + bds.height) }; + } else { + result = new Rectangle[0]; + } + } + return result; + } + + /** + * Show popups for each rectangle, using the now configured painter. + */ + private void showPopups(Rectangle[] rects, Rectangle bds, + Rectangle visible, JComponent comp, JScrollPane view) { + boolean shown = false; + for (int i = 0; i < rects.length; i++) { + Rectangle sect = rects[i]; + sect.translate(-bds.x, -bds.y); + ImgComp part = painter.getPartial(sect, + bds.x + rects[i].x < visible.x); + Point pos = new Point(bds.x + rects[i].x, bds.y + rects[i].y); + SwingUtilities.convertPointToScreen(pos, comp); + if (comp instanceof JList) { + //XXX off by one somewhere, only with JLists - where? + pos.y--; + } + if (pos.x > 0) { //Mac OS will reposition off-screen popups to x=0, + //so don't try to show them + popups[i] = getPopupFactory() + .getPopup(view, part, pos.x, pos.y); + popups[i].show(); + shown = true; + } + } + if (shown) { + setHideComponent(comp, view); + } else { + setHideComponent(null, null); //clear references + } + } + + private static PopupFactory getPopupFactory() { + //if (Utilities.isMac()) { + + // See ide/applemenu/src/org/netbeans/modules/applemenu/ApplePopupFactory + // We have a custom PopupFactory that will consistently use + // lightweight popups on Mac OS, since HW popups get a drop + // shadow. By default, popups returned when a heavyweight popup + // is needed (SDI mode) are no-op popups, since some hacks + // are necessary to make it really work. + + // To enable heavyweight popups which have no drop shadow + // *most* of the time on mac os, run with + // -J-Dnb.explorer.hw.completions=true + + // To enable heavyweight popups which have no drop shadow + // *ever* on mac os, you need to put the cocoa classes on the + // classpath - modify netbeans.conf to add + // System/Library/Java on the bootclasspath. *Then* + // run with the above line switch and + // -J-Dnb.explorer.hw.cocoahack=true + + /*PopupFactory result = (PopupFactory) Lookup.getDefault().lookup ( + PopupFactory.class); + return result == null ? PopupFactory.getSharedInstance() : result; + } else {*/ + return PopupFactory.getSharedInstance(); + //} + } + + private Hider hider = null; + + /** + * Set a component (JList or JTree) which should be listened to, such that if + * a model, selection or scroll event occurs, all currently open popups + * should be hidden. + */ + private void setHideComponent(JComponent comp, JScrollPane parent) { + if (hider != null) { + if (hider.isListeningTo(comp)) { + return; + } + } + if (hider != null) { + hider.detach(); + } + if (comp != null) { + hider = new Hider(comp, parent); + } else { + hider = null; + } + } + + /** + * A JComponent which creates a BufferedImage of a cell renderer and can + * produce clones of itself that display subrectangles of that cell + * renderer. + */ + private static final class ImgComp extends JComponent { + private BufferedImage img; + private Dimension d = null; + + private Color bg = Color.WHITE; + private JScrollPane comp = null; + + private Object node = null; + + private AffineTransform at = AffineTransform.getTranslateInstance(0d, + 0d); + boolean isRight = false; + + ImgComp() { + } + + /** + * Create a clone with a specified backing image + */ + ImgComp(BufferedImage img, Rectangle off, boolean right) { + this.img = img; + at = AffineTransform.getTranslateInstance(-off.x, 0); + d = new Dimension(off.width, off.height); + isRight = right; + } + + public ImgComp getPartial(Rectangle bds, boolean right) { + assert img != null; + return new ImgComp(img, bds, right); + } + + /** Configures a tree cell renderer and sets up sizing and the + * backing image from it */ + public boolean configure(Object nd, JScrollPane tv, JTree tree, + TreePath path, int row) { + boolean sameVn = setLastRendereredObject(nd); + boolean sameComp = setLastRenderedScrollPane(tv); + Component renderer = null; + bg = tree.getBackground(); + boolean sel = tree.isSelectionEmpty() ? false : tree + .getSelectionModel().isPathSelected(path); + boolean exp = tree.isExpanded(path); + boolean leaf = !exp && tree.getModel().isLeaf(nd); + boolean lead = path.equals(tree.getSelectionModel() + .getLeadSelectionPath()); + renderer = tree.getCellRenderer().getTreeCellRendererComponent( + tree, nd, sel, exp, leaf, row, lead); + if (renderer != null) { + setComponent(renderer); + } + return true; + } + + /** Configures a list cell renderer and sets up sizing and the + * backing image from it */ + public boolean configure(Object nd, JScrollPane tv, JList list, int row) { + boolean sameVn = setLastRendereredObject(nd); + boolean sameComp = setLastRenderedScrollPane(tv); + Component renderer = null; + bg = list.getBackground(); + boolean sel = list.isSelectionEmpty() ? false : list + .getSelectionModel().isSelectedIndex(row); + renderer = list.getCellRenderer().getListCellRendererComponent( + list, nd, row, sel, false); + if (renderer != null) { + setComponent(renderer); + } + return true; + } + + private boolean setLastRenderedScrollPane(JScrollPane comp) { + boolean result = comp != this.comp; + this.comp = comp; + return result; + } + + private boolean setLastRendereredObject(Object nd) { + boolean result = node != nd; + if (result) { + node = nd; + } + return result; + } + + void clear() { + comp = null; + node = null; + } + + /** + * Set the cell renderer we will proxy. + */ + public void setComponent(Component jc) { + Dimension d = jc.getPreferredSize(); + BufferedImage nue = new BufferedImage(d.width, d.height + 2, + BufferedImage.TYPE_INT_ARGB_PRE); + SwingUtilities.paintComponent(nue.getGraphics(), jc, this, 0, 0, + d.width, d.height + 2); + setImage(nue); + } + + public Rectangle getBounds() { + Dimension dd = getPreferredSize(); + return new Rectangle(0, 0, dd.width, dd.height); + } + + private void setImage(BufferedImage img) { + this.img = img; + d = null; + } + + public Dimension getPreferredSize() { + if (d == null) { + d = new Dimension(img.getWidth(), img.getHeight()); + } + return d; + } + + public Dimension getSize() { + return getPreferredSize(); + } + + public void paint(Graphics g) { + g.setColor(bg); + g.fillRect(0, 0, d.width, d.height); + Graphics2D g2d = (Graphics2D) g; + g2d.drawRenderedImage(img, at); + g.setColor(Color.GRAY); + g.drawLine(0, 0, d.width, 0); + g.drawLine(0, d.height - 1, d.width, d.height - 1); + if (isRight) { + g.drawLine(0, 0, 0, d.height - 1); + } else { + g.drawLine(d.width - 1, 0, d.width - 1, d.height - 1); + } + } + + public void firePropertyChange(String s, Object a, Object b) { + } + + public void invalidate() { + } + + public void validate() { + } + + public void revalidate() { + } + } + + /** + * A listener that listens to just about everything in the known universe + * and hides all currently displayed popups if anything happens. + */ + private static final class Hider implements ChangeListener, + PropertyChangeListener, TreeModelListener, TreeSelectionListener, + HierarchyListener, HierarchyBoundsListener, ListSelectionListener, + ListDataListener, ComponentListener { + private final JTree tree; + + private JScrollPane pane; + private final JList list; + + public Hider(JComponent comp, JScrollPane pane) { + if (comp instanceof JTree) { + this.tree = (JTree) comp; + this.list = null; + } else { + this.list = (JList) comp; + this.tree = null; + } + assert tree != null || list != null; + this.pane = pane; + attach(); + } + + private boolean isListeningTo(JComponent comp) { + return !detached && (comp == list || comp == tree); + } + + private void attach() { + if (tree != null) { + tree.getModel().addTreeModelListener(this); + tree.getSelectionModel().addTreeSelectionListener(this); + tree.addHierarchyBoundsListener(this); + tree.addHierarchyListener(this); + tree.addComponentListener(this); + } else { + list.getSelectionModel().addListSelectionListener(this); + list.getModel().addListDataListener(this); + list.addHierarchyBoundsListener(this); + list.addHierarchyListener(this); + list.addComponentListener(this); + } + pane.getHorizontalScrollBar().getModel().addChangeListener(this); + pane.getVerticalScrollBar().getModel().addChangeListener(this); + KeyboardFocusManager.getCurrentKeyboardFocusManager() + .addPropertyChangeListener(this); + } + + private boolean detached = false; + + private void detach() { + KeyboardFocusManager.getCurrentKeyboardFocusManager() + .removePropertyChangeListener(this); + if (tree != null) { + tree.getSelectionModel().removeTreeSelectionListener(this); + tree.getModel().removeTreeModelListener(this); + tree.removeHierarchyBoundsListener(this); + tree.removeHierarchyListener(this); + tree.removeComponentListener(this); + } else { + list.getSelectionModel().removeListSelectionListener(this); + list.getModel().removeListDataListener(this); + list.removeHierarchyBoundsListener(this); + list.removeHierarchyListener(this); + list.removeComponentListener(this); + } + pane.getHorizontalScrollBar().getModel().removeChangeListener(this); + pane.getVerticalScrollBar().getModel().removeChangeListener(this); + detached = true; + } + + private void change() { + if (ViewTooltips.INSTANCE != null) { + ViewTooltips.INSTANCE.hide(); + } + detach(); + } + + public void propertyChange(PropertyChangeEvent evt) { + change(); + } + + public void treeNodesChanged(TreeModelEvent e) { + change(); + } + + public void treeNodesInserted(TreeModelEvent e) { + change(); + } + + public void treeNodesRemoved(TreeModelEvent e) { + change(); + } + + public void treeStructureChanged(TreeModelEvent e) { + change(); + } + + public void hierarchyChanged(HierarchyEvent e) { + change(); + } + + public void valueChanged(TreeSelectionEvent e) { + change(); + } + + public void ancestorMoved(HierarchyEvent e) { + change(); + } + + public void ancestorResized(HierarchyEvent e) { + change(); + } + + public void stateChanged(ChangeEvent e) { + change(); + } + + public void valueChanged(ListSelectionEvent e) { + change(); + } + + public void intervalAdded(ListDataEvent e) { + change(); + } + + public void intervalRemoved(ListDataEvent e) { + change(); + } + + public void contentsChanged(ListDataEvent e) { + change(); + } + + public void componentResized(ComponentEvent e) { + change(); + } + + public void componentMoved(ComponentEvent e) { + change(); + } + + public void componentShown(ComponentEvent e) { + change(); + } + + public void componentHidden(ComponentEvent e) { + change(); + } + } +} Property changes on: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tooltip/ViewTooltips.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r390 - in eugenehelloworld/trunk: . lib src/main/java/org/nuiton src/main/java/org/nuiton/helloworld
by echatellier＠users.nuiton.org March 5, 2010

March 5, 2010

Author: echatellier Date: 2010-03-05 15:08:58 +0100 (Fri, 05 Mar 2010) New Revision: 390 Log: Update hello world ant application on eugene 2 Added: eugenehelloworld/trunk/lib/ eugenehelloworld/trunk/lib/README.txt Removed: eugenehelloworld/trunk/src/main/java/org/nuiton/util/ Modified: eugenehelloworld/trunk/build.xml eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/ClassInfoGenerator.java eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/JavaBeanGenerator.java Modified: eugenehelloworld/trunk/build.xml =================================================================== --- eugenehelloworld/trunk/build.xml 2010-03-05 10:56:46 UTC (rev 389) +++ eugenehelloworld/trunk/build.xml 2010-03-05 14:08:58 UTC (rev 390) @@ -1,6 +1,6 @@ <project name="EugeneHelloWorld" default="compile" basedir="."> <description> - simple example build file + Simple example build file </description>  @@ -8,9 +8,9 @@ <property name="resources" location="src/main/resources" /> <property name="modelDir" location="src/main/xmi" /> <property name="lib" location="lib" /> - <property name="target" location="target" /> - <property name="targetgen" location="${target}/gen/java" /> - <property name="targetbuild" location="${target}/classes" /> + <property name="builddir" location="build" /> + <property name="buildgen" location="${builddir}/gen/java" /> + <property name="buildclasses" location="${builddir}/classes" /> <path id="project.classpath"> <fileset dir="${lib}"> @@ -23,7 +23,7 @@ </pathconvert> <taskdef name="eugene" classname="org.nuiton.eugene.GeneratorTask" - classpath="${compile.classpath}:${targetbuild}:${resources}" /> + classpath="${compile.classpath}:${buildclasses}:${resources}" /> <target name="warning"> <echo>********************************************************</echo> @@ -34,31 +34,30 @@ <target name="init" depends="warning">  - <mkdir dir="${target}" /> - <mkdir dir="${targetgen}" /> - <mkdir dir="${targetbuild}" /> + <mkdir dir="${builddir}" /> + <mkdir dir="${buildgen}" /> + <mkdir dir="${buildclasses}" /> </target> <target name="pre-compile" depends="init"> <echo>Using classpath ${compile.classpath}</echo> - <javac srcdir="${src}" destdir="${targetbuild}" classpath="${compile.classpath}" /> + <javac srcdir="${src}" destdir="${buildclasses}" classpath="${compile.classpath}" /> </target> <target name="generate" depends="pre-compile" description="generate"> - <eugene srcdir="${modelDir}" destdir="${targetgen}" + <eugene srcdir="${modelDir}" destdir="${buildgen}" resolver="org.nuiton.util.ResourceResolver" templates="org.nuiton.helloworld.ClassInfoGenerator,org.nuiton.helloworld.JavaBeanGenerator" - properties="defaultPackage=org.nuiton,fullPackagePath=org.nuiton,extraPackages=org.nuiton" - classpath="${compile.classpath}:${targetbuild}:${resources}" /> + properties="defaultPackage=org.nuiton,fullPackagePath=org,extraPackages=org" /> </target> <target name="compile" depends="generate" description="compile the source ">  - <javac srcdir="${targetgen}" destdir="${targetbuild}" /> + <javac srcdir="${buildgen}" destdir="${buildclasses}" /> </target> <target name="clean" description="clean up">  - <delete dir="${target}" /> + <delete dir="${builddir}" /> </target> </project> Added: eugenehelloworld/trunk/lib/README.txt =================================================================== --- eugenehelloworld/trunk/lib/README.txt (rev 0) +++ eugenehelloworld/trunk/lib/README.txt 2010-03-05 14:08:58 UTC (rev 390) @@ -0,0 +1,22 @@ +All eugene ant task dependency must be located into +this directory. + +Tested with: +------------ +ant-eugene-task-2.0.0.jar +commons-beanutils-1.8.0.jar +commons-collections-3.2.1.jar +commons-digester-2.0.jar +commons-lang-2.4.jar +commons-logging-1.1.1.jar +commons-primitives-1.0.jar +dom4j-1.6.1.jar +eugene-2.0.0.jar +jaxen-1.1.1.jar +jdom-1.0.jar +nuiton-i18n-api-1.0.1.jar +nuiton-utils-1.1.1.jar +saxon-9.1.0.8.jar +xercesImpl-2.9.1.jar +xml-apis-1.3.04.jar +xom-1.0.jar Modified: eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/ClassInfoGenerator.java =================================================================== --- eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/ClassInfoGenerator.java 2010-03-05 10:56:46 UTC (rev 389) +++ eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/ClassInfoGenerator.java 2010-03-05 14:08:58 UTC (rev 390) @@ -21,9 +21,9 @@ import java.io.IOException; import java.io.Writer; -import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelGenerator; /** * HelloWorld. Modified: eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/JavaBeanGenerator.java =================================================================== --- eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/JavaBeanGenerator.java 2010-03-05 10:56:46 UTC (rev 389) +++ eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/JavaBeanGenerator.java 2010-03-05 14:08:58 UTC (rev 390) @@ -22,9 +22,9 @@ import java.io.Writer; import org.apache.commons.lang.StringUtils; -import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelGenerator; /** * HelloWorld.

1 0

r389 - in testTreeTooltipSession/trunk: . src/main/java/org/nuiton/test src/main/java/org/nuiton/test/tree
by echatellier＠users.nuiton.org March 5, 2010

March 5, 2010

Author: echatellier Date: 2010-03-05 11:56:46 +0100 (Fri, 05 Mar 2010) New Revision: 389 Log: Ajout du filtrage des arbres (filtrage par modele) Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/FilterTreeModel.java testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/MyFilter.java Modified: testTreeTooltipSession/trunk/pom.xml testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/MainPanel.java testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/TreeFilter.java Modified: testTreeTooltipSession/trunk/pom.xml =================================================================== --- testTreeTooltipSession/trunk/pom.xml 2010-03-05 09:09:13 UTC (rev 388) +++ testTreeTooltipSession/trunk/pom.xml 2010-03-05 10:56:46 UTC (rev 389) @@ -99,6 +99,13 @@ <version>1.0.3</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.5</version> + <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-05 09:09:13 UTC (rev 388) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/MainPanel.java 2010-03-05 10:56:46 UTC (rev 389) @@ -17,6 +17,7 @@ **/ package org.nuiton.test; +import java.awt.BorderLayout; import java.awt.Color; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -34,6 +35,8 @@ import javax.swing.JTextField; import javax.swing.JToolTip; import javax.swing.JTree; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; import net.java.balloontip.BalloonTip; import net.java.balloontip.styles.RoundedBalloonStyle; @@ -42,6 +45,8 @@ import org.nuiton.test.table.BasicTableModel; import org.nuiton.test.table.BasicTableRenderer; import org.nuiton.test.tree.BasicTreeModel; +import org.nuiton.test.tree.FilterTreeModel; +import org.nuiton.test.tree.MyFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +58,7 @@ * @author ceric35 * Date : 4 mars 2010 */ -public class MainPanel extends JPanel { +public class MainPanel extends JPanel implements DocumentListener { /** serialVersionUID. */ private static final long serialVersionUID = -4867848058485235754L; @@ -61,8 +66,14 @@ /** Logger */ private static Logger logger = LoggerFactory.getLogger(MainPanel.class); + protected FilterTreeModel filterModel; + + protected JTextField filterField; + public MainPanel() { + super(new BorderLayout()); + // label filter JPanel leftPanel = new JPanel(new GridBagLayout()); JLabel filterLabel = new JLabel("Filtre : "); @@ -71,7 +82,8 @@ new Insets(2, 2, 2, 2), 0, 0)); // field filter - JTextField filterField = new JTextField(); + filterField = new JTextField(); + filterField.getDocument().addDocumentListener(this); leftPanel.add(filterField, new GridBagConstraints(1, 0, 1, 1, 1, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0)); @@ -80,8 +92,9 @@ try { BasicTreeModel treeModel = new BasicTreeModel(new File(".") .getCanonicalFile()); + filterModel = new FilterTreeModel(treeModel, new MyFilter("")); - JTree tree = new JTree(treeModel); + JTree tree = new JTree(filterModel); tree.setName("tree"); leftPanel.add(new JScrollPane(tree), new GridBagConstraints(0, 1, 2, 1, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH, @@ -162,50 +175,35 @@ JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftPanel, rigthPanel); pane.setName("mainViewPane"); - add(pane); + add(pane, BorderLayout.CENTER); } - /*public static void main(String[] args) { - final MainFrame m = new MainFrame(); - m.setName("mainFrame"); + protected void updateFilter() { + String filterString = filterField.getText().trim(); + filterModel.setFilter(new MyFilter(filterString)); + } - // centering - centerWindow(m); + /* + * @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent) + */ + @Override + public void insertUpdate(DocumentEvent e) { + updateFilter(); + } - SafApplicationContext context = new SafApplicationContext(); - final SessionStorage sessionStorage = context.getSessionStorage(); - sessionStorage.restore(m, m.getName() + ".session.xml"); - - m.addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent e) { - try { - sessionStorage.save(m, m.getName() + ".session.xml"); - System.exit(0); - } catch (IOException ex) { - logger.error("Can't save frame session", ex); - } - } - }); - m.setVisible(true); + /* + * @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent) + */ + @Override + public void removeUpdate(DocumentEvent e) { + updateFilter(); } - protected static void centerWindow(Window root) { - // If the window's bounds don't appear to have been set, do it - if (root instanceof Window) { - Window window = (Window) root; - if (!root.isValid() || (root.getWidth() == 0) - || (root.getHeight() == 0)) { - window.pack(); - } - if (!window.isLocationByPlatform() && (root.getX() == 0) - && (root.getY() == 0)) { - Component owner = window.getOwner(); - //if (owner == null) { - // owner = (window != mainFrame) ? mainFrame : null; - //} - window.setLocationRelativeTo(owner); // center the window - } - } - }*/ + /* + * @see javax.swing.event.DocumentListener#changedUpdate(javax.swing.event.DocumentEvent) + */ + @Override + public void changedUpdate(DocumentEvent e) { + updateFilter(); + } } Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/FilterTreeModel.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/FilterTreeModel.java (rev 0) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/FilterTreeModel.java 2010-03-05 10:56:46 UTC (rev 389) @@ -0,0 +1,139 @@ +/* *##% + * 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.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + +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. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + * + * Based on : http://forums.sun.com/thread.jspa?forumID=57&threadID=5378510 + */ +public class FilterTreeModel implements TreeModel { + + protected TreeModelSupport support; + + protected TreeModel delegateModel; + + protected TreeFilter treeFilter; + + public FilterTreeModel(TreeModel delegateModel, TreeFilter filter) { + this.delegateModel = delegateModel; + this.treeFilter = filter; + this.support = new TreeModelSupport(delegateModel); + } + + public void setFilter(TreeFilter treeFilter) { + this.treeFilter = treeFilter; + TreePath path = new TreePath(delegateModel.getRoot()); + support.fireTreeStructureChanged(path); + } + + @Override + public int getChildCount(Object parent) { + int realCount = delegateModel.getChildCount(parent); + int filterCount = 0; + + for (int i = 0; i < realCount; i++) { + Object child = delegateModel.getChild(parent, i); + if (treeFilter.include(delegateModel, child)) { + filterCount++; + } + } + return filterCount; + } + + @Override + public Object getChild(Object parent, int index) { + int cnt = -1; + for (int i = 0; i < delegateModel.getChildCount(parent); i++) { + Object child = delegateModel.getChild(parent, i); + if (treeFilter.include(delegateModel, child)) { + cnt++; + } + if (cnt == index) { + return child; + } + } + return null; + } + + /* + * @see javax.swing.tree.TreeModel#getRoot() + */ + @Override + public Object getRoot() { + return delegateModel.getRoot(); + } + + /* + * @see javax.swing.tree.TreeModel#isLeaf(java.lang.Object) + */ + @Override + public boolean isLeaf(Object node) { + return delegateModel.isLeaf(node); + } + + /* + * @see javax.swing.tree.TreeModel#valueForPathChanged(javax.swing.tree.TreePath, java.lang.Object) + */ + @Override + public void valueForPathChanged(TreePath path, Object newValue) { + delegateModel.valueForPathChanged(path, newValue); + } + + /* + * @see javax.swing.tree.TreeModel#getIndexOfChild(java.lang.Object, java.lang.Object) + */ + @Override + public int getIndexOfChild(Object parent, Object child) { + return delegateModel.getIndexOfChild(parent, child); + } + + /* + * @see javax.swing.tree.TreeModel#addTreeModelListener(javax.swing.event.TreeModelListener) + */ + @Override + public void addTreeModelListener(TreeModelListener l) { + delegateModel.addTreeModelListener(l); + support.addTreeModelListener(l); + } + + /* + * @see javax.swing.tree.TreeModel#removeTreeModelListener(javax.swing.event.TreeModelListener) + */ + @Override + public void removeTreeModelListener(TreeModelListener l) { + delegateModel.removeTreeModelListener(l); + support.addTreeModelListener(l); + } +} Property changes on: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/FilterTreeModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/MyFilter.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/MyFilter.java (rev 0) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/MyFilter.java 2010-03-05 10:56:46 UTC (rev 389) @@ -0,0 +1,61 @@ +/* *##% + * 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 javax.swing.tree.TreeModel; + +import org.apache.commons.lang.StringUtils; + +/** + * TODO add comment here. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class MyFilter implements TreeFilter { + + protected String filterString; + + public MyFilter(String filterString) { + this.filterString = filterString; + } + + /* + * @see org.nuiton.test.tree.TreeFilter#pass(javax.swing.tree.TreeModel, java.lang.Object) + */ + @Override + public boolean include(TreeModel model, Object node) { + + boolean result = true; + + if (StringUtils.isNotEmpty(filterString)) { + if (node.toString().contains(filterString)) { + result = true; + } + else { + result = false; + } + } + + return result; + } +} Property changes on: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/MyFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/TreeFilter.java =================================================================== --- testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/TreeFilter.java 2010-03-05 09:09:13 UTC (rev 388) +++ testTreeTooltipSession/trunk/src/main/java/org/nuiton/test/tree/TreeFilter.java 2010-03-05 10:56:46 UTC (rev 389) @@ -17,6 +17,8 @@ **/ package org.nuiton.test.tree; +import javax.swing.tree.TreeModel; + /** * TreeFilter * @@ -26,6 +28,6 @@ * Date : 4 mars 2010 */ public interface TreeFilter { - - public boolean include(Object o); + + boolean include(TreeModel model, Object node); }

1 0