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> <!--JSeparator orientation="vertical"/--> - <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>