Menu
▾
▴
xframe-xsddoc-dev — Public mailing list for xsddoc developers
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(14) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(7) |
Feb
(16) |
Mar
(41) |
Apr
(19) |
May
(3) |
Jun
(34) |
Jul
(40) |
Aug
(40) |
Sep
(166) |
Oct
(78) |
Nov
(42) |
Dec
(54) |
| 2005 |
Jan
(2) |
Feb
(19) |
Mar
(19) |
Apr
(31) |
May
(50) |
Jun
(16) |
Jul
|
Aug
(1) |
Sep
(2) |
Oct
(29) |
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
(5) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(6) |
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
(7) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Iñaqui M. <ina...@us...> - 2005-05-31 16:38:40
|
Update of /cvsroot/xframe/swing/src/net/sf/xframe/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24861/src/net/sf/xframe/swing Modified Files: JXTable.java Log Message: Fix for bug 1212114 Index: JXTable.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/JXTable.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** JXTable.java 27 May 2005 14:24:23 -0000 1.23 --- JXTable.java 31 May 2005 16:38:21 -0000 1.24 *************** *** 2539,2543 **** int i = lockedTable.getSelectedColumn(); if (i == -1) { ! i = scrollTable.getSelectedColumn(); } return i; --- 2539,2543 ---- int i = lockedTable.getSelectedColumn(); if (i == -1) { ! i = frozenColumns + scrollTable.getSelectedColumn(); } return i; |
|
From: Iñaqui M. <ina...@us...> - 2005-05-27 14:24:31
|
Update of /cvsroot/xframe/swing/src/net/sf/xframe/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv351/src/net/sf/xframe/swing Modified Files: JXTable.java Log Message: Fix to last fix Index: JXTable.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/JXTable.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** JXTable.java 25 May 2005 23:27:35 -0000 1.22 --- JXTable.java 27 May 2005 14:24:23 -0000 1.23 *************** *** 2558,2563 **** i3[i] = i1[i]; } ! for (int i = 0; i < i3.length; i++) { ! i3[i + i1.length] = i3[i] + frozenColumns; } return i3; --- 2558,2563 ---- i3[i] = i1[i]; } ! for (int i = 0; i < i2.length; i++) { ! i3[i + i1.length] = i2[i] + frozenColumns; } return i3; |
|
From: Iñaqui M. <ina...@us...> - 2005-05-25 23:27:45
|
Update of /cvsroot/xframe/swing/src/net/sf/xframe/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3166/src/net/sf/xframe/swing Modified Files: JXTable.java Log Message: getSelectedColumns may work better with this fix :) Index: JXTable.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/JXTable.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** JXTable.java 20 May 2005 14:17:02 -0000 1.21 --- JXTable.java 25 May 2005 23:27:35 -0000 1.22 *************** *** 2558,2565 **** i3[i] = i1[i]; } ! for (int i = i1.length; i < i3.length; i++) { ! i3[i] = i1[i] + frozenColumns; } ! return null; } --- 2558,2565 ---- i3[i] = i1[i]; } ! for (int i = 0; i < i3.length; i++) { ! i3[i + i1.length] = i3[i] + frozenColumns; } ! return i3; } |
|
From: Kurt R. <kr...@us...> - 2005-05-22 21:26:26
|
Update of /cvsroot/xframe/swing/src/net/sf/xframe/swing/table In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1024/src/net/sf/xframe/swing/table Modified Files: JXTableHeader.java ColumnGroupHeader.java KTable.java Log Message: debug statements removed Index: ColumnGroupHeader.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/table/ColumnGroupHeader.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ColumnGroupHeader.java 19 May 2005 00:09:28 -0000 1.3 --- ColumnGroupHeader.java 22 May 2005 21:26:14 -0000 1.4 *************** *** 111,115 **** x = e.getX() + jxTable.getLockedTable().getWidth(); } - System.out.println("ColumnGroupHeader.getToolTipText" + x + ", " + e.getY()); final MouseEvent event = new MouseEvent(jxTable.getTableHeader(), e.getID(), e.getWhen(), e.getModifiers(), x, e.getY(), e.getClickCount(), e.isPopupTrigger(), e.getButton()); --- 111,114 ---- Index: JXTableHeader.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/table/JXTableHeader.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JXTableHeader.java 19 May 2005 00:09:28 -0000 1.8 --- JXTableHeader.java 22 May 2005 21:26:14 -0000 1.9 *************** *** 1053,1057 **** */ public String getToolTipText(final MouseEvent e) { - System.out.println("getToolTipText" + e.getX() + ", " + e.getY()); if (e.getY() < lockedHeader.getWidth()) { return lockedHeader.getToolTipText(e); --- 1053,1056 ---- Index: KTable.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/table/KTable.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** KTable.java 19 May 2005 00:09:29 -0000 1.4 --- KTable.java 22 May 2005 21:26:14 -0000 1.5 *************** *** 626,630 **** */ public String getToolTipText(final MouseEvent e) { - System.out.println("getToolTipText" + e.getX() + ", " + e.getY()); final int x; final JXTable jxTable = getEnclosingJXTable(); --- 626,629 ---- |
|
From: Iñaqui M. <ina...@us...> - 2005-05-20 14:17:12
|
Update of /cvsroot/xframe/swing/src/net/sf/xframe/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8305/src/net/sf/xframe/swing Modified Files: JXTable.java Log Message: Fix for bugs 1205676 and 1205679 Index: JXTable.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/JXTable.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** JXTable.java 19 May 2005 00:09:35 -0000 1.20 --- JXTable.java 20 May 2005 14:17:02 -0000 1.21 *************** *** 751,757 **** if (lockedTable.hasFocus()) { return lockedTable.getEditingColumn(); - } else { - return scrollTable.getEditingColumn() - frozenColumns; } } --- 751,757 ---- if (lockedTable.hasFocus()) { return lockedTable.getEditingColumn(); } + + return scrollTable.getEditingColumn() + frozenColumns; } *************** *** 764,768 **** */ public int getEditingRow() { ! return lockedTable.getEditingRow(); } --- 764,772 ---- */ public int getEditingRow() { ! if (lockedTable.hasFocus()) { ! return lockedTable.getEditingRow(); ! } ! ! return scrollTable.getEditingRow(); } |
|
From: Kurt R. <kr...@us...> - 2005-05-19 20:04:58
|
Update of /cvsroot/xframe/homepage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5431 Modified Files: project.xml Log Message: documentation update Index: project.xml =================================================================== RCS file: /cvsroot/xframe/homepage/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** project.xml 9 May 2005 22:43:07 -0000 1.4 --- project.xml 19 May 2005 20:04:48 -0000 1.5 *************** *** 64,68 **** <name>Kurt Riede</name> <id>kriede</id> ! <email>mailto:kr...@xn...</email> <roles> <role>Project Admin</role> --- 64,68 ---- <name>Kurt Riede</name> <id>kriede</id> ! <email>mailto:kr...@us...</email> <roles> <role>Project Admin</role> |
|
From: Kurt R. <kr...@us...> - 2005-05-19 00:24:51
|
Update of /cvsroot/xframe/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13132 Modified Files: project.xml Log Message: fix for bug [1204084] invalid entry in project.xml file Index: project.xml =================================================================== RCS file: /cvsroot/xframe/swing/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** project.xml 27 Dec 2004 15:01:04 -0000 1.3 --- project.xml 19 May 2005 00:24:42 -0000 1.4 *************** *** 89,96 **** <resource> <directory>${basedir}/src</directory> ! <exclude> <exclude>**/*.java</exclude> <exclude>**/package.html</exclude> ! </exclude> </resource> </resources> --- 89,96 ---- <resource> <directory>${basedir}/src</directory> ! <excludes> <exclude>**/*.java</exclude> <exclude>**/package.html</exclude> ! </excludes> </resource> </resources> |
|
From: Kurt R. <kr...@us...> - 2005-05-19 00:09:46
|
Update of /cvsroot/xframe/swing/src/net/sf/xframe/swing/table In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10224/src/net/sf/xframe/swing/table Modified Files: JXTableColumnModel.java JXTableHeader.java ColumnGroupHeader.java KTable.java Log Message: fix for bug [1200282] Header tooltips Index: JXTableColumnModel.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/table/JXTableColumnModel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JXTableColumnModel.java 2 Apr 2005 21:12:06 -0000 1.2 --- JXTableColumnModel.java 19 May 2005 00:09:28 -0000 1.3 *************** *** 172,176 **** return lockedColumnModel.getColumnIndexAtX(xPosition); } else { ! return scrollColumnModel.getColumnIndexAtX(xPosition - lockedColumnModel.getTotalColumnWidth()); } } --- 172,177 ---- return lockedColumnModel.getColumnIndexAtX(xPosition); } else { ! return getFrozenColumns() ! + scrollColumnModel.getColumnIndexAtX(xPosition - lockedColumnModel.getTotalColumnWidth()); } } Index: ColumnGroupHeader.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/table/ColumnGroupHeader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ColumnGroupHeader.java 12 Nov 2004 11:37:17 -0000 1.2 --- ColumnGroupHeader.java 19 May 2005 00:09:28 -0000 1.3 *************** *** 21,24 **** --- 21,26 ---- package net.sf.xframe.swing.table; + import java.awt.Point; + import java.awt.event.MouseEvent; import java.util.Enumeration; import java.util.Vector; *************** *** 28,31 **** --- 30,35 ---- import javax.swing.table.TableColumnModel; + import net.sf.xframe.swing.JXTable; + /** * *************** *** 91,93 **** --- 95,141 ---- return null; } + + /** + * Allows the renderer's tips to be used if there is text set. + * @param e the location of the event identifies the proper renderer and, + * therefore, the proper tip + * @return the tool tip for this component + */ + public String getToolTipText(final MouseEvent e) { + final int x; + final KTable kTable1 = (KTable) getTable(); + final JXTable jxTable = kTable1.getEnclosingJXTable(); + if (kTable1.getType() == KTable.TYPE_LOCKED) { + x = e.getX(); + } else { + x = e.getX() + jxTable.getLockedTable().getWidth(); + } + System.out.println("ColumnGroupHeader.getToolTipText" + x + ", " + e.getY()); + final MouseEvent event = new MouseEvent(jxTable.getTableHeader(), e.getID(), e.getWhen(), e.getModifiers(), x, e.getY(), + e.getClickCount(), e.isPopupTrigger(), e.getButton()); + return jxTable.getTableHeader().getToolTipText(event); + } + + /** + * Returns the tooltip location in this component's coordinate system. + * If <code>null</code> is returned, Swing will choose a location. + * The default implementation returns <code>null</code>. + * + * @param e the <code>MouseEvent</code> that caused the + * <code>ToolTipManager</code> to show the tooltip + * @return always returns <code>null</code> + */ + public Point getToolTipLocation(final MouseEvent e) { + final int x; + final KTable kTable1 = (KTable) getTable(); + final JXTable jxTable = kTable1.getEnclosingJXTable(); + if (kTable1.getType() == KTable.TYPE_LOCKED) { + x = e.getX(); + } else { + x = e.getX() + jxTable.getLockedTable().getWidth(); + } + final MouseEvent event = new MouseEvent(jxTable.getTableHeader(), e.getID(), e.getWhen(), e.getModifiers(), x, e.getY(), + e.getClickCount(), e.isPopupTrigger(), e.getButton()); + return jxTable.getTableHeader().getToolTipLocation(event); + } } Index: JXTableHeader.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/table/JXTableHeader.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JXTableHeader.java 6 Apr 2005 20:23:15 -0000 1.7 --- JXTableHeader.java 19 May 2005 00:09:28 -0000 1.8 *************** *** 21,24 **** --- 21,25 ---- package net.sf.xframe.swing.table; + import java.awt.AWTEventMulticaster; import java.awt.Font; import java.awt.Point; *************** *** 26,30 **** --- 27,35 ---- import java.awt.event.MouseEvent; import java.awt.event.MouseListener; + import java.awt.event.MouseMotionListener; + import java.awt.event.MouseWheelEvent; + import java.awt.event.MouseWheelListener; import java.util.Enumeration; + import java.util.EventListener; import javax.accessibility.Accessible; *************** *** 49,53 **** * @author <a href=mailto:kr...@us...>Kurt Riede</a> */ ! public final class JXTableHeader extends JComponent implements TableColumnModelListener, Accessible { /** --- 54,58 ---- * @author <a href=mailto:kr...@us...>Kurt Riede</a> */ ! public class JXTableHeader extends JComponent implements TableColumnModelListener, Accessible { /** *************** *** 66,69 **** --- 71,83 ---- private final JTableHeader scrollHeader; + /** Reference to the mouse listener. */ + private transient MouseListener mouseListener; + + /** Reference to the mouse motion listener. */ + private transient MouseMotionListener mouseMotionListener; + + /** Reference to the mouse wheel listener. */ + private transient MouseWheelListener mouseWheelListener; + /** * Constructs a <code>JXTableHeader</code> which is initialized with *************** *** 75,79 **** */ public JXTableHeader(final TableColumnModel cm) { ! this(cm, new JTableHeader(), new JTableHeader(cm)); } --- 89,93 ---- */ public JXTableHeader(final TableColumnModel cm) { ! this(cm, new ColumnGroupHeader(null), new ColumnGroupHeader(null)); } *************** *** 414,433 **** /** - * Allows the renderer's tips to be used if there is text set. - * @param e the location of the event identifies the proper - * renderer and, therefore, the proper tip - * @return the tool tip for this component - */ - public String getToolTipText(final MouseEvent e) { - if (e.getY() < lockedHeader.getWidth()) { - return lockedHeader.getToolTipText(e); - } else { - MouseEvent event = new MouseEvent(e.getComponent(), e.getID(), e.getWhen(), e.getModifiers(), - e.getX(), e.getY(), e.getClickCount(), e.isPopupTrigger(), e.getButton()); - return scrollHeader.getToolTipText(event); - } - } - - /** * Returns the look and feel (L&F) object that renders this component. * @return the look and feel (L&F) object --- 428,431 ---- *************** *** 702,704 **** --- 700,1077 ---- return lockedHeader.getAccessibleContext(); } + + /** + * Removes the specified mouse listener so that it no longer + * receives mouse events from this component. This method performs + * no function, nor does it throw an exception, if the listener + * specified by the argument was not previously added to this component. + * If listener <code>l</code> is <code>null</code>, + * no exception is thrown and no action is performed. + * + * @param l the mouse listener + * @see java.awt.event.MouseEvent + * @see java.awt.event.MouseListener + * @see #addMouseListener + * @see #getMouseListeners + * @see java.awt.Component#removeMouseListener(java.awt.event.MouseListener) + */ + public synchronized void removeMouseListener(final MouseListener l) { + if (l == null) { + return; + } + mouseListener = AWTEventMulticaster.remove(mouseListener, l); + } + + /** + * Returns an array of all the mouse listeners + * registered on this component. + * + * @return all of this component's <code>MouseListener</code>s + * or an empty array if no mouse + * listeners are currently registered + * + * @see #addMouseListener + * @see #removeMouseListener + * @since 1.4 + * @see java.awt.Component#getMouseListeners() + */ + public synchronized MouseListener[] getMouseListeners() { + return (MouseListener[]) getListeners(MouseListener.class); + } + + /** + * Adds the specified mouse motion listener to receive mouse motion + * events from this component. + * If listener <code>l</code> is <code>null</code>, + * no exception is thrown and no action is performed. + * + * @param l the mouse motion listener + * @see java.awt.event.MouseEvent + * @see java.awt.event.MouseMotionListener + * @see #removeMouseMotionListener + * @see #getMouseMotionListeners + * @see java.awt.Component#addMouseMotionListener(java.awt.event.MouseMotionListener) + */ + public synchronized void addMouseMotionListener(final MouseMotionListener l) { + if (l == null) { + return; + } + mouseMotionListener = AWTEventMulticaster.add(mouseMotionListener, l); + scrollHeader.addMouseMotionListener(new JXMouseMultiListener(l, KTable.TYPE_SCROLL)); + lockedHeader.addMouseMotionListener(new JXMouseMultiListener(l, KTable.TYPE_LOCKED)); + } + + /** + * Removes the specified mouse motion listener so that it no longer + * receives mouse motion events from this component. This method performs + * no function, nor does it throw an exception, if the listener + * specified by the argument was not previously added to this component. + * If listener <code>l</code> is <code>null</code>, + * no exception is thrown and no action is performed. + * + * @param l the mouse motion listener + * @see java.awt.event.MouseEvent + * @see java.awt.event.MouseMotionListener + * @see #addMouseMotionListener + * @see #getMouseMotionListeners + * @see java.awt.Component#removeMouseMotionListener(java.awt.event.MouseMotionListener) + */ + public synchronized void removeMouseMotionListener(final MouseMotionListener l) { + if (l == null) { + return; + } + mouseMotionListener = AWTEventMulticaster.remove(mouseMotionListener, l); + } + + /** + * Returns an array of all the mouse motion listeners + * registered on this component. + * + * @return all of this component's <code>MouseMotionListener</code>s + * or an empty array if no mouse motion + * listeners are currently registered + * + * @see #addMouseMotionListener + * @see #removeMouseMotionListener + * @see java.awt.Component#getMouseMotionListeners() + */ + public synchronized MouseMotionListener[] getMouseMotionListeners() { + return (MouseMotionListener[]) getListeners(MouseMotionListener.class); + } + + /** + * Adds the specified mouse wheel listener to receive mouse wheel events + * from this component. Containers also receive mouse wheel events from + * sub-components. + * If l is null, no exception is thrown and no action is performed. + * + * @param l the mouse wheel listener. + * @see java.awt.event.MouseWheelEvent + * @see java.awt.event.MouseWheelListener + * @see #removeMouseWheelListener + * @see #getMouseWheelListeners + * @see java.awt.Component#addMouseWheelListener(java.awt.event.MouseWheelListener) + */ + public synchronized void addMouseWheelListener(final MouseWheelListener l) { + if (l == null) { + return; + } + mouseWheelListener = AWTEventMulticaster.add(mouseWheelListener, l); + scrollHeader.addMouseWheelListener(new JXMouseMultiListener(l, KTable.TYPE_SCROLL)); + lockedHeader.addMouseWheelListener(new JXMouseMultiListener(l, KTable.TYPE_LOCKED)); + } + + /** + * Removes the specified mouse wheel listener so that it no longer + * receives mouse wheel events from this component. This method performs + * no function, nor does it throw an exception, if the listener + * specified by the argument was not previously added to this component. + * If l is null, no exception is thrown and no action is performed. + * + * @param l the mouse wheel listener. + * @see java.awt.event.MouseWheelEvent + * @see java.awt.event.MouseWheelListener + * @see #addMouseWheelListener + * @see #getMouseWheelListeners + * @see java.awt.Component#removeMouseWheelListener(java.awt.event.MouseWheelListener) + */ + public synchronized void removeMouseWheelListener(final MouseWheelListener l) { + if (l == null) { + return; + } + mouseWheelListener = AWTEventMulticaster.remove(mouseWheelListener, l); + } + + /** + * Returns an array of all the mouse wheel listeners + * registered on this component. + * + * @return all of this component's <code>MouseWheelListener</code>s + * or an empty array if no mouse wheel + * listeners are currently registered + * + * @see #addMouseWheelListener + * @see #removeMouseWheelListener + * @see java.awt.Component#getMouseWheelListeners() + */ + public synchronized MouseWheelListener[] getMouseWheelListeners() { + return (MouseWheelListener[]) getListeners(MouseWheelListener.class); + } + + /** + * Returns an array of all the objects currently registered + * as <code><em>Foo</em>Listener</code>s + * upon this <code>Component</code>. + * <code><em>Foo</em>Listener</code>s are registered using the + * <code>add<em>Foo</em>Listener</code> method. + * + * <p> + * You can specify the <code>listenerType</code> argument + * with a class literal, such as + * <code><em>Foo</em>Listener.class</code>. + * For example, you can query a + * <code>Component</code> <code>c</code> + * for its mouse listeners with the following code: + * + * <pre>MouseListener[] mls = (MouseListener[])(c.getListeners(MouseListener.class));</pre> + * + * If no such listeners exist, this method returns an empty array. + * + * @param listenerType the type of listeners requested; this parameter + * should specify an interface that descends from + * <code>java.util.EventListener</code> + * @return an array of all objects registered as + * <code><em>Foo</em>Listener</code>s on this component, + * or an empty array if no such listeners have been added + * + * @see #getMouseListeners + */ + public EventListener[] getListeners(final Class listenerType) { + final EventListener l; + if (listenerType == MouseListener.class) { + l = mouseListener; + } else if (listenerType == MouseMotionListener.class) { + l = mouseMotionListener; + } else if (listenerType == MouseWheelListener.class) { + l = mouseWheelListener; + } else { + return super.getListeners(listenerType); + } + return AWTEventMulticaster.getListeners(l, listenerType); + } + + /** + * Internal mouse listener delegate for all three mouse listener interfaces. + */ + private final class JXMouseMultiListener implements MouseListener, MouseMotionListener, MouseWheelListener { + + /** Reference to the enclosing mouse listener. */ + private final transient EventListener parentEventListener; + + /** Type of tabel, can be {@link KTable#TYPE_LOCKED}, {@link KTable#TYPE_SCROLL} or {@link KTable#TYPE_NONE}. */ + private final int tableType; + + /** + * Constructor. + * @param l mouse listener of sourrounding JTable + * @param type table tye ({@link KTable#TYPE_LOCKED} or {@link KTable#TYPE_SCROLL}) + */ + private JXMouseMultiListener(final EventListener l, final int type) { + super(); + parentEventListener = l; + tableType = type; + } + + /** + * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) + */ + public void mouseClicked(final MouseEvent e) { + ((MouseListener) parentEventListener).mouseClicked(translateMouseEvent(e)); + } + + /** + * @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent) + */ + public void mouseEntered(final MouseEvent e) { + ((MouseListener) parentEventListener).mouseEntered(translateMouseEvent(e)); + } + + /** + * @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent) + */ + public void mouseExited(final MouseEvent e) { + ((MouseListener) parentEventListener).mouseExited(translateMouseEvent(e)); + } + + /** + * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) + */ + public void mousePressed(final MouseEvent e) { + ((MouseListener) parentEventListener).mousePressed(translateMouseEvent(e)); + } + + /** + * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent) + */ + public void mouseReleased(final MouseEvent e) { + ((MouseListener) parentEventListener).mouseReleased(translateMouseEvent(e)); + } + + /** + * @see java.awt.event.MouseMotionListener#mouseDragged(java.awt.event.MouseEvent) + */ + public void mouseDragged(final MouseEvent e) { + ((MouseMotionListener) parentEventListener).mouseDragged(translateMouseEvent(e)); + } + + /** + * @see java.awt.event.MouseMotionListener#mouseMoved(java.awt.event.MouseEvent) + */ + public void mouseMoved(final MouseEvent e) { + ((MouseMotionListener) parentEventListener).mouseMoved(translateMouseEvent(e)); + } + + /** + * @see java.awt.event.MouseWheelListener#mouseWheelMoved(java.awt.event.MouseWheelEvent) + */ + public void mouseWheelMoved(final MouseWheelEvent e) { + ((MouseWheelListener) parentEventListener).mouseWheelMoved(translateMouseWheelEvent(e)); + } + + /** + * Translates the coordinates of a KTable's mouse event into + * coordinated of the surrounding JTable. + * + * @param e mouse event of KTable + * @return mouse event for JTable + */ + private MouseEvent translateMouseEvent(final MouseEvent e) { + final int x; + if (tableType == KTable.TYPE_LOCKED) { + x = e.getX(); + } else { + x = e.getX() + lockedHeader.getWidth(); + } + return new MouseEvent( + table.getTableHeader(), e.getID(), e.getWhen(), e.getModifiers(), x, e.getY(), + e.getClickCount(), e.isPopupTrigger(), e.getButton()); + } + + /** + * Translates the coordinates of a KTable's mouse wheel event into + * coordinated of the surrounding JTable. + * + * @param e mouse event of KTable + * @return mouse event for JTable + */ + private MouseWheelEvent translateMouseWheelEvent(final MouseWheelEvent e) { + final int x; + if (tableType == KTable.TYPE_LOCKED) { + x = e.getX(); + } else { + x = e.getX() + lockedHeader.getWidth(); + } + return new MouseWheelEvent( + e.getComponent(), e.getID(), e.getWhen(), e.getModifiers(), x, e.getY(), + e.getClickCount(), e.isPopupTrigger(), e.getScrollType(), e.getScrollAmount(), e.getWheelRotation()); + } + } + + /** + * Registers the text to display in a tool tip. + * The text displays when the cursor lingers over the component. + * <p> + * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/tooltip.html">How to Use Tool Tips</a> + * in <em>The Java Tutorial</em> + * for further documentation. + * + * @param text the string to display; if the text is <code>null</code>, + * the tool tip is turned off for this component + * @see javax.swing.JComponent#TOOL_TIP_TEXT_KEY + */ + public void setToolTipText(final String text) { + lockedHeader.setToolTipText(text); + scrollHeader.setToolTipText(text); + } + + /** + * Returns the tooltip string that has been set with + * <code>setToolTipText</code>. + * + * @return the text of the tool tip + * @see javax.swing.JComponent#TOOL_TIP_TEXT_KEY + */ + public String getToolTipText() { + return lockedHeader.getToolTipText(); + } + + /** + * Allows the renderer's tips to be used if there is text set. + * @param e the location of the event identifies the proper + * renderer and, therefore, the proper tip + * @return the tool tip for this component + */ + public String getToolTipText(final MouseEvent e) { + System.out.println("getToolTipText" + e.getX() + ", " + e.getY()); + if (e.getY() < lockedHeader.getWidth()) { + return lockedHeader.getToolTipText(e); + } else { + MouseEvent event = new MouseEvent(e.getComponent(), e.getID(), e.getWhen(), e.getModifiers(), + e.getX(), e.getY(), e.getClickCount(), e.isPopupTrigger(), e.getButton()); + return scrollHeader.getToolTipText(event); + } + } + + /** + * Returns the tooltip location in this component's coordinate system. + * If <code>null</code> is returned, Swing will choose a location. + * The default implementation returns <code>null</code>. + * + * @param event the <code>MouseEvent</code> that caused the + * <code>ToolTipManager</code> to show the tooltip + * @return always returns <code>null</code> + */ + public Point getToolTipLocation(final MouseEvent event) { + return null; + } } \ No newline at end of file Index: KTable.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/table/KTable.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** KTable.java 9 Apr 2005 12:48:13 -0000 1.3 --- KTable.java 19 May 2005 00:09:29 -0000 1.4 *************** *** 22,29 **** --- 22,31 ---- import java.awt.Component; + import java.awt.Point; import java.awt.Rectangle; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.KeyEvent; + import java.awt.event.MouseEvent; import java.text.MessageFormat; import java.util.EventObject; *************** *** 559,569 **** * @param anchorSelected index of anchor selection */ ! private static void changeTableColumnModels( ! final ListSelectionModel sm, ! final int index, ! final boolean toggle, ! final boolean extend, ! final boolean selected, ! final boolean anchorSelected) { if (toggle) { if (extend) { --- 561,566 ---- * @param anchorSelected index of anchor selection */ ! private static void changeTableColumnModels(final ListSelectionModel sm, final int index, final boolean toggle, ! final boolean extend, final boolean selected, final boolean anchorSelected) { if (toggle) { if (extend) { *************** *** 621,623 **** --- 618,662 ---- } } + + /** + * Allows the renderer's tips to be used if there is text set. + * @param e the location of the event identifies the proper renderer and, + * therefore, the proper tip + * @return the tool tip for this component + */ + public String getToolTipText(final MouseEvent e) { + System.out.println("getToolTipText" + e.getX() + ", " + e.getY()); + final int x; + final JXTable jxTable = getEnclosingJXTable(); + if (type == TYPE_LOCKED) { + x = e.getX(); + } else { + x = e.getX() + jxTable.getLockedTable().getWidth(); + } + final MouseEvent event = new MouseEvent(e.getComponent(), e.getID(), e.getWhen(), e.getModifiers(), x, e.getY(), + e.getClickCount(), e.isPopupTrigger(), e.getButton()); + return jxTable.getToolTipText(event); + } + + /** + * Returns the tooltip location in this component's coordinate system. + * If <code>null</code> is returned, Swing will choose a location. + * The default implementation returns <code>null</code>. + * + * @param e the <code>MouseEvent</code> that caused the + * <code>ToolTipManager</code> to show the tooltip + * @return always returns <code>null</code> + */ + public Point getToolTipLocation(final MouseEvent e) { + final int x; + final JXTable jxTable = getEnclosingJXTable(); + if (type == TYPE_LOCKED) { + x = e.getX(); + } else { + x = e.getX() + jxTable.getLockedTable().getWidth(); + } + final MouseEvent event = new MouseEvent(e.getComponent(), e.getID(), e.getWhen(), e.getModifiers(), x, e.getY(), + e.getClickCount(), e.isPopupTrigger(), e.getButton()); + return jxTable.getToolTipLocation(event); + } } |
|
From: Kurt R. <kr...@us...> - 2005-05-19 00:09:46
|
Update of /cvsroot/xframe/swing/samples/net/sf/xframe/swing/demo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10224/samples/net/sf/xframe/swing/demo Added Files: JXTableHeaderToolTips1.java JXTableHeaderToolTips2.java Log Message: fix for bug [1200282] Header tooltips --- NEW FILE: JXTableHeaderToolTips2.java --- package net.sf.xframe.swing.demo; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import net.sf.xframe.swing.JXTable; import net.sf.xframe.swing.table.JXTableHeader; /** * Simple demo of the JXTable with tool tips on the header by subclassing * class {@link net.sf.xframe.swing.table.JXTableHeader JXTableHeader} and overwriting * method {@link net.sf.xframe.swing.table.JXTableHeader#getToolTipText getToolTipText}. * * @author <a href=mailto:kr...@us...>Kurt Riede</a> */ public final class JXTableHeaderToolTips2 { /** * Static main method. * @param args arguments */ public static void main(final String[] args) { new JXTableHeaderToolTips2().run(); } /** * Run the demo. */ public void run() { // create the demo frame final JFrame frame = new JFrame("JXTable Demo"); final BorderLayout layout = new BorderLayout(); frame.getContentPane().setLayout(layout); // create and add the table final TableModel model = new DefaultTableModel(15, 20); final JXTable jxTable = new JXTable(model, 2); frame.getContentPane().add(jxTable, BorderLayout.CENTER); // create some buttons to change the number of frozen columns final JPanel buttonPanel = new JPanel(); frame.getContentPane().add(buttonPanel, BorderLayout.NORTH); buttonPanel.setLayout(new FlowLayout()); for (int i = 0; i < 10; i++) { final JButton button = new JButton("Freeze " + i); final int num = i; button.addActionListener(new ActionListener() { public void actionPerformed(final ActionEvent e) { jxTable.setFrozenColumns(num); } }); buttonPanel.add(button); } // Create table header with tooltips for each of the columns jxTable.setTableHeader(new JXTableHeader(jxTable.getColumnModel()) { public String getToolTipText(final MouseEvent e) { System.out.println("getToolTipText" + e.getX() + ", " + e.getY()); final int index = getColumnModel().getColumnIndexAtX(e.getX()); final int realIndex = getColumnModel().getColumn(index).getModelIndex(); return "Col " + realIndex; } }); // set size, center and show the demo frame frame.setSize(650, 300); final Dimension screen = Toolkit.getDefaultToolkit().getScreenSize(); final Dimension frameSize = frame.getSize(); frame.setLocation((screen.width - frameSize.width) / 2, (screen.height - frameSize.height) / 2); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setVisible(true); } } --- NEW FILE: JXTableHeaderToolTips1.java --- package net.sf.xframe.swing.demo; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; import java.util.HashMap; import java.util.Map; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; import javax.swing.table.TableModel; import net.sf.xframe.swing.JXTable; import net.sf.xframe.swing.table.JXTableHeader; /** * Simple demo of the JXTable with tool tips on the header using a * {@link java.awt.event.MouseMotionListener MouseMotionListener}. * * @author <a href=mailto:kr...@us...>Kurt Riede</a> */ public final class JXTableHeaderToolTips1 { /** * Static main method. * @param args arguments */ public static void main(final String[] args) { new JXTableHeaderToolTips1().run(); } /** * Run the demo. */ public void run() { // create the demo frame final JFrame frame = new JFrame("JXTable Demo"); final BorderLayout layout = new BorderLayout(); frame.getContentPane().setLayout(layout); // create and add the table final TableModel model = new DefaultTableModel(15, 20); final JXTable jxTable = new JXTable(model, 2); frame.getContentPane().add(jxTable, BorderLayout.CENTER); // create some buttons to change the number of frozen columns final JPanel buttonPanel = new JPanel(); frame.getContentPane().add(buttonPanel, BorderLayout.NORTH); buttonPanel.setLayout(new FlowLayout()); for (int i = 0; i < 10; i++) { final JButton button = new JButton("Freeze " + i); final int num = i; button.addActionListener(new ActionListener() { public void actionPerformed(final ActionEvent e) { jxTable.setFrozenColumns(num); } }); buttonPanel.add(button); } // Assign a tooltip for each of the columns final ColumnHeaderToolTips tips = new ColumnHeaderToolTips(); final TableColumnModel columnModel = jxTable.getColumnModel(); for (int c = 0; c < jxTable.getColumnCount(); c++) { tips.setToolTip(columnModel.getColumn(c), "Col " + c); } jxTable.getTableHeader().addMouseMotionListener(tips); // set size, center and show the demo frame frame.setSize(650, 300); final Dimension screen = Toolkit.getDefaultToolkit().getScreenSize(); final Dimension frameSize = frame.getSize(); frame.setLocation((screen.width - frameSize.width) / 2, (screen.height - frameSize.height) / 2); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setVisible(true); } private class ColumnHeaderToolTips extends MouseMotionAdapter { /** Current column whose tooltip is being displayed. * This variable is used to minimize the calls to setToolTipText(). */ private TableColumn curCol; /** Maps TableColumn objects to tooltips. */ private final Map tips = new HashMap(); // If tooltip is null, removes any tooltip text. public void setToolTip(final TableColumn col, final String tooltip) { if (tooltip == null) { tips.remove(col); } else { tips.put(col, tooltip); } } public void mouseMoved(final MouseEvent evt) { final JXTableHeader header = (JXTableHeader) evt.getSource(); final JXTable table = header.getTable(); final TableColumnModel colModel = table.getColumnModel(); final int vColIndex = colModel.getColumnIndexAtX(evt.getX()); TableColumn col = null; if (vColIndex >= 0) { col = colModel.getColumn(vColIndex); } if (col != null && col != curCol) { System.out.println(evt.getX() + "/" + evt.getY() + " " + col.getIdentifier()); header.setToolTipText((String) tips.get(col)); curCol = col; } } } } |
|
From: Kurt R. <kr...@us...> - 2005-05-19 00:09:45
|
Update of /cvsroot/xframe/swing/src/net/sf/xframe/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10224/src/net/sf/xframe/swing Modified Files: JXTable.java Log Message: fix for bug [1200282] Header tooltips Index: JXTable.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/JXTable.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** JXTable.java 18 May 2005 16:56:54 -0000 1.19 --- JXTable.java 19 May 2005 00:09:35 -0000 1.20 *************** *** 2372,2384 **** * It is legal to have a <code>null</code> <code>tableHeader</code>. * ! * @param tableHeader new tableHeader * @see #getTableHeader */ ! public void setTableHeader(final JXTableHeader tableHeader) { ! collTableHeader = tableHeader; ! lockedHeader = tableHeader.getLockedHeader(); ! scrollHeader = tableHeader.getScrollHeader(); ! scrollTable.setTableHeader(lockedHeader); ! lockedTable.setTableHeader(scrollHeader); } --- 2372,2395 ---- * It is legal to have a <code>null</code> <code>tableHeader</code>. * ! * @param newHeader new tableHeader * @see #getTableHeader */ ! public void setTableHeader(final JXTableHeader newHeader) { ! if (collTableHeader != newHeader) { ! final JXTableHeader oldHeader = collTableHeader; ! if (oldHeader != null) { ! oldHeader.setTable(null); ! } ! collTableHeader = newHeader; ! lockedHeader = newHeader.getLockedHeader(); ! scrollHeader = newHeader.getScrollHeader(); ! lockedHeader.setColumnModel(lockedTable.getColumnModel()); ! scrollHeader.setColumnModel(scrollTable.getColumnModel()); ! lockedHeader.setTable(lockedTable); ! scrollHeader.setTable(scrollTable); ! lockedTable.setTableHeader(lockedHeader); ! scrollTable.setTableHeader(scrollHeader); ! scrollPane.setCorner(ScrollPaneConstants.UPPER_LEFT_CORNER, lockedHeader); ! } } |
|
From: Kurt R. <kr...@us...> - 2005-05-18 16:57:30
|
Update of /cvsroot/xframe/swing/src/net/sf/xframe/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2224/src/net/sf/xframe/swing Modified Files: JXTable.java Log Message: fix for bug [1200279] getTableHeader().addColumnGroup() doesn't throw Index: JXTable.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/JXTable.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** JXTable.java 16 May 2005 16:26:41 -0000 1.18 --- JXTable.java 18 May 2005 16:56:54 -0000 1.19 *************** *** 342,345 **** --- 342,346 ---- final JTableHeader theScrollHeader = scrollTable.getTableHeader(); collTableHeader = new JXTableHeader(columnModel, theLockedHeader, theScrollHeader); + collTableHeader.setTable(this); // add scrollpane to container |
|
From: Kurt R. <kr...@us...> - 2005-05-18 08:05:26
|
Update of /cvsroot/xframe/xsddoc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12939 Modified Files: project.xml Log Message: fix for bug [1204084] invalid entry in project.xml file Index: project.xml =================================================================== RCS file: /cvsroot/xframe/xsddoc/project.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** project.xml 9 May 2005 22:47:01 -0000 1.13 --- project.xml 18 May 2005 08:05:17 -0000 1.14 *************** *** 145,152 **** <resource> <directory>${basedir}/src</directory> ! <exclude> <exclude>**/*.java</exclude> <exclude>**/package.html</exclude> ! </exclude> </resource> </resources> --- 145,152 ---- <resource> <directory>${basedir}/src</directory> ! <excludes> <exclude>**/*.java</exclude> <exclude>**/package.html</exclude> ! </excludes> </resource> </resources> |
|
From: Kurt R. <kr...@us...> - 2005-05-17 22:11:28
|
Update of /cvsroot/xframe/maven-xsddoc-plugin/src/plugin-resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4716/src/plugin-resources Modified Files: xsddoc-report.jsl Log Message: improved reporting of errors/warnings/broken links Index: xsddoc-report.jsl =================================================================== RCS file: /cvsroot/xframe/maven-xsddoc-plugin/src/plugin-resources/xsddoc-report.jsl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** xsddoc-report.jsl 10 May 2005 16:21:44 -0000 1.8 --- xsddoc-report.jsl 17 May 2005 22:11:18 -0000 1.9 *************** *** 39,44 **** <j:set var="files"><x:expr select="count(xsddoc)"/></j:set> <j:set var="success"><x:expr select="count(xsddoc[@result = 'success' and @linkcheck = 'OK'])"/></j:set> ! <j:set var="linkcheck"><x:expr select="count(xsddoc[@linkcheck != 'OK'])"/></j:set> ! <j:set var="errors"><x:expr select="${files} - ${success}"/></j:set> <j:set var="percentage"><x:expr select="(${success} div ${files}) * 100"/></j:set> <a name="summary"></a> --- 39,45 ---- <j:set var="files"><x:expr select="count(xsddoc)"/></j:set> <j:set var="success"><x:expr select="count(xsddoc[@result = 'success' and @linkcheck = 'OK'])"/></j:set> ! <j:set var="broken"><x:expr select="count(xsddoc[@linkcheck != 'OK'])"/></j:set> ! <j:set var="errors"><x:expr select="count(xsddoc[@result = 'failed'])"/></j:set> ! <j:set var="warnings"><x:expr select="count(xsddoc[@result = 'warning'])"/></j:set> <j:set var="percentage"><x:expr select="(${success} div ${files}) * 100"/></j:set> <a name="summary"></a> *************** *** 49,55 **** <th>Files</th> <th> ! <a href="#errors">Errors</a> </th> - <th>with broken links</th> <th>success</th> <th>success [%]</th> --- 50,76 ---- <th>Files</th> <th> ! <j:choose> ! <j:when test="${(errors != 0) or (warnings != 0) or (broken != 0)}"> ! <a href="#errors">errors</a> ! </j:when> ! <j:otherwise>errors</j:otherwise> ! </j:choose> ! </th> ! <th> ! <j:choose> ! <j:when test="${(errors != 0) or (warnings != 0) or (broken != 0)}"> ! <a href="#errors">warnings</a> ! </j:when> ! <j:otherwise>warnings</j:otherwise> ! </j:choose> ! </th> ! <th> ! <j:choose> ! <j:when test="${(errors != 0) or (warnings != 0) or (broken != 0)}"> ! <a href="#errors">with broken links</a> ! </j:when> ! <j:otherwise>with broken links</j:otherwise> ! </j:choose> </th> <th>success</th> <th>success [%]</th> *************** *** 60,64 **** <td>${files}</td> <td>${errors}</td> ! <td>${linkcheck}</td> <td>${success}</td> <td>${percentage}</td> --- 81,86 ---- <td>${files}</td> <td>${errors}</td> ! <td>${warnings}</td> ! <td>${broken}</td> <td>${success}</td> <td>${percentage}</td> *************** *** 81,88 **** <tr> <td> ! <a target="_blank" href="./${doc.attribute('schema').getValue()}">${doc.attribute('schema').getValue()}</a> </td> <td> ! <a target="_blank" href="${maven.xsddoc.dest}/${doc.attribute('report').getValue()}/index.html">documentation</a> </td> </tr> --- 103,110 ---- <tr> <td> ! <a target="_blank" href="../../${doc.attribute('schema').getValue()}">${doc.attribute('schema').getValue()}</a> </td> <td> ! <a target="_blank" href="xsddocs/${doc.attribute('report').getValue()}/index.html">documentation</a> </td> </tr> *************** *** 90,96 **** </tbody> </table> ! <a name="errors"></a> ! <h2>xsddoc errors</h2> ! <j:if test="${errors != 0}"> <table> <thead> --- 112,118 ---- </tbody> </table> ! <j:if test="${(errors != 0) or (warnings != 0) or (broken != 0)}"> ! <a name="errors"></a> ! <h2>Files with Errors, Warnings or Broken Links</h2> <table> <thead> *************** *** 103,120 **** </thead> <tbody> ! <x:set var="docs" select="xsddoc[@result != 'success']"/> <j:forEach var="doc" items="${docs}"> <tr> <td> ! <a target="_blank" href="./${doc.attribute('schema').getValue()}">${doc.attribute('schema').getValue()}</a> </td> <td> ! <a target="_blank" href="${maven.xsddoc.dest}/${doc.attribute('report').getValue()}/index.html">documentation</a> </td> <td> ! <a target="_blank" href="${maven.xsddoc.dest}/${doc.attribute('report').getValue()}-linkcheck.xml"><b>${doc.attribute('linkcheck').getValue()}</b></a> </td> <td> ! <a target="_blank" href="${maven.xsddoc.dest}/${doc.attribute('report').getValue()}.txt"><b>${doc.attribute('result').getValue()}</b></a> </td> </tr> --- 125,142 ---- </thead> <tbody> ! <x:set var="docs" select="xsddoc[(@result != 'success') or (@linkcheck != 'OK')]"/> <j:forEach var="doc" items="${docs}"> <tr> <td> ! <a target="_blank" href="../../${doc.attribute('schema').getValue()}">${doc.attribute('schema').getValue()}</a> </td> <td> ! <a target="_blank" href="xsddocs/${doc.attribute('report').getValue()}/index.html">documentation</a> </td> <td> ! <a target="_blank" href="xsddocs/${doc.attribute('report').getValue()}-linkcheck.xml"><b>${doc.attribute('linkcheck').getValue()}</b></a> </td> <td> ! <a target="_blank" href="xsddocs/${doc.attribute('report').getValue()}.txt"><b>${doc.attribute('result').getValue()}</b></a> </td> </tr> |
|
From: Kurt R. <kr...@us...> - 2005-05-17 22:10:05
|
Update of /cvsroot/xframe/maven-xsddoc-plugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4399 Modified Files: plugin.jelly Log Message: minor fix Index: plugin.jelly =================================================================== RCS file: /cvsroot/xframe/maven-xsddoc-plugin/plugin.jelly,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** plugin.jelly 10 May 2005 16:17:51 -0000 1.10 --- plugin.jelly 17 May 2005 22:09:57 -0000 1.11 *************** *** 83,87 **** <j:set var="result" value="${xsddocprocessor.setSchemaLocation(sourcefile)}"/> <j:set var="result" value="${xsddocprocessor.setOut(targetpath)}"/> - <j:set var="result" value="${xsddocprocessor.setCss(maven.xsddoc.css)}"/> <j:set var="result" value="${xsddocprocessor.setHeader(relpath)}"/> <j:set var="result" value="${xsddocprocessor.setBottom(bottom)}"/> --- 83,86 ---- |
|
From: Kurt R. <kr...@us...> - 2005-05-17 22:07:19
|
Update of /cvsroot/xframe/maven-xsddoc-plugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3500 Modified Files: project.xml Log Message: Pom version changes to correct value 3 Index: project.xml =================================================================== RCS file: /cvsroot/xframe/maven-xsddoc-plugin/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** project.xml 9 May 2005 23:08:12 -0000 1.4 --- project.xml 17 May 2005 22:07:10 -0000 1.5 *************** *** 21,25 **** --> <project> ! <pomVersion>4</pomVersion> <id>maven-xsddoc-plugin</id> <name>Maven xsddoc Plug-in</name> --- 21,25 ---- --> <project> ! <pomVersion>3</pomVersion> <id>maven-xsddoc-plugin</id> <name>Maven xsddoc Plug-in</name> |
|
From: Iñaqui M. <ina...@us...> - 2005-05-17 02:06:49
|
Update of /cvsroot/xframe/swing/src/net/sf/xframe/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32315/src/net/sf/xframe/swing Modified Files: JXTable.java Log Message: Completion of fix for bug 1177993 and fix for bug 1202938 Index: JXTable.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/JXTable.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** JXTable.java 10 May 2005 11:36:32 -0000 1.17 --- JXTable.java 16 May 2005 16:26:41 -0000 1.18 *************** *** 2047,2050 **** --- 2047,2077 ---- return scrollPane.getHorizontalScrollBarPolicy(); } + + /** + * Determines when the vertical scrollbar appears in the scrollpane. + * Legal values are: + * <ul> + * <li>JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED + * <li>JScrollPane.VERTICAL_SCROLLBAR_NEVER + * <li>JScrollPane.VERTICAL_SCROLLBAR_ALWAYS + * </ul> + * + * @param policy one of the three values listed above + * @exception IllegalArgumentException if <code>policy</code> + * is not one of the legal values shown above + * @see #getVerticalScrollBarPolicy + */ + public void setVerticalScrollBarPolicy(final int policy) { + scrollPane.setVerticalScrollBarPolicy(policy); + } + + /** + * Returns the vertical scroll bar policy value. + * @return the <code>verticalScrollBarPolicy</code> property + * @see #setVerticalScrollBarPolicy + */ + public int getVerticalScrollBarPolicy() { + return scrollPane.getVerticalScrollBarPolicy(); + } /** *************** *** 2740,2743 **** --- 2767,2783 ---- getScrollTable().setTransferHandler(newHandler); } + + /** + * Gets the <code>transferHandler</code> property. + * + * @return the value of the <code>transferHandler</code> property + * + * @see TransferHandler + * @see #setTransferHandler + */ + public TransferHandler getTransferHandler() { + //Both KTables should have the same handler. Return any of those. + return getLockedTable().getTransferHandler(); + } /** |
|
From: Kurt R. <kr...@us...> - 2005-05-15 11:41:48
|
Update of /cvsroot/xframe/xsddoc-compatibility-test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30626 Modified Files: project.xml Log Message: prepared for release 0.8 Index: project.xml =================================================================== RCS file: /cvsroot/xframe/xsddoc-compatibility-test/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** project.xml 6 May 2005 11:16:28 -0000 1.4 --- project.xml 15 May 2005 11:41:36 -0000 1.5 *************** *** 98,102 **** <groupId>xsddoc</groupId> <artifactId>maven-xsddoc-plugin</artifactId> ! <version>0.7</version> <type>plugin</type> </dependency> --- 98,102 ---- <groupId>xsddoc</groupId> <artifactId>maven-xsddoc-plugin</artifactId> ! <version>0.8</version> <type>plugin</type> </dependency> |
|
From: Kurt R. <kr...@us...> - 2005-05-15 11:41:48
|
Update of /cvsroot/xframe/xsddoc-compatibility-test/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30626/xdocs Modified Files: site.jsl Log Message: prepared for release 0.8 Index: site.jsl =================================================================== RCS file: /cvsroot/xframe/xsddoc-compatibility-test/xdocs/site.jsl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** site.jsl 6 May 2005 11:05:07 -0000 1.3 --- site.jsl 15 May 2005 11:41:37 -0000 1.4 *************** *** 188,191 **** --- 188,195 ---- </div> </j:if> + <x:if select="$nav"> + <jsl:applyTemplates select="$nav/body/search"/> + <jsl:applyTemplates select="$nav/body/googleAdsenseLeft"/> + </x:if> <!-- Standard Maven Navigation --> <j:set var="fileName">${file}</j:set> |
|
From: Kurt R. <kr...@us...> - 2005-05-11 08:00:17
|
Update of /cvsroot/xframe/xsddoc/samples/xsddoc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv425/samples/xsddoc Modified Files: xsddoc.xsd Log Message: some errors in the schema resolved Index: xsddoc.xsd =================================================================== RCS file: /cvsroot/xframe/xsddoc/samples/xsddoc/xsddoc.xsd,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** xsddoc.xsd 30 Sep 2004 11:27:48 -0000 1.9 --- xsddoc.xsd 11 May 2005 07:59:50 -0000 1.10 *************** *** 1,271 **** <?xml version="1.0" encoding="UTF-8"?> ! <xs:schema targetNamespace="http://xframe.sf.net/xsddoc/doc" xmlns:doc="http://xframe.sf.net/xsddoc/doc" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> <xs:annotation> ! <xs:documentation>This schema describes the XML structure of XML documentation generated bx xsddoc.</xs:documentation> ! </xs:annotation> ! <xs:element name="xsddoc"> ! <xs:annotation> ! <xs:documentation>Root element of XML documentation of a W3C XML Schema generated by xsddoc.</xs:documentation> ! </xs:annotation> ! <xs:complexType> ! <xs:choice> ! <xs:element name="component" type="doc:componentType"/> ! <xs:element name="overview" type="doc:overviewType"/> ! <xs:element name="index" type="doc:indexType"/> ! </xs:choice> ! </xs:complexType> ! </xs:element> ! <xs:element name="overview-namespaces"> ! <xs:annotation> ! <xs:documentation>Root element of namespaces overview page.</xs:documentation> ! </xs:annotation> ! <xs:complexType> ! <xs:sequence> ! <xs:element name="namespace" type="doc:namespaceType" minOccurs="0"/> ! </xs:sequence> ! </xs:complexType> ! </xs:element> ! <xs:element name="schema-summary"> ! <xs:annotation> ! <xs:documentation>Root element of schema summary page.</xs:documentation> ! </xs:annotation> ! <xs:complexType> ! <xs:sequence> ! <xs:element name="namespace" type="doc:namespaceType" minOccurs="0"/> ! </xs:sequence> ! </xs:complexType> ! </xs:element> ! <xs:complexType name="namespaceType"> ! <xs:sequence> ! <xs:element name="documentation" type="doc:documentationType" minOccurs="0" maxOccurs="unbounded"/> ! </xs:sequence> ! <xs:attribute name="name" type="xs:string" use="required"/> ! <xs:attribute name="href" type="xs:anyURI" use="required"/> ! </xs:complexType> ! <xs:complexType name="overviewType"> ! <xs:annotation> ! <xs:documentation>Container for overviews.</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:element name="component" type="doc:modelType" minOccurs="0"/> ! </xs:sequence> ! <xs:attributeGroup ref="doc:attributes.type"/> ! </xs:complexType> ! <xs:complexType name="indexType"> ! <xs:annotation> ! <xs:documentation>Container for schema indices.</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:element name="component" type="doc:componentType" minOccurs="0"/> ! </xs:sequence> ! <xs:attributeGroup ref="doc:attributes.type"/> ! </xs:complexType> ! <xs:complexType name="componentType"> ! <xs:annotation> ! <xs:documentation>Container for component descriptions.</xs:documentation> ! </xs:annotation> ! <xs:sequence maxOccurs="unbounded"> ! <xs:choice> ! <xs:element name="model" type="doc:modelType" minOccurs="0"/> ! <xs:element name="superTypes" type="doc:superTypes" minOccurs="0"/> ! <xs:element name="subTypes" type="doc:subTypes" minOccurs="0"/> ! <xs:element name="implementors" type="doc:implementors" minOccurs="0"/> ! <xs:element name="typeReference" type="doc:typeReference" minOccurs="0"/> ! <xs:element name="source" type="doc:sourceType" minOccurs="0"/> ! <xs:element name="documentation" type="doc:documentationType" minOccurs="0" maxOccurs="unbounded"/> ! </xs:choice> ! </xs:sequence> ! <xs:attribute name="name" type="xs:NCName" use="required"/> ! <xs:attribute name="type" type="doc:componentTypeType" use="required"/> ! <xs:attribute name="namespace" type="xs:string" use="required"/> ! <xs:attribute name="form" type="xs:string" use="optional"/> ! <xs:attribute name="block" type="xs:string" use="optional"/> ! <xs:attribute name="final" type="xs:string" use="optional"/> ! </xs:complexType> ! <xs:complexType name="superTypes"> ! <xs:annotation> ! <xs:documentation>List of super type chain.</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:element name="type" type="doc:baseType" minOccurs="0" maxOccurs="unbounded"> ! <xs:annotation> ! <xs:documentation>Super types hierarcha as a flat list.</xs:documentation> ! </xs:annotation> ! </xs:element> ! </xs:sequence> ! </xs:complexType> ! <xs:complexType name="subTypes"> ! <xs:annotation> ! <xs:documentation>Tree of derived types.</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:element name="type" type="doc:typeNode" minOccurs="0" maxOccurs="unbounded"> ! <xs:annotation> ! <xs:documentation>direct derived types.</xs:documentation> ! </xs:annotation> ! </xs:element> ! </xs:sequence> ! </xs:complexType> ! <xs:complexType name="implementors"> ! <xs:annotation> ! <xs:documentation>List of all implementors of a simpleType or complexType.</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:element name="type" type="doc:baseType" minOccurs="0" maxOccurs="unbounded"> ! <xs:annotation> ! <xs:documentation>List of direct implementors.</xs:documentation> ! </xs:annotation> ! </xs:element> ! </xs:sequence> ! </xs:complexType> ! <xs:complexType name="typeReference"> ! <xs:annotation> ! <xs:documentation>List of components using a type</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:element name="type" type="doc:baseType" minOccurs="0" maxOccurs="unbounded"> ! <xs:annotation> ! <xs:documentation>List of refering components.</xs:documentation> ! </xs:annotation> ! </xs:element> ! </xs:sequence> ! </xs:complexType> ! <xs:complexType name="modelType"> ! <xs:annotation> ! <xs:documentation>Resolved content model</xs:documentation> ! </xs:annotation> ! <xs:sequence minOccurs="0" maxOccurs="unbounded"> ! <xs:choice> ! <xs:element name="sequence" type="doc:modelType"/> ! <xs:element name="choice" type="doc:modelType"/> ! <xs:element name="all" type="doc:modelType"/> ! <xs:element name="element" type="doc:modelType"/> ! <xs:element name="attribute" type="doc:attribute"/> ! <xs:element name="simpleType" type="doc:modelType"/> ! <xs:element name="complexType" type="doc:modelType"/> ! <xs:element name="restriction" type="doc:modelType"/> ! <xs:element name="whiteSpace" type="doc:modelType"/> ! <xs:element name="pattern" type="doc:modelType"/> ! <xs:element name="enumeration" type="doc:modelType"/> ! <xs:element name="fractionDigits" type="doc:modelType"/> ! <xs:element name="length" type="doc:modelType"/> ! <xs:element name="maxExclusive" type="doc:modelType"/> ! <xs:element name="maxInclusive" type="doc:modelType"/> ! <xs:element name="maxLength" type="doc:modelType"/> ! <xs:element name="minExclusive" type="doc:modelType"/> ! <xs:element name="minInclusive" type="doc:modelType"/> ! <xs:element name="minLength" type="doc:modelType"/> ! <xs:element name="pattern" type="doc:modelType"/> ! <xs:element name="totalDigits" type="doc:modelType"/> ! <xs:element name="whiteSpace" type="doc:modelType"/> ! <xs:element name="documentation" type="xs:anyType"/> ! </xs:choice> ! </xs:sequence> ! <xs:attribute name="occurs" type="doc:occursType" use="optional"/> ! <xs:attribute name="name" type="xs:Name" use="optional"/> ! <xs:attribute name="type" type="xs:Name" use="optional"/> ! <xs:attribute name="href" type="xs:anyURI" use="optional"/> ! <xs:attribute name="namespace" type="xs:anyURI" use="optional"/> ! <xs:attribute name="base" type="xs:Name" use="optional"/> ! <xs:attribute name="value" type="xs:string" use="optional"/> ! </xs:complexType> ! <xs:simpleType name="occursType"> ! <xs:annotation> ! <xs:documentation>Occurs can be either of the DTD symbols '*','+', '?' or empty, or an occurance string similar to regex of the form '{' integer ',' integer '}'.</xs:documentation> ! </xs:annotation> ! <xs:restriction base="xs:string"> ! <xs:pattern value="(\*|\+|\?|\{\d*,\d*\})?"/> ! </xs:restriction> ! </xs:simpleType> ! <xs:complexType name="attribute"> ! <xs:annotation> ! <xs:documentation>Resolved attribute description</xs:documentation> ! </xs:annotation> ! <xs:all> ! <xs:element name="documentation" type="doc:documentationType" minOccurs="0"/> ! <xs:element name="simpleType" type="doc:modelType" minOccurs="0"/> ! </xs:all> ! <xs:attribute name="name" type="xs:NCName" use="required"/> ! <xs:attribute name="default" type="xs:string" use="optional"/> ! <xs:attribute name="fixed" type="xs:string" use="optional"/> ! <xs:attribute name="form" type="xs:string" use="optional"/> ! <xs:attribute name="id" use="optional"/> ! <xs:attribute name="ref" type="xs:NCName" use="optional"/> ! <xs:attribute name="base" type="xs:Name" use="optional"/> ! <xs:attribute name="type" type="xs:Name" use="optional"/> ! <xs:attribute name="use" type="xs:string" use="optional"/> ! <xs:attribute name="href" type="xs:anyURI" use="optional"/> ! </xs:complexType> ! <xs:complexType name="sourceType"> ! <xs:annotation> ! <xs:documentation>Container for the source of a schema component.</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded"/> ! <xs:any namespace="http://www.w3.org/1999/xhtml" processContents="lax" minOccurs="0" maxOccurs="unbounded"> <xs:annotation> <xs:documentation>Original source of a schema component, formatted as HTML.</xs:documentation> </xs:annotation> ! </xs:any> ! </xs:sequence> ! </xs:complexType> ! <xs:complexType name="documentationType" mixed="true"> ! <xs:annotation> ! <xs:documentation>Container for the documentation of a schema component.</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"> ! <xs:annotation> ! <xs:documentation>Original documentation of a schema componentor abstract of original.</xs:documentation> ! </xs:annotation> ! </xs:any> ! </xs:sequence> ! </xs:complexType> ! <xs:complexType name="baseType"> ! <xs:annotation> ! <xs:documentation>Base type of type elements.</xs:documentation> ! </xs:annotation> ! <xs:attributeGroup ref="doc:attributes.type"/> ! <xs:attribute name="namespace" type="xs:anyURI" use="required"/> ! <xs:attribute name="derivation" type="xs:NCName" use="optional"/> ! </xs:complexType> ! <xs:complexType name="typeNode"> ! <xs:annotation> ! <xs:documentation>Node of a type hierarchy.</xs:documentation> ! </xs:annotation> ! <xs:complexContent> ! <xs:extension base="doc:baseType"> ! <xs:sequence> ! <xs:element name="type" type="doc:typeNode" minOccurs="0" maxOccurs="unbounded"> ! <xs:annotation> ! <xs:documentation>List of child nodes.</xs:documentation> ! </xs:annotation> ! </xs:element> ! </xs:sequence> ! </xs:extension> ! </xs:complexContent> ! </xs:complexType> ! <xs:simpleType name="componentTypeType"> ! <xs:annotation> ! <xs:documentation>Type attribute of a type element.</xs:documentation> ! </xs:annotation> ! <xs:restriction base="xs:NCName"> ! <xs:enumeration value="complexType"/> ! <xs:enumeration value="simpleType"/> ! <xs:enumeration value="element"/> ! <xs:enumeration value="attribute"/> ! <xs:enumeration value="group"/> ! <xs:enumeration value="attributeGroup"/> ! </xs:restriction> ! </xs:simpleType> ! <xs:attributeGroup name="attributes.type"> ! <xs:annotation> ! <xs:documentation>Common attributes of types.</xs:documentation> ! </xs:annotation> ! <xs:attribute name="name" type="xs:NCName" use="required"/> ! <xs:attribute name="type" type="doc:componentTypeType" use="optional"/> ! <xs:attribute name="href" type="xs:anyURI" use="optional"/> ! </xs:attributeGroup> </xs:schema> --- 1,268 ---- <?xml version="1.0" encoding="UTF-8"?> ! <xs:schema xmlns:doc="http://xframe.sf.net/xsddoc/doc" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://xframe.sf.net/xsddoc/doc" elementFormDefault="qualified"> <xs:annotation> ! <xs:documentation>This schema describes the XML structure of XML documentation generated bx xsddoc.</xs:documentation> ! </xs:annotation> ! <xs:element name="xsddoc"> ! <xs:annotation> ! <xs:documentation>Root element of XML documentation of a W3C XML Schema generated by xsddoc.</xs:documentation> ! </xs:annotation> ! <xs:complexType> ! <xs:choice> ! <xs:element name="component" type="doc:componentType"/> ! <xs:element name="overview" type="doc:overviewType"/> ! <xs:element name="index" type="doc:indexType"/> ! </xs:choice> ! </xs:complexType> ! </xs:element> ! <xs:element name="overview-namespaces"> ! <xs:annotation> ! <xs:documentation>Root element of namespaces overview page.</xs:documentation> ! </xs:annotation> ! <xs:complexType> ! <xs:sequence> ! <xs:element name="namespace" type="doc:namespaceType" minOccurs="0"/> ! </xs:sequence> ! </xs:complexType> ! </xs:element> ! <xs:element name="schema-summary"> ! <xs:annotation> ! <xs:documentation>Root element of schema summary page.</xs:documentation> ! </xs:annotation> ! <xs:complexType> ! <xs:sequence> ! <xs:element name="namespace" type="doc:namespaceType" minOccurs="0"/> ! </xs:sequence> ! </xs:complexType> ! </xs:element> ! <xs:complexType name="namespaceType"> ! <xs:sequence> ! <xs:element name="documentation" type="doc:documentationType" minOccurs="0" maxOccurs="unbounded"/> ! </xs:sequence> ! <xs:attribute name="name" type="xs:string" use="required"/> ! <xs:attribute name="href" type="xs:anyURI" use="required"/> ! </xs:complexType> ! <xs:complexType name="overviewType"> ! <xs:annotation> ! <xs:documentation>Container for overviews.</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:element name="component" type="doc:modelType" minOccurs="0"/> ! </xs:sequence> ! <xs:attributeGroup ref="doc:attributes.type"/> ! </xs:complexType> ! <xs:complexType name="indexType"> ! <xs:annotation> ! <xs:documentation>Container for schema indices.</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:element name="component" type="doc:componentType" minOccurs="0"/> ! </xs:sequence> ! <xs:attributeGroup ref="doc:attributes.type"/> ! </xs:complexType> ! <xs:complexType name="componentType"> ! <xs:annotation> ! <xs:documentation>Container for component descriptions.</xs:documentation> ! </xs:annotation> ! <xs:sequence maxOccurs="unbounded"> ! <xs:choice> ! <xs:element name="model" type="doc:modelType" minOccurs="0"/> ! <xs:element name="superTypes" type="doc:superTypes" minOccurs="0"/> ! <xs:element name="subTypes" type="doc:subTypes" minOccurs="0"/> ! <xs:element name="implementors" type="doc:implementors" minOccurs="0"/> ! <xs:element name="typeReference" type="doc:typeReference" minOccurs="0"/> ! <xs:element name="source" type="doc:sourceType" minOccurs="0"/> ! <xs:element name="documentation" type="doc:documentationType" minOccurs="0" maxOccurs="unbounded"/> ! </xs:choice> ! </xs:sequence> ! <xs:attribute name="name" type="xs:NCName" use="required"/> ! <xs:attribute name="type" type="doc:componentTypeType" use="required"/> ! <xs:attribute name="namespace" type="xs:string" use="required"/> ! <xs:attribute name="form" type="xs:string" use="optional"/> ! <xs:attribute name="block" type="xs:string" use="optional"/> ! <xs:attribute name="final" type="xs:string" use="optional"/> ! </xs:complexType> ! <xs:complexType name="superTypes"> ! <xs:annotation> ! <xs:documentation>List of super type chain.</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:element name="type" type="doc:baseType" minOccurs="0" maxOccurs="unbounded"> ! <xs:annotation> ! <xs:documentation>Super types hierarcha as a flat list.</xs:documentation> ! </xs:annotation> ! </xs:element> ! </xs:sequence> ! </xs:complexType> ! <xs:complexType name="subTypes"> ! <xs:annotation> ! <xs:documentation>Tree of derived types.</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:element name="type" type="doc:typeNode" minOccurs="0" maxOccurs="unbounded"> ! <xs:annotation> ! <xs:documentation>direct derived types.</xs:documentation> ! </xs:annotation> ! </xs:element> ! </xs:sequence> ! </xs:complexType> ! <xs:complexType name="implementors"> ! <xs:annotation> ! <xs:documentation>List of all implementors of a simpleType or complexType.</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:element name="type" type="doc:baseType" minOccurs="0" maxOccurs="unbounded"> ! <xs:annotation> ! <xs:documentation>List of direct implementors.</xs:documentation> ! </xs:annotation> ! </xs:element> ! </xs:sequence> ! </xs:complexType> ! <xs:complexType name="typeReference"> ! <xs:annotation> ! <xs:documentation>List of components using a type</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:element name="type" type="doc:baseType" minOccurs="0" maxOccurs="unbounded"> ! <xs:annotation> ! <xs:documentation>List of refering components.</xs:documentation> ! </xs:annotation> ! </xs:element> ! </xs:sequence> ! </xs:complexType> ! <xs:complexType name="modelType"> ! <xs:annotation> ! <xs:documentation>Resolved content model</xs:documentation> ! </xs:annotation> ! <xs:sequence minOccurs="0" maxOccurs="unbounded"> ! <xs:choice> ! <xs:element name="sequence" type="doc:modelType"/> ! <xs:element name="choice" type="doc:modelType"/> ! <xs:element name="all" type="doc:modelType"/> ! <xs:element name="element" type="doc:modelType"/> ! <xs:element name="attribute" type="doc:attribute"/> ! <xs:element name="simpleType" type="doc:modelType"/> ! <xs:element name="complexType" type="doc:modelType"/> ! <xs:element name="restriction" type="doc:modelType"/> ! <xs:element name="whiteSpace" type="doc:modelType"/> ! <xs:element name="pattern" type="doc:modelType"/> ! <xs:element name="enumeration" type="doc:modelType"/> ! <xs:element name="fractionDigits" type="doc:modelType"/> ! <xs:element name="length" type="doc:modelType"/> ! <xs:element name="maxExclusive" type="doc:modelType"/> ! <xs:element name="maxInclusive" type="doc:modelType"/> ! <xs:element name="maxLength" type="doc:modelType"/> ! <xs:element name="minExclusive" type="doc:modelType"/> ! <xs:element name="minInclusive" type="doc:modelType"/> ! <xs:element name="minLength" type="doc:modelType"/> ! <xs:element name="totalDigits" type="doc:modelType"/> ! <xs:element name="documentation" type="xs:anyType"/> ! </xs:choice> ! </xs:sequence> ! <xs:attribute name="occurs" type="doc:occursType" use="optional"/> ! <xs:attribute name="name" type="xs:Name" use="optional"/> ! <xs:attribute name="type" type="xs:Name" use="optional"/> ! <xs:attribute name="href" type="xs:anyURI" use="optional"/> ! <xs:attribute name="namespace" type="xs:anyURI" use="optional"/> ! <xs:attribute name="base" type="xs:Name" use="optional"/> ! <xs:attribute name="value" type="xs:string" use="optional"/> ! </xs:complexType> ! <xs:simpleType name="occursType"> ! <xs:annotation> ! <xs:documentation>Occurs can be either of the DTD symbols '*','+', '?' or empty, or an occurance string similar to regex of the form '{' integer ',' integer '}'.</xs:documentation> ! </xs:annotation> ! <xs:restriction base="xs:string"> ! <xs:pattern value="(\*|\+|\?|\{\d*,\d*\})?"/> ! </xs:restriction> ! </xs:simpleType> ! <xs:complexType name="attribute"> ! <xs:annotation> ! <xs:documentation>Resolved attribute description</xs:documentation> ! </xs:annotation> ! <xs:all> ! <xs:element name="documentation" type="doc:documentationType" minOccurs="0"/> ! <xs:element name="simpleType" type="doc:modelType" minOccurs="0"/> ! </xs:all> ! <xs:attribute name="name" type="xs:NCName" use="required"/> ! <xs:attribute name="default" type="xs:string" use="optional"/> ! <xs:attribute name="fixed" type="xs:string" use="optional"/> ! <xs:attribute name="form" type="xs:string" use="optional"/> ! <xs:attribute name="id" use="optional"/> ! <xs:attribute name="ref" type="xs:NCName" use="optional"/> ! <xs:attribute name="base" type="xs:Name" use="optional"/> ! <xs:attribute name="type" type="xs:Name" use="optional"/> ! <xs:attribute name="use" type="xs:string" use="optional"/> ! <xs:attribute name="href" type="xs:anyURI" use="optional"/> ! </xs:complexType> ! <xs:complexType name="sourceType"> ! <xs:annotation> ! <xs:documentation>Container for the source of a schema component.</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded"> <xs:annotation> <xs:documentation>Original source of a schema component, formatted as HTML.</xs:documentation> </xs:annotation> ! </xs:any> ! </xs:sequence> ! </xs:complexType> ! <xs:complexType name="documentationType" mixed="true"> ! <xs:annotation> ! <xs:documentation>Container for the documentation of a schema component.</xs:documentation> ! </xs:annotation> ! <xs:sequence> ! <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"> ! <xs:annotation> ! <xs:documentation>Original documentation of a schema componentor abstract of original.</xs:documentation> ! </xs:annotation> ! </xs:any> ! </xs:sequence> ! </xs:complexType> ! <xs:complexType name="baseType"> ! <xs:annotation> ! <xs:documentation>Base type of type elements.</xs:documentation> ! </xs:annotation> ! <xs:attributeGroup ref="doc:attributes.type"/> ! <xs:attribute name="namespace" type="xs:anyURI" use="required"/> ! <xs:attribute name="derivation" type="xs:NCName" use="optional"/> ! </xs:complexType> ! <xs:complexType name="typeNode"> ! <xs:annotation> ! <xs:documentation>Node of a type hierarchy.</xs:documentation> ! </xs:annotation> ! <xs:complexContent> ! <xs:extension base="doc:baseType"> ! <xs:sequence> ! <xs:element name="type" type="doc:typeNode" minOccurs="0" maxOccurs="unbounded"> ! <xs:annotation> ! <xs:documentation>List of child nodes.</xs:documentation> ! </xs:annotation> ! </xs:element> ! </xs:sequence> ! </xs:extension> ! </xs:complexContent> ! </xs:complexType> ! <xs:simpleType name="componentTypeType"> ! <xs:annotation> ! <xs:documentation>Type attribute of a type element.</xs:documentation> ! </xs:annotation> ! <xs:restriction base="xs:NCName"> ! <xs:enumeration value="complexType"/> ! <xs:enumeration value="simpleType"/> ! <xs:enumeration value="element"/> ! <xs:enumeration value="attribute"/> ! <xs:enumeration value="group"/> ! <xs:enumeration value="attributeGroup"/> ! </xs:restriction> ! </xs:simpleType> ! <xs:attributeGroup name="attributes.type"> ! <xs:annotation> ! <xs:documentation>Common attributes of types.</xs:documentation> ! </xs:annotation> ! <xs:attribute name="name" type="xs:NCName" use="required"/> ! <xs:attribute name="type" type="doc:componentTypeType" use="optional"/> ! <xs:attribute name="href" type="xs:anyURI" use="optional"/> ! </xs:attributeGroup> </xs:schema> |
|
From: Kurt R. <kr...@us...> - 2005-05-10 16:22:48
|
Update of /cvsroot/xframe/xsddoc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19534 Modified Files: project.properties Log Message: adjusted to new behaviour of properties Index: project.properties =================================================================== RCS file: /cvsroot/xframe/xsddoc/project.properties,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** project.properties 9 May 2005 23:08:34 -0000 1.9 --- project.properties 10 May 2005 16:22:39 -0000 1.10 *************** *** 37,42 **** # ------------------------------------------------------------------- maven.xsddoc.src=samples ! maven.xsddoc.xsd.dest=${maven.docs.dest}/xsd-src maven.xsddoc.include=**/*.xsd maven.xsddoc.bottom=\ <font size="-1">\ --- 37,43 ---- # ------------------------------------------------------------------- maven.xsddoc.src=samples ! maven.xsddoc.xsd.dest=xsd-src maven.xsddoc.include=**/*.xsd + maven.xsddoc.xsd.include=**/*.xsd maven.xsddoc.bottom=\ <font size="-1">\ |
|
From: Kurt R. <kr...@us...> - 2005-05-10 16:22:00
|
Update of /cvsroot/xframe/maven-xsddoc-plugin/src/plugin-resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19296/src/plugin-resources Modified Files: xsddoc-report.jsl Log Message: changed the behaviour of some properties for better reports and to support multi-project builds Index: xsddoc-report.jsl =================================================================== RCS file: /cvsroot/xframe/maven-xsddoc-plugin/src/plugin-resources/xsddoc-report.jsl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** xsddoc-report.jsl 22 Dec 2004 15:24:23 -0000 1.7 --- xsddoc-report.jsl 10 May 2005 16:21:44 -0000 1.8 *************** *** 81,88 **** <tr> <td> ! <a target="_blank" href="../../${doc.attribute('schema').getValue()}">${doc.attribute('schema').getValue()}</a> </td> <td> ! <a target="_blank" href="xsddocs/${doc.attribute('report').getValue()}/index.html">documentation</a> </td> </tr> --- 81,88 ---- <tr> <td> ! <a target="_blank" href="./${doc.attribute('schema').getValue()}">${doc.attribute('schema').getValue()}</a> </td> <td> ! <a target="_blank" href="${maven.xsddoc.dest}/${doc.attribute('report').getValue()}/index.html">documentation</a> </td> </tr> *************** *** 107,120 **** <tr> <td> ! <a target="_blank" href="../../${doc.attribute('schema').getValue()}">${doc.attribute('schema').getValue()}</a> </td> <td> ! <a target="_blank" href="xsddocs/${doc.attribute('report').getValue()}/index.html">documentation</a> </td> <td> ! <a target="_blank" href="xsddocs/${doc.attribute('report').getValue()}-linkcheck.xml"><b>${doc.attribute('linkcheck').getValue()}</b></a> </td> <td> ! <a target="_blank" href="xsddocs/${doc.attribute('report').getValue()}.txt"><b>${doc.attribute('result').getValue()}</b></a> </td> </tr> --- 107,120 ---- <tr> <td> ! <a target="_blank" href="./${doc.attribute('schema').getValue()}">${doc.attribute('schema').getValue()}</a> </td> <td> ! <a target="_blank" href="${maven.xsddoc.dest}/${doc.attribute('report').getValue()}/index.html">documentation</a> </td> <td> ! <a target="_blank" href="${maven.xsddoc.dest}/${doc.attribute('report').getValue()}-linkcheck.xml"><b>${doc.attribute('linkcheck').getValue()}</b></a> </td> <td> ! <a target="_blank" href="${maven.xsddoc.dest}/${doc.attribute('report').getValue()}.txt"><b>${doc.attribute('result').getValue()}</b></a> </td> </tr> |
|
From: Kurt R. <kr...@us...> - 2005-05-10 16:21:59
|
Update of /cvsroot/xframe/maven-xsddoc-plugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19296 Modified Files: plugin.properties Log Message: changed the behaviour of some properties for better reports and to support multi-project builds Index: plugin.properties =================================================================== RCS file: /cvsroot/xframe/maven-xsddoc-plugin/plugin.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** plugin.properties 9 May 2005 23:02:52 -0000 1.4 --- plugin.properties 10 May 2005 16:21:45 -0000 1.5 *************** *** 28,33 **** maven.xsddoc.include=**/*.xsd maven.xsddoc.exclude= ! maven.xsddoc.dest=${maven.docs.dest}/xsddocs ! maven.xsddoc.xsd.dest=${maven.docs.dest}/xsd-src maven.xsddoc.summary=true maven.xsddoc.css= --- 28,35 ---- maven.xsddoc.include=**/*.xsd maven.xsddoc.exclude= ! maven.xsddoc.dest=xsddocs ! maven.xsddoc.xsd.dest=xsd-src ! maven.xsddoc.xsd.include=**/*.xsd ! maven.xsddoc.xsd.exclude= maven.xsddoc.summary=true maven.xsddoc.css= |
|
From: Kurt R. <kr...@us...> - 2005-05-10 16:21:56
|
Update of /cvsroot/xframe/maven-xsddoc-plugin/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19296/xdocs Modified Files: properties.xml Log Message: changed the behaviour of some properties for better reports and to support multi-project builds Index: properties.xml =================================================================== RCS file: /cvsroot/xframe/maven-xsddoc-plugin/xdocs/properties.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** properties.xml 26 Feb 2005 14:43:42 -0000 1.3 --- properties.xml 10 May 2005 16:21:45 -0000 1.4 *************** *** 86,89 **** --- 86,117 ---- </td> </tr> + <tr> + <td>maven.xsddoc.xsd.dest</td> + <td>Yes</td> + <td> + <p>Base target folder for schema files.</p> + <p>Default value is + <code>xsd</code>.</p> + </td> + </tr> + <tr> + <td>maven.xsddoc.xsd.include</td> + <td>Yes</td> + <td> + <p>Pattern of schema files to include, relative to + property <code>maven.xsddoc.src</code></p> + <p>Default value is + <code>**/*.xsd</code>.</p> + </td> + </tr> + <tr> + <td>maven.xsddoc.xsd.exclude</td> + <td>Yes</td> + <td> + <p>Pattern of schema files to exclude, relative to + property <code>maven.xsddoc.src</code></p> + <p>Default value is empty.</p> + </td> + </tr> </table> </section> |
|
From: Kurt R. <kr...@us...> - 2005-05-10 16:18:33
|
Update of /cvsroot/xframe/maven-xsddoc-plugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18199 Modified Files: plugin.jelly Log Message: fixed bug [1168954] Maven multiproject: no entry generated in Project Reports Index: plugin.jelly =================================================================== RCS file: /cvsroot/xframe/maven-xsddoc-plugin/plugin.jelly,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** plugin.jelly 9 May 2005 23:02:52 -0000 1.9 --- plugin.jelly 10 May 2005 16:17:51 -0000 1.10 *************** *** 29,35 **** <goal name="maven-xsddoc-plugin:register"> <!-- only register report, if at least one file exists on which the report may work. --> ! <u:available file="${maven.xsddoc.src}"> <ant:fileScanner var="xsdFiles"> ! <ant:fileset dir="${maven.xsddoc.src}"> <ant:patternset includes="${maven.xsddoc.include}"/> </ant:fileset> --- 29,35 ---- <goal name="maven-xsddoc-plugin:register"> <!-- only register report, if at least one file exists on which the report may work. --> ! <u:available file="${basedir}/${maven.xsddoc.src}"> <ant:fileScanner var="xsdFiles"> ! <ant:fileset dir="${basedir}/${maven.xsddoc.src}"> <ant:patternset includes="${maven.xsddoc.include}"/> </ant:fileset> *************** *** 52,62 **** description="Generate XML Schema documentation using xsddoc tool."> ${systemScope.setProperty('javax.xml.transform.TransformerFactory', 'org.apache.xalan.processor.TransformerFactoryImpl')} ! <ant:copy todir="${maven.xsddoc.xsd.dest}"> ! <ant:fileset dir="${maven.xsddoc.src}"> <ant:patternset includes="${maven.xsddoc.include}"/> </ant:fileset> </ant:copy> <ant:fileScanner var="xsdFiles"> ! <ant:fileset dir="${maven.xsddoc.src}"> <ant:patternset includes="${maven.xsddoc.include}"/> <ant:patternset excludes="${maven.xsddoc.exclude}"/> --- 52,62 ---- description="Generate XML Schema documentation using xsddoc tool."> ${systemScope.setProperty('javax.xml.transform.TransformerFactory', 'org.apache.xalan.processor.TransformerFactoryImpl')} ! <ant:copy todir="${maven.docs.dest}/${maven.xsddoc.xsd.dest}"> ! <ant:fileset dir="${basedir}/${maven.xsddoc.src}"> <ant:patternset includes="${maven.xsddoc.include}"/> </ant:fileset> </ant:copy> <ant:fileScanner var="xsdFiles"> ! <ant:fileset dir="${basedir}/${maven.xsddoc.src}"> <ant:patternset includes="${maven.xsddoc.include}"/> <ant:patternset excludes="${maven.xsddoc.exclude}"/> *************** *** 67,73 **** <xsddocs> <j:forEach var="file" items="${xsdFiles.iterator()}"> ! <j:set var="relpath" value="${file.getAbsolutePath().substring(size(srcbasepath)).substring(1)}"/> <j:set var="sourcefile" value="${srcbasepath}/${relpath}"/> ! <j:set var="targetpath" value="${maven.xsddoc.dest}/${relpath}"/> <j:set var="css" value="${maven.xsddoc.css}"/> <j:set var="header" value="${maven.xsddoc.header}"/> --- 67,73 ---- <xsddocs> <j:forEach var="file" items="${xsdFiles.iterator()}"> ! <j:set var="relpath" value="${file.getAbsolutePath().substring(size(srcbasepath)).substring(1).replaceAll('\\', '/')}"/> <j:set var="sourcefile" value="${srcbasepath}/${relpath}"/> ! <j:set var="targetpath" value="${maven.docs.dest}/${maven.xsddoc.dest}/${relpath}"/> <j:set var="css" value="${maven.xsddoc.css}"/> <j:set var="header" value="${maven.xsddoc.header}"/> *************** *** 112,128 **** <j:choose> <j:when test="${xsddocresult.indexOf('xsddoc failed with exception') > 0}"> ! <xsddoc schema="${maven.xsddoc.dest.xsd}/${relpath}" report="${relpath}" result="failed" linkcheck="${xsddoclinkcheck}"/> </j:when> <j:when test="${xsddocresult.indexOf('xsddoc caused a fatal error') > 0}"> ! <xsddoc schema="${maven.xsddoc.dest.xsd}/${relpath}" report="${relpath}" result="fatal error" linkcheck="${xsddoclinkcheck}"/> </j:when> <j:when test="${xsddocresult.indexOf('xsddoc caused an error') > 0}"> ! <xsddoc schema="${maven.xsddoc.dest.xsd}/${relpath}" report="${relpath}" result="error" linkcheck="${xsddoclinkcheck}"/> </j:when> <j:when test="${xsddocresult.indexOf('xsddoc caused a warning') > 0}"> ! <xsddoc schema="${maven.xsddoc.dest.xsd}/${relpath}" report="${relpath}" result="warning" linkcheck="${xsddoclinkcheck}"/> </j:when> <j:otherwise> ! <xsddoc schema="${maven.xsddoc.dest.xsd}/${relpath}" report="${relpath}" result="success" linkcheck="${xsddoclinkcheck}"/> </j:otherwise> </j:choose> --- 112,128 ---- <j:choose> <j:when test="${xsddocresult.indexOf('xsddoc failed with exception') > 0}"> ! <xsddoc schema="${maven.xsddoc.xsd.dest}/${relpath}" report="${relpath}" result="failed" linkcheck="${xsddoclinkcheck}"/> </j:when> <j:when test="${xsddocresult.indexOf('xsddoc caused a fatal error') > 0}"> ! <xsddoc schema="${maven.xsddoc.xsd.dest}/${relpath}" report="${relpath}" result="fatal error" linkcheck="${xsddoclinkcheck}"/> </j:when> <j:when test="${xsddocresult.indexOf('xsddoc caused an error') > 0}"> ! <xsddoc schema="${maven.xsddoc.xsd.dest}/${relpath}" report="${relpath}" result="error" linkcheck="${xsddoclinkcheck}"/> </j:when> <j:when test="${xsddocresult.indexOf('xsddoc caused a warning') > 0}"> ! <xsddoc schema="${maven.xsddoc.xsd.dest}/${relpath}" report="${relpath}" result="warning" linkcheck="${xsddoclinkcheck}"/> </j:when> <j:otherwise> ! <xsddoc schema="${maven.xsddoc.xsd.dest}/${relpath}" report="${relpath}" result="success" linkcheck="${xsddoclinkcheck}"/> </j:otherwise> </j:choose> *************** *** 140,146 **** <goal name="maven-xsddoc-plugin:deregister"> <!-- only deregister report, if at least one file exists on which the report has been invoked. --> ! <u:available file="${maven.xsddoc.src}"> <ant:fileScanner var="xsdFiles"> ! <ant:fileset dir="${maven.xsddoc.src}"> <ant:patternset includes="${maven.xsddoc.include}"/> </ant:fileset> --- 140,146 ---- <goal name="maven-xsddoc-plugin:deregister"> <!-- only deregister report, if at least one file exists on which the report has been invoked. --> ! <u:available file="${basedir}/${maven.xsddoc.src}"> <ant:fileScanner var="xsdFiles"> ! <ant:fileset dir="${basedir}/${maven.xsddoc.src}"> <ant:patternset includes="${maven.xsddoc.include}"/> </ant:fileset> |
|
From: Kurt R. <kr...@us...> - 2005-05-10 11:36:42
|
Update of /cvsroot/xframe/swing/src/net/sf/xframe/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15260/src/net/sf/xframe/swing Modified Files: JXTable.java Log Message: formatting Index: JXTable.java =================================================================== RCS file: /cvsroot/xframe/swing/src/net/sf/xframe/swing/JXTable.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** JXTable.java 10 May 2005 07:37:13 -0000 1.16 --- JXTable.java 10 May 2005 11:36:32 -0000 1.17 *************** *** 2741,2746 **** } - - /** * Adds the specified mouse listener to receive mouse events from this --- 2741,2744 ---- |
