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

r294 - in trunk: . src/main/java/org/nuiton/widget
by echatellier＠users.nuiton.org 05 Nov '10

05 Nov '10

Author: echatellier Date: 2010-11-05 13:25:29 +0100 (Fri, 05 Nov 2010) New Revision: 294 Url: http://nuiton.org/repositories/revision/nuiton-widgets/294 Log: Add deprecated on components depending on jgoodies or l2fprod Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/widget/Settings.java trunk/src/main/java/org/nuiton/widget/SwingUtil.java trunk/src/main/java/org/nuiton/widget/SwingWidgetFactory.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-05 11:51:05 UTC (rev 293) +++ trunk/pom.xml 2010-11-05 12:25:29 UTC (rev 294) @@ -27,10 +27,11 @@ <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4</version> + <version>1.4.1</version> <scope>compile</scope> </dependency> +  <dependency> <groupId>jgoodies</groupId> <artifactId>looks</artifactId> @@ -38,6 +39,7 @@ <scope>compile</scope> </dependency> +  <dependency> <groupId>org.nuiton.thirdparty</groupId> <artifactId>l2fprod-common</artifactId> Modified: trunk/src/main/java/org/nuiton/widget/Settings.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/Settings.java 2010-11-05 11:51:05 UTC (rev 293) +++ trunk/src/main/java/org/nuiton/widget/Settings.java 2010-11-05 12:25:29 UTC (rev 294) @@ -76,7 +76,10 @@ * @see com.jgoodies.plaf.FontSizeHints * @see com.jgoodies.plaf.HeaderStyle * @see com.jgoodies.plaf.Options + * + * @deprecated since 1.0.4 with no replacement (removed in 1.1) */ +@Deprecated public final class Settings { private LookAndFeel selectedLookAndFeel; Modified: trunk/src/main/java/org/nuiton/widget/SwingUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/SwingUtil.java 2010-11-05 11:51:05 UTC (rev 293) +++ trunk/src/main/java/org/nuiton/widget/SwingUtil.java 2010-11-05 12:25:29 UTC (rev 294) @@ -57,6 +57,10 @@ */ public class SwingUtil { + /** + * @deprecated since 1.0.4 with no replacement (removed in 1.1) + */ + @Deprecated public static void init() throws Exception { UIManager.put("ClassLoader", LookUtils.class.getClassLoader()); PlasticLookAndFeel.setMyCurrentTheme(new SkyBluerTahoma()); Modified: trunk/src/main/java/org/nuiton/widget/SwingWidgetFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/SwingWidgetFactory.java 2010-11-05 11:51:05 UTC (rev 293) +++ trunk/src/main/java/org/nuiton/widget/SwingWidgetFactory.java 2010-11-05 12:25:29 UTC (rev 294) @@ -83,7 +83,10 @@ /** * Creates and returns a <code>AbstractButton</code> + * + * @deprecated since 1.0.4, use swingx hyperlink component instead (removed in 1.1) */ + @Deprecated public static AbstractButton createHyperLinkButton(ApplicationAction action) { JLinkButton button = new JLinkButton(action); button.setText((String) action.getValue(AbstractAction.NAME)); @@ -120,7 +123,10 @@ /** * Creates and returns a <code>JToolBar</code> + * + * @deprecated since 1.0.4 with no replacement (removed in 1.1) */ + @Deprecated public static JToolBar createToolBar() { JToolBar toolBar = new JToolBar(); @@ -148,7 +154,10 @@ /** * Creates and returns a <code>JMenuBar</code> + * + * @deprecated since 1.0.4 with no replacement (removed in 1.1) */ + @Deprecated public static JMenuBar createMenuBar() { JMenuBar menuBar = new JMenuBar();

1 0

r293 - trunk/src/main/java/org/nuiton/widget
by echatellier＠users.nuiton.org 05 Nov '10

05 Nov '10

Author: echatellier Date: 2010-11-05 12:51:05 +0100 (Fri, 05 Nov 2010) New Revision: 293 Url: http://nuiton.org/repositories/revision/nuiton-widgets/293 Log: Add deprecated targeted as 1.1 Modified: trunk/src/main/java/org/nuiton/widget/DatePicker.java trunk/src/main/java/org/nuiton/widget/SwingWidgetFactory.java Modified: trunk/src/main/java/org/nuiton/widget/DatePicker.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/DatePicker.java 2010-11-05 11:46:57 UTC (rev 292) +++ trunk/src/main/java/org/nuiton/widget/DatePicker.java 2010-11-05 11:51:05 UTC (rev 293) @@ -31,6 +31,9 @@ import javax.swing.JTextField; +/** + * @deprecate since 1.0.4 will be remove in 1.1 use swingx date picker instead + */ @Deprecated public class DatePicker extends JTextField { Modified: trunk/src/main/java/org/nuiton/widget/SwingWidgetFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/SwingWidgetFactory.java 2010-11-05 11:46:57 UTC (rev 292) +++ trunk/src/main/java/org/nuiton/widget/SwingWidgetFactory.java 2010-11-05 11:51:05 UTC (rev 293) @@ -183,6 +183,9 @@ return menuItem; } + /** + * @deprecate since 1.0.4 will be remove in 1.1 use swingx date picker instead + */ @Deprecated public static DatePicker createDatePicker(DateFormat dateFormat) { return new DatePicker(dateFormat);

1 0

r292 - trunk/src/main/java/org/nuiton/widget
by echatellier＠users.nuiton.org 05 Nov '10

05 Nov '10

Author: echatellier Date: 2010-11-05 12:46:57 +0100 (Fri, 05 Nov 2010) New Revision: 292 Url: http://nuiton.org/repositories/revision/nuiton-widgets/292 Log: Add deprecated on component depending on lutin log Modified: trunk/src/main/java/org/nuiton/widget/ApplicationMonitor.java trunk/src/main/java/org/nuiton/widget/StatusBar.java Modified: trunk/src/main/java/org/nuiton/widget/ApplicationMonitor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/ApplicationMonitor.java 2010-11-04 15:22:38 UTC (rev 291) +++ trunk/src/main/java/org/nuiton/widget/ApplicationMonitor.java 2010-11-05 11:46:57 UTC (rev 292) @@ -91,6 +91,10 @@ import org.nuiton.log.LutinLogListener; import org.nuiton.log.LutinProgressEvent; +/** + * @deprecated since 1.0.4, will be removed in 1.1, depends on remove lutinlog + */ +@Deprecated public class ApplicationMonitor extends JPanel { private static final long serialVersionUID = 1L; Modified: trunk/src/main/java/org/nuiton/widget/StatusBar.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/StatusBar.java 2010-11-04 15:22:38 UTC (rev 291) +++ trunk/src/main/java/org/nuiton/widget/StatusBar.java 2010-11-05 11:46:57 UTC (rev 292) @@ -69,8 +69,9 @@ /** * TODO: renomer cette statusBar en autre chose, car son role est d'afficher des * messages par exemple StatusMessageBar ou StatusMessagePanel, ... - * @deprecated since 1.0.0-rc-3-SNAPSHOT, prefer use the jaxx version in jaxx-runtime-swing-widget module * + * @deprecated since 1.0.0-rc-3-SNAPSHOT, will be remove in 1.1 prefer use the jaxx version in jaxx-runtime-swing-widget module + * * The new classe is renamed jaxx.runtime.swing.StatusMessagePanel */ @Deprecated

1 0

r291 - trunk/src/main/java/org/nuiton/widget
by bpoussin＠users.nuiton.org 04 Nov '10

04 Nov '10

