From tchemit@users.labs.libre-entreprise.org Sat Apr  5 22:43:39 2008
From: tchemit@users.labs.libre-entreprise.org
To: buix-commits@list.nuiton.org
Subject: [Buix-commits] r371 -
	trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui
Date: Sat, 05 Apr 2008 22:43:39 +0200
Message-ID: <20080405204339.BF051461B09@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0940324779824714317=="

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

Author: tchemit
Date: 2008-04-05 20:43:39 +0000 (Sat, 05 Apr 2008)
New Revision: 371

Modified:
   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
Log:
refactor PRovider, Handler and Connexion

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-05 20:43:32 UTC (rev 370)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDi=
ffUI.jaxx	2008-04-05 20:43:39 UTC (rev 371)
@@ -3,6 +3,7 @@
     <script>
=20
         import org.codelutin.vcs.VCSAction;
+        import org.codelutin.vcs.VCSEntryLocation;
         import org.codelutin.vcs.ui.handler.AbstractDiffUIHandler;
         import org.codelutin.vcs.ui.VCSUIConstants;
=20
@@ -14,9 +15,9 @@
=20
         @Override
         public void setVisible(boolean b) {
-        if (getHandler().getModel().getTabModel() =3D=3D null) {
+        if (getModel().getLocation() =3D=3D null) {
         // first launch, no tab model selected,choose one
-        selectTab(VCSUIConstants.DIFF_ALL_MODEL_PROPERTY);
+        allTab.doClick();
         }
         super.setVisible(b);
         }
@@ -33,12 +34,12 @@
         this.handler =3D handler;
         }
=20
-        protected void selectTab(String tabname) {
-        model.setTabModel(model.getModel(tabname));
+        protected void selectTab(VCSEntryLocation location) {
+        getModel().setLocation(location);
         }
=20
         protected void selectFile(JTable table) {
-        model.setFileModel(model.getTabModel().getData(table.getSelectionMod=
el())[0]);
+        model.setFileModel(model.getModel().getData(table.getSelectionModel(=
))[0]);
         }
=20
         protected void doAction(VCSAction action) {
@@ -77,15 +78,15 @@
                     <JToggleButton id=3D'allTab' selected=3D'true' buttonGro=
up=3D'tabs' mnemonic=3D"A"
                                    toolTipText=3D"lutinvcs.tabs.diff.tooltip=
.all"
                                    icon=3D'{createImageIcon("remote_vs_local=
.png")}'
-                                   onActionPerformed=3D'selectTab("modelSync=
hAll")'/>
+                                   onActionPerformed=3D'selectTab(VCSEntryLo=
cation.ALL)'/>
                     <JToggleButton id=3D'localTab' selected=3D'false' button=
Group=3D'tabs' mnemonic=3D"L"
                                    toolTipText=3D"lutinvcs.tabs.diff.tooltip=
.local"
                                    icon=3D'{createImageIcon("local_vs_local.=
png")}'
-                                   onActionPerformed=3D'selectTab("modelSync=
hLocal")'/>
+                                   onActionPerformed=3D'selectTab(VCSEntryLo=
cation.LOCAL)'/>
                     <JToggleButton id=3D'remoteTab' selected=3D'false' butto=
nGroup=3D'tabs' mnemonic=3D"R"
                                    icon=3D'{createImageIcon("remote_vs_remot=
e.png")}'
                                    toolTipText=3D"lutinvcs.tabs.diff.tooltip=
.remote"
-                                   onActionPerformed=3D'selectTab("modelSync=
hRemote")'/>
+                                   onActionPerformed=3D'selectTab(VCSEntryLo=
cation.REMOTE)'/>
=20
=20
                     <JButton id=3D'nextDiff' toolTipText=3D"lutinvcs.action.=
tooltip.nextDiff"
@@ -120,16 +121,16 @@
             <cell fill=3D'both' weighty=3D'1' weightx=3D'2'>
                 <JPanel id=3D'preview' layout=3D'{cardLayout}'>
                     <JScrollPane id=3D'allContent' styleClass=3D'diffScroll'=
 constraints=3D'"modelSynchAll"'>
-                        <JTable id=3D"modelDiffAllTable" styleClass=3D'diffT=
able'
-                                onMouseClicked=3D"selectFile(modelDiffAllTab=
le)"/>
+                        <JTable id=3D"allTable" styleClass=3D'diffTable'
+                                onMouseClicked=3D"selectFile(allTable)"/>
                     </JScrollPane>
                     <JScrollPane id=3D'localContent' styleClass=3D'diffScrol=
l' constraints=3D'"modelSynchLocal"'>
-                        <JTable id=3D"modelDiffLocalTable" styleClass=3D'dif=
fTable'
-                                onMouseClicked=3D"selectFile(modelDiffLocalT=
able)"/>
+                        <JTable id=3D"localTable" styleClass=3D'diffTable'
+                                onMouseClicked=3D"selectFile(localTable)"/>
                     </JScrollPane>
                     <JScrollPane id=3D'remoteContent' styleClass=3D'diffScro=
