April 2008 - Buix-commits - mailman.cloud.codelutin.com

r613 - in trunk/lutinvcs/ui: common/src/main/java/org/codelutin/vcs/ui/action jaxx/src/main/uimodel/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 25 Apr '08

25 Apr '08

Author: tchemit Date: 2008-04-25 23:39:52 +0000 (Fri, 25 Apr 2008) New Revision: 613 Added: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowChangelogUIAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfirmUIAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowDiffUIAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowSynchUIAction.java Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSGenerateSshKey.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxChangelogUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfirmUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxDiffUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css Log: add generic show ui action Added: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowChangelogUIAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowChangelogUIAction.java (rev 0) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowChangelogUIAction.java 2008-04-25 23:39:52 UTC (rev 613) @@ -0,0 +1,67 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.ui.action; + +import org.codelutin.ui.DialogUI; +import org.codelutin.ui.DialogUIHandler; +import org.codelutin.vcs.VCSEntry; +import org.codelutin.vcs.type.VCSEntryLocation; +import org.codelutin.vcs.ui.ChangelogUI; +import org.codelutin.vcs.ui.VCSUIFactory; +import org.codelutin.vcs.ui.handler.ChangelogUIHandler; +import org.codelutin.vcs.ui.model.ChangelogUIModel; +import org.codelutin.vcs.ui.util.AbstractShowUIAction; + +import java.awt.event.ActionEvent; + +/** @author chemit */ +public class ShowChangelogUIAction extends AbstractShowUIAction<ChangelogUIModel, ChangelogUI, ChangelogUIHandler, DialogUIHandler<?, ?>> { + + private static final long serialVersionUID = 1L; + + private VCSEntryLocation location; + private VCSEntry[] entries; + + public ShowChangelogUIAction(DialogUI ui, boolean showText) { + super(ui, VCSUIFactory.CHANGELOG_UI, showText); + } + + public void setLocation(VCSEntryLocation location) { + this.location = location; + } + + public void setEntries(VCSEntry[] entries) { + this.entries = entries; + } + + @Override + protected ChangelogUI initUI(ActionEvent e) { + ChangelogUI ui = super.initUI(e); + ui.getHandler().getModel().init(getLocation(), entries); + ui.getContentScroll().setEnabled(entries.length > 1); + return ui; + } + + protected VCSEntryLocation getLocation() { + if (location == null) { + location = VCSEntryLocation.ALL; + } + return location; + } + + protected VCSEntry[] getEntries() { + return entries; + } +} \ No newline at end of file Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java 2008-04-25 23:38:14 UTC (rev 612) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java 2008-04-25 23:39:52 UTC (rev 613) @@ -14,34 +14,29 @@ */ package org.codelutin.vcs.ui.action; -import static org.codelutin.i18n.I18n._; -import org.codelutin.ui.AbstractUIAction; +import org.codelutin.ui.DialogUIHandler; import org.codelutin.vcs.ui.ConfigUI; -import org.codelutin.vcs.ui.util.handler.AbstractUIHandler; -import org.codelutin.vcs.ui.util.ui.AbstractUI; +import org.codelutin.vcs.ui.VCSUIFactory; +import org.codelutin.vcs.ui.handler.ConfigUIHandler; +import org.codelutin.vcs.ui.model.ConfigUIModel; +import org.codelutin.vcs.ui.util.AbstractShowUIAction; import java.awt.event.ActionEvent; /** @author chemit */ -public class ShowConfigAction extends AbstractUIAction<AbstractUIHandler<?, ?>> { +public class ShowConfigAction extends AbstractShowUIAction<ConfigUIModel, ConfigUI, ConfigUIHandler, DialogUIHandler<?, ?>> { private static final long serialVersionUID = 1L; - public ShowConfigAction(AbstractUI<? extends AbstractUIHandler<?, ?>> ui) { - super(_("lutinvcs.action.showconfig.libelle"), org.codelutin.ui.UIHelper.createActionIcon("showconfig"), ui); - String name = (String) getValue(NAME); - putValue(DISPLAYED_MNEMONIC_INDEX_KEY, name.length() - 1); - putValue(ACCELERATOR_KEY, (int) name.charAt(name.length() - 1)); - putValue(NAME, null); - putValue(SHORT_DESCRIPTION, _("lutinvcs.action.showconfig.tip")); + public ShowConfigAction(org.codelutin.ui.DialogUI ui, boolean showText) { + super(ui, VCSUIFactory.CONFIG_UI, showText); } - public void actionPerformed(ActionEvent e) { - checkInit(); - ConfigUI ui = org.codelutin.vcs.ui.VCSUIFactory.getUI(org.codelutin.vcs.ui.VCSUIFactory.CONFIG_UI); - // populate with common config - ui.getHandler().getModel().populate(ui.getHandler().getConfig()); - ui.setVisible(true); + @Override + protected ConfigUI initUI(ActionEvent e) { + ConfigUI ui = super.initUI(e); + ui.getHandler().getModel().populate(getConfig()); + return ui; } } \ No newline at end of file Copied: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfirmUIAction.java (from rev 608, trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java) =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfirmUIAction.java (rev 0) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfirmUIAction.java 2008-04-25 23:39:52 UTC (rev 613) @@ -0,0 +1,85 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.ui.action; + +import org.codelutin.ui.DialogUI; +import org.codelutin.ui.DialogUIHandler; +import org.codelutin.vcs.VCSEntry; +import org.codelutin.vcs.type.VCSAction; +import org.codelutin.vcs.type.VCSEntryLocation; +import org.codelutin.vcs.ui.ConfirmUI; +import org.codelutin.vcs.ui.VCSUIFactory; +import org.codelutin.vcs.ui.handler.ConfirmUIHandler; +import org.codelutin.vcs.ui.model.ConfirmUIModel; +import org.codelutin.vcs.ui.util.AbstractShowUIAction; + +import java.awt.event.ActionEvent; + +/** @author chemit */ +public class ShowConfirmUIAction extends AbstractShowUIAction<ConfirmUIModel, ConfirmUI, ConfirmUIHandler, DialogUIHandler<?, ?>> { + + private static final long serialVersionUID = 1L; + + private VCSAction action; + private VCSEntryLocation location; + private VCSEntry[] entries; + + public ShowConfirmUIAction(DialogUI ui, boolean showText) { + super(ui, VCSUIFactory.CONFIRM_UI, showText); + } + + public VCSAction getAction() { + return action; + } + + public void setAction(VCSAction action) { + this.action = action; + } + + public VCSEntryLocation getLocation() { + if (location == null) { + location = VCSEntryLocation.ALL; + } + return location; + } + + public void setLocation(VCSEntryLocation location) { + this.location = location; + } + + public VCSEntry[] getEntries() { + return entries; + } + + public void setEntries(VCSEntry[] entries) { + this.entries = entries; + } + + @Override + protected ConfirmUI initUI(ActionEvent e) { + ConfirmUI ui = super.initUI(e); + ui.getHandler().getModel().init(action, getLocation(), entries); + ui.getContentScroll().setEnabled(entries.length > 1); + return ui; + } + + @Override + protected void checkInit() throws IllegalStateException { + super.checkInit(); + if (action == null) { + throw new IllegalStateException("no action found in " + this); + } + } +} \ No newline at end of file Added: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowDiffUIAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowDiffUIAction.java (rev 0) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowDiffUIAction.java 2008-04-25 23:39:52 UTC (rev 613) @@ -0,0 +1,67 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.ui.action; + +import org.codelutin.ui.DialogUI; +import org.codelutin.ui.DialogUIHandler; +import org.codelutin.vcs.VCSEntry; +import org.codelutin.vcs.type.VCSEntryLocation; +import org.codelutin.vcs.ui.DiffUI; +import org.codelutin.vcs.ui.VCSUIFactory; +import org.codelutin.vcs.ui.handler.DiffUIHandler; +import org.codelutin.vcs.ui.model.DiffUIModel; +import org.codelutin.vcs.ui.util.AbstractShowUIAction; + +import java.awt.event.ActionEvent; + +/** @author chemit */ +public class ShowDiffUIAction extends AbstractShowUIAction<DiffUIModel, DiffUI, DiffUIHandler, DialogUIHandler<?, ?>> { + + private static final long serialVersionUID = 1L; + + private VCSEntryLocation location; + private VCSEntry[] entries; + + public ShowDiffUIAction(DialogUI ui, boolean showText) { + super(ui, VCSUIFactory.DIFF_UI, showText); + } + + public VCSEntryLocation getLocation() { + if (location == null) { + location = VCSEntryLocation.ALL; + } + return location; + } + + public void setLocation(VCSEntryLocation location) { + this.location = location; + } + + public VCSEntry[] getEntries() { + return entries; + } + + public void setEntries(VCSEntry[] entries) { + this.entries = entries; + } + + @Override + protected DiffUI initUI(ActionEvent e) { + DiffUI ui = super.initUI(e); + ui.getHandler().getModel().init(getLocation(), entries); + ui.getContentScroll().setEnabled(entries.length > 1); + return ui; + } +} \ No newline at end of file Added: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowSynchUIAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowSynchUIAction.java (rev 0) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowSynchUIAction.java 2008-04-25 23:39:52 UTC (rev 613) @@ -0,0 +1,68 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.ui.action; + +import org.codelutin.ui.DialogUI; +import org.codelutin.ui.DialogUIHandler; +import org.codelutin.vcs.VCSEntry; +import org.codelutin.vcs.type.VCSEntryLocation; +import org.codelutin.vcs.ui.SynchUI; +import org.codelutin.vcs.ui.VCSUIFactory; +import org.codelutin.vcs.ui.handler.SynchUIHandler; +import org.codelutin.vcs.ui.model.SynchUIModel; +import org.codelutin.vcs.ui.util.AbstractShowUIAction; + +import java.awt.event.ActionEvent; + +/** @author chemit */ +public class ShowSynchUIAction extends AbstractShowUIAction<SynchUIModel, SynchUI, SynchUIHandler, DialogUIHandler<?,?>> { + + private static final long serialVersionUID = 1L; + + private VCSEntryLocation location; + private VCSEntry[] entries; + + public ShowSynchUIAction(DialogUI ui, boolean showText) { + super(ui, VCSUIFactory.SYNCH_UI, showText); + } + + public VCSEntryLocation getLocation() { + if (location == null) { + location = VCSEntryLocation.ALL; + } + return location; + } + + public void setLocation(VCSEntryLocation location) { + this.location = location; + } + + public VCSEntry[] getEntries() { + return entries; + } + + public void setEntries(VCSEntry[] entries) { + this.entries = entries; + } + + @Override + protected SynchUI initUI(ActionEvent e) { + SynchUI ui = super.initUI(e); + ui.getHandler().getModel().populate(getLocation(), entries); + ui.getContentScroll().setEnabled(entries.length > 1); + ((AbstractShowUIAction) ui.getConfig().getAction()).setConfig(ui.getHandler().getConfig()); + return ui; + } +} \ No newline at end of file Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java 2008-04-25 23:38:14 UTC (rev 612) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java 2008-04-25 23:39:52 UTC (rev 613) @@ -15,8 +15,11 @@ package org.codelutin.vcs.ui.action; import org.codelutin.ui.AbstractUIAction; +import org.codelutin.vcs.VCSConnexionConfig; import org.codelutin.vcs.VCSEntry; import org.codelutin.vcs.type.VCSAction; +import org.codelutin.vcs.type.VCSEntryLocation; +import org.codelutin.vcs.ui.UIActionHelper; import org.codelutin.vcs.ui.util.handler.AbstractTabUIHandler; import org.codelutin.vcs.ui.util.ui.AbstractTabUI; @@ -31,6 +34,7 @@ private static final long serialVersionUID = 1L; + public TabUIAction(AbstractTabUI<?> ui, VCSAction action, boolean useSelection) { super(null, org.codelutin.vcs.ui.util.UIHelper.createActionIcon(action), ui); this.useSelection = useSelection; @@ -48,12 +52,22 @@ AbstractTabUIHandler<?, ?> handler = getHandler(); org.codelutin.vcs.ui.util.AbstractVCSEntriesTableModel model = handler.getModel().getEntriesModel(); List<VCSEntry> entries = model.filter(action, model.getDisplayedEntries(useSelection ? handler.getSelectionModel() : null)); + VCSConnexionConfig config = getHandler().getConfig(); + VCSEntryLocation location = model.getLocation(); switch (action) { case CHANGELOG: - handler.showChangelogUI(useSelection, model, entries); + if (!useSelection) { + // take all entries + entries = model.filter(VCSAction.CHANGELOG, model.getEntries()); + } + UIActionHelper.showChangelogUI(config, ui, location, entries.toArray(new VCSEntry[entries.size()])); return; case DIFF: - handler.showDiffUI(useSelection, model, entries); + if (!useSelection) { + // take all entries + entries = model.filter(VCSAction.DIFF, model.getEntries()); + } + UIActionHelper.showDiffUI(config, ui, location, entries.toArray(new VCSEntry[entries.size()])); return; case REFRESH: handler.doRefresh(model, entries, handler.getSelectionModel()); @@ -65,7 +79,7 @@ case DELETE: case REVERT: case UPDATE: - handler.showConfirmUI(action, model, entries); + UIActionHelper.showConfirmUI(config, ui, location, action, entries.toArray(new VCSEntry[entries.size()])); return; } throw new IllegalStateException("could not perform action for action " + action + " (" + this + ')'); Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSGenerateSshKey.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSGenerateSshKey.jaxx 2008-04-25 23:38:14 UTC (rev 612) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSGenerateSshKey.jaxx 2008-04-25 23:39:52 UTC (rev 613) @@ -1,4 +1,4 @@ -<JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> +<JDialog modal='true'> <script> import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxChangelogUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxChangelogUI.jaxx 2008-04-25 23:38:14 UTC (rev 612) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxChangelogUI.jaxx 2008-04-25 23:39:52 UTC (rev 613) @@ -1,4 +1,4 @@ -<ChangelogUI title='lutinvcs.changelog.title' modal="true" defaultCloseOperation='DISPOSE_ON_CLOSE' height='400' width='500'> +<ChangelogUI modal="true" height='400' width='500'> <style source="common.css"/> <script> import static org.codelutin.vcs.type.VCSAction.*; Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx 2008-04-25 23:38:14 UTC (rev 612) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx 2008-04-25 23:39:52 UTC (rev 613) @@ -1,35 +1,9 @@ -<ConfigUI title='lutinvcs.config.title' modal='true'> -  +<ConfigUI modal='true' resizable='false'> <style source="config.css"/> <script> import static org.codelutin.vcs.type.VCSConnexionMode.*; import static org.codelutin.vcs.ui.util.UIHelper.createActionIcon; import org.codelutin.vcs.ui.action.*; - - public String getElementValue(Element element) { - JComponent o = getElement(element); - if (o instanceof JPasswordField) { - return Arrays.toString(((JPasswordField) o).getPassword()); - } - if (o instanceof JTextField) { - return ((JTextField) o).getText(); - } - if (o instanceof JRadioButton) { - return String.valueOf(((JRadioButton) o).isSelected()); - } - if (o instanceof JCheckBox) { - return String.valueOf(((JCheckBox) o).isSelected()); - } - return ""; - } - - public JLabel getElementLabel(Element element) { - return (JLabel) $objectMap.get(element.name() + "Label"); - } - - public JComponent getElement(Element element) { - return (JComponent) $objectMap.get(element.name()); - } </script> <java.awt.CardLayout id='connexionPanelLayout'> @@ -117,19 +91,16 @@ <JButton id='generateKey' icon='{createActionIcon("generatekey")}' onActionPerformed="generateKey()" borderPainted='false'/> <JButton id='reset' onActionPerformed="reset()" icon='{createActionIcon("revert")}' borderPainted='false'/> - <JButton id='testConnection' onActionPerformed="testConnexion()" icon='{createActionIcon("test")}' - borderPainted='false'/> + <JButton id='testConnection' action='{newAction(TestConnexionAction.class)}' borderPainted='false'/> </JToolBar> - -  + <JToolBar id='identityHead' opaque='false'> <JLabel id='identityLabel'/> </JToolBar> <Table fill='both' insets="1,1,1,1"> <row fill='horizontal'> <cell columns='2'> - <JScrollPane columnHeaderView='{top}'> -  + <JScrollPane columnHeaderView='{top}'> <JEditorPane id="doc"/> </JScrollPane> </cell> @@ -168,8 +139,7 @@ </row> <row fill='horizontal'> <cell columns="2" fill='both'> - <JScrollPane columnHeaderView='{connexionHead}' styleClass='connexionScroll'> -  + <JScrollPane columnHeaderView='{connexionHead}' styleClass='connexionScroll'> <JPanel id='connexionPanel' layout='{connexionPanelLayout}'/> </JScrollPane> </cell> Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfirmUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfirmUI.jaxx 2008-04-25 23:38:14 UTC (rev 612) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfirmUI.jaxx 2008-04-25 23:39:52 UTC (rev 613) @@ -1,5 +1,4 @@ -<ConfirmUI title='lutinvcs.confirm.title' defaultCloseOperation='DISPOSE_ON_CLOSE' modal='true' - resizable='false' height='300' width='400'> +<ConfirmUI modal='true' resizable='false' height='300' width='400'> <style source="common.css"/> <script>import org.codelutin.vcs.ui.action.*;</script> <JPopupMenu id="popup"> Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxDiffUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxDiffUI.jaxx 2008-04-25 23:38:14 UTC (rev 612) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxDiffUI.jaxx 2008-04-25 23:39:52 UTC (rev 613) @@ -1,4 +1,4 @@ -<DiffUI title='lutinvcs.diff.title' modal="true" defaultCloseOperation='DISPOSE_ON_CLOSE' height='600' width='500'> +<DiffUI modal="true" height='600' width='500'> <style source="common.css"/> <script> import static org.codelutin.vcs.type.VCSAction.*; Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx 2008-04-25 23:38:14 UTC (rev 612) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx 2008-04-25 23:39:52 UTC (rev 613) @@ -1,34 +1,9 @@ -<GenerateSshKeyUI title='lutinvcs.generateSskKey.title'> +<GenerateSshKeyUI modal="true">  <style source="config.css"/> <script> import static org.codelutin.vcs.ui.util.UIHelper.createActionIcon; import org.codelutin.vcs.ui.action.*; - - public String getElementValue(Element element) { - JComponent o = getElement(element); - if (o instanceof JPasswordField) { - return Arrays.toString(((JPasswordField) o).getPassword()); - } - if (o instanceof JTextField) { - return ((JTextField) o).getText(); - } - if (o instanceof JRadioButton) { - return String.valueOf(((JRadioButton) o).isSelected()); - } - if (o instanceof JCheckBox) { - return String.valueOf(((JCheckBox) o).isSelected()); - } - return ""; - } - - public JLabel getElementLabel(Element element) { - return (JLabel) $objectMap.get(element.name() + "Label"); - } - - public JComponent getElement(Element element) { - return (JComponent) $objectMap.get(element.name()); - } </script> <JToolBar id='top'> Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.jaxx 2008-04-25 23:38:14 UTC (rev 612) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.jaxx 2008-04-25 23:39:52 UTC (rev 613) @@ -1,4 +1,4 @@ -<SynchUI title='lutinvcs.synch.title' defaultCloseOperation='DISPOSE_ON_CLOSE'> +<SynchUI> <style source="common.css"/> <script> import static org.codelutin.vcs.type.VCSAction.*; @@ -37,7 +37,7 @@ <JButton id='addAll' action='{newAction(TabUIAction.class,ADD,false)}'/> <JButton id='deleteAll' action='{newAction(TabUIAction.class,DELETE,false)}'/> <JSeparator orientation="vertical"/> - <JButton id='config' action='{newAction(ShowConfigAction.class)}'/> + <JButton id='config' action='{newAction(ShowConfigAction.class,false)}'/> <JButton id='help' action='{newAction(HelpAction.class)}'/> </JToolBar> </cell> Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css 2008-04-25 23:38:14 UTC (rev 612) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/config.css 2008-04-25 23:39:52 UTC (rev 613) @@ -97,11 +97,6 @@ toolTipText: "lutinvcs.config.server.ssh.key.generate"; } -#testConnection { - /*text: "lutinvcs.config.test";*/ - toolTipText: "lutinvcs.config.test.tip"; -} - #ok { text: "lutinvcs.apply"; }

1 0

r612 - trunk/lutinvcs/ui/jaxx/src/main/resources/icons
by tchemit＠users.labs.libre-entreprise.org 25 Apr '08

25 Apr '08

Author: tchemit Date: 2008-04-25 23:38:14 +0000 (Fri, 25 Apr 2008) New Revision: 612 Added: trunk/lutinvcs/ui/jaxx/src/main/resources/icons/action-show-changelogui.png trunk/lutinvcs/ui/jaxx/src/main/resources/icons/action-show-configui.png trunk/lutinvcs/ui/jaxx/src/main/resources/icons/action-show-confirmui.png trunk/lutinvcs/ui/jaxx/src/main/resources/icons/action-show-diffui.png trunk/lutinvcs/ui/jaxx/src/main/resources/icons/action-show-synchui.png Log: add generic show ui action Copied: trunk/lutinvcs/ui/jaxx/src/main/resources/icons/action-show-changelogui.png (from rev 609, trunk/lutinvcs/ui/jaxx/src/main/resources/icons/action-changelog.png) =================================================================== (Binary files differ) Copied: trunk/lutinvcs/ui/jaxx/src/main/resources/icons/action-show-configui.png (from rev 605, trunk/lutinvcs/ui/jaxx/src/main/resources/icons/action-showconfig.png) =================================================================== (Binary files differ) Added: trunk/lutinvcs/ui/jaxx/src/main/resources/icons/action-show-confirmui.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/ui/jaxx/src/main/resources/icons/action-show-confirmui.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/lutinvcs/ui/jaxx/src/main/resources/icons/action-show-diffui.png (from rev 609, trunk/lutinvcs/ui/jaxx/src/main/resources/icons/action-diff.png) =================================================================== (Binary files differ) Copied: trunk/lutinvcs/ui/jaxx/src/main/resources/icons/action-show-synchui.png (from rev 609, trunk/lutinvcs/ui/jaxx/src/main/resources/icons/versioning-view.png) =================================================================== (Binary files differ)

1 0

r611 - trunk/lutinui/src/main/java/org/codelutin/ui
by tchemit＠users.labs.libre-entreprise.org 25 Apr '08

25 Apr '08

Author: tchemit Date: 2008-04-25 22:12:42 +0000 (Fri, 25 Apr 2008) New Revision: 611 Added: trunk/lutinui/src/main/java/org/codelutin/ui/ShowUIAction.java Modified: trunk/lutinui/src/main/java/org/codelutin/ui/DialogUIDef.java trunk/lutinui/src/main/java/org/codelutin/ui/UIFactory.java Log: add generic show ui action Modified: trunk/lutinui/src/main/java/org/codelutin/ui/DialogUIDef.java =================================================================== --- trunk/lutinui/src/main/java/org/codelutin/ui/DialogUIDef.java 2008-04-25 22:11:57 UTC (rev 610) +++ trunk/lutinui/src/main/java/org/codelutin/ui/DialogUIDef.java 2008-04-25 22:12:42 UTC (rev 611) @@ -14,6 +14,10 @@ */ package org.codelutin.ui; +import static org.codelutin.i18n.I18n._; + +import javax.swing.ImageIcon; + /** * Definition of an ui, with his model, handler and ui class definitions. * <p/> @@ -23,6 +27,12 @@ */ public class DialogUIDef<M extends DialogUIModel, U extends DialogUI<H>, H extends DialogUIHandler<M, U>> implements java.io.Serializable { + public static <M extends DialogUIModel, U extends DialogUI<H>, H extends DialogUIHandler<M, U>> DialogUIDef<M, U, H> newDef(Class<H> handlerClass, Class<U> uiClass, Class<M> modelClass, String showActionLibelle, String showActionTip, String uiTitle) { + DialogUIDef<M, U, H> result; + result = new DialogUIDef<M, U, H>(handlerClass, uiClass, modelClass, showActionLibelle, showActionTip, uiTitle); + return result; + } + /** model class */ private final Class<M> modelClass; @@ -38,12 +48,28 @@ /** shared instance of ui */ protected U uiInstance; + /** unique name of ui def */ + protected final String name; + + protected final String uiTitle; + protected final String showActionLibelle; + + protected final String showActionTip; + + protected ImageIcon showUIActionIcon; + + private static final long serialVersionUID = 1L; - public DialogUIDef(Class<H> handlerClass, Class<U> uiClass, Class<M> modelClass) { + private DialogUIDef(Class<H> handlerClass, Class<U> uiClass, Class<M> modelClass, + String showActionLibelle, String showActionTip, String uiTitle) { this.handlerClass = handlerClass; this.uiClass = uiClass; this.modelClass = modelClass; + this.showActionLibelle = showActionLibelle; + this.name = uiClass.getSimpleName().toLowerCase(); + this.showActionTip = showActionTip; + this.uiTitle = uiTitle; } public Class<U> getUiClass() { @@ -62,6 +88,25 @@ return uiImplClass; } + public String getUiTitle() { + return _(uiTitle); + } + + public String getShowActionLibelle() { + return _(showActionLibelle); + } + + public String getShowActionTip() { + return _(showActionTip); + } + + public ImageIcon getShowUIActionIcon() { + if (showUIActionIcon == null) { + showUIActionIcon = UIHelper.createActionIcon("show-" + name); + } + return showUIActionIcon; + } + @SuppressWarnings({"unchecked"}) public void setUiImplClass(Class<?> uiImplClass) { this.uiImplClass = (Class<? extends U>) uiImplClass; Added: trunk/lutinui/src/main/java/org/codelutin/ui/ShowUIAction.java =================================================================== --- trunk/lutinui/src/main/java/org/codelutin/ui/ShowUIAction.java (rev 0) +++ trunk/lutinui/src/main/java/org/codelutin/ui/ShowUIAction.java 2008-04-25 22:12:42 UTC (rev 611) @@ -0,0 +1,68 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.ui; + +/** @author chemit */ +public abstract class ShowUIAction<M extends DialogUIModel, U extends DialogUI<H>, H extends DialogUIHandler<M, U>, HH extends org.codelutin.ui.DialogUIHandler<?, ?>> extends AbstractUIAction<HH> { + + private static final long serialVersionUID = 1L; + + protected DialogUIDef<M, U, H> uiDef; + + protected transient UIFactory factory; + + protected abstract U initUI(java.awt.event.ActionEvent e); + + public <UU extends DialogUI<HH>> ShowUIAction(UU ui, DialogUIDef<M, U, H> uiDef, UIFactory factory, boolean showText) { + super(uiDef.getShowActionLibelle(), uiDef.getShowUIActionIcon(), ui); + this.uiDef = uiDef; + String name = (String) getValue(NAME); + putValue(DISPLAYED_MNEMONIC_INDEX_KEY, name.length() - 1); + putValue(ACCELERATOR_KEY, (int) name.charAt(name.length() - 1)); + if (!showText) { + putValue(NAME, null); + } + putValue(SHORT_DESCRIPTION, uiDef.getShowActionTip()); + this.factory = factory; + } + + public DialogUIDef<M, U, H> getUiDef() { + return uiDef; + } + + public void setUiDef(DialogUIDef<M, U, H> uiDef) { + this.uiDef = uiDef; + } + + public UIFactory getFactory() { + return factory; + } + + public void actionPerformed(java.awt.event.ActionEvent e) { + checkInit(); + U ui = initUI(e); + ui.setTitle(uiDef.getUiTitle()); + log.info(ui.getTitle()); + ui.setVisible(true); + } + + @Override + protected void checkInit() throws IllegalStateException { + super.checkInit(); + if (factory == null) { + throw new IllegalStateException("no factory found in " + this); + } + } +} \ No newline at end of file Modified: trunk/lutinui/src/main/java/org/codelutin/ui/UIFactory.java =================================================================== --- trunk/lutinui/src/main/java/org/codelutin/ui/UIFactory.java 2008-04-25 22:11:57 UTC (rev 610) +++ trunk/lutinui/src/main/java/org/codelutin/ui/UIFactory.java 2008-04-25 22:12:42 UTC (rev 611) @@ -154,7 +154,7 @@ close(); } - protected <M extends DialogUIModel, U extends DialogUI<H>, H extends DialogUIHandler<M, U>> U getUI(DialogUIDef<M, U, H> uiType, Object... params) { + public <M extends DialogUIModel, U extends DialogUI<H>, H extends DialogUIHandler<M, U>> U getUI(DialogUIDef<M, U, H> uiType, Object... params) { U result = uiType.uiInstance; if (result == null) { try {

1 0

r610 - trunk/lutinui/src/main/java/org/codelutin/ui
by tchemit＠users.labs.libre-entreprise.org 25 Apr '08

25 Apr '08

Author: tchemit Date: 2008-04-25 22:11:57 +0000 (Fri, 25 Apr 2008) New Revision: 610 Modified: trunk/lutinui/src/main/java/org/codelutin/ui/DialogUI.java Log: use convinient method to obtain components (compatible with jaxx) Modified: trunk/lutinui/src/main/java/org/codelutin/ui/DialogUI.java =================================================================== --- trunk/lutinui/src/main/java/org/codelutin/ui/DialogUI.java 2008-04-20 12:25:05 UTC (rev 609) +++ trunk/lutinui/src/main/java/org/codelutin/ui/DialogUI.java 2008-04-25 22:11:57 UTC (rev 610) @@ -68,6 +68,8 @@ private H handler; public abstract AbstractButton getHelp(); + + public abstract Object getObjectById(java.lang.String s); protected DialogUI() { UIHelper.setQuitAction(this);

1 0

r609 - trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 20 Apr '08

20 Apr '08

Author: tchemit Date: 2008-04-20 12:25:05 +0000 (Sun, 20 Apr 2008) New Revision: 609 Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxChangelogUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfirmUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxDiffUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.jaxx Log: generic action factory in DialogUI.newAction Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxChangelogUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxChangelogUI.jaxx 2008-04-20 12:24:48 UTC (rev 608) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxChangelogUI.jaxx 2008-04-20 12:25:05 UTC (rev 609) @@ -3,23 +3,24 @@ <script> import static org.codelutin.vcs.type.VCSAction.*; import static org.codelutin.vcs.type.VCSEntryLocation.*; + import org.codelutin.vcs.ui.action.*; </script> <Table> <row fill='both'> <cell fill='both' weightx='1'> <JToolBar> - <JToggleButton id='allTab' action='{createLocationAction(ALL)}'/> - <JToggleButton id='localTab' action='{createLocationAction(LOCAL)}'/> - <JToggleButton id='remoteTab' action='{createLocationAction(REMOTE)}'/> + <JToggleButton id='allTab' action='{newAction(ChangeLocationAction.class,ALL)}'/> + <JToggleButton id='localTab' action='{newAction(ChangeLocationAction.class,LOCAL)}'/> + <JToggleButton id='remoteTab' action='{newAction(ChangeLocationAction.class,REMOTE)}'/> <JSeparator orientation="vertical"/> - <JButton id='previousFile' action='{createFileAction(true)}'/> - <JButton id='nextFile' action='{createFileAction(false)}'/> - <JButton id='refresh' action='{createAction(REFRESH,true)}'/> + <JButton id='previousFile' action='{newAction(ChangeFileAction.class,true)}'/> + <JButton id='nextFile' action='{newAction(ChangeFileAction.class,false)}'/> + <JButton id='refresh' action='{newAction(TabUIAction.class,REFRESH,true)}'/> <JSeparator orientation="vertical"/> - <JButton id='update' action='{createAction(UPDATE,true)}'/> - <JButton id='revert' action='{createAction(REVERT,true)}'/> + <JButton id='update' action='{newAction(TabUIAction.class,UPDATE,true)}'/> + <JButton id='revert' action='{newAction(TabUIAction.class,REVERT,true)}'/> <JSeparator orientation="vertical"/> - <JButton id='help' action='{createHelpAction()}'/> + <JButton id='help' action='{newAction(HelpAction.class)}'/> </JToolBar> </cell> </row> Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx 2008-04-20 12:24:48 UTC (rev 608) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfigUI.jaxx 2008-04-20 12:25:05 UTC (rev 609) @@ -4,7 +4,8 @@ <script> import static org.codelutin.vcs.type.VCSConnexionMode.*; import static org.codelutin.vcs.ui.util.UIHelper.createActionIcon; - + import org.codelutin.vcs.ui.action.*; + public String getElementValue(Element element) { JComponent o = getElement(element); if (o instanceof JPasswordField) { @@ -100,7 +101,7 @@ <cell fill='both'/> </row> </Table> - <JButton id='help' action='{createHelpAction()}' borderPainted='false'/> + <JButton id='help' action='{newAction(HelpAction.class)}' borderPainted='false'/> </JToolBar> <JToolBar id='connexionHead' opaque='false' height='30'> Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfirmUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfirmUI.jaxx 2008-04-20 12:24:48 UTC (rev 608) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxConfirmUI.jaxx 2008-04-20 12:25:05 UTC (rev 609) @@ -1,6 +1,7 @@ <ConfirmUI title='lutinvcs.confirm.title' defaultCloseOperation='DISPOSE_ON_CLOSE' modal='true' resizable='false' height='300' width='400'> <style source="common.css"/> + <script>import org.codelutin.vcs.ui.action.*;</script> <JPopupMenu id="popup"> <JScrollPane styleClass='confirmScroll'> <JList id='messages' model='{messageModel}' selectionModel='{messageSelectionModel}'/> @@ -17,7 +18,7 @@ </row> </Table>  - <JButton id='help' action='{createHelpAction()}'/> + <JButton id='help' action='{newAction(HelpAction.class)}'/> </JToolBar> </cell> </row> @@ -33,7 +34,7 @@ <cell fill='both'/> </row> </Table> - <JButton id='lastMessages' action='{createShowMessagesAction()}'/> + <JButton id='lastMessages' action='{newAction(ShowMessagesAction.class)}'/> </JToolBar> </cell> </row> Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxDiffUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxDiffUI.jaxx 2008-04-20 12:24:48 UTC (rev 608) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxDiffUI.jaxx 2008-04-20 12:25:05 UTC (rev 609) @@ -3,27 +3,28 @@ <script> import static org.codelutin.vcs.type.VCSAction.*; import static org.codelutin.vcs.type.VCSEntryLocation.*; + import org.codelutin.vcs.ui.action.*; </script> <Table> <row fill='both'> <cell fill='both' weightx='1'> <JToolBar> - <JToggleButton id='allTab' action='{createLocationAction(ALL)}'/> - <JToggleButton id='localTab' action='{createLocationAction(LOCAL)}'/> - <JToggleButton id='remoteTab' action='{createLocationAction(REMOTE)}'/> + <JToggleButton id='allTab' action='{newAction(ChangeLocationAction.class,ALL)}'/> + <JToggleButton id='localTab' action='{newAction(ChangeLocationAction.class,LOCAL)}'/> + <JToggleButton id='remoteTab' action='{newAction(ChangeLocationAction.class,REMOTE)}'/> <JSeparator orientation="vertical"/> - <JButton id='previousFile' action='{createFileAction(true)}'/> - <JButton id='nextFile' action='{createFileAction(false)}'/> - <JButton id='refresh' action='{createAction(REFRESH,true)}'/> + <JButton id='previousFile' action='{newAction(ChangeFileAction.class,true)}'/> + <JButton id='nextFile' action='{newAction(ChangeFileAction.class,false)}'/> + <JButton id='refresh' action='{newAction(TabUIAction.class,REFRESH,true)}'/> <JSeparator orientation="vertical"/> - <JButton id='nextDiff' action='{createDiffAction(false)}'/> - <JButton id='previousDiff' action='{createDiffAction(true)}'/> + <JButton id='nextDiff' action='{newAction(DiffAction.class,false)}'/> + <JButton id='previousDiff' action='{newAction(DiffAction.class,true)}'/> <JSeparator orientation="vertical"/> - <JButton id='update' action='{createAction(UPDATE,true)}'/> - <JButton id='commit' action='{createAction(COMMIT,true)}'/> - <JButton id='revert' action='{createAction(REVERT,true)}'/> + <JButton id='update' action='{newAction(TabUIAction.class,UPDATE,true)}'/> + <JButton id='commit' action='{newAction(TabUIAction.class,COMMIT,true)}'/> + <JButton id='revert' action='{newAction(TabUIAction.class,REVERT,true)}'/> <JSeparator orientation="vertical"/> - <JButton id='help' action='{createHelpAction()}'/> + <JButton id='help' action='{newAction(HelpAction.class)}'/> </JToolBar> </cell> </row> Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx 2008-04-20 12:24:48 UTC (rev 608) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxGenerateSshKeyUI.jaxx 2008-04-20 12:25:05 UTC (rev 609) @@ -3,7 +3,8 @@ <style source="config.css"/> <script> import static org.codelutin.vcs.ui.util.UIHelper.createActionIcon; - + import org.codelutin.vcs.ui.action.*; + public String getElementValue(Element element) { JComponent o = getElement(element); if (o instanceof JPasswordField) { @@ -38,7 +39,7 @@ </row> </Table> <JButton id='reset' onActionPerformed="reset()" icon='{createActionIcon("revert")}' borderPainted='false'/> - <JButton id='help' action='{createHelpAction()}' borderPainted='false'/> + <JButton id='help' action='{newAction(HelpAction.class)}' borderPainted='false'/> </JToolBar> <Table fill='both' insets="1,1,1,1"> <row fill='horizontal'> Modified: trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.jaxx =================================================================== --- trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.jaxx 2008-04-20 12:24:48 UTC (rev 608) +++ trunk/lutinvcs/ui/jaxx/src/main/uimodel/org/codelutin/vcs/ui/JaxxSynchUI.jaxx 2008-04-20 12:25:05 UTC (rev 609) @@ -3,41 +3,42 @@ <script> import static org.codelutin.vcs.type.VCSAction.*; import static org.codelutin.vcs.type.VCSEntryLocation.*; + import org.codelutin.vcs.ui.action.*; </script> <JPopupMenu id="popup" invoker='{contentTable}'> - <JMenuItem id='refresh' action='{createAction(REFRESH,true)}' font-size='10'/> - <JMenuItem id='diff' action='{createAction(DIFF,true)}' font-size='10'/> - <JMenuItem id='changelog' action='{createAction(CHANGELOG,true)}' font-size='10'/> + <JMenuItem id='refresh' action='{newAction(TabUIAction.class,REFRESH,true)}' font-size='10'/> + <JMenuItem id='diff' action='{newAction(TabUIAction.class,DIFF,true)}' font-size='10'/> + <JMenuItem id='changelog' action='{newAction(TabUIAction.class,CHANGELOG,true)}' font-size='10'/> <JSeparator/> - <JMenuItem id='update' action='{createAction(UPDATE,true)}' font-size='10'/> - <JMenuItem id='revert' action='{createAction(REVERT,true)}' font-size='10'/> + <JMenuItem id='update' action='{newAction(TabUIAction.class,UPDATE,true)}' font-size='10'/> + <JMenuItem id='revert' action='{newAction(TabUIAction.class,REVERT,true)}' font-size='10'/> <JSeparator/> - <JMenuItem id='commit' action='{createAction(COMMIT,true)}' font-size='10'/> - <JMenuItem id='add' action='{createAction(ADD,true)}' font-size='10'/> - <JMenuItem id='delete' action='{createAction(DELETE,true)}' font-size='10'/> + <JMenuItem id='commit' action='{newAction(TabUIAction.class,COMMIT,true)}' font-size='10'/> + <JMenuItem id='add' action='{newAction(TabUIAction.class,ADD,true)}' font-size='10'/> + <JMenuItem id='delete' action='{newAction(TabUIAction.class,DELETE,true)}' font-size='10'/> </JPopupMenu> <Table id='table'> <row fill='both'> <cell fill='both' weightx='1'> <JToolBar> - <JToggleButton id='allTab' action='{createLocationAction(ALL)}'/> - <JToggleButton id='localTab' action='{createLocationAction(LOCAL)}'/> - <JToggleButton id='remoteTab' action='{createLocationAction(REMOTE)}'/> + <JToggleButton id='allTab' action='{newAction(ChangeLocationAction.class,ALL)}'/> + <JToggleButton id='localTab' action='{newAction(ChangeLocationAction.class,LOCAL)}'/> + <JToggleButton id='remoteTab' action='{newAction(ChangeLocationAction.class,REMOTE)}'/> <JSeparator orientation="vertical"/> - <JButton id='refreshAll' action='{createAction(REFRESH,false)}'/> - <JButton id='diffAll' action='{createAction(DIFF,false)}'/> - <JButton id='changelogAll' action='{createAction(CHANGELOG,false)}'/> + <JButton id='refreshAll' action='{newAction(TabUIAction.class,REFRESH,false)}'/> + <JButton id='diffAll' action='{newAction(TabUIAction.class,DIFF,false)}'/> + <JButton id='changelogAll' action='{newAction(TabUIAction.class,CHANGELOG,false)}'/> <JSeparator orientation="vertical"/> - <JButton id='updateAll' action='{createAction(UPDATE,false)}'/> - <JButton id='revertAll' action='{createAction(REVERT,false)}'/> + <JButton id='updateAll' action='{newAction(TabUIAction.class,UPDATE,false)}'/> + <JButton id='revertAll' action='{newAction(TabUIAction.class,REVERT,false)}'/> <JSeparator orientation="vertical"/> - <JButton id='commitAll' action='{createAction(COMMIT,false)}'/> - <JButton id='addAll' action='{createAction(ADD,false)}'/> - <JButton id='deleteAll' action='{createAction(DELETE,false)}'/> + <JButton id='commitAll' action='{newAction(TabUIAction.class,COMMIT,false)}'/> + <JButton id='addAll' action='{newAction(TabUIAction.class,ADD,false)}'/> + <JButton id='deleteAll' action='{newAction(TabUIAction.class,DELETE,false)}'/> <JSeparator orientation="vertical"/> - <JButton id='config' action='{createShowConfigAction()}'/> - <JButton id='help' action='{createHelpAction()}'/> + <JButton id='config' action='{newAction(ShowConfigAction.class)}'/> + <JButton id='help' action='{newAction(HelpAction.class)}'/> </JToolBar> </cell> </row>

1 0

r608 - in trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui: . action util/ui
by tchemit＠users.labs.libre-entreprise.org 20 Apr '08

20 Apr '08

Author: tchemit Date: 2008-04-20 12:24:48 +0000 (Sun, 20 Apr 2008) New Revision: 608 Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/ConfirmUI.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/DiffUI.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeFileAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeLocationAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ConfirmAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/DiffAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/HelpAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowMessagesAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractTabOneFileUI.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractTabUI.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractUI.java Log: generic action factory in DialogUI.newAction Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/ConfirmUI.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/ConfirmUI.java 2008-04-20 12:23:38 UTC (rev 607) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/ConfirmUI.java 2008-04-20 12:24:48 UTC (rev 608) @@ -14,11 +14,9 @@ */ package org.codelutin.vcs.ui; -import org.codelutin.vcs.ui.action.ShowMessagesAction; import org.codelutin.vcs.ui.handler.ConfirmUIHandler; import org.codelutin.vcs.ui.util.ui.AbstractBasicUI; -import javax.swing.AbstractAction; import javax.swing.AbstractButton; import javax.swing.DefaultListModel; import javax.swing.DefaultListSelectionModel; @@ -33,6 +31,10 @@ /** @author chemit */ public abstract class ConfirmUI extends AbstractBasicUI<ConfirmUIHandler> { + public abstract AbstractButton getLastMessages(); + + public abstract AbstractButton getAccept(); + public abstract JLabel getActionLabel(); public abstract JPanel getToolbar(); @@ -45,10 +47,6 @@ public abstract JTextArea getCommitMessage(); - public abstract AbstractButton getLastMessages(); - - public abstract AbstractButton getAccept(); - public abstract JPopupMenu getPopup(); public abstract JList getMessages(); @@ -69,7 +67,4 @@ super.setVisible(b); } - protected AbstractAction createShowMessagesAction() { - return ShowMessagesAction.createAction(this); - } } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/DiffUI.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/DiffUI.java 2008-04-20 12:23:38 UTC (rev 607) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/DiffUI.java 2008-04-20 12:24:48 UTC (rev 608) @@ -17,7 +17,6 @@ import org.codelutin.vcs.ui.handler.DiffUIHandler; import org.codelutin.vcs.ui.util.ui.AbstractTabOneFileUI; -import javax.swing.AbstractAction; import javax.swing.AbstractButton; import javax.swing.JScrollPane; import javax.swing.JTextArea; @@ -39,7 +38,4 @@ public abstract JTextArea getLocalEditorContent(); - protected AbstractAction createDiffAction(boolean goUp) { - return org.codelutin.vcs.ui.action.DiffAction.createAction(goUp, this); - } } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeFileAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeFileAction.java 2008-04-20 12:23:38 UTC (rev 607) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeFileAction.java 2008-04-20 12:24:48 UTC (rev 608) @@ -14,9 +14,8 @@ */ package org.codelutin.vcs.ui.action; -import org.codelutin.vcs.ui.util.ui.AbstractTabOneFileUI; -import org.codelutin.vcs.ui.util.handler.AbstractTabOneFileUIHandler; import org.codelutin.ui.AbstractUIAction; +import org.codelutin.vcs.ui.util.handler.AbstractTabOneFileUIHandler; /** @author chemit */ public class ChangeFileAction extends AbstractUIAction<AbstractTabOneFileUIHandler<?, ?>> { @@ -25,10 +24,12 @@ private static final long serialVersionUID = 1L; - public static javax.swing.AbstractAction createAction(boolean location, AbstractTabOneFileUI<?> ui) { - ChangeFileAction action = new ChangeFileAction(location); - action.setUi(ui); - return action; + public ChangeFileAction(org.codelutin.vcs.ui.util.ui.AbstractTabOneFileUI<?> ui, boolean location) { + super(null, org.codelutin.ui.UIHelper.createActionIcon("file-" + (location ? "prev" : "next")), ui); + this.goPrevious = location; + //putValue(SHORT_DESCRIPTION, location.getTip()); + //putValue(DISPLAYED_MNEMONIC_INDEX_KEY, 0); + //putValue(MNEMONIC_KEY, (int) ((String) getValue(NAME)).charAt(0)); } public void actionPerformed(java.awt.event.ActionEvent e) { @@ -44,12 +45,4 @@ return goPrevious; } - protected ChangeFileAction(boolean location) { - super(null, org.codelutin.ui.UIHelper.createActionIcon("file-" + (location ? "prev" : "next"))); - this.goPrevious = location; - //putValue(SHORT_DESCRIPTION, location.getTip()); - //putValue(DISPLAYED_MNEMONIC_INDEX_KEY, 0); - //putValue(MNEMONIC_KEY, (int) ((String) getValue(NAME)).charAt(0)); - } - } \ No newline at end of file Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeLocationAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeLocationAction.java 2008-04-20 12:23:38 UTC (rev 607) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeLocationAction.java 2008-04-20 12:24:48 UTC (rev 608) @@ -14,10 +14,10 @@ */ package org.codelutin.vcs.ui.action; +import org.codelutin.ui.AbstractUIAction; import org.codelutin.vcs.type.VCSEntryLocation; -import org.codelutin.vcs.ui.util.ui.AbstractTabUI; import org.codelutin.vcs.ui.util.handler.AbstractTabUIHandler; -import org.codelutin.ui.AbstractUIAction; +import org.codelutin.vcs.ui.util.ui.AbstractTabUI; /** @author chemit */ public class ChangeLocationAction extends AbstractUIAction<AbstractTabUIHandler<?, ?>> { @@ -26,10 +26,12 @@ private static final long serialVersionUID = 1L; - public static javax.swing.AbstractAction createAction(VCSEntryLocation location, AbstractTabUI<?> ui) { - ChangeLocationAction action = new ChangeLocationAction(location); - action.setUi(ui); - return action; + public ChangeLocationAction(AbstractTabUI<?> ui, VCSEntryLocation location) { + super(location.getLibelle(), org.codelutin.vcs.ui.util.UIHelper.createLocationIcon(location), ui); + this.location = location; + putValue(SHORT_DESCRIPTION, location.getTip()); + putValue(DISPLAYED_MNEMONIC_INDEX_KEY, 0); + putValue(MNEMONIC_KEY, (int) ((String) getValue(NAME)).charAt(0)); } public void actionPerformed(java.awt.event.ActionEvent e) { @@ -48,12 +50,4 @@ this.location = location; } - protected ChangeLocationAction(VCSEntryLocation location) { - super(location.getLibelle(), org.codelutin.vcs.ui.util.UIHelper.createLocationIcon(location)); - this.location = location; - putValue(SHORT_DESCRIPTION, location.getTip()); - putValue(DISPLAYED_MNEMONIC_INDEX_KEY, 0); - putValue(MNEMONIC_KEY, (int) ((String) getValue(NAME)).charAt(0)); - } - } Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ConfirmAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ConfirmAction.java 2008-04-20 12:23:38 UTC (rev 607) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ConfirmAction.java 2008-04-20 12:24:48 UTC (rev 608) @@ -15,20 +15,20 @@ package org.codelutin.vcs.ui.action; import org.codelutin.vcs.type.VCSAction; -import org.codelutin.vcs.ui.handler.ConfirmUIHandler; -import org.codelutin.ui.AbstractUIAction; /** @author chemit */ -public class ConfirmAction extends AbstractUIAction<ConfirmUIHandler> { +public class ConfirmAction extends org.codelutin.ui.AbstractUIAction<org.codelutin.vcs.ui.handler.ConfirmUIHandler> { protected VCSAction action; private static final long serialVersionUID = 1L; - public static javax.swing.AbstractAction createAction(VCSAction action, org.codelutin.vcs.ui.ConfirmUI ui) { - ConfirmAction action1 = new ConfirmAction(action); - action1.setUi(ui); - return action1; + public ConfirmAction(org.codelutin.vcs.ui.ConfirmUI ui, VCSAction action) { + super(null, org.codelutin.vcs.ui.util.UIHelper.createActionIcon(action), ui); + this.action = action; + //putValue(SHORT_DESCRIPTION, action.getTip()); + putValue(DISPLAYED_MNEMONIC_INDEX_KEY, 0); + putValue(MNEMONIC_KEY, (int) (action.getLibelle()).charAt(0)); } public void actionPerformed(java.awt.event.ActionEvent e) { @@ -48,7 +48,7 @@ case DELETE: case REVERT: case UPDATE: - ConfirmUIHandler uiHandler = getHandler(); + org.codelutin.vcs.ui.handler.ConfirmUIHandler uiHandler = getHandler(); uiHandler.doAction(uiHandler.getUi().getCommitMessage().getText(), uiHandler.getModel().getEntriesModel()); return; } @@ -62,12 +62,4 @@ protected void setAction(VCSAction action) { this.action = action; } - - protected ConfirmAction(VCSAction action) { - super(null, org.codelutin.vcs.ui.util.UIHelper.createActionIcon(action)); - this.action = action; - //putValue(SHORT_DESCRIPTION, action.getTip()); - putValue(DISPLAYED_MNEMONIC_INDEX_KEY, 0); - putValue(MNEMONIC_KEY, (int) (action.getLibelle()).charAt(0)); - } } \ No newline at end of file Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/DiffAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/DiffAction.java 2008-04-20 12:23:38 UTC (rev 607) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/DiffAction.java 2008-04-20 12:24:48 UTC (rev 608) @@ -14,20 +14,19 @@ */ package org.codelutin.vcs.ui.action; -import org.codelutin.vcs.ui.handler.DiffUIHandler; -import org.codelutin.ui.AbstractUIAction; - /** @author chemit */ -public class DiffAction extends AbstractUIAction<DiffUIHandler> { +public class DiffAction extends org.codelutin.ui.AbstractUIAction<org.codelutin.vcs.ui.handler.DiffUIHandler> { protected boolean goUp; private static final long serialVersionUID = 1L; - public static javax.swing.AbstractAction createAction(boolean goUp, org.codelutin.vcs.ui.DiffUI ui) { - DiffAction action1 = new DiffAction(goUp); - action1.setUi(ui); - return action1; + public DiffAction(org.codelutin.vcs.ui.DiffUI ui, boolean goUp) { + super(null, org.codelutin.ui.UIHelper.createActionIcon("diff-" + (goUp ? "prev" : "next")), ui); + this.goUp = goUp; + //putValue(SHORT_DESCRIPTION, action.getTip()); + //putValue(DISPLAYED_MNEMONIC_INDEX_KEY, 0); + //putValue(MNEMONIC_KEY, (int) (action.getLibelle()).charAt(0)); } public void actionPerformed(java.awt.event.ActionEvent e) { @@ -47,12 +46,4 @@ this.goUp = goUp; } - protected DiffAction(boolean goUp) { - super(null, org.codelutin.ui.UIHelper.createActionIcon("diff-" + (goUp ? "prev" : "next"))); - this.goUp = goUp; - //putValue(SHORT_DESCRIPTION, action.getTip()); - //putValue(DISPLAYED_MNEMONIC_INDEX_KEY, 0); - //putValue(MNEMONIC_KEY, (int) (action.getLibelle()).charAt(0)); - } - } \ No newline at end of file Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/HelpAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/HelpAction.java 2008-04-20 12:23:38 UTC (rev 607) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/HelpAction.java 2008-04-20 12:24:48 UTC (rev 608) @@ -15,28 +15,16 @@ package org.codelutin.vcs.ui.action; import static org.codelutin.i18n.I18n._; -import org.codelutin.ui.DialogUI; -import org.codelutin.ui.DialogUIHandler; import org.codelutin.ui.AbstractUIAction; +import org.codelutin.ui.DialogUI; /** @author chemit */ -public class HelpAction extends AbstractUIAction<DialogUIHandler<?, ?>> { +public class HelpAction extends AbstractUIAction<org.codelutin.ui.DialogUIHandler<?, ?>> { - public static <H extends DialogUIHandler<?, ?>> javax.swing.AbstractAction createAction(DialogUI<H> ui) { - HelpAction action = new HelpAction(); - action.setUi(ui); - return action; - } - private static final long serialVersionUID = 1L; - public void actionPerformed(java.awt.event.ActionEvent e) { - checkInit(); - log.info("//TODO : " + this + ", " + ui); - } - - protected HelpAction() { - super(_("lutinvcs.action.help.libelle"), org.codelutin.ui.UIHelper.createActionIcon("help")); + public HelpAction(DialogUI<? extends org.codelutin.ui.DialogUIHandler<?, ?>> ui) { + super(_("lutinvcs.action.help.libelle"), org.codelutin.ui.UIHelper.createActionIcon("help"), ui); String name = (String) getValue(NAME); putValue(DISPLAYED_MNEMONIC_INDEX_KEY, name.length() - 1); putValue(ACCELERATOR_KEY, (int) name.charAt(name.length() - 1)); @@ -44,4 +32,9 @@ putValue(SHORT_DESCRIPTION, _("lutinvcs.action.help.tip")); } + public void actionPerformed(java.awt.event.ActionEvent e) { + checkInit(); + log.info("//TODO : " + this + ", " + ui); + } + } \ No newline at end of file Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java 2008-04-20 12:23:38 UTC (rev 607) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java 2008-04-20 12:24:48 UTC (rev 608) @@ -15,35 +15,20 @@ package org.codelutin.vcs.ui.action; import static org.codelutin.i18n.I18n._; -import static org.codelutin.vcs.ui.VCSUIFactory.CONFIG_UI; +import org.codelutin.ui.AbstractUIAction; +import org.codelutin.vcs.ui.ConfigUI; import org.codelutin.vcs.ui.util.handler.AbstractUIHandler; import org.codelutin.vcs.ui.util.ui.AbstractUI; -import org.codelutin.ui.AbstractUIAction; -import javax.swing.AbstractAction; import java.awt.event.ActionEvent; /** @author chemit */ public class ShowConfigAction extends AbstractUIAction<AbstractUIHandler<?, ?>> { - public static <H extends AbstractUIHandler<?, ?>> AbstractAction createAction(AbstractUI<H> ui) { - ShowConfigAction action = new ShowConfigAction(); - action.setUi(ui); - return action; - } - private static final long serialVersionUID = 1L; - public void actionPerformed(ActionEvent e) { - checkInit(); - org.codelutin.vcs.ui.ConfigUI ui = org.codelutin.vcs.ui.VCSUIFactory.getUI(CONFIG_UI); - // populate with common config - ui.getHandler().getModel().populate(ui.getHandler().getConfig()); - ui.setVisible(true); - } - - protected ShowConfigAction() { - super(_("lutinvcs.action.showconfig.libelle"), org.codelutin.ui.UIHelper.createActionIcon("showconfig")); + public ShowConfigAction(AbstractUI<? extends AbstractUIHandler<?, ?>> ui) { + super(_("lutinvcs.action.showconfig.libelle"), org.codelutin.ui.UIHelper.createActionIcon("showconfig"), ui); String name = (String) getValue(NAME); putValue(DISPLAYED_MNEMONIC_INDEX_KEY, name.length() - 1); putValue(ACCELERATOR_KEY, (int) name.charAt(name.length() - 1)); @@ -51,4 +36,12 @@ putValue(SHORT_DESCRIPTION, _("lutinvcs.action.showconfig.tip")); } + public void actionPerformed(ActionEvent e) { + checkInit(); + ConfigUI ui = org.codelutin.vcs.ui.VCSUIFactory.getUI(org.codelutin.vcs.ui.VCSUIFactory.CONFIG_UI); + // populate with common config + ui.getHandler().getModel().populate(ui.getHandler().getConfig()); + ui.setVisible(true); + } + } \ No newline at end of file Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowMessagesAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowMessagesAction.java 2008-04-20 12:23:38 UTC (rev 607) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowMessagesAction.java 2008-04-20 12:24:48 UTC (rev 608) @@ -15,24 +15,23 @@ package org.codelutin.vcs.ui.action; import org.codelutin.vcs.ui.handler.ConfirmUIHandler; -import org.codelutin.ui.AbstractUIAction; /** @author chemit */ -public class ShowMessagesAction extends AbstractUIAction<ConfirmUIHandler> { +public class ShowMessagesAction extends org.codelutin.ui.AbstractUIAction<ConfirmUIHandler> { private static final long serialVersionUID = 1L; - public static javax.swing.AbstractAction createAction(org.codelutin.vcs.ui.ConfirmUI ui) { - ShowMessagesAction action1 = new ShowMessagesAction(); - action1.setUi(ui); - return action1; + public ShowMessagesAction(org.codelutin.vcs.ui.ConfirmUI ui) { + super(null, org.codelutin.ui.UIHelper.createActionIcon("showmessages"), ui); + putValue(SHORT_DESCRIPTION, org.codelutin.i18n.I18n._("lutinvcs.action.showmessages.tip")); + setEnabled(false); } public void actionPerformed(java.awt.event.ActionEvent e) { checkInit(); ConfirmUIHandler uiHandler = getHandler(); - + String currentMessage = uiHandler.getCurrentMessage(); if (!uiHandler.getModel().containsMessage(currentMessage)) { @@ -49,10 +48,4 @@ } - protected ShowMessagesAction() { - super(null, org.codelutin.ui.UIHelper.createActionIcon("showmessages")); - putValue(SHORT_DESCRIPTION, org.codelutin.i18n.I18n._("lutinvcs.action.showmessages.tip")); - setEnabled(false); - } - } \ No newline at end of file Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java 2008-04-20 12:23:38 UTC (rev 607) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java 2008-04-20 12:24:48 UTC (rev 608) @@ -14,11 +14,11 @@ */ package org.codelutin.vcs.ui.action; +import org.codelutin.ui.AbstractUIAction; import org.codelutin.vcs.VCSEntry; import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.ui.util.handler.AbstractTabUIHandler; import org.codelutin.vcs.ui.util.ui.AbstractTabUI; -import org.codelutin.ui.AbstractUIAction; import java.util.List; @@ -31,10 +31,13 @@ private static final long serialVersionUID = 1L; - public static javax.swing.AbstractAction createAction(VCSAction action, boolean useSelection, AbstractTabUI<?> ui) { - TabUIAction action1 = new TabUIAction(action, useSelection); - action1.setUi(ui); - return action1; + public TabUIAction(AbstractTabUI<?> ui, VCSAction action, boolean useSelection) { + super(null, org.codelutin.vcs.ui.util.UIHelper.createActionIcon(action), ui); + this.useSelection = useSelection; + this.action = action; + //putValue(SHORT_DESCRIPTION, action.getTip()); + putValue(DISPLAYED_MNEMONIC_INDEX_KEY, 0); + putValue(MNEMONIC_KEY, (int) (action.getLibelle()).charAt(0)); } public void actionPerformed(java.awt.event.ActionEvent e) { @@ -84,13 +87,4 @@ this.useSelection = useSelection; } - protected TabUIAction(VCSAction action, boolean useSelection) { - super(null, org.codelutin.vcs.ui.util.UIHelper.createActionIcon(action)); - this.useSelection = useSelection; - this.action = action; - //putValue(SHORT_DESCRIPTION, action.getTip()); - putValue(DISPLAYED_MNEMONIC_INDEX_KEY, 0); - putValue(MNEMONIC_KEY, (int) (action.getLibelle()).charAt(0)); - } - } \ No newline at end of file Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractTabOneFileUI.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractTabOneFileUI.java 2008-04-20 12:23:38 UTC (rev 607) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractTabOneFileUI.java 2008-04-20 12:24:48 UTC (rev 608) @@ -14,10 +14,8 @@ */ package org.codelutin.vcs.ui.util.ui; -import org.codelutin.vcs.ui.action.ChangeFileAction; import org.codelutin.vcs.ui.util.handler.AbstractTabOneFileUIHandler; -import javax.swing.AbstractAction; import javax.swing.AbstractButton; import java.awt.event.WindowEvent; @@ -28,10 +26,6 @@ public abstract AbstractButton getPreviousFile(); - protected AbstractAction createFileAction(boolean goPrevious) { - return ChangeFileAction.createAction(goPrevious, this); - } - protected boolean hasListener; @Override Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractTabUI.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractTabUI.java 2008-04-20 12:23:38 UTC (rev 607) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractTabUI.java 2008-04-20 12:24:48 UTC (rev 608) @@ -14,11 +14,9 @@ */ package org.codelutin.vcs.ui.util.ui; -import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSEntryLocation; import org.codelutin.vcs.ui.util.handler.AbstractTabUIHandler; -import javax.swing.AbstractAction; import javax.swing.AbstractButton; import javax.swing.ButtonGroup; @@ -74,12 +72,4 @@ throw new IllegalStateException("no button found for " + modelName); } - protected AbstractAction createLocationAction(VCSEntryLocation location) { - return org.codelutin.vcs.ui.action.ChangeLocationAction.createAction(location, this); - } - - protected AbstractAction createAction(VCSAction action, boolean useSelection) { - return org.codelutin.vcs.ui.action.TabUIAction.createAction(action, useSelection, this); - } - } 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-20 12:23:38 UTC (rev 607) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/ui/AbstractUI.java 2008-04-20 12:24:48 UTC (rev 608) @@ -23,11 +23,4 @@ */ 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); - } - - protected javax.swing.AbstractAction createShowConfigAction() { - return org.codelutin.vcs.ui.action.ShowConfigAction.createAction(this); - } }

1 0

r607 - trunk/lutinui/src/main/java/org/codelutin/ui
by tchemit＠users.labs.libre-entreprise.org 20 Apr '08

20 Apr '08

Author: tchemit Date: 2008-04-20 12:23:38 +0000 (Sun, 20 Apr 2008) New Revision: 607 Modified: trunk/lutinui/src/main/java/org/codelutin/ui/AbstractUIAction.java trunk/lutinui/src/main/java/org/codelutin/ui/DialogUI.java Log: generic action factory in DialogUI.newAction Modified: trunk/lutinui/src/main/java/org/codelutin/ui/AbstractUIAction.java =================================================================== --- trunk/lutinui/src/main/java/org/codelutin/ui/AbstractUIAction.java 2008-04-20 10:49:03 UTC (rev 606) +++ trunk/lutinui/src/main/java/org/codelutin/ui/AbstractUIAction.java 2008-04-20 12:23:38 UTC (rev 607) @@ -23,32 +23,25 @@ protected static Log log = LogFactory.getLog(AbstractUIAction.class); protected transient DialogUI<? extends H> ui; - protected transient H handler; private static final long serialVersionUID = 1L; - protected AbstractUIAction(String name, javax.swing.Icon icon) { + protected AbstractUIAction(String name, javax.swing.Icon icon, DialogUI<? extends H> ui) { super(name, icon); + this.ui = ui; } - public AbstractUIAction() { - } - protected H getHandler() { checkInit(); - if (handler == null) { - handler = ui.getHandler(); - } - return handler; + return ui.getHandler(); } protected void setUi(DialogUI<? extends H> ui) { this.ui = ui; - this.handler = null; } protected void checkInit() throws IllegalStateException { - if (handler == null && ui == null) { + if (ui == null) { throw new IllegalStateException("no handler, nor ui referenced in " + this); } } Modified: trunk/lutinui/src/main/java/org/codelutin/ui/DialogUI.java =================================================================== --- trunk/lutinui/src/main/java/org/codelutin/ui/DialogUI.java 2008-04-20 10:49:03 UTC (rev 606) +++ trunk/lutinui/src/main/java/org/codelutin/ui/DialogUI.java 2008-04-20 12:23:38 UTC (rev 607) @@ -23,6 +23,7 @@ import javax.swing.JDialog; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; +import java.lang.reflect.Constructor; /** * A abstract dialog contract to be realised by a dialogUI (WindowEvent adapter) @@ -35,16 +36,44 @@ protected static Log log = LogFactory.getLog(DialogUI.class); + public javax.swing.AbstractAction newAction(Class<? extends AbstractUIAction> actionClass, Object... params) { + Constructor<?> constructor = null; + for (Constructor<?> cons : actionClass.getConstructors()) { + Class<?>[] prototype = cons.getParameterTypes(); + if (prototype.length > 0 && DialogUI.class.isAssignableFrom(prototype[0])) { + // use this constructor + constructor = cons; + break; + } + } + if (constructor == null) { + throw new IllegalStateException("could not find a matching constructor for " + actionClass); + } + + // wrap params + Object[] parameters = new Object[1 + params.length]; + parameters[0] = this; + System.arraycopy(params, 0, parameters, 1, params.length); + try { + AbstractAction action = (AbstractAction) constructor.newInstance(parameters); + if (log.isInfoEnabled()) { + log.info(action); + } + return action; + } catch (Exception e) { + throw new IllegalStateException("could not init the action " + actionClass + " for reason : " + e.getMessage()); + } + } + private H handler; public abstract AbstractButton getHelp(); - //TODO will be handled by jaxx with javax.help... - protected abstract AbstractAction createHelpAction(); - protected DialogUI() { UIHelper.setQuitAction(this); addWindowListener(this); + //TODO will be handled by jaxx with javax.help... + //getHelp().setAction(newAction(HelpAction.class)); } public H getHandler() {

1 0

r606 - trunk/lutinui/src/main/java/org/codelutin/ui
by tchemit＠users.labs.libre-entreprise.org 20 Apr '08

20 Apr '08

Author: tchemit Date: 2008-04-20 10:49:03 +0000 (Sun, 20 Apr 2008) New Revision: 606 Modified: trunk/lutinui/src/main/java/org/codelutin/ui/AbstractUIAction.java Log: imports Modified: trunk/lutinui/src/main/java/org/codelutin/ui/AbstractUIAction.java =================================================================== --- trunk/lutinui/src/main/java/org/codelutin/ui/AbstractUIAction.java 2008-04-20 10:47:40 UTC (rev 605) +++ trunk/lutinui/src/main/java/org/codelutin/ui/AbstractUIAction.java 2008-04-20 10:49:03 UTC (rev 606) @@ -16,8 +16,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.ui.DialogUI; -import org.codelutin.ui.DialogUIHandler; /** @author chemit */ public abstract class AbstractUIAction<H extends DialogUIHandler<?, ?>> extends javax.swing.AbstractAction {

1 0

r605 - in trunk: lutinui/src/main/java/org/codelutin/ui lutinvcs/ui/common/src/main/java/org/codelutin/ui
by tchemit＠users.labs.libre-entreprise.org 20 Apr '08

20 Apr '08

Author: tchemit Date: 2008-04-20 10:47:40 +0000 (Sun, 20 Apr 2008) New Revision: 605 Added: trunk/lutinui/src/main/java/org/codelutin/ui/AbstractUIAction.java Removed: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/AbstractUIAction.java Log: generalisation de l'AbstractAction Copied: trunk/lutinui/src/main/java/org/codelutin/ui/AbstractUIAction.java (from rev 604, trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/AbstractUIAction.java) =================================================================== --- trunk/lutinui/src/main/java/org/codelutin/ui/AbstractUIAction.java (rev 0) +++ trunk/lutinui/src/main/java/org/codelutin/ui/AbstractUIAction.java 2008-04-20 10:47:40 UTC (rev 605) @@ -0,0 +1,58 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.ui.DialogUI; +import org.codelutin.ui.DialogUIHandler; + +/** @author chemit */ +public abstract class AbstractUIAction<H extends DialogUIHandler<?, ?>> extends javax.swing.AbstractAction { + + protected static Log log = LogFactory.getLog(AbstractUIAction.class); + + protected transient DialogUI<? extends H> ui; + protected transient H handler; + + private static final long serialVersionUID = 1L; + + protected AbstractUIAction(String name, javax.swing.Icon icon) { + super(name, icon); + } + + public AbstractUIAction() { + } + + protected H getHandler() { + checkInit(); + if (handler == null) { + handler = ui.getHandler(); + } + return handler; + } + + protected void setUi(DialogUI<? extends H> ui) { + this.ui = ui; + this.handler = null; + } + + protected void checkInit() throws IllegalStateException { + if (handler == null && ui == null) { + throw new IllegalStateException("no handler, nor ui referenced in " + this); + } + } + +} Deleted: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/AbstractUIAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/AbstractUIAction.java 2008-04-20 10:44:42 UTC (rev 604) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/AbstractUIAction.java 2008-04-20 10:47:40 UTC (rev 605) @@ -1,58 +0,0 @@ -/** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * # #% - */ -package org.codelutin.ui; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.ui.DialogUI; -import org.codelutin.ui.DialogUIHandler; - -/** @author chemit */ -public abstract class AbstractUIAction<H extends DialogUIHandler<?, ?>> extends javax.swing.AbstractAction { - - protected static Log log = LogFactory.getLog(AbstractUIAction.class); - - protected transient DialogUI<? extends H> ui; - protected transient H handler; - - private static final long serialVersionUID = 1L; - - protected AbstractUIAction(String name, javax.swing.Icon icon) { - super(name, icon); - } - - public AbstractUIAction() { - } - - protected H getHandler() { - checkInit(); - if (handler == null) { - handler = ui.getHandler(); - } - return handler; - } - - protected void setUi(DialogUI<? extends H> ui) { - this.ui = ui; - this.handler = null; - } - - protected void checkInit() throws IllegalStateException { - if (handler == null && ui == null) { - throw new IllegalStateException("no handler, nor ui referenced in " + this); - } - } - -}

1 0

r604 - in trunk/lutinvcs/ui/common/src/main/java/org/codelutin: . ui vcs/ui/action vcs/ui/util
by tchemit＠users.labs.libre-entreprise.org 20 Apr '08

20 Apr '08

Author: tchemit Date: 2008-04-20 10:44:42 +0000 (Sun, 20 Apr 2008) New Revision: 604 Added: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/AbstractUIAction.java Removed: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIAction.java Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeFileAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeLocationAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ConfirmAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/DiffAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/HelpAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowMessagesAction.java trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java Log: generalisation de l'AbstractAction Copied: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/AbstractUIAction.java (from rev 603, trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIAction.java) =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/AbstractUIAction.java (rev 0) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/ui/AbstractUIAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -0,0 +1,58 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.ui.DialogUI; +import org.codelutin.ui.DialogUIHandler; + +/** @author chemit */ +public abstract class AbstractUIAction<H extends DialogUIHandler<?, ?>> extends javax.swing.AbstractAction { + + protected static Log log = LogFactory.getLog(AbstractUIAction.class); + + protected transient DialogUI<? extends H> ui; + protected transient H handler; + + private static final long serialVersionUID = 1L; + + protected AbstractUIAction(String name, javax.swing.Icon icon) { + super(name, icon); + } + + public AbstractUIAction() { + } + + protected H getHandler() { + checkInit(); + if (handler == null) { + handler = ui.getHandler(); + } + return handler; + } + + protected void setUi(DialogUI<? extends H> ui) { + this.ui = ui; + this.handler = null; + } + + protected void checkInit() throws IllegalStateException { + if (handler == null && ui == null) { + throw new IllegalStateException("no handler, nor ui referenced in " + this); + } + } + +} Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeFileAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeFileAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeFileAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -16,9 +16,10 @@ import org.codelutin.vcs.ui.util.ui.AbstractTabOneFileUI; import org.codelutin.vcs.ui.util.handler.AbstractTabOneFileUIHandler; +import org.codelutin.ui.AbstractUIAction; /** @author chemit */ -public class ChangeFileAction extends org.codelutin.vcs.ui.util.AbstractUIAction<AbstractTabOneFileUIHandler<?, ?>> { +public class ChangeFileAction extends AbstractUIAction<AbstractTabOneFileUIHandler<?, ?>> { protected boolean goPrevious; Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeLocationAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeLocationAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ChangeLocationAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -17,9 +17,10 @@ import org.codelutin.vcs.type.VCSEntryLocation; import org.codelutin.vcs.ui.util.ui.AbstractTabUI; import org.codelutin.vcs.ui.util.handler.AbstractTabUIHandler; +import org.codelutin.ui.AbstractUIAction; /** @author chemit */ -public class ChangeLocationAction extends org.codelutin.vcs.ui.util.AbstractUIAction<AbstractTabUIHandler<?, ?>> { +public class ChangeLocationAction extends AbstractUIAction<AbstractTabUIHandler<?, ?>> { protected VCSEntryLocation location; Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ConfirmAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ConfirmAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ConfirmAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -16,9 +16,10 @@ import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.ui.handler.ConfirmUIHandler; +import org.codelutin.ui.AbstractUIAction; /** @author chemit */ -public class ConfirmAction extends org.codelutin.vcs.ui.util.AbstractUIAction<ConfirmUIHandler> { +public class ConfirmAction extends AbstractUIAction<ConfirmUIHandler> { protected VCSAction action; Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/DiffAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/DiffAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/DiffAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -14,8 +14,11 @@ */ package org.codelutin.vcs.ui.action; +import org.codelutin.vcs.ui.handler.DiffUIHandler; +import org.codelutin.ui.AbstractUIAction; + /** @author chemit */ -public class DiffAction extends org.codelutin.vcs.ui.util.AbstractUIAction<org.codelutin.vcs.ui.handler.DiffUIHandler> { +public class DiffAction extends AbstractUIAction<DiffUIHandler> { protected boolean goUp; Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/HelpAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/HelpAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/HelpAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -17,9 +17,10 @@ import static org.codelutin.i18n.I18n._; import org.codelutin.ui.DialogUI; import org.codelutin.ui.DialogUIHandler; +import org.codelutin.ui.AbstractUIAction; /** @author chemit */ -public class HelpAction extends org.codelutin.vcs.ui.util.AbstractUIAction<DialogUIHandler<?, ?>> { +public class HelpAction extends AbstractUIAction<DialogUIHandler<?, ?>> { public static <H extends DialogUIHandler<?, ?>> javax.swing.AbstractAction createAction(DialogUI<H> ui) { HelpAction action = new HelpAction(); Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowConfigAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -18,12 +18,13 @@ import static org.codelutin.vcs.ui.VCSUIFactory.CONFIG_UI; import org.codelutin.vcs.ui.util.handler.AbstractUIHandler; import org.codelutin.vcs.ui.util.ui.AbstractUI; +import org.codelutin.ui.AbstractUIAction; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; /** @author chemit */ -public class ShowConfigAction extends org.codelutin.vcs.ui.util.AbstractUIAction<AbstractUIHandler<?, ?>> { +public class ShowConfigAction extends AbstractUIAction<AbstractUIHandler<?, ?>> { public static <H extends AbstractUIHandler<?, ?>> AbstractAction createAction(AbstractUI<H> ui) { ShowConfigAction action = new ShowConfigAction(); Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowMessagesAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowMessagesAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/ShowMessagesAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -15,9 +15,10 @@ package org.codelutin.vcs.ui.action; import org.codelutin.vcs.ui.handler.ConfirmUIHandler; +import org.codelutin.ui.AbstractUIAction; /** @author chemit */ -public class ShowMessagesAction extends org.codelutin.vcs.ui.util.AbstractUIAction<ConfirmUIHandler> { +public class ShowMessagesAction extends AbstractUIAction<ConfirmUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/action/TabUIAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -18,12 +18,13 @@ import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.ui.util.handler.AbstractTabUIHandler; import org.codelutin.vcs.ui.util.ui.AbstractTabUI; +import org.codelutin.ui.AbstractUIAction; import java.util.List; /** @author chemit */ -public class TabUIAction extends org.codelutin.vcs.ui.util.AbstractUIAction<AbstractTabUIHandler<?, ?>> { +public class TabUIAction extends AbstractUIAction<AbstractTabUIHandler<?, ?>> { protected VCSAction action; protected boolean useSelection; Deleted: trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIAction.java =================================================================== --- trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIAction.java 2008-04-20 10:43:20 UTC (rev 603) +++ trunk/lutinvcs/ui/common/src/main/java/org/codelutin/vcs/ui/util/AbstractUIAction.java 2008-04-20 10:44:42 UTC (rev 604) @@ -1,58 +0,0 @@ -/** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * # #% - */ -package org.codelutin.vcs.ui.util; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.ui.DialogUI; -import org.codelutin.ui.DialogUIHandler; - -/** @author chemit */ -public abstract class AbstractUIAction<H extends DialogUIHandler<?, ?>> extends javax.swing.AbstractAction { - - protected static Log log = LogFactory.getLog(AbstractUIAction.class); - - protected transient DialogUI<? extends H> ui; - protected transient H handler; - - private static final long serialVersionUID = 1L; - - protected AbstractUIAction(String name, javax.swing.Icon icon) { - super(name, icon); - } - - public AbstractUIAction() { - } - - protected H getHandler() { - checkInit(); - if (handler == null) { - handler = ui.getHandler(); - } - return handler; - } - - protected void setUi(DialogUI<? extends H> ui) { - this.ui = ui; - this.handler = null; - } - - protected void checkInit() throws IllegalStateException { - if (handler == null && ui == null) { - throw new IllegalStateException("no handler, nor ui referenced in " + this); - } - } - -}

1 0