From tchemit@users.labs.libre-entreprise.org Sun Apr  6 15:54:13 2008
From: tchemit@users.labs.libre-entreprise.org
To: jaxx-commits@list.nuiton.org
Subject: [Buix-commits] r406 - in trunk/lutinvcs:
	lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui
	lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui
Date: Sun, 06 Apr 2008 15:54:13 +0200
Message-ID: <20080406135413.B98A8461B09@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7160281234915455238=="

--===============7160281234915455238==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/JCon=
firmUI.jaxx
   trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDif=
fUI.jaxx
   trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSyn=
chUI.jaxx
   trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/Abs=
tractConfirmUI.java
   trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/Abs=
tractDiffUI.java
   trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/Abs=
tractSynchUI.java
Log:
model is instanciate in AbstractXXXUI

Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/=
ui/JConfirmUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JCo=
nfirmUI.jaxx	2008-04-06 13:47:28 UTC (rev 405)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JCo=
nfirmUI.jaxx	2008-04-06 13:54:13 UTC (rev 406)
@@ -5,16 +5,8 @@
         import org.codelutin.vcs.type.VCSAction;
=20
         public JConfirmUI(org.codelutin.vcs.ui.handler.AbstractConfirmUIHand=
ler handler) {
-        super(handler,new org.codelutin.vcs.ui.model.ConfirmUIModel());
-        Action acceptAction =3D new AbstractAction("accept") {
-        private static final long serialVersionUID =3D 1L;
-
-        public void actionPerformed(ActionEvent e) {
-        getHandler().doAction(getCommitMessage().getText(), getModel().getMo=
del());
+        super(handler);
         }
-        };
-        getAccept().setAction((acceptAction));
-        }
=20
     </script>
     <Table>
@@ -62,7 +54,7 @@
         </row>
         <row>
             <cell fill=3D'both'>
-                <JButton id=3D'accept' text=3D'lutinvcs.accept'/>
+                <JButton id=3D'accept' text=3D'lutinvcs.accept' onActionPerf=
ormed=3D'doAccept()'/>
             </cell>
         </row>
     </Table>

Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/=
ui/JDiffUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDi=
ffUI.jaxx	2008-04-06 13:47:28 UTC (rev 405)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDi=
ffUI.jaxx	2008-04-06 13:54:13 UTC (rev 406)
@@ -5,7 +5,7 @@
         import org.codelutin.vcs.type.VCSEntryLocation;
=20
         public JDiffUI(org.codelutin.vcs.ui.handler.AbstractDiffUIHandler ha=
ndler) {
-        super(handler,new org.codelutin.vcs.ui.model.DiffUIModel());
+        super(handler);
         }
     </script>
=20

Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/=
ui/JSynchUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSy=
nchUI.jaxx	2008-04-06 13:47:28 UTC (rev 405)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSy=
nchUI.jaxx	2008-04-06 13:54:13 UTC (rev 406)
@@ -6,9 +6,9 @@
         import org.codelutin.vcs.type.VCSEntryLocation;
=20
         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>
=20
     <java.awt.CardLayout id=3D'cardLayout'/>

Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs=
/ui/AbstractConfirmUI.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/Ab=
stractConfirmUI.java	2008-04-06 13:47:28 UTC (rev 405)
+++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/Ab=
stractConfirmUI.java	2008-04-06 13:54:13 UTC (rev 406)
@@ -53,8 +53,8 @@
     public AbstractConfirmUI() {
     }
=20
-    public AbstractConfirmUI(AbstractUIHandler handler, AbstractUIModel mode=
l) {
-        super(handler, model);
+    public AbstractConfirmUI(AbstractConfirmUIHandler handler) {
+        super(handler, new ConfirmUIModel());
     }
=20
     @Override
@@ -67,6 +67,10 @@
         return (ConfirmUIModel) super.getModel();
     }
=20
+    public void doAccept() {
+        getHandler().doAction(getCommitMessage().getText(), getModel().getMo=
del());
+    }
+
     protected void showLastMessages() {
=20
     }

Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs=
/ui/AbstractDiffUI.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/Ab=
stractDiffUI.java	2008-04-06 13:47:28 UTC (rev 405)
+++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/Ab=
stractDiffUI.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;
=20
 import javax.swing.JButton;
@@ -34,8 +33,8 @@
         super();
     }
=20
-    public AbstractDiffUI(AbstractTabUIHandler handler, AbstractTabUIModel m=
odel) {
-        super(handler, model);
+    public AbstractDiffUI(AbstractTabUIHandler handler) {
+        super(handler, new DiffUIModel());
     }
=20
     public DiffUIModel getModel() {

Modified: trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs=
/ui/AbstractSynchUI.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/Ab=
stractSynchUI.java	2008-04-06 13:47:28 UTC (rev 405)
+++ trunk/lutinvcs/lutinvcs-ui-pre-jaxx/src/main/java/org/codelutin/vcs/ui/Ab=
stractSynchUI.java	2008-04-06 13:54:13 UTC (rev 406)
@@ -48,8 +48,8 @@
         super();
     }
=20
-    public AbstractSynchUI(AbstractSynchUIHandler handler, SynchUIModel mode=
l) {
-        super(handler, model);
+    public AbstractSynchUI(AbstractSynchUIHandler handler) {
+        super(handler, new SynchUIModel());
     }
=20
     public SynchUIModel getModel() {


--===============7160281234915455238==--