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 title='lutinvcs.config.title' resizable='false'--> +<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' onMouseClicked="identityContent.setVisible(!identityContent.isVisible());if (!identityContent.isVisible()) identityScroll.setSize(0,0);pack();identityScroll.invalidate();"--> + <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 height="60" columnHeaderView='{top}' width="420"--> + <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}' height="120" width="420" 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"> <!--ConfigUI title='lutinvcs.config.title' resizable='false'--> <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"; }