From tchemit@users.labs.libre-entreprise.org Mon Mar 31 22:41:09 2008
From: tchemit@users.labs.libre-entreprise.org
To: buix-commits@list.nuiton.org
Subject: [Buix-commits] r249 - in trunk/lutinvcs:
	lutinvcs-core/src/main/java/org/codelutin/vcs
	lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui
	lutinvcs-ui/src/test/java/org/codelutin/vcs/ui
Date: Mon, 31 Mar 2008 22:41:09 +0200
Message-ID: <20080331204109.6B58F461AF8@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4972026985725636209=="

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

Author: tchemit
Date: 2008-03-31 20:41:08 +0000 (Mon, 31 Mar 2008)
New Revision: 249

Modified:
   trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSFileStateI=
mpl.java
   trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSUpdate=
Dialog.jaxx
   trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/common.css
   trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui/UITest.java
Log:
begin of synch ui

Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSFil=
eStateImpl.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-core/src/main/java/org/codelutin/vcs/VCSFileState=
Impl.java	2008-03-31 20:40:35 UTC (rev 248)
+++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSFileState=
Impl.java	2008-03-31 20:41:08 UTC (rev 249)
@@ -73,7 +73,7 @@
      * @param handler the vcs handler used with this working copy
      * @param file    file to be handled
      */
-    protected VCSFileStateImpl(VCSHandler handler, File file) {
+    public VCSFileStateImpl(VCSHandler handler, File file) {
         this.file =3D file;
         this.key =3D file.getAbsolutePath().hashCode();
         String path =3D file.getAbsolutePath();
@@ -85,7 +85,12 @@
                     "vcsHandler, but was : [" + file + " ::" +
                     handler.getLocalDatabasePath() + " ]");
         }
-        this.localPath =3D path.substring(rootPath.length() + 1);
+        if (file.equals(handler.getConfig().getLocalDatabasePath())) {
+            this.localPath =3D "";
+        } else {
+
+            this.localPath =3D path.substring(rootPath.length() + 1);
+        }
         // by default moduleName is the first dir of localpath (if any)
         int index =3D this.localPath.indexOf(File.separator);
         if (index =3D=3D -1) {
@@ -254,5 +259,9 @@
     public void setAction(VCSAction action) {
         this.action =3D action;
     }
+
+    public void setState(VCSState state) {
+        this.state =3D state;
+    }
 }
=20

Modified: trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VC=
SUpdateDialog.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/src/main/uimodel/org/codelutin/vcs/ui/VCSUpdat=
eDialog.jaxx	2008-03-31 20:40:35 UTC (rev 248)
+++ trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSUpdat=
eDialog.jaxx	2008-03-31 20:41:08 UTC (rev 249)
@@ -1,8 +1,11 @@
-<JDialog title=3D'lutinutil.config.title' modal=3D'true'
-         defaultCloseOperation=3D'DISPOSE_ON_CLOSE' width=3D'500' height=3D'=
300'>
+<JDialog title=3D'lutinvcs.synch.title'
+         defaultCloseOperation=3D'DISPOSE_ON_CLOSE'>
     <style source=3D"common.css"/>
     <script>
=20
+        protected void selectTab(String tabname) {
+        cardLayout.show(preview, tabname);
+        }
         Action quitAction ;
=20
         JRootPane rootPane =3D getRootPane();
@@ -15,49 +18,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>
     <DefaultListModel id=3D'listModel'/>
-    <org.codelutin.vcs.ui.VCSFileStateTableModel id=3D"allModel"/>
-    <org.codelutin.vcs.ui.VCSFileStateTableModel id=3D"localModel"/>
-    <org.codelutin.vcs.ui.VCSFileStateTableModel id=3D"remoteModel"/>
+    <org.codelutin.vcs.ui.model.SynchUIModel id=3D"model"/>
     <java.awt.CardLayout id=3D'cardLayout'/>
=20
     <JPopupMenu id=3D"tablePopupMenu" invoker=3D'{allTable}' enabled=3D'fals=
e'>
-        <JMenuItem id=3D'diff'/>
-        <JMenuItem id=3D'update'/>
-        <JMenuItem id=3D'commit'/>
-        <JMenuItem id=3D'revert'/>
+        <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>
     <Table>
         <row fill=3D'both'>
             <cell fill=3D'both' weightx=3D'1'>
                 <JToolBar>
