From tchemit@users.labs.libre-entreprise.org Wed Apr  2 10:55:11 2008
From: tchemit@users.labs.libre-entreprise.org
To: buix-commits@list.nuiton.org
Subject: [Buix-commits] r281 -
	trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui
Date: Wed, 02 Apr 2008 10:55:11 +0200
Message-ID: <20080402085511.C81F1461AF8@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7527556985923984129=="

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

Author: tchemit
Date: 2008-04-02 08:55:11 +0000 (Wed, 02 Apr 2008)
New Revision: 281

Added:
   trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCS=
Popup.jaxx
Modified:
   trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSyn=
chUI.jaxx
Log:
popup pour les actions sur la selection des lignes
l'ui de synch avance bien

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-02 08:53:39 UTC (rev 280)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSy=
nchUI.jaxx	2008-04-02 08:55:11 UTC (rev 281)
@@ -1,10 +1,42 @@
-<JDialog title=3D'lutinvcs.synch.title' id=3D'ui'
-         defaultCloseOperation=3D'DISPOSE_ON_CLOSE'>
+<JDialog title=3D'lutinvcs.synch.title' id=3D'ui' defaultCloseOperation=3D'D=
ISPOSE_ON_CLOSE'>
     <style source=3D"common.css"/>
     <script>
=20
         import org.codelutin.vcs.VCSAction;
+        import org.codelutin.vcs.ui.action.AbstractSynchUIHandler;
=20
+        protected AbstractSynchUIHandler handler;
+
+        public JTable getTable(String modelName) {
+        return (JTable) get$objectMap().get(modelName+"Table");
+        }
+
+        public JVCSPopup getPopup(String modelName) {
+        return (JVCSPopup) get$objectMap().get(modelName+"Popup");
+        }
+
+        @Override
+        public void setVisible(boolean b) {
+        if (getHandler().getModel().getTabModel() =3D=3D null) {
+        getHandler().init();
+        // first launch, no tab model selected,choose one
+        selectTab(VCSUIConstants.ALL_MODEL_PROPERTY);
+        }
+        super.setVisible(b);
+        }
+
+        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));
         }
@@ -12,8 +44,8 @@
         protected void doAllAction(VCSAction action) {
         model.doAllAction(action);
         }
+
         Action quitAction;
-
         JRootPane rootPane =3D ui.getRootPane();
         rootPane.setDefaultButton(quit);
         quitAction =3D new AbstractAction(quit.getText()) {
@@ -24,79 +56,67 @@
         };
         rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStrok=
e.getKeyStroke("ESCAPE"),"quit");
         rootPane.getActionMap().put("quit", quitAction);
-        allTable.setModel(model.getModel("model.synch.all"));
-        localTable.setModel(model.getModel("model.synch.local"));
-        remoteTable.setModel(model.getModel("model.synch.remote"));
-        refresh.setText("");
-        diffAll.setText("");
-        updateAll.setText("");
-        commitAll.setText("");
-        revertAll.setText("");
-
     </script>
=20
-    <!--org.codelutin.vcs.ui.SynchUIHandlerImpl id=3D'handler' constructorPa=
rameters=3D"this"/-->
-
     <org.codelutin.vcs.ui.model.SynchUIModel id=3D"model"/>
=20
-    <DefaultListModel id=3D'listModel'/>
-    <!--org.codelutin.vcs.ui.model.SynchUIModel id=3D"model"/-->
-    <!--org.codelutin.vcs.ui.model.SynchVCSFileStatesModel id=3D"tabModel"/-=
->
     <java.awt.CardLayout id=3D'cardLayout'/>
=20
-    <JPopupMenu id=3D"tablePopupMenu" invoker=3D'{allTable}' enabled=3D'fals=
e'>
-        <JMenuItem id=3D'diff' text=3D"lutinvcs.action.diff" toolTipText=3D"=
lutinvcs.action.tooltip.diff"/>
-        <JMenuItem id=3D'update' text=3D"lutinvcs.action.update" toolTipText=
=3D"lutinvcs.action.tooltip.update"/>
-        <JMenuItem id=3D'commit' text=3D"lutinvcs.action.commit" toolTipText=
=3D"lutinvcs.action.tooltip.commit"/>
-        <JMenuItem id=3D'revert' text=3D"lutinvcs.action.revert" toolTipText=
=3D"lutinvcs.action.tooltip.revert"/>
+    <JPopupMenu enabled=3D'false'>
     </JPopupMenu>
