From tchemit@users.labs.libre-entreprise.org Fri Apr  4 00:23:45 2008
From: tchemit@users.labs.libre-entreprise.org
To: buix-commits@list.nuiton.org
Subject: [Buix-commits] r331 -
	trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui
Date: Fri, 04 Apr 2008 00:23:44 +0200
Message-ID: <20080403222345.0E0FD461B09@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6619115415740633318=="

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

Author: tchemit
Date: 2008-04-03 22:23:44 +0000 (Thu, 03 Apr 2008)
New Revision: 331

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/JSyn=
chUI.jaxx
Log:
use AbstractUI

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-03 22:23:09 UTC (rev 330)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JCo=
nfirmUI.jaxx	2008-04-03 22:23:44 UTC (rev 331)
@@ -1,74 +1,71 @@
-<JDialog title=3D'lutinvcs.confirm.title' id=3D'ui' defaultCloseOperation=3D=
'DISPOSE_ON_CLOSE' modal=3D'true'>
+<org.codelutin.vcs.ui.AbstractUI title=3D'lutinvcs.confirm.title' defaultClo=
seOperation=3D'DISPOSE_ON_CLOSE' modal=3D'true'>
     <style source=3D"common.css"/>
     <script>
-
         import org.codelutin.vcs.VCSAction;
         import org.codelutin.vcs.ui.handler.AbstractConfirmUIHandler;
+        import org.codelutin.vcs.ui.model.ConfirmUIModel ;
=20
-        protected AbstractConfirmUIHandler handler;
-
         public JConfirmUI(AbstractConfirmUIHandler handler) {
-        this.handler =3Dhandler;
-        JRootPane rootPane =3D ui.getRootPane();
-        //rootPane.setDefaultButton(accept);
+        super(handler,new ConfirmUIModel());
=20
-        Action quitAction =3D new AbstractAction("cancel") {
-        private static final long serialVersionUID =3D -869095664995763057L;
-        public void actionPerformed(ActionEvent e) {
-        ui.dispose();
-        }
-        };
-
         Action acceptAction=3D new AbstractAction("accept") {
         private static final long serialVersionUID =3D -869095664995763055L;
         public void actionPerformed(ActionEvent e) {
-        model.doAction(commitMessage.getText());
+        getHandler().doAction(getCommitMessage().getText(),getModel().getMod=
el());
         }
         };
-        rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStrok=
e.getKeyStroke("ESCAPE"),"quit");
-        rootPane.getActionMap().put("quit", quitAction);
         accept.setAction((acceptAction));
         }
=20
         protected AbstractConfirmUIHandler getHandler() {
-        return handler;
+        return (AbstractConfirmUIHandler) super.getHandler();
         }
=20
+        public ConfirmUIModel getModel() {
+        return (ConfirmUIModel) super.getModel();
+        }
+
         protected void showLastMessages() {
=20
         }
     </script>
=20
-    <org.codelutin.vcs.ui.model.ConfirmUIModel id=3D"model"/>
-
-
     <Table>
         <row fill=3D'both'>
             <cell fill=3D'both'>
                 <JLabel id=3D"actionLabel" text=3D"lutinvcs.confirm.message"=
/>
             </cell>
         </row>
-
         <row fill=3D'both'>
             <cell fill=3D'both' weightx=3D'1'>
                 <Table id=3D"toolbar" fill=3D'both'>
                     <row>
-                        <cell fill=3D'both'>
-                            <JLabel id=3D"actionCommitLabel" text=3D"lutinvc=
s.commit.message"/>
+                        <cell>
+                            <JToolBar id=3D'tool'>
+                                <Table fill=3D'both' insets=3D'0,0,0,0'>
+                                    <row>
+                                        <cell fill=3D'both'>
+                                            <JLabel id=3D"actionCommitLabel"=
 text=3D"lutinvcs.commit.message"/>
+                                        </cell>
+                                        <cell fill=3D'both' weightx=3D"1">
+                                            <JLabel/>
+                                        </cell>
+                                        <cell anchor=3D'east'>
+                                            <JButton id=3D'lastMessages'
+                                                     toolTipText=3D"lutinvcs=
.action.tooltip.lastMessages"
+                                                     icon=3D'{createImageIco=
n("recent_msgs.png")}'
+                                                     onActionPerformed=3D'sh=
owLastMessages()'/>
+                                        </cell>
+                                    </row>
+                                </Table>
+
+                            </JToolBar>
                         </cell>
-                        <cell fill=3D'both'>
-                            <JLabel/>
-                        </cell>
-                        <cell fill=3D'horizontal' anchor=3D'east'>
-                            <JButton id=3D'lastMessages' toolTipText=3D"luti=
nvcs.action.tooltip.lastMessages"
-                                     icon=3D'{createImageIcon("recent_messag=
es.png")}'
-                                     onActionPerformed=3D'showLastMessages()=
'/>
-                        </cell>
                     </row>
                     <row fill=3D'both'>
                         <cell fill=3D'both' columns=3D'3' weightx=3D'1' weig=