-                    <JButton id=3D'refresh' text=3D"lutinvcs.action.refresh"=
/>
-                    <JButton id=3D'diffAll' text=3D"lutinvcs.action.diffAll"=
/>
-                    <JButton id=3D'updateAll' text=3D"lutinvcs.action.update=
All"/>
-                    <JButton id=3D'commitAll' text=3D"lutinvcs.action.commit=
All"/>
-                    <JButton id=3D'revertAll' text=3D"lutinvcs.action.revert=
All"/>
+                    <JToggleButton id=3D'allTab' selected=3D'true' buttonGro=
up=3D'tabs' text=3D'lutinvcs.tabs.all'
+                                   toolTipText=3D"lutinvcs.tabs.tooltip.all"=
 onActionPerformed=3D'selectTab("all")'/>
+                    <JToggleButton id=3D'localTab' selected=3D'false' button=
Group=3D'tabs' text=3D'lutinvcs.tabs.local'
+                                   toolTipText=3D"lutinvcs.tabs.tooltip.loca=
l" onActionPerformed=3D'selectTab("local")'/>
+                    <JToggleButton id=3D'remoteTab' selected=3D'false' butto=
nGroup=3D'tabs' text=3D'lutinvcs.tabs.remote'
+                                   toolTipText=3D"lutinvcs.tabs.tooltip.remo=
te" onActionPerformed=3D'selectTab("remote")'/>
+
+                    <JButton id=3D'refresh' text=3D"lutinvcs.action.refresh"=
 toolTipText=3D"lutinvcs.action.tooltip.refresh"
+                             icon=3D'{createImageIcon("autoRefresh.png")}'/>
+                    <JButton id=3D'diffAll' text=3D"lutinvcs.action.diffAll"=
 toolTipText=3D"lutinvcs.action.tooltip.diffAll"
+                             icon=3D'{createImageIcon("diff.png")}'/>
+                    <JButton id=3D'updateAll' text=3D"lutinvcs.action.update=
All"
+                             toolTipText=3D"lutinvcs.action.tooltip.updateAl=
l" icon=3D'{createImageIcon("update.png")}'/>
+                    <JButton id=3D'commitAll' text=3D"lutinvcs.action.commit=
All"
+                             toolTipText=3D"lutinvcs.action.tooltip.commitAl=
l" icon=3D'{createImageIcon("commit.png")}'/>
+                    <JButton id=3D'revertAll' text=3D"lutinvcs.action.revert=
All"
+                             toolTipText=3D"lutinvcs.action.tooltip.revertAl=
l" icon=3D'{createImageIcon("rollback.png")}'/>
                 </JToolBar>
             </cell>
         </row>
-        <row fill=3D'both'>           =20
+        <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'"all"'>
-                        <JTable id=3D"allTable" model=3D"{allModel}" styleCl=
ass=3D'updateTable'/>
+                        <JTable id=3D"allTable" styleClass=3D'updateTable'/>
                     </JScrollPane>
                     <JScrollPane id=3D'localContent' styleClass=3D'updateScr=
oll' visible=3D'false' constraints=3D'"local"'>
-                        <JTable id=3D"localTable" model=3D"{localModel}" sty=
leClass=3D'updateTable'/>
+                        <JTable id=3D"localTable" styleClass=3D'updateTable'=
/>
                     </JScrollPane>
                     <JScrollPane id=3D'remoteContent' styleClass=3D'updateSc=
roll' visible=3D'false' constraints=3D'"remote"'>
-                        <JTable id=3D"remoteTable" model=3D"{remoteModel}" s=
tyleClass=3D'updateTable'/>
+                        <JTable id=3D"remoteTable" styleClass=3D'updateTable=
'/>
                     </JScrollPane>
                 </JPanel>
             </cell>
         </row>
         <row>
             <cell columns=3D'2' fill=3D'both'>
-                <JButton id=3D'quit' text=3D'lutinutil.common.quit' action=
=3D'{quitAction}'/>
+                <JButton id=3D'quit' text=3D'lutinvcs.quit' action=3D'{quitA=
ction}'/>
             </cell>
         </row>
     </Table>

Modified: trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/co=
mmon.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/src/main/uimodel/org/codelutin/vcs/ui/common.c=
ss	2008-03-31 20:40:35 UTC (rev 248)
+++ trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/common.c=
ss	2008-03-31 20:41:08 UTC (rev 249)
@@ -1,36 +1,49 @@
 JToolBar {
-    floatable:false;
-    focusable:false;
-    opaque:false;
-    margin:0;
-    borderPainted:false;
+    floatable: false;
+    focusable: false;
+    opaque: false;
+    margin: 0;
+    borderPainted: false;
 }