Author: bpoussin Date: 2010-11-04 16:22:38 +0100 (Thu, 04 Nov 2010) New Revision: 291 Url: http://nuiton.org/repositories/revision/nuiton-widgets/291 Log: second version without listener, that cause probleme and are not necessary for good usage Modified: trunk/src/main/java/org/nuiton/widget/SwingSession.java Modified: trunk/src/main/java/org/nuiton/widget/SwingSession.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/SwingSession.java 2010-11-04 15:08:51 UTC (rev 290) +++ trunk/src/main/java/org/nuiton/widget/SwingSession.java 2010-11-04 15:22:38 UTC (rev 291) @@ -17,8 +17,6 @@ import java.beans.Encoder; import java.beans.ExceptionListener; import java.beans.Expression; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.beans.XMLDecoder; import java.beans.XMLEncoder; import java.io.ByteArrayOutputStream; @@ -31,11 +29,9 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.Enumeration; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; -import javax.mail.Session; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JScrollPane; @@ -43,8 +39,6 @@ import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.JTextArea; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableColumn; import javax.swing.table.TableModel; @@ -59,10 +53,15 @@ * <li> javax.swing.JSplitPane (and subclasses) * <li> javax.swing.JTable (and subclasses) * - * You can use: + * usage: + * <li> create SwingSession object + * <li> add component that you want save * <li> explicite call to save - * <li> auto save * + * You can use same SwingSession for multiple window but in this case you must + * have setName for each window with different name, otherwize there are + * collision between window component and result is undetermisitic + * * This code is partialy inspired from http://kenai.com/projects/bsaf/pages/Home * project. This project is under LGPL v2.1 license. We can't reuse directly this * library because to many fields and methods are private and we can't implements @@ -232,20 +231,15 @@ registeredComponent.add(c); walkThrowComponent("", Collections.singleton(c), new RestoreStateAction()); - if (autoSave) { - // register do save if necessary - walkThrowComponent("", Collections.singleton(c), - new RegisterAsListenerAction()); - } } } + /** + * Remove component from component to save + * @param c + */ public void remove(Component c) { registeredComponent.remove(c); - if (autoSave) { - walkThrowComponent("/", Collections.singleton(c), - new UnregisterAsListenerAction()); - } } protected String getComponentName(Component c) { @@ -334,35 +328,10 @@ } } - static public class RegisterAsListenerAction implements Action { - @Override - public void doAction(SwingSession session, String path, Component c) { - State state = session.getStates(path); - if (state == null) { - State manager = session.getStateManager(c.getClass()); - state = manager.getState(c); - session.setStates(path, state); - } - state.addListener(c, state); - } - } - - static public class UnregisterAsListenerAction implements Action { - @Override - public void doAction(SwingSession session, String path, Component c) { - State state = session.getStates(path); - if (state != null) { - state.removeListener(c, state); - } - } - } - /** * get(save) and set(restore) state of object passed in argument */ static public interface State { - public void addListener(Object o, Object l); - public void removeListener(Object o, Object l); public State getState(Object o); public void setState(Object o, State state); } @@ -370,7 +339,7 @@ /** * State for JTabbedPane */ - static public class JTabbedPaneState implements State, ChangeListener { + static public class JTabbedPaneState implements State { protected int selectedIndex = -1; protected int tabCount; @@ -405,29 +374,14 @@ return (JTabbedPane) o; } - @Override - public void addListener(Object o, Object l) { - JTabbedPane p = checkComponent(o); - p.addChangeListener((ChangeListener)l); - } + public State getState(Object o) { + JTabbedPaneState result = new JTabbedPaneState(); - @Override - public void removeListener(Object o, Object l) { JTabbedPane p = checkComponent(o); - p.removeChangeListener((ChangeListener)l); - } + result.setSelectedIndex(p.getSelectedIndex()); + result.setTabCount(p.getTabCount()); - public void updateState(Object o, JTabbedPaneState state) { - JTabbedPane p = checkComponent(o); - state.setSelectedIndex(p.getSelectedIndex()); - state.setTabCount(p.getTabCount()); - } - - @Override - public State getState(Object o) { - JTabbedPaneState result = new JTabbedPaneState(); - updateState(o, result); return result; } @@ -447,19 +401,13 @@ throw new IllegalArgumentException("invalid state"); } } - - @Override - public void stateChanged(ChangeEvent e) { - updateState(e.getSource(), this); - } - } /** * State for JSplit * FIXME add listener for divider move action */ - static public class JSplitPaneState implements State, PropertyChangeListener { + static public class JSplitPaneState implements State { protected int dividerLocation = -1; protected int orientation = JSplitPane.HORIZONTAL_SPLIT; @@ -494,27 +442,13 @@ } @Override - public void addListener(Object o, Object l) { - throw new UnsupportedOperationException("Not supported yet."); - // FIXME poussin 20101104 est ce possible de se mettre listener - // pour recevoir les events de modification de la possition du split ? - } - - @Override - public void removeListener(Object o, Object l) { - throw new UnsupportedOperationException("Not supported yet."); - } - - protected void updateState(Object o, JSplitPaneState state) { + public State getState(Object o) { JSplitPane p = checkComponent(o); - state.setDividerLocation(p.getUI().getDividerLocation(p)); - state.setOrientation(p.getOrientation()); - } - @Override - public State getState(Object o) { JSplitPaneState result = new JSplitPaneState(); - updateState(o, result); + result.setDividerLocation(p.getUI().getDividerLocation(p)); + result.setOrientation(p.getOrientation()); + return result; } @@ -534,19 +468,13 @@ throw new IllegalArgumentException("invalid state"); } } - - @Override - public void propertyChange(PropertyChangeEvent evt) { - throw new UnsupportedOperationException("Not supported yet."); - } - } /** * State for JTable. * TODO add support for column order change */ - static public class JTableState implements State, PropertyChangeListener { + static public class JTableState implements State { protected int[] columnWidths = new int[0]; @@ -576,26 +504,8 @@ } @Override - public void addListener(Object o, Object l) { + public State getState(Object o) { JTable table = checkComponent(o); - for (Enumeration<TableColumn> tc = - table.getColumnModel().getColumns(); tc.hasMoreElements();) { - // on se met listener pour recevoir les events de resize - tc.nextElement().addPropertyChangeListener(this); - } - } - - @Override - public void removeListener(Object o, Object l) { - JTable table = checkComponent(o); - for (Enumeration<TableColumn> tc = - table.getColumnModel().getColumns(); tc.hasMoreElements();) { - tc.nextElement().removePropertyChangeListener(this); - } - } - - public void updateState(Object o, JTableState state) { - JTable table = checkComponent(o); int[] columnWidths = new int[table.getColumnCount()]; boolean resizableColumnExists = false; for (int i = 0; i < columnWidths.length; i++) { @@ -605,15 +515,11 @@ resizableColumnExists = true; } } + JTableState result = null; if (resizableColumnExists) { - state.setColumnWidths(columnWidths); + result = new JTableState(); + result.setColumnWidths(columnWidths); } - } - - @Override - public State getState(Object o) { - JTableState result = new JTableState(columnWidths); - updateState(o, result); return result; } @@ -636,18 +542,12 @@ } } } - - @Override - public void propertyChange(PropertyChangeEvent evt) { - updateState(evt.getSource(), this); - } - } /** * State for Window */ - static public class WindowState implements State, PropertyChangeListener { + static public class WindowState implements State { private static final String WINDOW_STATE_NORMAL_BOUNDS = "WindowState.normalBounds"; @@ -759,25 +659,7 @@ } @Override - public void addListener(Object o, Object l) { - Window w = checkComponent(o); - w.addPropertyChangeListener("extendedState", (PropertyChangeListener)l); - w.addPropertyChangeListener("bounds", (PropertyChangeListener)l); - } - - @Override - public void removeListener(Object o, Object l) { - Window w = checkComponent(o); - w.removePropertyChangeListener("extendedState", (PropertyChangeListener)l); - w.removePropertyChangeListener("bounds", (PropertyChangeListener)l); - } - - @Override - public void propertyChange(PropertyChangeEvent evt) { - updateState(evt.getSource(), this); - } - - protected void updateState(Object o, WindowState state) { + public State getState(Object o) { Window c = checkComponent(o); int frameState = Frame.NORMAL; if (c instanceof Frame) { @@ -793,18 +675,14 @@ if ((c instanceof JFrame) && (0 != (frameState & Frame.MAXIMIZED_BOTH))) { frameBounds = getWindowNormalBounds((JFrame) c); } - if (frameBounds.isEmpty()) { - return; + WindowState result = null; + if (!frameBounds.isEmpty()) { + result = new WindowState(); + result.setBounds(frameBounds); + result.setGcBounds(gcBounds); + result.setFrameState(frameState); } - state.setBounds(frameBounds); - state.setGcBounds(gcBounds); - state.setFrameState(frameState); - } - @Override - public State getState(Object o) { - WindowState result = new WindowState(); - updateState(o, result); return result; }

1 0

r290 - trunk/src/main/java/org/nuiton/widget
by bpoussin＠users.nuiton.org 04 Nov '10

04 Nov '10

