From tchemit@users.labs.libre-entreprise.org Tue Apr  1 01:24:12 2008
From: tchemit@users.labs.libre-entreprise.org
To: buix-commits@list.nuiton.org
Subject: [Buix-commits] r267 - in trunk/lutinvcs/lutinvcs-ui/src:
	main/uimodel/org/codelutin/vcs/ui test/java/org/codelutin/vcs/ui
Date: Tue, 01 Apr 2008 01:24:12 +0200
Message-ID: <20080331232412.921F8461AF8@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1719618740275344128=="

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

Author: tchemit
Date: 2008-03-31 23:24:12 +0000 (Mon, 31 Mar 2008)
New Revision: 267

Added:
   trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSSynchU=
I.jaxx
Removed:
   trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSUpdate=
Dialog.jaxx
Modified:
   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:
generate test datas + synch ui more

Copied: trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSS=
ynchUI.jaxx (from rev 258, trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/co=
delutin/vcs/ui/VCSUpdateDialog.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/VCSSynch=
UI.jaxx	                        (rev 0)
+++ trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSSynch=
UI.jaxx	2008-03-31 23:24:12 UTC (rev 267)
@@ -0,0 +1,105 @@
+<JDialog title=3D'lutinvcs.synch.title'
+         defaultCloseOperation=3D'DISPOSE_ON_CLOSE'>
+    <style source=3D"common.css"/>
+    <script>
+
+        protected void selectTab(String tabname) {
+        cardLayout.show(preview, tabname);
+        }
+        Action quitAction;
+
+        JRootPane rootPane =3D getRootPane();
+        rootPane.setDefaultButton(quit);
+        quitAction =3D new AbstractAction(quit.getText()) {
+        private static final long serialVersionUID =3D -869095664995763057L;
+        public void actionPerformed(ActionEvent e) {
+        dispose();
+        }
+        };
+        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.model.SynchUIModel id=3D"model"/>
+    <java.awt.CardLayout id=3D'cardLayout'/>
+
+    <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>
+    <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("all")'/>
+                    <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("local")'/>
+                    <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("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'>
+            <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" styleClass=3D'updateTable'/>
+                    </JScrollPane>
+                    <JScrollPane id=3D'localContent' styleClass=3D'updateScr=
oll' visible=3D'false' constraints=3D'"local"'>
+                        <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" styleClass=3D'updateTable=
'/>
+                    </JScrollPane>
+                </JPanel>
+            </cell>
+        </row>
+        <row>
+            <cell fill=3D'both'>
+                <JButton id=3D'quit' text=3D'lutinvcs.quit' action=3D'{quitA=
ction}'/>
+            </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>

Deleted: trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCS=
UpdateDialog.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 23:23:32 UTC (rev 266)
+++ trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSUpdat=
eDialog.jaxx	2008-03-31 23:24:12 UTC (rev 267)
@@ -1,85 +0,0 @@
-<JDialog title=3D'lutinvcs.synch.title'
-         defaultCloseOperation=3D'DISPOSE_ON_CLOSE'>
-    <style source=3D"common.css"/>
-    <script>
-
-        protected void selectTab(String tabname) {
-        cardLayout.show(preview, tabname);
-        }
-        Action quitAction ;
-
-        JRootPane rootPane =3D getRootPane();
-        rootPane.setDefaultButton(quit);
-        quitAction =3D new AbstractAction(quit.getText()) {
-        private static final long serialVersionUID =3D -869095664995763057L;
-        public void actionPerformed(ActionEvent e) {
-        dispose();
-        }
-        };
-        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.model.SynchUIModel id=3D"model"/>
-    <java.awt.CardLayout id=3D'cardLayout'/>
-
-    <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>
-    <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'
-                                   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'>
-            <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" styleClass=3D'updateTable'/>
-                    </JScrollPane>
-                    <JScrollPane id=3D'localContent' styleClass=3D'updateScr=
oll' visible=3D'false' constraints=3D'"local"'>
-                        <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" styleClass=3D'updateTable=
'/>
-                    </JScrollPane>
-                </JPanel>
-            </cell>
-        </row>
-        <row>
-            <cell columns=3D'2' fill=3D'both'>
-                <JButton id=3D'quit' text=3D'lutinvcs.quit' action=3D'{quitA=
ction}'/>
-            </cell>
-        </row>
-    </Table>
-</JDialog>

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 23:23:32 UTC (rev 266)
+++ trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/common.c=
ss	2008-03-31 23:24:12 UTC (rev 267)
@@ -33,7 +33,8 @@
=20
 .updateTable {
     rowSelectionAllowed: true;
-    autoResizeMode: auto_resize_last_column;
+    /*autoResizeMode: auto_resize_all_columns;
+    autoResizeMode: auto_resize_last_column;*/
     showVerticalLines: false;
     cellSelectionEnabled: false;
     rowMargin: 0;

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 23:23:32 UTC (rev 266)
+++ trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui/UITest.java=
	2008-03-31 23:24:12 UTC (rev 267)
@@ -19,7 +19,7 @@
 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.impl.mock.MockVCSConfig;
 import org.codelutin.vcs.ui.model.SynchUIModel;
=20
 import java.io.File;
@@ -29,55 +29,46 @@
 /** @author chemit */
 public class UITest {
=20
+    /** The r. */
+    static java.util.Random r =3D new java.util.Random();
+
     public static void main(String[] args) {
         org.codelutin.i18n.I18n.init();
=20
-        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.setLocalRoot(new File(new File("").getAbsolutePath()));
         config.setInit(true);
         VCSHandlerFactory.setConfig(config);
=20
         VCSHandler handler =3D VCSHandlerFactory.getHandler();
=20
-        List<VCSFileState> datas =3D generateLocalFileStates(handler, new Fi=
le(root, "trunk"));
-        datas.addAll(generateRemoteFileStates(handler, new File(root, "trunk=
")));
+        VCSSynchUI dialog =3D new VCSSynchUI();
+        fillSynchModel(handler, dialog.getModel(), 20, "trunk", "local/", "r=
emote/");
=20
-        model.setData(datas);
         dialog.setVisible(true);
     }
=20
-    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);
+    protected static void fillSynchModel(VCSHandler handler, SynchUIModel mo=
del, int max, String prefix, String localPRefix, String remotePrefix) {
+        List<VCSFileState> datas =3D generateLocalFileStates(handler, max, n=
ew File(handler.getConfig().getLocalDatabasePath(), prefix), localPRefix);
+        datas.addAll(generateRemoteFileStates(handler, max, new File(handler=
.getConfig().getLocalDatabasePath(), prefix), remotePrefix));
+        model.setData(datas);
+    }
=20
-        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> generateLocalFileStates(VCSHandler h=
andler, int max, File root, String localPRefix) {
+        return generateFileStates(handler, root, max, localPRefix, VCSState.=
MODIFIED, VCSState.UNVERSIONNED, VCSState.OUT_OF_DATE_AND_MODIFIED);
     }
=20
-    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);
+    protected static List<VCSFileState> generateRemoteFileStates(VCSHandler =
handler, int max, File root, String remotePRefix) {
+        return generateFileStates(handler, root, max, remotePRefix, VCSState=
.MISSING, VCSState.OUT_OF_DATE, VCSState.OUT_OF_DATE_AND_MODIFIED);
+    }
=20
-        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);
+    protected static List<VCSFileState> generateFileStates(VCSHandler handle=
r, File root, int max, String prefix, VCSState... states) {
+        List<VCSFileState> datas =3D new ArrayList<VCSFileState>();
+        for (int i =3D 0, nbFiles =3D 1 + r.nextInt(max), size =3D states.le=
ngth; i < nbFiles; i++) {
+            VCSFileStateImpl state =3D new VCSFileStateImpl(handler, new Fil=
e(root, prefix + "file" + i));
+            state.setState(states[r.nextInt(size)]);
+            datas.add(state);
+        }
         return datas;
     }
 }


--===============1719618740275344128==--