+    <org.codelutin.vcs.ui.JVCSPopup id=3D"modelSynchAllPopup"/>
+    <org.codelutin.vcs.ui.JVCSPopup id=3D"modelSynchLocalPopup"/>
+    <org.codelutin.vcs.ui.JVCSPopup id=3D"modelSynchRemotePopup"/>
     <Table>
         <row fill=3D'both'>
             <cell fill=3D'both' weightx=3D'1'>
                 <JToolBar>
                     <JToggleButton id=3D'allTab' selected=3D'true' buttonGro=
up=3D'tabs' text=3D'lutinvcs.tabs.all' mnemonic=3D"A"
                                    toolTipText=3D"lutinvcs.tabs.tooltip.all"
-                                   onActionPerformed=3D'selectTab("model.syn=
ch.all")'/>
+                                   onActionPerformed=3D'selectTab("modelSync=
hAll")'/>
                     <JToggleButton id=3D'localTab' selected=3D'false' button=
Group=3D'tabs' text=3D'lutinvcs.tabs.local'
-                                   mnemonic=3D"L"
-                                   toolTipText=3D"lutinvcs.tabs.tooltip.loca=
l"
-                                   onActionPerformed=3D'selectTab("model.syn=
ch.local")'/>
+                                   mnemonic=3D"L" toolTipText=3D"lutinvcs.ta=
bs.tooltip.local"
+                                   onActionPerformed=3D'selectTab("modelSync=
hLocal")'/>
                     <JToggleButton id=3D'remoteTab' selected=3D'false' butto=
nGroup=3D'tabs' text=3D'lutinvcs.tabs.remote'
-                                   mnemonic=3D"R"
-                                   toolTipText=3D"lutinvcs.tabs.tooltip.remo=
te"
-                                   onActionPerformed=3D'selectTab("model.syn=
ch.remote")'/>
+                                   mnemonic=3D"R" toolTipText=3D"lutinvcs.ta=
bs.tooltip.remote"
+                                   onActionPerformed=3D'selectTab("modelSync=
hRemote")'/>
=20
-                    <JButton id=3D'refresh' text=3D"lutinvcs.action.refresh"=
 toolTipText=3D"lutinvcs.action.tooltip.refresh"
-                             icon=3D'{createImageIcon("autoRefresh.png")}'/>
+                    <JButton id=3D'refreshAll' toolTipText=3D"lutinvcs.actio=
n.tooltip.refreshAll"
+                             icon=3D'{createImageIcon("autoRefresh.png")}'
+                             onActionPerformed=3D'doAllAction(VCSAction.REFR=
ESH)'/>
=20
-                    <JButton id=3D'diffAll' text=3D"lutinvcs.action.diffAll"=
 toolTipText=3D"lutinvcs.action.tooltip.diffAll"
+                    <JButton id=3D'diffAll' toolTipText=3D"lutinvcs.action.t=
ooltip.diffAll"
                              icon=3D'{createImageIcon("diff.png")}' onAction=
Performed=3D'doAllAction(VCSAction.DIFF)'/>
=20
-                    <JButton id=3D'updateAll' text=3D"lutinvcs.action.update=
All"
-                             onActionPerformed=3D'doAllAction(VCSAction.UPDA=
TE)'
-                             toolTipText=3D"lutinvcs.action.tooltip.updateAl=
l" icon=3D'{createImageIcon("update.png")}'/>
+                    <JButton id=3D'updateAll' toolTipText=3D"lutinvcs.action=
.tooltip.updateAll"
+                             icon=3D'{createImageIcon("update.png")}'
+                             onActionPerformed=3D'doAllAction(VCSAction.UPDA=
TE)'/>
=20
-                    <JButton id=3D'commitAll' text=3D"lutinvcs.action.commit=
All"
-                             onActionPerformed=3D'doAllAction(VCSAction.COMM=
IT)'
-                             toolTipText=3D"lutinvcs.action.tooltip.commitAl=
l" icon=3D'{createImageIcon("commit.png")}'/>
+                    <JButton id=3D'commitAll' toolTipText=3D"lutinvcs.action=
.tooltip.commitAll"
+                             icon=3D'{createImageIcon("commit.png")}'
+                             onActionPerformed=3D'doAllAction(VCSAction.COMM=
IT)'/>
=20
-                    <JButton id=3D'revertAll' text=3D"lutinvcs.action.revert=
All"
-                             onActionPerformed=3D'doAllAction(VCSAction.REVE=
RT)'
-                             toolTipText=3D"lutinvcs.action.tooltip.revertAl=
l" icon=3D'{createImageIcon("rollback.png")}'/>
+                    <JButton id=3D'revertAll' toolTipText=3D"lutinvcs.action=
.tooltip.revertAll"
+                             icon=3D'{createImageIcon("rollback.png")}'
+                             onActionPerformed=3D'doAllAction(VCSAction.REVE=
RT)'/>
+
+                    <JButton id=3D'deleteAll' toolTipText=3D"lutinvcs.action=
.tooltip.deleteAll"
+                             icon=3D'{createImageIcon("remove.png")}'
+                             onActionPerformed=3D'doAllAction(VCSAction.DELE=
TE)'/>
                 </JToolBar>
             </cell>
         </row>
         <row fill=3D'both'>
             <cell fill=3D'both' weighty=3D'1' weightx=3D'2'>
                 <JPanel id=3D'preview' layout=3D'{cardLayout}'>
