Author: tchemit Date: 2008-04-06 13:54:13 +0000 (Sun, 06 Apr 2008) New Revision: 406 Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractConfirmUI.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractDiffUI.java trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractSynchUI.java Log: model is instanciate in AbstractXXXUI Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx 2008-04-06 13:47:28 UTC (rev 405) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx 2008-04-06 13:54:13 UTC (rev 406) @@ -5,16 +5,8 @@ import org.codelutin.vcs.type.VCSAction; public JConfirmUI(org.codelutin.vcs.ui.handler.AbstractConfirmUIHandler handler) { - super(handler,new org.codelutin.vcs.ui.model.ConfirmUIModel()); - Action acceptAction = new AbstractAction("accept") { - private static final long serialVersionUID = 1L; - - public void actionPerformed(ActionEvent e) { - getHandler().doAction(getCommitMessage().getText(), getModel().getModel()); + super(handler); } - }; - getAccept().setAction((acceptAction)); - } </script> <Table> @@ -62,7 +54,7 @@ </row> <row> <cell fill='both'> - <JButton id='accept' text='lutinvcs.accept'/> + <JButton id='accept' text='lutinvcs.accept' onActionPerformed='doAccept()'/> </cell> </row> </Table> Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx 2008-04-06 13:47:28 UTC (rev 405) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx 2008-04-06 13:54:13 UTC (rev 406) @@ -5,7 +5,7 @@ import org.codelutin.vcs.type.VCSEntryLocation; public JDiffUI(org.codelutin.vcs.ui.handler.AbstractDiffUIHandler handler) { - super(handler,new org.codelutin.vcs.ui.model.DiffUIModel()); + super(handler); } </script> Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx 2008-04-06 13:47:28 UTC (rev 405) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx 2008-04-06 13:54:13 UTC (rev 406) @@ -6,9 +6,9 @@ import org.codelutin.vcs.type.VCSEntryLocation; public JSynchUI(org.codelutin.vcs.ui.handler.AbstractSynchUIHandler handler) { - super(handler,new org.codelutin.vcs.ui.model.SynchUIModel()); + super(handler); } - add(table); + //add(table); </script> <java.awt.CardLayout id='cardLayout'/> Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractConfirmUI.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractConfirmUI.java 2008-04-06 13:47:28 UTC (rev 405) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractConfirmUI.java 2008-04-06 13:54:13 UTC (rev 406) @@ -53,8 +53,8 @@ public AbstractConfirmUI() { } - public AbstractConfirmUI(AbstractUIHandler handler, AbstractUIModel model) { - super(handler, model); + public AbstractConfirmUI(AbstractConfirmUIHandler handler) { + super(handler, new ConfirmUIModel()); } @Override @@ -67,6 +67,10 @@ return (ConfirmUIModel) super.getModel(); } + public void doAccept() { + getHandler().doAction(getCommitMessage().getText(), getModel().getModel()); + } + protected void showLastMessages() { } Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractDiffUI.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractDiffUI.java 2008-04-06 13:47:28 UTC (rev 405) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractDiffUI.java 2008-04-06 13:54:13 UTC (rev 406) @@ -17,7 +17,6 @@ import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.ui.handler.AbstractDiffUIHandler; import org.codelutin.vcs.ui.handler.AbstractTabUIHandler; -import org.codelutin.vcs.ui.model.AbstractTabUIModel; import org.codelutin.vcs.ui.model.DiffUIModel; import javax.swing.JButton; @@ -34,8 +33,8 @@ super(); } - public AbstractDiffUI(AbstractTabUIHandler handler, AbstractTabUIModel model) { - super(handler, model); + public AbstractDiffUI(AbstractTabUIHandler handler) { + super(handler, new DiffUIModel()); } public DiffUIModel getModel() { Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractSynchUI.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractSynchUI.java 2008-04-06 13:47:28 UTC (rev 405) +++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/AbstractSynchUI.java 2008-04-06 13:54:13 UTC (rev 406) @@ -48,8 +48,8 @@ super(); } - public AbstractSynchUI(AbstractSynchUIHandler handler, SynchUIModel model) { - super(handler, model); + public AbstractSynchUI(AbstractSynchUIHandler handler) { + super(handler, new SynchUIModel()); } public SynchUIModel getModel() {