Author: bpoussin Date: 2010-11-04 16:08:51 +0100 (Thu, 04 Nov 2010) New Revision: 290 Url: http://nuiton.org/repositories/revision/nuiton-widgets/290 Log: first version of save/restore of swing UI Added: trunk/src/main/java/org/nuiton/widget/SwingSession.java Added: trunk/src/main/java/org/nuiton/widget/SwingSession.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/SwingSession.java (rev 0) +++ trunk/src/main/java/org/nuiton/widget/SwingSession.java 2010-11-04 15:08:51 UTC (rev 290) @@ -0,0 +1,904 @@ +package org.nuiton.widget; + + +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dialog; +import java.awt.Frame; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsDevice; +import java.awt.GraphicsEnvironment; +import java.awt.Rectangle; +import java.awt.Window; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.beans.DefaultPersistenceDelegate; +import java.beans.Encoder; +import java.beans.ExceptionListener; +import java.beans.Expression; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.beans.XMLDecoder; +import java.beans.XMLEncoder; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import javax.mail.Session; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JScrollPane; +import javax.swing.JSplitPane; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JTextArea; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.table.AbstractTableModel; +import javax.swing.table.TableColumn; +import javax.swing.table.TableModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Use to store and restore position and size of application. Supported widgets + * are: + * <li> java.awt.Window (and subclasses) + * <li> javax.swing.JTabbedPane (and subclasses) + * <li> javax.swing.JSplitPane (and subclasses) + * <li> javax.swing.JTable (and subclasses) + * + * You can use: + * <li> explicite call to save + * <li> auto save + * + * This code is partialy inspired from http://kenai.com/projects/bsaf/pages/Home + * project. This project is under LGPL v2.1 license. We can't reuse directly this + * library because to many fields and methods are private and we can't implements + * it and modify some behavior. + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class SwingSession { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(SwingSession.class); + + protected File file; + protected boolean autoSave; + protected LinkedHashSet<Component> registeredComponent = + new LinkedHashSet<Component>(); + /** State object registered to get and set State. + * key: class of component managed by the state; value: the state*/ + protected Map<Class, State> stateManager = new HashMap<Class, State>(); + /** state of all component added with add method. + * key: path of compoenent; value: State */ + protected Map<String, State> states; + + public SwingSession(File file, boolean autoSave) { + this.file = file; + this.autoSave = autoSave; + stateManager.put(Window.class, new WindowState()); + stateManager.put(JTable.class, new JTableState()); + stateManager.put(JTabbedPane.class, new JTabbedPaneState()); + stateManager.put(JSplitPane.class, new JSplitPaneState()); + + states = loadStates(file); + if (states == null) { + states = new HashMap<String, State>(); + } + } + + @Override + protected void finalize() throws Throwable { + save(); + super.finalize(); + } + + + /* If an exception occurs in the XMLEncoder/Decoder, we want + * to throw an IOException. The exceptionThrow listener method + * doesn't throw a checked exception so we just set a flag + * here and check it when the encode/decode operation finishes + */ + private static class AbortExceptionListener implements ExceptionListener { + + public Exception exception = null; + + @Override + public void exceptionThrown(Exception e) { + if (exception == null) { + exception = e; + } + } + } + + /* There are some (old) Java classes that aren't proper beans. Rectangle + * is one of these. When running within the secure sandbox, writing a + * Rectangle with XMLEncoder causes a security exception because + * DefaultPersistenceDelegate calls Field.setAccessible(true) to gain + * access to private fields. This is a workaround for that problem. + * A bug has been filed, see JDK bug ID 4741757 + */ + private static class RectanglePD extends DefaultPersistenceDelegate { + + public RectanglePD() { + super(new String[]{"x", "y", "width", "height"}); + } + + @Override + protected Expression instantiate(Object oldInstance, Encoder out) { + Rectangle oldR = (Rectangle) oldInstance; + Object[] constructorArgs = new Object[]{ + oldR.x, oldR.y, oldR.width, oldR.height + }; + return new Expression(oldInstance, oldInstance.getClass(), "new", constructorArgs); + } + } + + public void save() { + updateState(); + AbortExceptionListener el = new AbortExceptionListener(); + ByteArrayOutputStream bst = new ByteArrayOutputStream(); + XMLEncoder e = null; + /* Buffer the XMLEncoder's output so that decoding errors don't + * cause us to trash the current version of the specified file. + */ + try { + e = new XMLEncoder(bst); + e.setPersistenceDelegate(Rectangle.class, new RectanglePD()); + e.setExceptionListener(el); + e.writeObject(states); + } finally { + if (e != null) { + e.close(); + } + } + if (el.exception != null) { + log.warn("save failed \"" + file + "\"", el.exception); + } else { + OutputStream ost = null; + try { + ost = new FileOutputStream(file); + ost.write(bst.toByteArray()); + } catch (IOException eee) { + log.warn("save failed \"" + file + "\"", eee); + } finally { + if (ost != null) { + try { + ost.close(); + } catch (IOException eee) { + log.warn("can't close properly \"" + file + "\"", eee); + } + } + } + } + } + + /** + * Loads the states from the file + */ + public Map<String, State> loadStates(File file) { + Map<String, State> result = null; + if (file.exists()) { + XMLDecoder d = null; + try { + InputStream ist = new FileInputStream(file); + d = new XMLDecoder(ist); + AbortExceptionListener eee = new AbortExceptionListener(); + d.setExceptionListener(eee); + Object bean = d.readObject(); + if (eee.exception != null) { + log.warn("load failed \"" + file + "\"", eee.exception); + } else { + result = (Map<String, State>) bean; + } + } catch (IOException eee) { + log.warn("load failed \"" + file + "\"", eee); + } finally { + if (d != null) { + d.close(); + } + } + } + return result; + } + + public void updateState() { + walkThrowComponent("", registeredComponent, + new SaveStateAction()); + } + + public void add(Component c) { + if (registeredComponent.contains(c)) { + log.warn(String.format( + "Component already added %s(%s)", c.getClass(), c.getName())); + } else { + registeredComponent.add(c); + walkThrowComponent("", Collections.singleton(c), + new RestoreStateAction()); + if (autoSave) { + // register do save if necessary + walkThrowComponent("", Collections.singleton(c), + new RegisterAsListenerAction()); + } + } + } + + public void remove(Component c) { + registeredComponent.remove(c); + if (autoSave) { + walkThrowComponent("/", Collections.singleton(c), + new UnregisterAsListenerAction()); + } + } + + protected String getComponentName(Component c) { + String name = c.getName(); + if (name == null) { + int n = c.getParent().getComponentZOrder(c); + if (n >= 0) { + Class clazz = c.getClass(); + name = clazz.getSimpleName(); + if (name.length() == 0) { + name = "Anonymous" + clazz.getSuperclass().getSimpleName(); + } + name = name + n; + } else { + // Implies that the component tree is changing + // while we're computing the path. Punt. + log.warn("Couldn't compute pathname for " + c); + } + } + return name; + } + + public State getStateManager(Class clazz) { + State result = null; + while (result == null && clazz != null) { + result = stateManager.get(clazz); + clazz = clazz.getSuperclass(); + } + return result; + } + + public State getStates(String path) { + return states.get(path); + } + + public void setStates(String path, State state) { + this.states.put(path, state); + } + + protected void walkThrowComponent( + String path, Collection<Component> roots, Action action) { + for (Component root : roots) { + if (root != null) { + String pathname = path + "/" + getComponentName(root); + State state = getStateManager(root.getClass()); + if (state != null) { + action.doAction(this, pathname, root); + } + if (root instanceof Container) { + Component[] children = ((Container) root).getComponents(); + if ((children != null) && (children.length > 0)) { + walkThrowComponent(pathname, Arrays.asList(children), action); + } + } + if (root instanceof JFrame) { + Component[] children = ((JFrame) root).getContentPane().getComponents(); + if ((children != null) && (children.length > 0)) { + walkThrowComponent(pathname, Arrays.asList(children), action); + } + } + } + } + } + + static public interface Action { + public void doAction(SwingSession session, String path, Component c); + } + + static public class SaveStateAction implements Action { + @Override + public void doAction(SwingSession session, String path, Component c) { + State manager = session.getStateManager(c.getClass()); + State state = manager.getState(c); + session.setStates(path, state); + } + } + + static public class RestoreStateAction implements Action { + @Override + public void doAction(SwingSession session, String path, Component c) { + State manager = session.getStateManager(c.getClass()); + State state = session.getStates(path); + if (state != null) { + manager.setState(c, state); + } + } + } + + static public class RegisterAsListenerAction implements Action { + @Override + public void doAction(SwingSession session, String path, Component c) { + State state = session.getStates(path); + if (state == null) { + State manager = session.getStateManager(c.getClass()); + state = manager.getState(c); + session.setStates(path, state); + } + state.addListener(c, state); + } + } + + static public class UnregisterAsListenerAction implements Action { + @Override + public void doAction(SwingSession session, String path, Component c) { + State state = session.getStates(path); + if (state != null) { + state.removeListener(c, state); + } + } + } + + /** + * get(save) and set(restore) state of object passed in argument + */ + static public interface State { + public void addListener(Object o, Object l); + public void removeListener(Object o, Object l); + public State getState(Object o); + public void setState(Object o, State state); + } + + /** + * State for JTabbedPane + */ + static public class JTabbedPaneState implements State, ChangeListener { + + protected int selectedIndex = -1; + protected int tabCount; + + public JTabbedPaneState() { + } + + public int getSelectedIndex() { + return selectedIndex; + } + + public void setSelectedIndex(int selectedIndex) { + this.selectedIndex = selectedIndex; + } + + public int getTabCount() { + return tabCount; + } + + public void setTabCount(int tabCount) { + this.tabCount = tabCount; + } + + + protected JTabbedPane checkComponent(Object o) { + if (o == null) { + throw new IllegalArgumentException("null component"); + } + if (!(o instanceof JTabbedPane)) { + throw new IllegalArgumentException("invalid component"); + } + return (JTabbedPane) o; + } + + + @Override + public void addListener(Object o, Object l) { + JTabbedPane p = checkComponent(o); + p.addChangeListener((ChangeListener)l); + } + + @Override + public void removeListener(Object o, Object l) { + JTabbedPane p = checkComponent(o); + p.removeChangeListener((ChangeListener)l); + } + + public void updateState(Object o, JTabbedPaneState state) { + JTabbedPane p = checkComponent(o); + state.setSelectedIndex(p.getSelectedIndex()); + state.setTabCount(p.getTabCount()); + } + + @Override + public State getState(Object o) { + JTabbedPaneState result = new JTabbedPaneState(); + updateState(o, result); + return result; + } + + @Override + public void setState(Object o, State state) { + if (state == null) { + return; + } + if (state instanceof JTabbedPaneState) { + JTabbedPane p = checkComponent(o); + JTabbedPaneState tps = (JTabbedPaneState) state; + if (tps.getSelectedIndex() != -1 + && p.getTabCount() == tps.getTabCount()) { + p.setSelectedIndex(tps.getSelectedIndex()); + } + } else { + throw new IllegalArgumentException("invalid state"); + } + } + + @Override + public void stateChanged(ChangeEvent e) { + updateState(e.getSource(), this); + } + + } + + /** + * State for JSplit + * FIXME add listener for divider move action + */ + static public class JSplitPaneState implements State, PropertyChangeListener { + + protected int dividerLocation = -1; + protected int orientation = JSplitPane.HORIZONTAL_SPLIT; + + public JSplitPaneState() { + } + + public int getDividerLocation() { + return dividerLocation; + } + + public void setDividerLocation(int dividerLocation) { + this.dividerLocation = dividerLocation; + } + + public int getOrientation() { + return orientation; + } + + public void setOrientation(int orientation) { + this.orientation = orientation; + } + + protected JSplitPane checkComponent(Object o) { + if (o == null) { + throw new IllegalArgumentException("null component"); + } + if (!(o instanceof JSplitPane)) { + throw new IllegalArgumentException("invalid component"); + } + return (JSplitPane) o; + } + + @Override + public void addListener(Object o, Object l) { + throw new UnsupportedOperationException("Not supported yet."); + // FIXME poussin 20101104 est ce possible de se mettre listener + // pour recevoir les events de modification de la possition du split ? + } + + @Override + public void removeListener(Object o, Object l) { + throw new UnsupportedOperationException("Not supported yet."); + } + + protected void updateState(Object o, JSplitPaneState state) { + JSplitPane p = checkComponent(o); + state.setDividerLocation(p.getUI().getDividerLocation(p)); + state.setOrientation(p.getOrientation()); + } + + @Override + public State getState(Object o) { + JSplitPaneState result = new JSplitPaneState(); + updateState(o, result); + return result; + } + + @Override + public void setState(Object o, State state) { + if (state == null) { + return; + } + JSplitPane p = checkComponent(o); + if (state instanceof JSplitPaneState) { + JSplitPaneState sps = (JSplitPaneState) state; + if (sps.getDividerLocation() != -1 + && p.getOrientation() == sps.getOrientation()) { + p.setDividerLocation(sps.getDividerLocation()); + } + } else { + throw new IllegalArgumentException("invalid state"); + } + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + throw new UnsupportedOperationException("Not supported yet."); + } + + } + + /** + * State for JTable. + * TODO add support for column order change + */ + static public class JTableState implements State, PropertyChangeListener { + + protected int[] columnWidths = new int[0]; + + public JTableState() { + } + + public JTableState(int[] columnWidths) { + this.columnWidths = columnWidths; + } + + public int[] getColumnWidths() { + return columnWidths; + } + + public void setColumnWidths(int[] columnWidths) { + this.columnWidths = columnWidths; + } + + protected JTable checkComponent(Object o) { + if (o == null) { + throw new IllegalArgumentException("null component"); + } + if (!(o instanceof JTable)) { + throw new IllegalArgumentException("invalid component"); + } + return (JTable) o; + } + + @Override + public void addListener(Object o, Object l) { + JTable table = checkComponent(o); + for (Enumeration<TableColumn> tc = + table.getColumnModel().getColumns(); tc.hasMoreElements();) { + // on se met listener pour recevoir les events de resize + tc.nextElement().addPropertyChangeListener(this); + } + } + + @Override + public void removeListener(Object o, Object l) { + JTable table = checkComponent(o); + for (Enumeration<TableColumn> tc = + table.getColumnModel().getColumns(); tc.hasMoreElements();) { + tc.nextElement().removePropertyChangeListener(this); + } + } + + public void updateState(Object o, JTableState state) { + JTable table = checkComponent(o); + int[] columnWidths = new int[table.getColumnCount()]; + boolean resizableColumnExists = false; + for (int i = 0; i < columnWidths.length; i++) { + TableColumn tc = table.getColumnModel().getColumn(i); + columnWidths[i] = (tc.getResizable()) ? tc.getWidth() : -1; + if (tc.getResizable()) { + resizableColumnExists = true; + } + } + if (resizableColumnExists) { + state.setColumnWidths(columnWidths); + } + } + + @Override + public State getState(Object o) { + JTableState result = new JTableState(columnWidths); + updateState(o, result); + return result; + } + + @Override + public void setState(Object o, State state) { + if (!(state instanceof JTableState)) { + throw new IllegalArgumentException("invalid state"); + } + JTable table = checkComponent(o); + int[] columnWidths = ((JTableState) state).getColumnWidths(); + if (columnWidths != null + && table.getColumnCount() == columnWidths.length) { + for (int i = 0; i < columnWidths.length; i++) { + if (columnWidths[i] != -1) { + TableColumn tc = table.getColumnModel().getColumn(i); + if (tc.getResizable()) { + tc.setPreferredWidth(columnWidths[i]); + } + } + } + } + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + updateState(evt.getSource(), this); + } + + } + + /** + * State for Window + */ + static public class WindowState implements State, PropertyChangeListener { + private static final String WINDOW_STATE_NORMAL_BOUNDS = + "WindowState.normalBounds"; + + protected Rectangle bounds; + protected Rectangle gcBounds; + protected int frameState = Frame.NORMAL; + + public WindowState() { + } + + public WindowState(Rectangle bounds, Rectangle gcBounds, int frameState) { + this.bounds = new Rectangle(bounds); + this.gcBounds = new Rectangle(gcBounds); + this.frameState = frameState; + } + + public Rectangle getBounds() { + return bounds; + } + + public void setBounds(Rectangle bounds) { + this.bounds = bounds; + } + + public Rectangle getGcBounds() { + return gcBounds; + } + + public void setGcBounds(Rectangle gcBounds) { + this.gcBounds = gcBounds; + } + + public int getFrameState() { + return frameState; + } + + public void setFrameState(int frameState) { + this.frameState = frameState; + } + + protected Window checkComponent(Object o) { + if (o == null) { + throw new IllegalArgumentException("null component"); + } + if (!(o instanceof Window)) { + throw new IllegalArgumentException("invalid component"); + } + return (Window) o; + } + + /** + * Checks whether the window supports resizing + * @param window the {@code Window} to be checked + * @return true if the window supports resizing + */ + protected static boolean isResizable(Window window) { + boolean resizable = true; + if (window instanceof Frame) { + resizable = ((Frame) window).isResizable(); + } else if (window instanceof Dialog) { + resizable = ((Dialog) window).isResizable(); + } + return resizable; + } + + /** + * Gets {@code Window} bounds from the client property + * @param window the source {@code Window} + * @return bounds from the client property + */ + protected static Rectangle getWindowNormalBounds(Window window) { + Rectangle result = null; + if (window instanceof JFrame) { + Object res = ((JFrame) window).getRootPane().getClientProperty( + WINDOW_STATE_NORMAL_BOUNDS); + if (res instanceof Rectangle) { + result = (Rectangle) res; + } + } + return result; + } + + /** + * Calculates virtual graphic bounds. + * On multiscreen systems all screens are united into one virtual screen. + * @return the graphic bounds + */ + public static Rectangle computeVirtualGraphicsBounds() { + Rectangle virtualBounds = new Rectangle(); + GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); + GraphicsDevice[] gs = ge.getScreenDevices(); + for (GraphicsDevice gd : gs) { + GraphicsConfiguration gc = gd.getDefaultConfiguration(); + virtualBounds = virtualBounds.union(gc.getBounds()); + } + return virtualBounds; + } + + /** + * Puts {@code Window} bounds to client property. + * @param window the target {@code Window} + * @param bounds bounds + */ + public static void putWindowNormalBounds(Window window, Rectangle bounds) { + if (window instanceof JFrame) { + ((JFrame) window).getRootPane().putClientProperty( + WINDOW_STATE_NORMAL_BOUNDS, bounds); + } + } + + @Override + public void addListener(Object o, Object l) { + Window w = checkComponent(o); + w.addPropertyChangeListener("extendedState", (PropertyChangeListener)l); + w.addPropertyChangeListener("bounds", (PropertyChangeListener)l); + } + + @Override + public void removeListener(Object o, Object l) { + Window w = checkComponent(o); + w.removePropertyChangeListener("extendedState", (PropertyChangeListener)l); + w.removePropertyChangeListener("bounds", (PropertyChangeListener)l); + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + updateState(evt.getSource(), this); + } + + protected void updateState(Object o, WindowState state) { + Window c = checkComponent(o); + int frameState = Frame.NORMAL; + if (c instanceof Frame) { + frameState = ((Frame) c).getExtendedState(); + } + GraphicsConfiguration gc = c.getGraphicsConfiguration(); + Rectangle gcBounds = (gc == null) ? null : gc.getBounds(); + Rectangle frameBounds = c.getBounds(); + /* If this is a JFrame created by FrameView and it's been maximized, + * retrieve the frame's normal (not maximized) bounds. More info: + * see FrameStateListener#windowStateChanged in FrameView. + */ + if ((c instanceof JFrame) && (0 != (frameState & Frame.MAXIMIZED_BOTH))) { + frameBounds = getWindowNormalBounds((JFrame) c); + } + if (frameBounds.isEmpty()) { + return; + } + state.setBounds(frameBounds); + state.setGcBounds(gcBounds); + state.setFrameState(frameState); + } + + @Override + public State getState(Object o) { + WindowState result = new WindowState(); + updateState(o, result); + return result; + } + + @Override + public void setState(Object o, State state) { + Window w = checkComponent(o); + if ((state != null) && !(state instanceof WindowState)) { + throw new IllegalArgumentException("invalid state"); + } + WindowState windowState = (WindowState) state; + if (windowState.getBounds() != null) { + putWindowNormalBounds(w, windowState.getBounds()); + if (!w.isLocationByPlatform() && (state != null)) { + + Rectangle gcBounds0 = windowState.getGcBounds(); + if (gcBounds0 != null && isResizable(w)) { + if (computeVirtualGraphicsBounds().contains(gcBounds0.getLocation())) { + w.setBounds(windowState.getBounds()); + } else { + w.setSize(windowState.getBounds().getSize()); + } + } + if (w instanceof Frame) { + ((Frame) w).setExtendedState(windowState.getFrameState()); + + } + } + } + } + + } + + + /** + * Just for test rapidly + * @param args + */ + static public void main(String[] args) { + final SwingSession session = + new SwingSession(new File("/tmp/SwingSession.config"), false); + + JFrame frame = new JFrame("truc"); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setBounds(10, 20, 300, 500); + + TableModel dataModel = new AbstractTableModel() { + + @Override + public String getColumnName(int column) { + return "c" + column; + } + + @Override + public int getColumnCount() { + return 5; + } + + @Override + public int getRowCount() { + return 10; + } + + @Override + public Object getValueAt(int row, int col) { + return new Integer(row * col); + } + }; + JTable table = new JTable(dataModel); + table.setName("MaTable"); + + JTabbedPane tab = new JTabbedPane(); + tab.setName("MaTab"); + tab.add("tab1", new JTextArea()); + tab.add("tab2", new JTextArea()); + tab.add("tab3", new JTextArea()); + + JSplitPane split = new JSplitPane(); + split.setTopComponent(new JScrollPane(table)); + split.setBottomComponent(tab); + + JButton button = new JButton("Save"); + button.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + session.save(); + } + }); + + frame.getContentPane().setLayout(new BorderLayout()); + frame.getContentPane().add(button, BorderLayout.NORTH); + frame.getContentPane().add(split, BorderLayout.CENTER); + + frame.setVisible(true); + session.add(frame); + session.save(); + } +}