-                    <JScrollPane id=3D'allContent' styleClass=3D'updateScrol=
l' constraints=3D'"model.synch.all"'>
-                        <JTable id=3D"allTable" styleClass=3D'updateTable'/>
+                    <JScrollPane id=3D'allContent' styleClass=3D'updateScrol=
l' constraints=3D'"modelSynchAll"'>
+                        <JTable id=3D"modelSynchAllTable" styleClass=3D'upda=
teTable'/>
                     </JScrollPane>
-                    <JScrollPane id=3D'localContent' styleClass=3D'updateScr=
oll' constraints=3D'"model.synch.local"'>
-                        <JTable id=3D"localTable" styleClass=3D'updateTable'=
/>
+                    <JScrollPane id=3D'localContent' styleClass=3D'updateScr=
oll' constraints=3D'"modelSynchLocal"'>
+                        <JTable id=3D"modelSynchLocalTable" styleClass=3D'up=
dateTable'/>
                     </JScrollPane>
-                    <JScrollPane id=3D'remoteContent' styleClass=3D'updateSc=
roll' constraints=3D'"model.synch.remote"'>
-                        <JTable id=3D"remoteTable" styleClass=3D'updateTable=
'/>
+                    <JScrollPane id=3D'remoteContent' styleClass=3D'updateSc=
roll' constraints=3D'"modelSynchRemote"'>
+                        <JTable id=3D"modelSynchRemoteTable" styleClass=3D'u=
pdateTable'/>
                     </JScrollPane>
                 </JPanel>
             </cell>

Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/=
JVCSPopup.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/JVC=
SPopup.jaxx	                        (rev 0)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVC=
SPopup.jaxx	2008-04-02 08:55:11 UTC (rev 281)
@@ -0,0 +1,30 @@
+<JPopupMenu enabled=3D'false'>
+    <script>
+        import org.codelutin.vcs.VCSAction;
+        import org.codelutin.vcs.ui.action.VCSAbsractAction;
+
+        protected VCSAbsractAction dispatchAction;
+
+        protected void setDispatchAction(VCSAbsractAction action) {
+        this.dispatchAction=3Daction;
+        }
+
+        protected void doAction(VCSAction action,JMenuItem item) {
+        dispatchAction.setAction(action);
+        ActionEvent e =3D new ActionEvent( item,1,action.name());
+        dispatchAction.actionPerformed(e);
+        }
+    </script>
+    <JMenuItem id=3D'refresh' text=3D"lutinvcs.action.refresh" toolTipText=
=3D"lutinvcs.action.tooltip.refresh"
+               icon=3D'{createImageIcon("autoRefresh.png")}' onActionPerform=
ed=3D'doAction(VCSAction.REFRESH,refresh)'/>
+    <JMenuItem id=3D'diff' text=3D"lutinvcs.action.diff" toolTipText=3D"luti=
nvcs.action.tooltip.diff"
+               icon=3D'{createImageIcon("diff.png")}' onActionPerformed=3D'd=
oAction(VCSAction.DIFF,diff)'/>
+    <JMenuItem id=3D'update' text=3D"lutinvcs.action.update" toolTipText=3D"=
lutinvcs.action.tooltip.update"
+               icon=3D'{createImageIcon("update.png")}' onActionPerformed=3D=
'doAction(VCSAction.UPDATE,update)'/>
+    <JMenuItem id=3D'commit' text=3D"lutinvcs.action.commit" toolTipText=3D"=
lutinvcs.action.tooltip.commit"
+               icon=3D'{createImageIcon("commit.png")}' onActionPerformed=3D=
'doAction(VCSAction.COMMIT,commit)'/>
+    <JMenuItem id=3D'revert' text=3D"lutinvcs.action.revert" toolTipText=3D"=
lutinvcs.action.tooltip.revert"
+               icon=3D'{createImageIcon("rollback.png")}' onActionPerformed=
=3D'doAction(VCSAction.REVERT,revert)'/>
+    <JMenuItem id=3D'delete' text=3D"lutinvcs.action.delete" toolTipText=3D"=
lutinvcs.action.tooltip.delete"
+               icon=3D'{createImageIcon("remove.png")}' onActionPerformed=3D=
'doAction(VCSAction.DELETE,delete)'/>
+</JPopupMenu>


--===============7527556985923984129==--