=20
 JButton {
-    opaque:false;
-    borderPainted:false;
-    /*enabled:false;*/
-    margin:0;
+    opaque: false;
+    borderPainted: false;
+    enabled: false;
+    margin: 0;
 }
=20
+JToggleButton {
+    opaque: false;
+    borderPainted: false;
+    margin: 0;
+}
+
 JMenuItem {
-    enabled:true;
+    enabled: true;
 }
=20
 JMenu {
-    enabled:true;
+    enabled: true;
 }
=20
 .smallSize {
-    font-size:9;
+    font-size: 9;
 }
=20
 .updateTable {
-      rowSelectionAllowed:false;
-      autoResizeMode:auto_resize_last_column;
+    rowSelectionAllowed: true;
+    autoResizeMode: auto_resize_last_column;
+    showVerticalLines: false;
+    cellSelectionEnabled: false;
+    rowMargin: 0;
+    selectionMode: { ListSelectionModel . MULTIPLE_INTERVAL_SELECTION
 }
=20
+;
+}
+
 .updateScroll {
- verticalScrollBarPolicy:20;
-    horizontalScrollBarPolicy:31;
+    verticalScrollBarPolicy: 20;
+    horizontalScrollBarPolicy: 31;
 }
\ No newline at end of file

Modified: trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui/UITes=
t.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/src/test/java/org/codelutin/vcs/ui/UITest.java=
	2008-03-31 20:40:35 UTC (rev 248)
+++ trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui/UITest.java=
	2008-03-31 20:41:08 UTC (rev 249)
@@ -14,11 +14,70 @@
  */
 package org.codelutin.vcs.ui;
=20
+import org.codelutin.vcs.VCSFileState;
+import org.codelutin.vcs.VCSFileStateImpl;
+import org.codelutin.vcs.VCSHandler;
+import org.codelutin.vcs.VCSHandlerFactory;
+import org.codelutin.vcs.VCSState;
+import org.codelutin.vcs.mock.MockVCSConfig;
+import org.codelutin.vcs.ui.model.SynchUIModel;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 /** @author chemit */
 public class UITest {
=20
     public static void main(String[] args) {
-        VCSUpdateDialog dialog =3Dnew VCSUpdateDialog();
+        org.codelutin.i18n.I18n.init();
+
+        VCSUpdateDialog dialog =3D new VCSUpdateDialog();
+        SynchUIModel model =3D dialog.getModel();
+        MockVCSConfig config =3D new MockVCSConfig();
+        File root =3D new File(new File("").getAbsolutePath());
+        config.setLocalRoot(root);
+        config.setInit(true);
+        VCSHandlerFactory.setConfig(config);
+
+        VCSHandler handler =3D VCSHandlerFactory.getHandler();
+
+        List<VCSFileState> datas =3D generateLocalFileStates(handler, new Fi=
le(root, "trunk"));
+        datas.addAll(generateRemoteFileStates(handler, new File(root, "trunk=
")));
+
+        model.setData(datas);
         dialog.setVisible(true);
     }
+
+    protected static List<VCSFileState> generateLocalFileStates(VCSHandler h=
andler, File root) {
+        List<VCSFileState> datas =3D new ArrayList<VCSFileState>();
+        VCSFileStateImpl state;
+        state =3D new VCSFileStateImpl(handler, new File(root, "local/file0"=
));
+        state.setState(VCSState.MODIFIED);
+        datas.add(state);
+
+        state =3D new VCSFileStateImpl(handler, new File(root, "local/file1"=
));
+        state.setState(VCSState.UNVERSIONNED);
+        datas.add(state);
+        state =3D new VCSFileStateImpl(handler, new File(root, "local/file2"=
));
+        state.setState(VCSState.MODIFIED);
+        datas.add(state);
+        return datas;
+    }
+
+    protected static List<VCSFileState> generateRemoteFileStates(VCSHandler =
handler, File root) {
+        List<VCSFileState> datas =3D new ArrayList<VCSFileState>();
+        VCSFileStateImpl state;
+        state =3D new VCSFileStateImpl(handler, new File(root, "remote/file0=
"));
+        state.setState(VCSState.MISSING);
+        datas.add(state);
+
+        state =3D new VCSFileStateImpl(handler, new File(root, "remote/file1=
"));
+        state.setState(VCSState.OUT_OF_DATE);
+        datas.add(state);
+        state =3D new VCSFileStateImpl(handler, new File(root, "remote/file2=
"));
+        state.setState(VCSState.MISSING);
+        datas.add(state);
+        return datas;
+    }
 }


--===============4972026985725636209==--