1 0

r289 - in trunk/src/main/java/org/nuiton/widget: datatips tooltip
by sletellier＠users.nuiton.org 02 Nov '10

02 Nov '10

Author: sletellier Date: 2010-11-02 16:07:38 +0100 (Tue, 02 Nov 2010) New Revision: 289 Url: http://nuiton.org/repositories/revision/nuiton-widgets/289 Log: Replace License-Ignore by Ignore-License Modified: trunk/src/main/java/org/nuiton/widget/datatips/DataTipCell.java trunk/src/main/java/org/nuiton/widget/datatips/DataTipComponent.java trunk/src/main/java/org/nuiton/widget/datatips/DataTipListener.java trunk/src/main/java/org/nuiton/widget/datatips/DataTipManager.java trunk/src/main/java/org/nuiton/widget/datatips/DataTipPopup.java trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipCell.java trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipListener.java trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipCell.java trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipListener.java trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipCell.java trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipListener.java trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java trunk/src/main/java/org/nuiton/widget/tooltip/SizeGrip.java trunk/src/main/java/org/nuiton/widget/tooltip/TipUtil.java trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java Modified: trunk/src/main/java/org/nuiton/widget/datatips/DataTipCell.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/DataTipCell.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/datatips/DataTipCell.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * Modified: trunk/src/main/java/org/nuiton/widget/datatips/DataTipComponent.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/DataTipComponent.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/datatips/DataTipComponent.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * Modified: trunk/src/main/java/org/nuiton/widget/datatips/DataTipListener.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/DataTipListener.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/datatips/DataTipListener.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * Modified: trunk/src/main/java/org/nuiton/widget/datatips/DataTipManager.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/DataTipManager.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/datatips/DataTipManager.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * Modified: trunk/src/main/java/org/nuiton/widget/datatips/DataTipPopup.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/DataTipPopup.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/datatips/DataTipPopup.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * Modified: trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipCell.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipCell.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipCell.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * Modified: trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipListener.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipListener.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipListener.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * Modified: trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipCell.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipCell.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipCell.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * Modified: trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipListener.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipListener.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipListener.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * Modified: trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipCell.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipCell.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipCell.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * Modified: trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipListener.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipListener.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipListener.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * Modified: trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * 07/29/2009 * Modified: trunk/src/main/java/org/nuiton/widget/tooltip/SizeGrip.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/SizeGrip.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/tooltip/SizeGrip.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * 12/23/2008 * Modified: trunk/src/main/java/org/nuiton/widget/tooltip/TipUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/TipUtil.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/tooltip/TipUtil.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * 08/13/2009 * Modified: trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java 2010-11-02 14:06:00 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java 2010-11-02 15:07:38 UTC (rev 289) @@ -1,5 +1,5 @@ /* - * %%License-Ignore + * %%Ignore-License * * 07/29/2009 *