hty=3D'1'>
-                            <JScrollPane id=3D"commitScroll" height=3D'60' v=
erticalScrollBarPolicy=3D"20">
-                                <!--JScrollPane id=3D"commitScroll" vertical=
ScrollBarPolicy=3D"20" columnHeaderView=3D"{toolbar}"-->
+                            <JScrollPane id=3D"commitScroll" height=3D'90' v=
erticalScrollBarPolicy=3D"20"
+                                         columnHeaderView=3D"{tool}">
                                 <JTextArea id=3D"commitMessage" constructorP=
arams=3D"4,50"/>
                             </JScrollPane>
                         </cell>
@@ -80,7 +77,7 @@
         <row>
             <cell fill=3D'both' weightx=3D'1' weighty=3D'1'>
                 <JScrollPane id=3D'content' styleClass=3D'confirmScroll'>
-                    <JTable id=3D"contentTable" styleClass=3D'confirmTable' =
model=3D"{model.getModel()}"/>
+                    <JTable id=3D"contentTable" styleClass=3D'confirmTable' =
model=3D"{getModel().getModel()}"/>
                 </JScrollPane>
             </cell>
         </row>
@@ -90,4 +87,4 @@
             </cell>
         </row>
     </Table>
-</JDialog>
+</org.codelutin.vcs.ui.AbstractUI>

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-03 22:23:09 UTC (rev 330)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSy=
nchUI.jaxx	2008-04-03 22:23:44 UTC (rev 331)
@@ -1,12 +1,25 @@
-<JDialog title=3D'lutinvcs.synch.title' id=3D'ui' defaultCloseOperation=3D'D=
ISPOSE_ON_CLOSE'>
+<org.codelutin.vcs.ui.AbstractUI title=3D'lutinvcs.synch.title' modal=3D"tru=
e" defaultCloseOperation=3D'DISPOSE_ON_CLOSE'>
     <style source=3D"common.css"/>
     <script>
=20
         import org.codelutin.vcs.VCSAction;
         import org.codelutin.vcs.ui.handler.AbstractSynchUIHandler;
+        import org.codelutin.vcs.ui.model.SynchUIModel;
=20
-        protected AbstractSynchUIHandler handler;
+        public JSynchUI(AbstractSynchUIHandler handler) {
+        super(handler,new SynchUIModel());
+        }
=20
+        @Override
+        protected AbstractSynchUIHandler getHandler() {
+        return (AbstractSynchUIHandler) handler;
+        }
+
+        @Override
+        public SynchUIModel getModel() {
+        return (SynchUIModel) super.getModel();
+        }
+
         public JTable getTable(String modelName) {
         return (JTable) get$objectMap().get(modelName+"Table");
         }
@@ -24,39 +37,16 @@
         super.setVisible(b);
         }
=20
-        public JSynchUI(AbstractSynchUIHandler handler) {
-        this.handler =3Dhandler;
-        }
-
-        protected AbstractSynchUIHandler getHandler() {
-        return handler;
-        }
-
-        protected void setHandler(AbstractSynchUIHandler handler) {
-        this.handler =3D handler;
-        }
-
         protected void selectTab(String tabname) {
-        model.setTabModel(model.getModel(tabname));
+        getModel().setTabModel(getModel().getModel(tabname));
         }
=20
         protected void doAllAction(VCSAction action) {
-        model.doAllAction(action);
+        getModel().doAllAction(action);
         }
-
-        Action quitAction;
-        JRootPane rootPane =3D ui.getRootPane();
-        quitAction =3D new AbstractAction("quit") {
-        private static final long serialVersionUID =3D -869095664995763057L;
-        public void actionPerformed(ActionEvent e) {
-        ui.dispose();
-        }
-        };
-        rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStrok=
e.getKeyStroke("ESCAPE"),"quit");
-        rootPane.getActionMap().put("quit", quitAction);
     </script>
=20
-    <org.codelutin.vcs.ui.model.SynchUIModel id=3D"model"/>
+    <!--org.codelutin.vcs.ui.model.SynchUIModel id=3D"model"/-->
=20
     <java.awt.CardLayout id=3D'cardLayout'/>
=20
@@ -119,28 +109,5 @@
                 </JPanel>
             </cell>
         </row>
-        <!--row>
-            <cell fill=3D'both'>
-                <JButton id=3D'quit' text=3D'lutinvcs.quit' handler=3D'{quit=
Action}'/>
-            </cell>
-        </row-->
-        <!--row>
-            <cell fill=3D'both'>
-                <JToolBar>
-                    <Table insets=3D'0,0,0,0'>
-                        <row fill=3D'both' anchor=3D'west'>
-                            <cell fill=3D'both' weightx=3D'2'>
-                                <JLabel id=3D"label"/>
-                            </cell>
-                        </row>
-                        <row fill=3D'both' anchor=3D'east'>
-                            <cell fill=3D'both'>
-                                <JProgressBar id=3D"progress"/>
-                            </cell>
-                        </row>
-                    </Table>
-                </JToolBar>
-            </cell>
-        </row-->
     </Table>
-</JDialog>
+</org.codelutin.vcs.ui.AbstractUI>


--===============6619115415740633318==--