ll' constraints=3D'"modelSynchRemote"'
-                                 onMouseClicked=3D"selectFile(modelDiffRemot=
eTable)">
-                        <JTable id=3D"modelDiffRemoteTable" styleClass=3D'di=
ffTable'/>
+                                 onMouseClicked=3D"selectFile(remoteTable)">
+                        <JTable id=3D"remoteTable" styleClass=3D'diffTable'/>
                     </JScrollPane>
                 </JPanel>
             </cell>

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-05 20:43:32 UTC (rev 370)
+++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSy=
nchUI.jaxx	2008-04-05 20:43:39 UTC (rev 371)
@@ -3,6 +3,7 @@
     <script>
=20
         import org.codelutin.vcs.VCSAction;
+        import org.codelutin.vcs.VCSEntryLocation;
         import org.codelutin.vcs.ui.handler.AbstractSynchUIHandler;
         import org.codelutin.vcs.ui.model.SynchUIModel;
=20
@@ -20,6 +21,14 @@
         return (SynchUIModel) super.getModel();
         }
=20
+        @Override
+        public void setVisible(boolean b) {
+        if (getModel().getModel().getLocation() =3D=3D null) {
+        // first launch, no tab model selected,choose one
+        allTab.doClick();
+        }
+        super.setVisible(b);
+        }
         public JTable getTable(String modelName) {
         return (JTable) get$objectMap().get(modelName+"Table");
         }
@@ -28,19 +37,10 @@
         return (JVCSPopup) get$objectMap().get(modelName+"Popup");
         }
=20
-        @Override
-        public void setVisible(boolean b) {
-        if (getHandler().getModel().getTabModel() =3D=3D null) {
-        // first launch, no tab model selected,choose one
-        selectTab(VCSUIConstants.SYNCH_ALL_MODEL_PROPERTY);
+        protected void setLocation(VCSEntryLocation location) {
+        getModel().setLocation(location);
         }
-        super.setVisible(b);
-        }
=20
-        protected void selectTab(String tabname) {
-        getModel().setTabModel(getModel().getModel(tabname));
-        }
-
         protected void doAllAction(VCSAction action) {
         getModel().doAllAction(action);
         }
@@ -52,22 +52,22 @@
=20
     <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"/>
+    <org.codelutin.vcs.ui.JVCSPopup id=3D"allPopup"/>
+    <org.codelutin.vcs.ui.JVCSPopup id=3D"localPopup"/>
+    <org.codelutin.vcs.ui.JVCSPopup id=3D"remotePopup"/>
     <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"
+                    <JToggleButton id=3D'allTab' buttonGroup=3D'tabs' text=
=3D'lutinvcs.tabs.all' mnemonic=3D"A"
                                    toolTipText=3D"lutinvcs.tabs.tooltip.all"
-                                   onActionPerformed=3D'selectTab("modelSync=
hAll")'/>
+                                   onActionPerformed=3D'setLocation(VCSEntry=
Location.ALL)'/>
                     <JToggleButton id=3D'localTab' selected=3D'false' button=
Group=3D'tabs' text=3D'lutinvcs.tabs.local'
                                    mnemonic=3D"L" toolTipText=3D"lutinvcs.ta=
bs.tooltip.local"
-                                   onActionPerformed=3D'selectTab("modelSync=
hLocal")'/>
+                                   onActionPerformed=3D'setLocation(VCSEntry=
Location.LOCAL)'/>
                     <JToggleButton id=3D'remoteTab' selected=3D'false' butto=
nGroup=3D'tabs' text=3D'lutinvcs.tabs.remote'
                                    mnemonic=3D"R" toolTipText=3D"lutinvcs.ta=
bs.tooltip.remote"
-                                   onActionPerformed=3D'selectTab("modelSync=
hRemote")'/>
+                                   onActionPerformed=3D'setLocation(VCSEntry=
Location.REMOTE)'/>
=20
                     <JButton id=3D'refreshAll' toolTipText=3D"lutinvcs.actio=
n.tooltip.refreshAll"
                              icon=3D'{createImageIcon("autoRefresh.png")}'
@@ -98,13 +98,13 @@
             <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'"modelSynchAll"'>
-                        <JTable id=3D"modelSynchAllTable" styleClass=3D'upda=
teTable'/>
+                        <JTable id=3D"allTable" styleClass=3D'updateTable'/>
                     </JScrollPane>
                     <JScrollPane id=3D'localContent' styleClass=3D'updateScr=
oll' constraints=3D'"modelSynchLocal"'>
-                        <JTable id=3D"modelSynchLocalTable" styleClass=3D'up=
dateTable'/>
+                        <JTable id=3D"localTable" styleClass=3D'updateTable'=
/>
                     </JScrollPane>
                     <JScrollPane id=3D'remoteContent' styleClass=3D'updateSc=
roll' constraints=3D'"modelSynchRemote"'>
-                        <JTable id=3D"modelSynchRemoteTable" styleClass=3D'u=
pdateTable'/>
+                        <JTable id=3D"remoteTable" styleClass=3D'updateTable=
'/>
                     </JScrollPane>
                 </JPanel>
             </cell>


--===============0940324779824714317==--