1 0

r288 - in trunk: . src/license src/main/assembly src/main/java/org/nuiton/widget src/main/java/org/nuiton/widget/datatips src/main/java/org/nuiton/widget/editor src/main/java/org/nuiton/widget/tooltip src/main/java/org/nuiton/widget/tree src/main/resources src/main/resources/i18n src/site src/site/rst src/site/rst/components src/test/java/org/nuiton/widget src/test/java/org/nuiton/widget/editor src/test/resources
by sletellier＠users.nuiton.org 02 Nov '10

02 Nov '10

Author: sletellier Date: 2010-11-02 15:06:00 +0100 (Tue, 02 Nov 2010) New Revision: 288 Url: http://nuiton.org/repositories/revision/nuiton-widgets/288 Log: - Update header licences - Evol 963 : Add menu to allow to copy content from a FocusableTip - Depreciate date picker class Added: trunk/src/main/resources/copy.png Modified: trunk/pom.xml trunk/src/license/THIRD-PARTY.properties trunk/src/main/assembly/deps.xml trunk/src/main/assembly/full.xml trunk/src/main/java/org/nuiton/widget/AboutFrame.java trunk/src/main/java/org/nuiton/widget/ApplicationAction.java trunk/src/main/java/org/nuiton/widget/ApplicationMonitor.java trunk/src/main/java/org/nuiton/widget/CustomFocusTraversalPolicy.java trunk/src/main/java/org/nuiton/widget/DatePicker.java trunk/src/main/java/org/nuiton/widget/GridFlowLayout.java trunk/src/main/java/org/nuiton/widget/IconFactory.java trunk/src/main/java/org/nuiton/widget/InvalidDateException.java trunk/src/main/java/org/nuiton/widget/JComboBoxAutoCompletionKit.java trunk/src/main/java/org/nuiton/widget/Mailor.java trunk/src/main/java/org/nuiton/widget/MessageDialog.java trunk/src/main/java/org/nuiton/widget/Settings.java trunk/src/main/java/org/nuiton/widget/SimpleInternalFrame.java trunk/src/main/java/org/nuiton/widget/SplashScreen.java trunk/src/main/java/org/nuiton/widget/StatusBar.java trunk/src/main/java/org/nuiton/widget/SwingUtil.java trunk/src/main/java/org/nuiton/widget/SwingWidgetFactory.java trunk/src/main/java/org/nuiton/widget/SwitchPane.java trunk/src/main/java/org/nuiton/widget/UIFSplitPane.java trunk/src/main/java/org/nuiton/widget/WidgetUtil.java trunk/src/main/java/org/nuiton/widget/XMLGridLayout.java trunk/src/main/java/org/nuiton/widget/XMLGridParseConstraints.java trunk/src/main/java/org/nuiton/widget/datatips/DataTipCell.java trunk/src/main/java/org/nuiton/widget/datatips/DataTipComponent.java trunk/src/main/java/org/nuiton/widget/datatips/DataTipListener.java trunk/src/main/java/org/nuiton/widget/datatips/DataTipManager.java trunk/src/main/java/org/nuiton/widget/datatips/DataTipPopup.java trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipCell.java trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipListener.java trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipCell.java trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipListener.java trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipCell.java trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipListener.java trunk/src/main/java/org/nuiton/widget/datatips/package-info.java trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java trunk/src/main/java/org/nuiton/widget/editor/Editor.java trunk/src/main/java/org/nuiton/widget/editor/EditorHelper.java trunk/src/main/java/org/nuiton/widget/editor/EditorInterface.java trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java trunk/src/main/java/org/nuiton/widget/editor/SDocEditor.java trunk/src/main/java/org/nuiton/widget/package.html trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java trunk/src/main/java/org/nuiton/widget/tooltip/SizeGrip.java trunk/src/main/java/org/nuiton/widget/tooltip/TipUtil.java trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java trunk/src/main/java/org/nuiton/widget/tooltip/package-info.java trunk/src/main/java/org/nuiton/widget/tree/FilterTreeModel.java trunk/src/main/java/org/nuiton/widget/tree/TreeFilter.java trunk/src/main/java/org/nuiton/widget/tree/package-info.java trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties trunk/src/site/rst/Todo.rst trunk/src/site/rst/components/focusabletooltips.rst trunk/src/site/rst/components/treefilters.rst trunk/src/site/rst/index.rst trunk/src/site/site_fr.xml trunk/src/test/java/org/nuiton/widget/AboutFrameTest.java trunk/src/test/java/org/nuiton/widget/AbstractTestCase.java trunk/src/test/java/org/nuiton/widget/IconFactoryTest.java trunk/src/test/java/org/nuiton/widget/WidgetUtilTest.java trunk/src/test/java/org/nuiton/widget/XMLGridLayoutTest.java trunk/src/test/java/org/nuiton/widget/editor/EditorTest.java trunk/src/test/resources/log4j.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/pom.xml 2010-11-02 14:06:00 UTC (rev 288) @@ -73,6 +73,11 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + </dependencies>  Modified: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/license/THIRD-PARTY.properties 2010-11-02 14:06:00 UTC (rev 288) @@ -1,3 +1,27 @@ +### +# #%L +# Graphical Widget +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : Modified: trunk/src/main/assembly/deps.xml =================================================================== --- trunk/src/main/assembly/deps.xml 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/assembly/deps.xml 2010-11-02 14:06:00 UTC (rev 288) @@ -1,3 +1,27 @@ + <assembly> <id>deps</id> <formats> Modified: trunk/src/main/assembly/full.xml =================================================================== --- trunk/src/main/assembly/full.xml 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/assembly/full.xml 2010-11-02 14:06:00 UTC (rev 288) @@ -1,3 +1,27 @@ + <assembly> <id>full</id> <formats> Modified: trunk/src/main/java/org/nuiton/widget/AboutFrame.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/AboutFrame.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/AboutFrame.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,28 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + package org.nuiton.widget; import static org.nuiton.i18n.I18n._; Modified: trunk/src/main/java/org/nuiton/widget/ApplicationAction.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/ApplicationAction.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/ApplicationAction.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * ApplicationAction.java Modified: trunk/src/main/java/org/nuiton/widget/ApplicationMonitor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/ApplicationMonitor.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/ApplicationMonitor.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,26 +1,34 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /******************************************************************************* * ApplicationMontior.java * * Created: Jul 29, 2004 * - * @author Cï¿½dric Pineau <pineau(a)codelutin.com> + * @author Cedric Pineau <pineau(a)codelutin.com> * * @version $Revision$ * Modified: trunk/src/main/java/org/nuiton/widget/CustomFocusTraversalPolicy.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/CustomFocusTraversalPolicy.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/CustomFocusTraversalPolicy.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/*##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * Created on 16 mai 2005 Modified: trunk/src/main/java/org/nuiton/widget/DatePicker.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/DatePicker.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/DatePicker.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,20 +1,28 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% */ + package org.nuiton.widget; import java.text.DateFormat; @@ -23,6 +31,7 @@ import javax.swing.JTextField; +@Deprecated public class DatePicker extends JTextField { private static final long serialVersionUID = 1L; @@ -39,7 +48,7 @@ } public Date getDate() throws InvalidDateException { - Date date = null; + Date date; try { date = dateFormat.parse(super.getText()); } catch (ParseException e) { Modified: trunk/src/main/java/org/nuiton/widget/GridFlowLayout.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/GridFlowLayout.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/GridFlowLayout.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * GridFlowLayout.java Modified: trunk/src/main/java/org/nuiton/widget/IconFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/IconFactory.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/IconFactory.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * IconFactory.java Modified: trunk/src/main/java/org/nuiton/widget/InvalidDateException.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/InvalidDateException.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/InvalidDateException.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,23 +1,30 @@ -/** - * *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% */ package org.nuiton.widget; +@Deprecated public class InvalidDateException extends Exception { private static final long serialVersionUID = 1L; Modified: trunk/src/main/java/org/nuiton/widget/JComboBoxAutoCompletionKit.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/JComboBoxAutoCompletionKit.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/JComboBoxAutoCompletionKit.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * JComboBoxAutoCompletionKit.java Modified: trunk/src/main/java/org/nuiton/widget/Mailor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/Mailor.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/Mailor.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,26 +1,34 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * Mailor.java * * Created: Nov 29, 2004 * - * @author C�dric Pineau <pineau(a)codelutin.com> + * @author Cédric Pineau <pineau(a)codelutin.com> * @version $Revision$ * * Last update : $Date$ Modified: trunk/src/main/java/org/nuiton/widget/MessageDialog.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/MessageDialog.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/MessageDialog.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * MessageDialog.java Modified: trunk/src/main/java/org/nuiton/widget/Settings.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/Settings.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/Settings.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,20 +1,26 @@ -/** - * *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% */ /* * Copyright (c) 2001-2004 JGoodies Karsten Lentzsch. All Rights Reserved. Modified: trunk/src/main/java/org/nuiton/widget/SimpleInternalFrame.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/SimpleInternalFrame.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/SimpleInternalFrame.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,20 +1,26 @@ -/** - * *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% */ /* * Copyright (c) 2003 JGoodies Karsten Lentzsch. All Rights Reserved. Modified: trunk/src/main/java/org/nuiton/widget/SplashScreen.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/SplashScreen.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/SplashScreen.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * SplashScreen.java Modified: trunk/src/main/java/org/nuiton/widget/StatusBar.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/StatusBar.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/StatusBar.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,28 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + /* * * StatusBar.java * Modified: trunk/src/main/java/org/nuiton/widget/SwingUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/SwingUtil.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/SwingUtil.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * SwingUtil.java Modified: trunk/src/main/java/org/nuiton/widget/SwingWidgetFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/SwingWidgetFactory.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/SwingWidgetFactory.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,26 +1,34 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * SwingWidgetFactory.java * * Created: Nov 19, 2004 * - * @author C�dric Pineau <pineau(a)codelutin.com> + * @author Cédric Pineau <pineau(a)codelutin.com> * @version $Revision$ * * Last update : $Date$ @@ -175,6 +183,7 @@ return menuItem; } + @Deprecated public static DatePicker createDatePicker(DateFormat dateFormat) { return new DatePicker(dateFormat); } Modified: trunk/src/main/java/org/nuiton/widget/SwitchPane.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/SwitchPane.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/SwitchPane.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,21 +1,28 @@ -/** - * *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% */ + /* * Created on 16 mai 2005 * Modified: trunk/src/main/java/org/nuiton/widget/UIFSplitPane.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/UIFSplitPane.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/UIFSplitPane.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,20 +1,26 @@ -/** - * *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% */ /* * Copyright (c) 2003, 2004 JGoodies Karsten Lentzsch. All Rights Reserved. Modified: trunk/src/main/java/org/nuiton/widget/WidgetUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/WidgetUtil.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/WidgetUtil.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * WidgetUtil.java Modified: trunk/src/main/java/org/nuiton/widget/XMLGridLayout.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/XMLGridLayout.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/XMLGridLayout.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,21 +1,28 @@ -/** - * *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% */ + package org.nuiton.widget; import java.awt.Component; Modified: trunk/src/main/java/org/nuiton/widget/XMLGridParseConstraints.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/XMLGridParseConstraints.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/XMLGridParseConstraints.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,21 +1,28 @@ -/** - * *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% */ + package org.nuiton.widget; import java.awt.GridBagConstraints; Modified: trunk/src/main/java/org/nuiton/widget/datatips/DataTipCell.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/DataTipCell.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/datatips/DataTipCell.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, Modified: trunk/src/main/java/org/nuiton/widget/datatips/DataTipComponent.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/DataTipComponent.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/datatips/DataTipComponent.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, Modified: trunk/src/main/java/org/nuiton/widget/datatips/DataTipListener.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/DataTipListener.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/datatips/DataTipListener.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, Modified: trunk/src/main/java/org/nuiton/widget/datatips/DataTipManager.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/DataTipManager.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/datatips/DataTipManager.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, Modified: trunk/src/main/java/org/nuiton/widget/datatips/DataTipPopup.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/DataTipPopup.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/datatips/DataTipPopup.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, Modified: trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipCell.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipCell.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipCell.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, @@ -26,8 +28,6 @@ */ package org.nuiton.widget.datatips; -import org.nuiton.widget.datatips.DataTipCell; - import javax.swing.*; import java.awt.*; Modified: trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipListener.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipListener.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/datatips/ListDataTipListener.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, @@ -26,10 +28,6 @@ */ package org.nuiton.widget.datatips; -import org.nuiton.widget.datatips.DataTipCell; -import org.nuiton.widget.datatips.DataTipListener; -import org.nuiton.widget.datatips.ListDataTipCell; - import javax.swing.*; import java.awt.*; Modified: trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipCell.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipCell.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipCell.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, Modified: trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipListener.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipListener.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/datatips/TableDataTipListener.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, Modified: trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipCell.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipCell.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipCell.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, Modified: trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipListener.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipListener.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/datatips/TreeDataTipListener.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * Copyright (c) 2002 - 2005, Stephen Kelvin Friedrich. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, Modified: trunk/src/main/java/org/nuiton/widget/datatips/package-info.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/datatips/package-info.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/datatips/package-info.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,3 +1,27 @@ +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /** * Add data tips to your Swing table, tree or list. * Modified: trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/editor/DefaultEditor.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * DefaultEditor.java Modified: trunk/src/main/java/org/nuiton/widget/editor/Editor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/Editor.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/editor/Editor.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * Editor.java Modified: trunk/src/main/java/org/nuiton/widget/editor/EditorHelper.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/EditorHelper.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/editor/EditorHelper.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,22 +1,28 @@ -/*##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ - - package org.nuiton.widget.editor; import java.awt.Event; Modified: trunk/src/main/java/org/nuiton/widget/editor/EditorInterface.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/EditorInterface.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/editor/EditorInterface.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.widget.editor; Modified: trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/editor/JEditEditor.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * 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. - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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. - *##%*/ + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.widget.editor; Modified: trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/editor/NullEditor.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.widget.editor; Modified: trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/editor/RSyntaxEditor.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * 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. - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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. - *##%*/ + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.widget.editor; Modified: trunk/src/main/java/org/nuiton/widget/editor/SDocEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/editor/SDocEditor.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/editor/SDocEditor.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,6 +1,12 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin +/* + * #%L + * Graphical Widget * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation, either version 3 of the @@ -13,7 +19,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.widget.editor; Modified: trunk/src/main/java/org/nuiton/widget/package.html =================================================================== --- trunk/src/main/java/org/nuiton/widget/package.html 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/package.html 2010-11-02 14:06:00 UTC (rev 288) @@ -1,3 +1,27 @@ + <html> <body> <h1>Nuiton-Widgets</h1> Modified: trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * 07/29/2009 * * FocusableTip.java - A focusable tool tip, like those in Eclipse. @@ -36,10 +38,8 @@ import java.awt.event.KeyListener; import java.awt.event.MouseEvent; import java.net.URL; -import java.util.ResourceBundle; import javax.swing.JComponent; -//import javax.swing.JTextArea; import javax.swing.SwingUtilities; import javax.swing.ToolTipManager; import javax.swing.event.CaretEvent; @@ -57,12 +57,13 @@ */ public class FocusableTip { - private JComponent attachedComponent; - private TipWindow tipWindow; - private URL imageBase; - private AttachedComponentListener attachedComponentListener; - private HyperlinkListener hyperlinkListener; - private String lastText; + protected JComponent attachedComponent; + protected TipWindow tipWindow; + protected URL imageBase; + protected AttachedComponentListener attachedComponentListener; + protected HyperlinkListener hyperlinkListener; + protected String lastText; + protected boolean showCopyContextMenu; /** Width with default value. */ protected int width = 320; @@ -74,22 +75,55 @@ * The screen bounds in which the mouse has to stay for the currently * displayed tip to stay visible. */ - private Rectangle tipVisibleBounds; + protected Rectangle tipVisibleBounds; /** * Margin from mouse cursor at which to draw focusable tip. */ - private static final int MARGIN = 10; + protected static final int MARGIN = 10; - //private static final String MSG = "org.nuiton.widget.tooltip.FocusableTip"; - //private static final ResourceBundle msg = ResourceBundle.getBundle(MSG); + /** + * FocusableTip constructor + * + * @param attachedComponent component to attach + */ + public FocusableTip(JComponent attachedComponent) { + this(attachedComponent, null); + } + /** + * FocusableTip constructor + * + * @param attachedComponent component to attach + * @param listener hyper link listener to add + */ + public FocusableTip(JComponent attachedComponent, HyperlinkListener listener) { + this(attachedComponent, listener, false); + } - public FocusableTip(JComponent attachedComponent, HyperlinkListener listener) { + /** + * FocusableTip constructor + * + * @param attachedComponent component to attach + * @param showCopyContextMenu to show copy context menu + */ + public FocusableTip(JComponent attachedComponent, boolean showCopyContextMenu) { + this(attachedComponent, null, showCopyContextMenu); + } + + /** + * FocusableTip constructor + * + * @param attachedComponent component to attach + * @param listener hyper link listener to add + * @param showCopyContextMenu to show copy context menu + */ + public FocusableTip(JComponent attachedComponent, HyperlinkListener listener, boolean showCopyContextMenu) { setAttachedComponent(attachedComponent); this.hyperlinkListener = listener; attachedComponentListener = new AttachedComponentListener(); tipVisibleBounds = new Rectangle(); + this.showCopyContextMenu = showCopyContextMenu; } /** @@ -103,11 +137,20 @@ this.height = height; } + /** + * Get {@link TipWindow} displayed + * + * @return TipWindow displayed + */ + public TipWindow getTipWindows() { + return tipWindow; + } + /** * Compute the bounds in which the user can move the mouse without the * tip window disappearing. */ - private void computeTipVisibleBounds() { + protected void computeTipVisibleBounds() { // Compute area that the mouse can move in without hiding the // tip window. Note that Java 1.4 can only detect mouse events // in Java windows, not globally. @@ -119,7 +162,7 @@ } - private void createAndShowTipWindow(final MouseEvent e, final String text) { + protected void createAndShowTipWindow(final MouseEvent e, final String text) { Window owner = SwingUtilities.getWindowAncestor(attachedComponent); tipWindow = new TipWindow(owner, this, text); @@ -142,6 +185,11 @@ return; } + // Add copy context menu + if (showCopyContextMenu) { + TipUtil.addCopyContextMenu(tipWindow); + } + tipWindow.fixSize(width, height); ComponentOrientation o = attachedComponent.getComponentOrientation(); @@ -228,7 +276,7 @@ } - private void setAttachedComponent(JComponent attachedComponent) { + protected void setAttachedComponent(JComponent attachedComponent) { this.attachedComponent = attachedComponent; // Is okay to do multiple times. ToolTipManager.sharedInstance().registerComponent(attachedComponent); @@ -252,7 +300,7 @@ } - private class AttachedComponentListener extends MouseInputAdapter implements + protected class AttachedComponentListener extends MouseInputAdapter implements CaretListener, ComponentListener, FocusListener, KeyListener { public void caretUpdate(CaretEvent e) { @@ -295,7 +343,7 @@ } } - private void handleComponentEvent(ComponentEvent e) { + protected void handleComponentEvent(ComponentEvent e) { possiblyDisposeOfTipWindow(); } Modified: trunk/src/main/java/org/nuiton/widget/tooltip/SizeGrip.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/SizeGrip.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/tooltip/SizeGrip.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * 12/23/2008 * * SizeGrip.java - A size grip component that sits at the bottom of the window, @@ -50,12 +52,12 @@ * @author Robert Futrell * @version 1.0 */ -class SizeGrip extends JPanel { +public class SizeGrip extends JPanel { /** * The size grip to use if we're on OS X. */ - private Image osxSizeGrip; + protected Image osxSizeGrip; public SizeGrip() { @@ -83,7 +85,7 @@ * * @return The OS X size grip. */ - private Image createOSXSizeGrip() { + protected Image createOSXSizeGrip() { ClassLoader cl = getClass().getClassLoader(); URL url = cl.getResource("org/fife/ui/autocomplete/osx_sizegrip.png"); if (url==null) { @@ -217,9 +219,9 @@ * buggy - stretch the window too wide and some kind of arithmetic error * started happening somewhere - our window would grow way too large. */ - private class MouseHandler extends MouseInputAdapter { + protected class MouseHandler extends MouseInputAdapter { - private Point origPos; + protected Point origPos; public void mouseDragged(MouseEvent e) { Point newPos = e.getPoint(); Modified: trunk/src/main/java/org/nuiton/widget/tooltip/TipUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/TipUtil.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/tooltip/TipUtil.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * 08/13/2009 * * TipUtil.java - Utility methods for homemade tool tips. @@ -25,12 +27,26 @@ import java.awt.Color; import java.awt.Font; import java.awt.SystemColor; +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.StringSelection; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + import javax.swing.BorderFactory; +import javax.swing.Icon; import javax.swing.JEditorPane; +import javax.swing.JMenuItem; +import javax.swing.JPopupMenu; import javax.swing.UIManager; import javax.swing.plaf.ColorUIResource; import javax.swing.text.html.HTMLDocument; +import org.apache.commons.lang.StringUtils; +import org.nuiton.util.Resource; +import static org.nuiton.i18n.I18n._; /** * Static utility methods for focusable tips. @@ -38,9 +54,10 @@ * @author Robert Futrell * @version 1.0 */ -class TipUtil { +public class TipUtil { + + protected static final String COPY_ICON_PATH = "copy.png"; - private TipUtil() { } @@ -110,8 +127,57 @@ doc.getStyleSheet().addRule( "body { font-family: " + font.getFamily() + "; font-size: " + font.getSize() + "pt; }"); - } + /** + * Add context menu for paste selected content + * + * @param focusableTip to add copy context menu + */ + public static void addCopyContextMenu(FocusableTip focusableTip) { + if (focusableTip == null) { + throw new NullPointerException("Focusable tip must be non null"); + } + TipWindow tipWindows = focusableTip.getTipWindows(); + addCopyContextMenu(tipWindows); + } + + protected static void addCopyContextMenu(TipWindow tipWindows) { + if (tipWindows == null) { + throw new NullPointerException("TipWindows must be non null"); + } + + JEditorPane textArea = tipWindows.getTextArea(); + textArea.addMouseListener(new MouseAdapter(){ + + @Override + public void mouseClicked(MouseEvent e) { + + JEditorPane textArea = (JEditorPane)e.getSource(); + final String selectedText = textArea.getSelectedText(); + if (e.getButton() == MouseEvent.BUTTON3 && !StringUtils.isBlank(selectedText)) { + + JPopupMenu popupMenu = new JPopupMenu(); + + Icon copyIcon = Resource.getIcon(COPY_ICON_PATH); + JMenuItem copyMenuItem = new JMenuItem(_("nuitonwidgets.common.copy"), copyIcon); + copyMenuItem.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + StringSelection selection = new StringSelection(selectedText); + + Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + clipboard.setContents(selection, null); + } + }); + + popupMenu.add(copyMenuItem); + popupMenu.show(textArea, e.getX(), e.getY()); + } + } + }); + } + } \ No newline at end of file Modified: trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,6 @@ /* + * %%License-Ignore + * * 07/29/2009 * * TipWindow.java - The actual window component representing the tool tip. @@ -64,22 +66,23 @@ * @author Robert Futrell * @version 1.0 */ -class TipWindow extends JWindow implements ActionListener { +public class TipWindow extends JWindow implements ActionListener { - private FocusableTip ft; - private JEditorPane textArea; - private String text; - private TipListener tipListener; - private HyperlinkListener userHyperlinkListener; + protected FocusableTip ft; + protected JEditorPane textArea; + protected String text; + protected TipListener tipListener; + protected HyperlinkListener userHyperlinkListener; - private static TipWindow visibleInstance; + protected static TipWindow visibleInstance; /** * Constructor. * * @param owner The parent window. - * @param msg The text of the tool tip. This can be HTML. + * @param ft Focusable tip + * @param msg The text of the tool tip. This can be HTML. */ public TipWindow(Window owner, FocusableTip ft, String msg) { @@ -137,6 +140,14 @@ } + /** + * Return textArea of TipWindow + * + * @return textArea + */ + public JEditorPane getTextArea() { + return textArea; + } public void actionPerformed(ActionEvent e) { @@ -183,10 +194,10 @@ * @param width min width * @param height min height */ - void fixSize(int width, int height) { + public void fixSize(int width, int height) { Dimension d = textArea.getPreferredSize(); - Rectangle r = null; + Rectangle r; try { r = textArea.modelToView(textArea.getDocument().getLength()-1); @@ -213,7 +224,7 @@ } - private void setBottomPanel() { + protected void setBottomPanel() { final JPanel panel = new JPanel(new BorderLayout()); panel.add(new JSeparator(), BorderLayout.NORTH); @@ -224,7 +235,7 @@ sg.applyComponentOrientation(sg.getComponentOrientation()); // Workaround panel.add(sg, BorderLayout.LINE_END); MouseInputAdapter adapter = new MouseInputAdapter() { - private Point lastPoint; + protected Point lastPoint; public void mouseDragged(MouseEvent e) { Point p = e.getPoint(); SwingUtilities.convertPointToScreen(p, panel); @@ -308,7 +319,7 @@ /** * Listens for events in this window. */ - private class TipListener extends MouseAdapter { + protected class TipListener extends MouseAdapter { public TipListener() { } Modified: trunk/src/main/java/org/nuiton/widget/tooltip/package-info.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/package-info.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/tooltip/package-info.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,3 +1,27 @@ +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /** * Focusable tooltip. * Modified: trunk/src/main/java/org/nuiton/widget/tree/FilterTreeModel.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tree/FilterTreeModel.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/tree/FilterTreeModel.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2010 CodeLutin, Chatellier Eric - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.widget.tree; Modified: trunk/src/main/java/org/nuiton/widget/tree/TreeFilter.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tree/TreeFilter.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/tree/TreeFilter.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2010 CodeLutin, Chatellier Eric - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.widget.tree; Modified: trunk/src/main/java/org/nuiton/widget/tree/package-info.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tree/package-info.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/java/org/nuiton/widget/tree/package-info.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,3 +1,27 @@ +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /** * Tree filtering classes. */ Added: trunk/src/main/resources/copy.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/resources/copy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties 2010-11-02 14:06:00 UTC (rev 288) @@ -1,6 +1,7 @@ nuitonwidgets.aboutframe.about=About nuitonwidgets.aboutframe.license=License nuitonwidgets.aboutframe.ok=OK +nuitonwidgets.common.copy=Copy nuitonwidgets.editor.saveorcancel=Do you want to save current opened file ? nuitonwidgets.message.file=File nuitonwidgets.message.folder=Folder Modified: trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties 2010-11-02 14:06:00 UTC (rev 288) @@ -1,6 +1,7 @@ nuitonwidgets.aboutframe.about=\u00C0 propos nuitonwidgets.aboutframe.license=Licence nuitonwidgets.aboutframe.ok=OK +nuitonwidgets.common.copy=Copier nuitonwidgets.editor.saveorcancel=Voulez vous sauver le fichier modifi\u00E9 ? nuitonwidgets.message.file=Fichier nuitonwidgets.message.folder=R\u00E9pertoire Modified: trunk/src/site/rst/Todo.rst =================================================================== --- trunk/src/site/rst/Todo.rst 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/site/rst/Todo.rst 2010-11-02 14:06:00 UTC (rev 288) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Graphical Widget +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - TODO ==== Modified: trunk/src/site/rst/components/focusabletooltips.rst =================================================================== --- trunk/src/site/rst/components/focusabletooltips.rst 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/site/rst/components/focusabletooltips.rst 2010-11-02 14:06:00 UTC (rev 288) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Graphical Widget +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - Focusables tooltips =================== Modified: trunk/src/site/rst/components/treefilters.rst =================================================================== --- trunk/src/site/rst/components/treefilters.rst 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/site/rst/components/treefilters.rst 2010-11-02 14:06:00 UTC (rev 288) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Graphical Widget +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - Tree filtering ============== Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/site/rst/index.rst 2010-11-02 14:06:00 UTC (rev 288) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Graphical Widget +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - Nuiton widgets ============== Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/site/site_fr.xml 2010-11-02 14:06:00 UTC (rev 288) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <bannerLeft> Modified: trunk/src/test/java/org/nuiton/widget/AboutFrameTest.java =================================================================== --- trunk/src/test/java/org/nuiton/widget/AboutFrameTest.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/test/java/org/nuiton/widget/AboutFrameTest.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008 Code Lutin - * - * 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. - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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. - *##%*/ + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.widget; Modified: trunk/src/test/java/org/nuiton/widget/AbstractTestCase.java =================================================================== --- trunk/src/test/java/org/nuiton/widget/AbstractTestCase.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/test/java/org/nuiton/widget/AbstractTestCase.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,21 +1,28 @@ -/** - * *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% */ + package org.nuiton.widget; import java.io.File; Modified: trunk/src/test/java/org/nuiton/widget/IconFactoryTest.java =================================================================== --- trunk/src/test/java/org/nuiton/widget/IconFactoryTest.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/test/java/org/nuiton/widget/IconFactoryTest.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * IconFactoryTest.java @@ -29,7 +37,6 @@ package org.nuiton.widget; -import org.nuiton.widget.IconFactory; import javax.swing.Icon; import org.junit.Assert; Modified: trunk/src/test/java/org/nuiton/widget/WidgetUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/widget/WidgetUtilTest.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/test/java/org/nuiton/widget/WidgetUtilTest.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * WidgetUtilTest.java @@ -30,7 +38,6 @@ package org.nuiton.widget; -import org.nuiton.widget.WidgetUtil; import java.awt.Component; import javax.swing.JLabel; Modified: trunk/src/test/java/org/nuiton/widget/XMLGridLayoutTest.java =================================================================== --- trunk/src/test/java/org/nuiton/widget/XMLGridLayoutTest.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/test/java/org/nuiton/widget/XMLGridLayoutTest.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * XMLGridLayoutTest.java @@ -29,7 +37,6 @@ package org.nuiton.widget; -import org.nuiton.widget.XMLGridLayout; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JPanel; Modified: trunk/src/test/java/org/nuiton/widget/editor/EditorTest.java =================================================================== --- trunk/src/test/java/org/nuiton/widget/editor/EditorTest.java 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/test/java/org/nuiton/widget/editor/EditorTest.java 2010-11-02 14:06:00 UTC (rev 288) @@ -1,19 +1,27 @@ -/* *##% Graphical Widget - * Copyright (C) 2004 - 2008 CodeLutin - * +/* + * #%L + * Graphical Widget + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* * * EditorTest.java Modified: trunk/src/test/resources/log4j.properties =================================================================== --- trunk/src/test/resources/log4j.properties 2010-10-29 08:29:27 UTC (rev 287) +++ trunk/src/test/resources/log4j.properties 2010-11-02 14:06:00 UTC (rev 288) @@ -1,3 +1,27 @@ +### +# #%L +# Graphical Widget +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # Global logging configuration log4j.rootLogger=ERROR, stdout # Console output...

1 0