Author: tchemit Date: 2008-04-19 09:16:28 +0000 (Sat, 19 Apr 2008) New Revision: 589 Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/UIHelper.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractUIModel.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractUI.java Log: use lutinui generic ui objects Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/UIHelper.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/UIHelper.java 2008-04-19 08:59:07 UTC (rev 588) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/UIHelper.java 2008-04-19 09:16:28 UTC (rev 589) @@ -19,17 +19,10 @@ import org.codelutin.vcs.type.VCSEntryLocation; import org.codelutin.vcs.type.VCSState; -import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.ImageIcon; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JRootPane; import javax.swing.JTable; -import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; import java.awt.Color; -import java.awt.event.ActionEvent; import java.util.EnumMap; import java.util.EnumSet; @@ -41,25 +34,6 @@ public class UIHelper { /** - * Attach to <code>ui</code> an abort action,accessible by <code>ESC</code> key. - * - * @param ui ui - */ - public static void setQuitAction(final JDialog ui) { - JRootPane rootPane = ui.getRootPane(); - - Action quitAction = new AbstractAction("quit") { - private static final long serialVersionUID = -869095664995763057L; - - public void actionPerformed(ActionEvent e) { - ui.dispose(); - } - }; - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "quit"); - rootPane.getActionMap().put("quit", quitAction); - } - - /** * Prepare an table of VCSEntries. * * @param table table @@ -131,7 +105,7 @@ } public static ImageIcon createActionIcon(String name) { - return jaxx.runtime.UIHelper.createImageIcon("action-" + name + ".png"); + return org.codelutin.ui.UIHelper.createImageIcon("action-" + name + ".png"); } public static ImageIcon createActionIcon(VCSAction location) { @@ -139,6 +113,6 @@ } public static ImageIcon createLocationIcon(VCSEntryLocation location) { - return jaxx.runtime.UIHelper.createImageIcon("location-" + location.name().toLowerCase() + ".png"); + return org.codelutin.ui.UIHelper.createImageIcon("location-" + location.name().toLowerCase() + ".png"); } } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java 2008-04-19 08:59:07 UTC (rev 588) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/handler/AbstractUIHandler.java 2008-04-19 09:16:28 UTC (rev 589) @@ -14,22 +14,22 @@ */ package org.codelutin.vcs.ui.util.handler; +import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.ui.util.model.AbstractUIModel; import org.codelutin.vcs.ui.util.ui.AbstractUI; -import org.codelutin.vcs.VCSConnexionConfig; /** - * TODO Move this classe in jaxx + * Base ui handler to be used in vcs project. * * @author chemit */ -public abstract class AbstractUIHandler<M extends AbstractUIModel, U extends AbstractUI<? extends AbstractUIHandler>> extends jaxx.DialogUIHandler<M, U> { +public abstract class AbstractUIHandler<M extends AbstractUIModel, U extends AbstractUI<? extends AbstractUIHandler>> extends org.codelutin.ui.DialogUIHandler<M, U> { private VCSConnexionConfig config; - protected AbstractUIHandler(U ui, M model,VCSConnexionConfig config) { + protected AbstractUIHandler(U ui, M model, VCSConnexionConfig config) { super(ui, model); - this.config=config; + this.config = config; } public VCSConnexionConfig getConfig() { Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractUIModel.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractUIModel.java 2008-04-19 08:59:07 UTC (rev 588) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/model/AbstractUIModel.java 2008-04-19 09:16:28 UTC (rev 589) @@ -14,14 +14,11 @@ */ package org.codelutin.vcs.ui.util.model; -import jaxx.DialogUIModel; - /** - * TODO Move this classe in jaxx - * Abstract ui model, with property change support. + * Base ui model tobe used in vcs project * * @author chemit */ -public abstract class AbstractUIModel extends DialogUIModel { +public abstract class AbstractUIModel extends org.codelutin.ui.DialogUIModel { } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractUI.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractUI.java 2008-04-19 08:59:07 UTC (rev 588) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractUI.java 2008-04-19 09:16:28 UTC (rev 589) @@ -17,13 +17,11 @@ import org.codelutin.vcs.ui.util.handler.AbstractUIHandler; /** - * A abstract dialog contract to be realised by a dialog - * <p/> - * TODO : make jaxx authorized implementing interface for root tag :) + * The base dialog to be used in vcs project * * @author chemit */ -public abstract class AbstractUI<H extends AbstractUIHandler> extends jaxx.DialogUI<H> { +public abstract class AbstractUI<H extends AbstractUIHandler> extends org.codelutin.ui.DialogUI<H> { protected javax.swing.AbstractAction createHelpAction() { return org.codelutin.vcs.ui.action.HelpAction.createAction(this);