March 2008 - Jaxx-commits - mailman.cloud.codelutin.com

[Buix-commits] r270 - in trunk/lutinvcs: . lutinvcs-api lutinvcs-core lutinvcs-provider-cvs lutinvcs-ui
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 23:25:46 +0000 (Mon, 31 Mar 2008) New Revision: 270 Removed: trunk/lutinvcs/.cvsignore trunk/lutinvcs/lutinvcs-api/.cvsignore trunk/lutinvcs/lutinvcs-core/.cvsignore trunk/lutinvcs/lutinvcs-provider-cvs/.cvsignore trunk/lutinvcs/lutinvcs-ui/.cvsignore Log: bye-bye! Deleted: trunk/lutinvcs/.cvsignore =================================================================== --- trunk/lutinvcs/.cvsignore 2008-03-31 23:24:36 UTC (rev 269) +++ trunk/lutinvcs/.cvsignore 2008-03-31 23:25:46 UTC (rev 270) @@ -1,7 +0,0 @@ -target -velocity.log -maven.log -.eclipse -.classpath -lutinutil.iml -lutinutil.ipr Deleted: trunk/lutinvcs/lutinvcs-api/.cvsignore =================================================================== --- trunk/lutinvcs/lutinvcs-api/.cvsignore 2008-03-31 23:24:36 UTC (rev 269) +++ trunk/lutinvcs/lutinvcs-api/.cvsignore 2008-03-31 23:25:46 UTC (rev 270) @@ -1,6 +0,0 @@ -target -target/* -velocity.log -maven.log -.eclipse -.classpath Deleted: trunk/lutinvcs/lutinvcs-core/.cvsignore =================================================================== --- trunk/lutinvcs/lutinvcs-core/.cvsignore 2008-03-31 23:24:36 UTC (rev 269) +++ trunk/lutinvcs/lutinvcs-core/.cvsignore 2008-03-31 23:25:46 UTC (rev 270) @@ -1,7 +0,0 @@ -target -velocity.log -maven.log -.eclipse -.classpath -lutinutil.iml -lutinutil.ipr Deleted: trunk/lutinvcs/lutinvcs-provider-cvs/.cvsignore =================================================================== --- trunk/lutinvcs/lutinvcs-provider-cvs/.cvsignore 2008-03-31 23:24:36 UTC (rev 269) +++ trunk/lutinvcs/lutinvcs-provider-cvs/.cvsignore 2008-03-31 23:25:46 UTC (rev 270) @@ -1,7 +0,0 @@ -target -velocity.log -maven.log -.eclipse -.classpath -lutinutil.iml -lutinutil.ipr Deleted: trunk/lutinvcs/lutinvcs-ui/.cvsignore =================================================================== --- trunk/lutinvcs/lutinvcs-ui/.cvsignore 2008-03-31 23:24:36 UTC (rev 269) +++ trunk/lutinvcs/lutinvcs-ui/.cvsignore 2008-03-31 23:25:46 UTC (rev 270) @@ -1,7 +0,0 @@ -target -velocity.log -maven.log -.eclipse -.classpath -lutinutil.iml -lutinutil.ipr

1 0

[Buix-commits] r269 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 23:24:36 +0000 (Mon, 31 Mar 2008) New Revision: 269 Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java Log: improve display Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-03-31 23:24:26 UTC (rev 268) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-03-31 23:24:36 UTC (rev 269) @@ -78,7 +78,7 @@ public void setData(List<VCSFileState> states) { getModel(ALL_MODEL_PROPERTY).setData(states); - List<VCSFileState> local = new ArrayList<VCSFileState>(states); + List<VCSFileState> local = new ArrayList<VCSFileState>(); List<VCSFileState> remote = new ArrayList<VCSFileState>(); splitStates(states, local, remote); getModel(LOCAL_MODEL_PROPERTY).setData(local); @@ -112,10 +112,10 @@ protected void splitStates(List<VCSFileState> states, List<VCSFileState> local, List<VCSFileState> remote) { for (VCSFileState state : states) { - if (state.getState()!=null && state.getState().isLocal()) { + if (state.getState() != null && state.getState().isLocal()) { local.add(state); } - if (state.getState()!=null && state.getState().isRemote()) { + if (state.getState() != null && state.getState().isRemote()) { remote.add(state); } }

1 0

[Buix-commits] r268 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 23:24:26 +0000 (Mon, 31 Mar 2008) New Revision: 268 Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchVCSFileStatesModel.java Log: improve display Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchVCSFileStatesModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchVCSFileStatesModel.java 2008-03-31 23:24:12 UTC (rev 267) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchVCSFileStatesModel.java 2008-03-31 23:24:26 UTC (rev 268) @@ -32,14 +32,14 @@ Object result = null; if (columnIndex == 0) { // get module - result = item.getLocalPath(); + result = item.getModuleName(); } else if (columnIndex == 1) { // get file - result = item.getFile().getName(); + result = item.getModuleRelativeFileName(); } else if (columnIndex == 2) { // get status VCSState state = item.getState(); - result = state==null?null:state.libelle(); + result = state == null ? null : state.libelle(); } return result; }

1 0

[Buix-commits] r267 - in trunk/lutinvcs/lutinvcs-ui/src: main/uimodel/org/codelutin/vcs/ui test/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

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/VCSSynchUI.jaxx Removed: trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSUpdateDialog.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/VCSSynchUI.jaxx (from rev 258, trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSUpdateDialog.jaxx) =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSSynchUI.jaxx (rev 0) +++ trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSSynchUI.jaxx 2008-03-31 23:24:12 UTC (rev 267) @@ -0,0 +1,105 @@ +<JDialog title='lutinvcs.synch.title' + defaultCloseOperation='DISPOSE_ON_CLOSE'> + <style source="common.css"/> + <script> + + protected void selectTab(String tabname) { + cardLayout.show(preview, tabname); + } + Action quitAction; + + JRootPane rootPane = getRootPane(); + rootPane.setDefaultButton(quit); + quitAction = new AbstractAction(quit.getText()) { + private static final long serialVersionUID = -869095664995763057L; + public void actionPerformed(ActionEvent e) { + dispose(); + } + }; + rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.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='listModel'/> + <org.codelutin.vcs.ui.model.SynchUIModel id="model"/> + <java.awt.CardLayout id='cardLayout'/> + + <JPopupMenu id="tablePopupMenu" invoker='{allTable}' enabled='false'> + <JMenuItem id='diff' text="lutinvcs.action.diff" toolTipText="lutinvcs.action.tooltip.diff"/> + <JMenuItem id='update' text="lutinvcs.action.update" toolTipText="lutinvcs.action.tooltip.update"/> + <JMenuItem id='commit' text="lutinvcs.action.commit" toolTipText="lutinvcs.action.tooltip.commit"/> + <JMenuItem id='revert' text="lutinvcs.action.revert" toolTipText="lutinvcs.action.tooltip.revert"/> + </JPopupMenu> + <Table> + <row fill='both'> + <cell fill='both' weightx='1'> + <JToolBar> + <JToggleButton id='allTab' selected='true' buttonGroup='tabs' text='lutinvcs.tabs.all' mnemonic="A" + toolTipText="lutinvcs.tabs.tooltip.all" onActionPerformed='selectTab("all")'/> + <JToggleButton id='localTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.local' + mnemonic="L" + toolTipText="lutinvcs.tabs.tooltip.local" onActionPerformed='selectTab("local")'/> + <JToggleButton id='remoteTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.remote' + mnemonic="R" + toolTipText="lutinvcs.tabs.tooltip.remote" onActionPerformed='selectTab("remote")'/> + + <JButton id='refresh' text="lutinvcs.action.refresh" toolTipText="lutinvcs.action.tooltip.refresh" + icon='{createImageIcon("autoRefresh.png")}'/> + <JButton id='diffAll' text="lutinvcs.action.diffAll" toolTipText="lutinvcs.action.tooltip.diffAll" + icon='{createImageIcon("diff.png")}'/> + <JButton id='updateAll' text="lutinvcs.action.updateAll" + toolTipText="lutinvcs.action.tooltip.updateAll" icon='{createImageIcon("update.png")}'/> + <JButton id='commitAll' text="lutinvcs.action.commitAll" + toolTipText="lutinvcs.action.tooltip.commitAll" icon='{createImageIcon("commit.png")}'/> + <JButton id='revertAll' text="lutinvcs.action.revertAll" + toolTipText="lutinvcs.action.tooltip.revertAll" icon='{createImageIcon("rollback.png")}'/> + </JToolBar> + </cell> + </row> + <row fill='both'> + <cell fill='both' weighty='1' weightx='2'> + <JPanel id='preview' layout='{cardLayout}'> + <JScrollPane id='allContent' styleClass='updateScroll' constraints='"all"'> + <JTable id="allTable" styleClass='updateTable'/> + </JScrollPane> + <JScrollPane id='localContent' styleClass='updateScroll' visible='false' constraints='"local"'> + <JTable id="localTable" styleClass='updateTable'/> + </JScrollPane> + <JScrollPane id='remoteContent' styleClass='updateScroll' visible='false' constraints='"remote"'> + <JTable id="remoteTable" styleClass='updateTable'/> + </JScrollPane> + </JPanel> + </cell> + </row> + <row> + <cell fill='both'> + <JButton id='quit' text='lutinvcs.quit' action='{quitAction}'/> + </cell> + </row> +  + </Table> +</JDialog> Deleted: trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSUpdateDialog.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSUpdateDialog.jaxx 2008-03-31 23:23:32 UTC (rev 266) +++ trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSUpdateDialog.jaxx 2008-03-31 23:24:12 UTC (rev 267) @@ -1,85 +0,0 @@ -<JDialog title='lutinvcs.synch.title' - defaultCloseOperation='DISPOSE_ON_CLOSE'> - <style source="common.css"/> - <script> - - protected void selectTab(String tabname) { - cardLayout.show(preview, tabname); - } - Action quitAction ; - - JRootPane rootPane = getRootPane(); - rootPane.setDefaultButton(quit); - quitAction = new AbstractAction(quit.getText()) { - private static final long serialVersionUID = -869095664995763057L; - public void actionPerformed(ActionEvent e) { - dispose(); - } - }; - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.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='listModel'/> - <org.codelutin.vcs.ui.model.SynchUIModel id="model"/> - <java.awt.CardLayout id='cardLayout'/> - - <JPopupMenu id="tablePopupMenu" invoker='{allTable}' enabled='false'> - <JMenuItem id='diff' text="lutinvcs.action.diff" toolTipText="lutinvcs.action.tooltip.diff"/> - <JMenuItem id='update' text="lutinvcs.action.update" toolTipText="lutinvcs.action.tooltip.update"/> - <JMenuItem id='commit' text="lutinvcs.action.commit" toolTipText="lutinvcs.action.tooltip.commit"/> - <JMenuItem id='revert' text="lutinvcs.action.revert" toolTipText="lutinvcs.action.tooltip.revert"/> - </JPopupMenu> - <Table> - <row fill='both'> - <cell fill='both' weightx='1'> - <JToolBar> - <JToggleButton id='allTab' selected='true' buttonGroup='tabs' text='lutinvcs.tabs.all' - toolTipText="lutinvcs.tabs.tooltip.all" onActionPerformed='selectTab("all")'/> - <JToggleButton id='localTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.local' - toolTipText="lutinvcs.tabs.tooltip.local" onActionPerformed='selectTab("local")'/> - <JToggleButton id='remoteTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.remote' - toolTipText="lutinvcs.tabs.tooltip.remote" onActionPerformed='selectTab("remote")'/> - - <JButton id='refresh' text="lutinvcs.action.refresh" toolTipText="lutinvcs.action.tooltip.refresh" - icon='{createImageIcon("autoRefresh.png")}'/> - <JButton id='diffAll' text="lutinvcs.action.diffAll" toolTipText="lutinvcs.action.tooltip.diffAll" - icon='{createImageIcon("diff.png")}'/> - <JButton id='updateAll' text="lutinvcs.action.updateAll" - toolTipText="lutinvcs.action.tooltip.updateAll" icon='{createImageIcon("update.png")}'/> - <JButton id='commitAll' text="lutinvcs.action.commitAll" - toolTipText="lutinvcs.action.tooltip.commitAll" icon='{createImageIcon("commit.png")}'/> - <JButton id='revertAll' text="lutinvcs.action.revertAll" - toolTipText="lutinvcs.action.tooltip.revertAll" icon='{createImageIcon("rollback.png")}'/> - </JToolBar> - </cell> - </row> - <row fill='both'> - <cell fill='both' weighty='1' weightx='2'> - <JPanel id='preview' layout='{cardLayout}'> - <JScrollPane id='allContent' styleClass='updateScroll' constraints='"all"'> - <JTable id="allTable" styleClass='updateTable'/> - </JScrollPane> - <JScrollPane id='localContent' styleClass='updateScroll' visible='false' constraints='"local"'> - <JTable id="localTable" styleClass='updateTable'/> - </JScrollPane> - <JScrollPane id='remoteContent' styleClass='updateScroll' visible='false' constraints='"remote"'> - <JTable id="remoteTable" styleClass='updateTable'/> - </JScrollPane> - </JPanel> - </cell> - </row> - <row> - <cell columns='2' fill='both'> - <JButton id='quit' text='lutinvcs.quit' action='{quitAction}'/> - </cell> - </row> - </Table> -</JDialog> Modified: trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/common.css =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/common.css 2008-03-31 23:23:32 UTC (rev 266) +++ trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/common.css 2008-03-31 23:24:12 UTC (rev 267) @@ -33,7 +33,8 @@ .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/UITest.java =================================================================== --- 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; import java.io.File; @@ -29,55 +29,46 @@ /** @author chemit */ public class UITest { + /** The r. */ + static java.util.Random r = new java.util.Random(); + public static void main(String[] args) { org.codelutin.i18n.I18n.init(); - VCSUpdateDialog dialog = new VCSUpdateDialog(); - SynchUIModel model = dialog.getModel(); MockVCSConfig config = new MockVCSConfig(); - File root = new File(new File("").getAbsolutePath()); - config.setLocalRoot(root); + config.setLocalRoot(new File(new File("").getAbsolutePath())); config.setInit(true); VCSHandlerFactory.setConfig(config); VCSHandler handler = VCSHandlerFactory.getHandler(); - List<VCSFileState> datas = generateLocalFileStates(handler, new File(root, "trunk")); - datas.addAll(generateRemoteFileStates(handler, new File(root, "trunk"))); + VCSSynchUI dialog = new VCSSynchUI(); + fillSynchModel(handler, dialog.getModel(), 20, "trunk", "local/", "remote/"); - model.setData(datas); dialog.setVisible(true); } - protected static List<VCSFileState> generateLocalFileStates(VCSHandler handler, File root) { - List<VCSFileState> datas = new ArrayList<VCSFileState>(); - VCSFileStateImpl state; - state = new VCSFileStateImpl(handler, new File(root, "local/file0")); - state.setState(VCSState.MODIFIED); - datas.add(state); + protected static void fillSynchModel(VCSHandler handler, SynchUIModel model, int max, String prefix, String localPRefix, String remotePrefix) { + List<VCSFileState> datas = generateLocalFileStates(handler, max, new File(handler.getConfig().getLocalDatabasePath(), prefix), localPRefix); + datas.addAll(generateRemoteFileStates(handler, max, new File(handler.getConfig().getLocalDatabasePath(), prefix), remotePrefix)); + model.setData(datas); + } - state = new VCSFileStateImpl(handler, new File(root, "local/file1")); - state.setState(VCSState.UNVERSIONNED); - datas.add(state); - state = new VCSFileStateImpl(handler, new File(root, "local/file2")); - state.setState(VCSState.MODIFIED); - datas.add(state); - return datas; + protected static List<VCSFileState> generateLocalFileStates(VCSHandler handler, int max, File root, String localPRefix) { + return generateFileStates(handler, root, max, localPRefix, VCSState.MODIFIED, VCSState.UNVERSIONNED, VCSState.OUT_OF_DATE_AND_MODIFIED); } - protected static List<VCSFileState> generateRemoteFileStates(VCSHandler handler, File root) { - List<VCSFileState> datas = new ArrayList<VCSFileState>(); - VCSFileStateImpl state; - state = 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); + } - state = new VCSFileStateImpl(handler, new File(root, "remote/file1")); - state.setState(VCSState.OUT_OF_DATE); - datas.add(state); - state = new VCSFileStateImpl(handler, new File(root, "remote/file2")); - state.setState(VCSState.MISSING); - datas.add(state); + protected static List<VCSFileState> generateFileStates(VCSHandler handler, File root, int max, String prefix, VCSState... states) { + List<VCSFileState> datas = new ArrayList<VCSFileState>(); + for (int i = 0, nbFiles = 1 + r.nextInt(max), size = states.length; i < nbFiles; i++) { + VCSFileStateImpl state = new VCSFileStateImpl(handler, new File(root, prefix + "file" + i)); + state.setState(states[r.nextInt(size)]); + datas.add(state); + } return datas; } }

1 0

[Buix-commits] r266 - trunk/lutinvcs/lutinvcs-ui
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 23:23:32 +0000 (Mon, 31 Mar 2008) New Revision: 266 Modified: trunk/lutinvcs/lutinvcs-ui/pom.xml Log: use mock provider (should be only in test phase!) Modified: trunk/lutinvcs/lutinvcs-ui/pom.xml =================================================================== --- trunk/lutinvcs/lutinvcs-ui/pom.xml 2008-03-31 23:23:08 UTC (rev 265) +++ trunk/lutinvcs/lutinvcs-ui/pom.xml 2008-03-31 23:23:32 UTC (rev 266) @@ -25,6 +25,25 @@ <build> <plugins> <plugin> +  + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>clean</phase> + <configuration> + <tasks> + <delete includeemptydirs="true"> + <fileset dir="${maven.src.dir}/main/java" includes="**/*"/> + </delete> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-jaxx-plugin</artifactId> <version>0.2-SNAPSHOT</version> @@ -50,7 +69,7 @@  <artifactId>lutinvcs-core</artifactId> <scope>compile</scope> - <version>0.1-SNAPSHOT</version> + <version>${current.version}</version> </dependency> </dependencies> </plugin> @@ -77,11 +96,15 @@ <artifactId>lutinvcs-core</artifactId> <scope>compile</scope> </dependency> + <dependency> + <groupId>lutinlib.vcs</groupId> + <artifactId>lutinvcs-provider-mock</artifactId> + <scope>compile</scope> + </dependency>  <dependency> <groupId>lutinlib</groupId> <artifactId>jaxx</artifactId> - <version>1.0.4-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies>

1 0

[Buix-commits] r265 - trunk/lutinvcs/lutinvcs-provider-mock
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 23:23:08 +0000 (Mon, 31 Mar 2008) New Revision: 265 Modified: trunk/lutinvcs/lutinvcs-provider-mock/ Log: svn ignore Property changes on: trunk/lutinvcs/lutinvcs-provider-mock ___________________________________________________________________ Name: svn:ignore + target target/*

1 0

[Buix-commits] r264 - trunk/lutinvcs
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 23:22:56 +0000 (Mon, 31 Mar 2008) New Revision: 264 Modified: trunk/lutinvcs/pom.xml Log: mock provider module Modified: trunk/lutinvcs/pom.xml =================================================================== --- trunk/lutinvcs/pom.xml 2008-03-31 23:22:40 UTC (rev 263) +++ trunk/lutinvcs/pom.xml 2008-03-31 23:22:56 UTC (rev 264) @@ -21,11 +21,12 @@ <modules> <module>lutinvcs-api</module> <module>lutinvcs-core</module> + <module>lutinvcs-provider-mock</module> <module>lutinvcs-provider-cvs</module> <module>lutinvcs-provider-svn</module> <module>lutinvcs-ui</module> </modules> - +   -  -   <maven.compile.source>1.6</maven.compile.source> <maven.compile.target>1.6</maven.compile.target> -  -  +  <labs.lists> http://lists.labs.libre-entreprise.org/mailman/listinfo/lutinutil </labs.lists>  - <maven.scm.developerConnection>scm:svn:svn+ssh://tchemit@${labs.host}/svnroot/buix/trunk</maven.scm.developerConnection> + <maven.scm.developerConnection>scm:svn:svn+ssh://tchemit@${labs.host}/svnroot/buix/trunk + </maven.scm.developerConnection>  <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/buix/trunk</maven.scm.connection> @@ -119,87 +118,8 @@ </profile> </profiles> - -  - -  - -  -  - -  - <build> <plugins> -  -  -  -  <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-i18n-plugin</artifactId> @@ -214,44 +134,34 @@ <keepBackup>false</keepBackup> </configuration> </plugin> - -  -  + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> - <!--repositories> <repository> <id>java.net</id> @@ -309,6 +219,11 @@ </dependency> <dependency> <groupId>lutinlib.vcs</groupId> + <artifactId>lutinvcs-provider-mock</artifactId> + <version>${current.version}</version> + </dependency> + <dependency> + <groupId>lutinlib.vcs</groupId> <artifactId>lutinvcs-provider-cvs</artifactId> <version>${current.version}</version> </dependency>

1 0

[Buix-commits] r263 - trunk/lutinvcs/lutinvcs-api/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 23:22:40 +0000 (Mon, 31 Mar 2008) New Revision: 263 Modified: trunk/lutinvcs/lutinvcs-api/src/main/resources/i18n/lutinvcs-api-en_GB.properties trunk/lutinvcs/lutinvcs-api/src/main/resources/i18n/lutinvcs-api-fr_FR.properties Log: i18n simplified Modified: trunk/lutinvcs/lutinvcs-api/src/main/resources/i18n/lutinvcs-api-en_GB.properties =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/resources/i18n/lutinvcs-api-en_GB.properties 2008-03-31 23:19:04 UTC (rev 262) +++ trunk/lutinvcs/lutinvcs-api/src/main/resources/i18n/lutinvcs-api-en_GB.properties 2008-03-31 23:22:40 UTC (rev 263) @@ -4,14 +4,14 @@ lutinvcs.action.commit=commit lutinvcs.action.delete=delete lutinvcs.action.diff=diff -lutinvcs.action.overwriteAndUpdate=overwriteAndUpdate +lutinvcs.action.overwriteAndUpdate=overwrite and update lutinvcs.action.revert=revert lutinvcs.action.update=update lutinvcs.state.missing=missing lutinvcs.state.modified=modified -lutinvcs.state.outofdate=outofdate -lutinvcs.state.outofdateAndModified=outofdateAndModified +lutinvcs.state.outofdate=out of date +lutinvcs.state.outofdateAndModified=out of date and modified lutinvcs.state.unknown=unknown lutinvcs.state.unversionned=unversionned -lutinvcs.state.unversionnedOrMissing=unversionnedOrMissing +lutinvcs.state.unversionnedOrMissing=unversionned or missing lutinvcs.state.uptodate=uptodate Modified: trunk/lutinvcs/lutinvcs-api/src/main/resources/i18n/lutinvcs-api-fr_FR.properties =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/resources/i18n/lutinvcs-api-fr_FR.properties 2008-03-31 23:19:04 UTC (rev 262) +++ trunk/lutinvcs/lutinvcs-api/src/main/resources/i18n/lutinvcs-api-fr_FR.properties 2008-03-31 23:22:40 UTC (rev 263) @@ -7,11 +7,11 @@ lutinvcs.action.overwriteAndUpdate=Update lutinvcs.action.revert=Rollback lutinvcs.action.update=Update -lutinvcs.state.missing=fichier non pr\u00E9sent localement -lutinvcs.state.modified=fichier modifi\u00E9 -lutinvcs.state.outofdate=fichier obsol\u00E8te -lutinvcs.state.outofdateAndModified=fichier modifi\u00E9 et obsol\u00E8te -lutinvcs.state.unknown=fichier d'\u00E9tat inconnu -lutinvcs.state.unversionned=fichier non versionn\u00E9 -lutinvcs.state.unversionnedOrMissing=fichier non versionn\u00E9 ou non pr\u00E9sent localement +lutinvcs.state.missing=non pr\u00E9sent +lutinvcs.state.modified=modifi\u00E9 +lutinvcs.state.outofdate=obsol\u00E8te +lutinvcs.state.outofdateAndModified=modifi\u00E9 et obsol\u00E8te +lutinvcs.state.unknown=\u00E9tat inconnu +lutinvcs.state.unversionned=non versionn\u00E9 +lutinvcs.state.unversionnedOrMissing=non versionn\u00E9 ou non pr\u00E9sent localement lutinvcs.state.uptodate=fichier \u00E0 jour

1 0

[Buix-commits] r262 - in trunk/lutinvcs/lutinvcs-core/src/main: java/org/codelutin/vcs resources/META-INF/services
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 23:19:04 +0000 (Mon, 31 Mar 2008) New Revision: 262 Removed: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/mock/ trunk/lutinvcs/lutinvcs-core/src/main/resources/META-INF/services/org.codelutin.vcs.VCSHandlerProvider Log: mock provider module Deleted: trunk/lutinvcs/lutinvcs-core/src/main/resources/META-INF/services/org.codelutin.vcs.VCSHandlerProvider =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/resources/META-INF/services/org.codelutin.vcs.VCSHandlerProvider 2008-03-31 23:18:48 UTC (rev 261) +++ trunk/lutinvcs/lutinvcs-core/src/main/resources/META-INF/services/org.codelutin.vcs.VCSHandlerProvider 2008-03-31 23:19:04 UTC (rev 262) @@ -1 +0,0 @@ -org.codelutin.vcs.mock.MockHandlerProvider \ No newline at end of file

1 0

March 31, 2008

Author: tchemit Date: 2008-03-31 23:18:48 +0000 (Mon, 31 Mar 2008) New Revision: 261 Added: trunk/lutinvcs/lutinvcs-provider-mock/ trunk/lutinvcs/lutinvcs-provider-mock/LICENSE.txt trunk/lutinvcs/lutinvcs-provider-mock/changelog trunk/lutinvcs/lutinvcs-provider-mock/pom.xml trunk/lutinvcs/lutinvcs-provider-mock/src/ trunk/lutinvcs/lutinvcs-provider-mock/src/main/ trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/ trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/ trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/ trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/ trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/MockHandlerProvider.java trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/impl/ trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/impl/mock/ trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/impl/mock/MockVCSConfig.java trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/impl/mock/MockVCSHandler.java trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/ trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/META-INF/ trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/META-INF/services/ trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/META-INF/services/org.apache.commons.logging.LogFactory trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/META-INF/services/org.codelutin.vcs.VCSHandlerProvider trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/i18n/ trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/i18n/lutinvcs-provider-mock-en_GB.properties trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/i18n/lutinvcs-provider-mock-fr_FR.properties trunk/lutinvcs/lutinvcs-provider-mock/src/site/ trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/ trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/rst/ trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/rst/devel/ trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/rst/devel/index.rst trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/rst/index.rst trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/rst/todo.rst trunk/lutinvcs/lutinvcs-provider-mock/src/site/site_fr.xml trunk/lutinvcs/lutinvcs-provider-mock/src/test/ trunk/lutinvcs/lutinvcs-provider-mock/src/test/java/ trunk/lutinvcs/lutinvcs-provider-mock/src/test/resources/ Log: mock provider module Added: trunk/lutinvcs/lutinvcs-provider-mock/LICENSE.txt =================================================================== --- trunk/lutinvcs/lutinvcs-provider-mock/LICENSE.txt (rev 0) +++ trunk/lutinvcs/lutinvcs-provider-mock/LICENSE.txt 2008-03-31 23:18:48 UTC (rev 261) @@ -0,0 +1,280 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS Added: trunk/lutinvcs/lutinvcs-provider-mock/changelog =================================================================== --- trunk/lutinvcs/lutinvcs-provider-mock/changelog (rev 0) +++ trunk/lutinvcs/lutinvcs-provider-mock/changelog 2008-03-31 23:18:48 UTC (rev 261) @@ -0,0 +1,57 @@ +ver-0-26 poussin 2007???? + * bug in concat(Object [] ...), better array type now work + * add unaccent in StringUtil + +ver-0-25 poussin 20070425 + * add StringUtil.toArrayXXX(String ... s) methodes + * use generic + +ver-0-24 poussin + * ArgumentsParser have 1 as repetitionMax by default + * ArgumentsParser use jdk 1.5 syntaxe (..., <>) + +ver-0-23 poussin 20061004 + * move i18n in lutinutil + * add method Resource.getConfigProperties(String, Properties) to chains + properties + +ver-0-22 poussin 20060913 + * use Generics in CategorisedListenerSet + * add org.codelutin.log package (LutinLog, ...) + * remove org.codelutin.util.Log + +ver-0-21 poussin 20060907 + + * Add TransformedList + * Add FileUtil.getTempFile(String):File + * add FileUtil.getFile():File that prompt user + * add FileUtil.getDirectory(): String that prompt user + * add FileUtil.copyRecursively(File, File, String ... patternFilter) + * add ZipUtil class to compress/uncompress zip file + * Transparente*Reference accept null object + +ver-0-17 thimel 20050610 + + * Ajout de BoundedList et BoundedListOutOfBoundsException + +ver-0-16 poussin 20050526 + + * Ajout de la methode getConfigProperties dans Resource + +ver-0-9 poussin 20040728 + + * Ajout de methode isJar, isZip, dans Resource + +ver-0-3 poussin 20040405 + + * utilisation de maven pour la gestion du projet + * Ajout de ExceptionUtil + +ver-0-2 poussin 20031021 + + * ajout du parser d'argument, ArgumentsParser + * ajout de StringUtil + +ver-0-1 + + * premier version contient seulement Resource Added: trunk/lutinvcs/lutinvcs-provider-mock/pom.xml =================================================================== --- trunk/lutinvcs/lutinvcs-provider-mock/pom.xml (rev 0) +++ trunk/lutinvcs/lutinvcs-provider-mock/pom.xml 2008-03-31 23:18:48 UTC (rev 261) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>lutinlib.vcs</groupId> + <artifactId>lutinvcs</artifactId> + <version>0.1-SNAPSHOT</version> + </parent> + + <artifactId>lutinvcs-provider-mock</artifactId> + <name>Lutinvcs provider mock</name> + + <packaging>jar</packaging> + <version>0.1-SNAPSHOT</version> + <description>Librairie vcs provider mock</description> + + <build> + <plugins> + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <phase>process-classes</phase> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +  + <dependencies> + <dependency> + <groupId>lutinlib.vcs</groupId> + <artifactId>lutinvcs-core</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> + +</project> Added: trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/MockHandlerProvider.java =================================================================== --- trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/MockHandlerProvider.java (rev 0) +++ trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/MockHandlerProvider.java 2008-03-31 23:18:48 UTC (rev 261) @@ -0,0 +1,31 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs; + +import org.codelutin.vcs.VCSConfig; +import org.codelutin.vcs.VCSHandlerProvider; +import org.codelutin.vcs.impl.mock.MockVCSHandler; + +/** @author chemit */ +public class MockHandlerProvider implements VCSHandlerProvider<MockVCSHandler> { + + public String getName() { + return "MOCK"; + } + + public MockVCSHandler newInstance(VCSConfig config) { + return new MockVCSHandler(config); + } +} \ No newline at end of file Added: trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/impl/mock/MockVCSConfig.java =================================================================== --- trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/impl/mock/MockVCSConfig.java (rev 0) +++ trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/impl/mock/MockVCSConfig.java 2008-03-31 23:18:48 UTC (rev 261) @@ -0,0 +1,126 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.impl.mock; + +import org.codelutin.vcs.ConnectionState; +import org.codelutin.vcs.VCSConfig; +import org.codelutin.vcs.VCSType; +import org.codelutin.vcs.VCSTypeRepo; + +import java.io.File; +import java.net.URL; + +/** @author chemit */ +public class MockVCSConfig implements VCSConfig { + + File localRoot; + URL remoteRoot; + + boolean init; + + public boolean canConnect() { + return false; + } + + public boolean isConnected() { + return false; + } + + public ConnectionState getConnectionState() { + return null; + } + + public VCSType getType() { + return VCSType.MOCK; + } + + public boolean isUseSshConnexion() { + return false; + } + + public String getHostName() { + return null; + } + + public File getKeyFile() { + return null; + } + + public String getUserName() { + return null; + } + + public boolean isNoPassPhrase() { + return false; + } + + public String getPassphrase() { + return null; + } + + public String getRemotePath() { + return null; + } + + public String getRemoteDatabase() { + return remoteRoot.toString(); + } + + public String getRemoteDatabasePath() { + return remoteRoot.toString(); + } + + public File getLocalDatabasePath() { + return localRoot; + } + + public VCSTypeRepo getTypeRepo() { + return null; + } + + public boolean isOffline() { + return false; + } + + public boolean isReadOnly() { + return false; + } + + public boolean isInit() { + return init; + } + + public void validate() { + } + + public void setUseSshConnexion(boolean useSshConnexion) { + } + + public File getSource() { + return null; + } + + public void setLocalRoot(File localRoot) { + this.localRoot = localRoot; + } + + public void setRemoteRoot(URL remoteRoot) { + this.remoteRoot = remoteRoot; + } + + public void setInit(boolean init) { + this.init = init; + } +} Added: trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/impl/mock/MockVCSHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/impl/mock/MockVCSHandler.java (rev 0) +++ trunk/lutinvcs/lutinvcs-provider-mock/src/main/java/org/codelutin/vcs/impl/mock/MockVCSHandler.java 2008-03-31 23:18:48 UTC (rev 261) @@ -0,0 +1,127 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.impl.mock; + +import org.codelutin.vcs.AbstractVCSHandler; +import org.codelutin.vcs.VCSConfig; +import org.codelutin.vcs.VCSException; +import org.codelutin.vcs.VCSState; + +import java.io.File; +import java.io.IOException; +import java.util.Collection; +import java.util.List; + +/** @author chemit */ +public class MockVCSHandler extends AbstractVCSHandler { + + public MockVCSHandler(VCSConfig config) { + super(config, "", ""); + } + + public void initWorkingCopy() throws VCSException { + } + + public String getRemoteUrl() { + return null; + } + + public VCSState getState(File fileState, Collection tmp) throws VCSException { + return null; + } + + public VCSState getState(File file, Collection tmp, boolean noremote) throws VCSException { + return null; + } + + public boolean isOnRemote(File file) { + return false; + } + + public boolean isUpToDate(File file) throws VCSException { + return false; + } + + public void makeRemoteDir(String commitMessage, String... dirNames) throws VCSException { + } + + public void deleteRemoteDir(String commitMessage, String... dirNames) throws VCSException { + } + + public long add(List<File> files, String msg) throws VCSException { + return 0; + } + + public void delete(List<File> files, String msg) throws VCSException { + } + + public void revert(List<File> files) throws VCSException { + } + + public long commit(List<File> files, String msg) throws VCSException { + return 0; + } + + public void update(File file, Object revision) throws VCSException { + } + + public void update(File file) throws VCSException { + } + + public void checkout(File destDir, String module, boolean recurse) throws VCSException { + } + + public void checkoutFile(File destDir, String module) throws VCSException { + } + + public long checkoutOnlyTheDirectory(File root, Object revision) throws VCSException { + return 0; + } + + public List<String> getRemoteStorageNames(File directory) throws VCSException { + return null; + } + + public Object getRevision(File f) throws VCSException { + return null; + } + + public List getLog(Object startRevision, Object endRevision, File file) throws VCSException { + return null; + } + + public String getFileContent(File file, Object revision) throws VCSException, IOException { + return null; + } + + public String getChangeLog(File file) throws VCSException { + return null; + } + + public String getDiff(File file) throws VCSException, IOException { + return null; + } + + public String getDiff(File file, Object againstRevision) throws VCSException, IOException { + return null; + } + + public void testConnection() throws VCSException { + } + + public boolean hasProtocoleChanged() throws VCSException { + return false; + } +} Added: trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/META-INF/services/org.apache.commons.logging.LogFactory =================================================================== --- trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/META-INF/services/org.apache.commons.logging.LogFactory (rev 0) +++ trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/META-INF/services/org.apache.commons.logging.LogFactory 2008-03-31 23:18:48 UTC (rev 261) @@ -0,0 +1 @@ +org.codelutin.util.LutinLogFactory \ No newline at end of file Added: trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/META-INF/services/org.codelutin.vcs.VCSHandlerProvider =================================================================== --- trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/META-INF/services/org.codelutin.vcs.VCSHandlerProvider (rev 0) +++ trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/META-INF/services/org.codelutin.vcs.VCSHandlerProvider 2008-03-31 23:18:48 UTC (rev 261) @@ -0,0 +1 @@ +org.codelutin.vcs.MockHandlerProvider \ No newline at end of file Added: trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/i18n/lutinvcs-provider-mock-en_GB.properties =================================================================== Added: trunk/lutinvcs/lutinvcs-provider-mock/src/main/resources/i18n/lutinvcs-provider-mock-fr_FR.properties =================================================================== Added: trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/rst/devel/index.rst =================================================================== --- trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/rst/devel/index.rst (rev 0) +++ trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/rst/devel/index.rst 2008-03-31 23:18:48 UTC (rev 261) @@ -0,0 +1,5 @@ +========================== +Lutin vcs provider cvs dev +========================== + +TODO Added: trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/rst/index.rst =================================================================== --- trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/rst/index.rst (rev 0) +++ trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/rst/index.rst 2008-03-31 23:18:48 UTC (rev 261) @@ -0,0 +1,5 @@ +====================== +Lutin vcs provider cvs +====================== + +TODO \ No newline at end of file Added: trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/rst/todo.rst =================================================================== --- trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/rst/todo.rst (rev 0) +++ trunk/lutinvcs/lutinvcs-provider-mock/src/site/fr/rst/todo.rst 2008-03-31 23:18:48 UTC (rev 261) @@ -0,0 +1,4 @@ +============================== +Lutinvcs - provider cvs - TODO +============================== + Added: trunk/lutinvcs/lutinvcs-provider-mock/src/site/site_fr.xml =================================================================== --- trunk/lutinvcs/lutinvcs-provider-mock/src/site/site_fr.xml (rev 0) +++ trunk/lutinvcs/lutinvcs-provider-mock/src/site/site_fr.xml 2008-03-31 23:18:48 UTC (rev 261) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<project name="simexplorer-si"> + + <skin> + <groupId>lutinlib</groupId> + <artifactId>lutin-site-skin</artifactId> + <version>0.1</version> + </skin> + + <bannerLeft> + <name>LutinVcs - provider mock</name> + </bannerLeft> + + <bannerRight> + <src> + http://www.codelutin.com/images/lutinorange-codelutin.png + </src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <poweredBy> + <logo href="http://docutils.sourceforge.net/rst.html" + img="/images/restructuredtext-logo.png" name="reStructuredText"/> + </poweredBy> + + <body> + <menu name="Common Links" inherit="top"/> + <menu ref="parent"/> + <menu ref="reports"/> + + <menu name="Liens"> + <item href="http://java.sun.com/j2se" + name="Le site Java de Sun"> + </item> + </menu> + </body> +</project>

1 0

[Buix-commits] r260 - in trunk/jaxx/src/main: java/jaxx/compiler java/jaxx/tags resources resources/META-INF resources/META-INF/services
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 22:54:43 +0000 (Mon, 31 Mar 2008) New Revision: 260 Added: trunk/jaxx/src/main/resources/META-INF/ trunk/jaxx/src/main/resources/META-INF/services/ trunk/jaxx/src/main/resources/META-INF/services/jaxx.spi.Initializer Modified: trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java trunk/jaxx/src/main/java/jaxx/tags/DefaultComponentHandler.java Log: use java ServiceLoader mecanism to find initializer + stop bug ... make have a closer look on it. TODO make a swing runtime module Modified: trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-03-31 21:27:27 UTC (rev 259) +++ trunk/jaxx/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-03-31 22:54:43 UTC (rev 260) @@ -67,6 +67,7 @@ import java.util.Map; import java.util.Set; import java.util.Stack; +import java.util.ServiceLoader; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.GZIPOutputStream; @@ -236,11 +237,6 @@ private static final int PASS_2 = 1; private static int currentPass; - private static final String[] INITIALIZER_CLASSES = { - "jaxx.DefaultInitializer", - "jaxx.tags.swing.SwingInitializer" - }; - static { try { loadLibraries(); @@ -255,13 +251,13 @@ } public static void loadLibraries() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException { - //System.out.println("init : " + Arrays.toString(INITIALIZER_CLASSES)); - for (String s : INITIALIZER_CLASSES) { - ((Initializer) Class.forName(s).newInstance()).initialize(); + ServiceLoader<Initializer> loader = ServiceLoader.load(Initializer.class); + for (Initializer initializer : loader) { + System.out.println("load initializer "+initializer); + initializer.initialize(); } } - private JAXXCompiler(ClassLoader classLoader) { this.options = new CompilerOptions(); this.classLoader = classLoader; Modified: trunk/jaxx/src/main/java/jaxx/tags/DefaultComponentHandler.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/tags/DefaultComponentHandler.java 2008-03-31 21:27:27 UTC (rev 259) +++ trunk/jaxx/src/main/java/jaxx/tags/DefaultComponentHandler.java 2008-03-31 22:54:43 UTC (rev 260) @@ -42,7 +42,12 @@ containerDelegate = (String) getJAXXBeanInfo().getJAXXBeanDescriptor().getValue("containerDelegate"); if (containerDelegate == null && ClassDescriptorLoader.getClassDescriptor(Container.class).isAssignableFrom(getBeanClass().getSuperclass())) { - containerDelegate = ((DefaultComponentHandler) TagManager.getTagHandler(getBeanClass().getSuperclass())).getContainerDelegate(); + DefaultObjectHandler tagHandler = TagManager.getTagHandler(getBeanClass().getSuperclass()); + if (tagHandler instanceof DefaultComponentHandler) { + containerDelegate = ((DefaultComponentHandler) tagHandler).getContainerDelegate(); + } else { + System.out.println("could not find componentHandler for "+getBeanClass()); + } } } } Added: trunk/jaxx/src/main/resources/META-INF/services/jaxx.spi.Initializer =================================================================== --- trunk/jaxx/src/main/resources/META-INF/services/jaxx.spi.Initializer (rev 0) +++ trunk/jaxx/src/main/resources/META-INF/services/jaxx.spi.Initializer 2008-03-31 22:54:43 UTC (rev 260) @@ -0,0 +1,2 @@ +jaxx.DefaultInitializer +jaxx.tags.swing.SwingInitializer \ No newline at end of file

1 0

[Buix-commits] r259 - trunk/lutinvcs/lutinvcs-api/src
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 21:27:27 +0000 (Mon, 31 Mar 2008) New Revision: 259 Removed: trunk/lutinvcs/lutinvcs-api/src/resources/ Log: wrong dir

1 0

[Buix-commits] r258 - trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 20:50:22 +0000 (Mon, 31 Mar 2008) New Revision: 258 Modified: trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-en_GB.properties trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-fr_FR.properties Log: pur generation module Modified: trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-en_GB.properties =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-en_GB.properties 2008-03-31 20:48:31 UTC (rev 257) +++ trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-en_GB.properties 2008-03-31 20:50:22 UTC (rev 258) @@ -1,6 +1,13 @@ +lutinvcs.action= lutinvcs.error.checkout.dir=Can''t checkout dir {0} +lutinvcs.error.fieldmodel.already.registred=FieldAccess [{0}] is already registred +lutinvcs.error.fieldmodel.not.registred=could not found a matching entry in cache for [{0}] +lutinvcs.error.fieldmodel.unmatchin.options=you can not defined a such model with no the same number of optionClass and optionNames lutinvcs.error.init.config=config is not init, you should invoke on the config validate(true) method to validate it and finish his init {0} lutinvcs.error.init.no.config=should invoke {0}\#init(VCSType,Properties) before required instance. lutinvcs.file=File +lutinvcs.logDiff=show diff lutinvcs.module=Module +lutinvcs.rev=Revision +lutinvcs.select=Select lutinvcs.status=Status Modified: trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-fr_FR.properties =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-fr_FR.properties 2008-03-31 20:48:31 UTC (rev 257) +++ trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-fr_FR.properties 2008-03-31 20:50:22 UTC (rev 258) @@ -1,6 +1,13 @@ +lutinvcs.action= lutinvcs.error.checkout.dir=Can''t checkout dir {0} +lutinvcs.error.fieldmodel.already.registred=FieldAccess [{0}] is already registred +lutinvcs.error.fieldmodel.not.registred=could not found a matching entry in cache for [{0}] +lutinvcs.error.fieldmodel.unmatchin.options= lutinvcs.error.init.config=config is not init, you should invoke on the config validate(true) method to validate it and finish his init {0} lutinvcs.error.init.no.config=should invoke {0}\#init(VCSType,Properties) before required instance. lutinvcs.file=Fichier +lutinvcs.logDiff=LogDiff lutinvcs.module=Module +lutinvcs.rev=R\u00E9vision +lutinvcs.select=S\u00E9lectionner lutinvcs.status=Status

1 0

[Buix-commits] r257 - trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 20:48:31 +0000 (Mon, 31 Mar 2008) New Revision: 257 Modified: trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-en_GB.properties trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-fr_FR.properties Log: pur generation module Modified: trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-en_GB.properties =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-en_GB.properties 2008-03-31 20:47:26 UTC (rev 256) +++ trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-en_GB.properties 2008-03-31 20:48:31 UTC (rev 257) @@ -1,4 +1,3 @@ -lutinvcs.action=Action lutinvcs.action.commit=commit lutinvcs.action.commitAll=commit all lutinvcs.action.diff=diff @@ -17,15 +16,7 @@ lutinvcs.action.tooltip.updateAll=update all files lutinvcs.action.update=update lutinvcs.action.updateAll=update all -lutinvcs.error.fieldmodel.already.registred=FieldAccess [{0}] is already registred -lutinvcs.error.fieldmodel.not.registred=could not found a matching entry in cache for [{0}] -lutinvcs.error.fieldmodel.unmatchin.options=you can not defined a such model with no the same number of optionClass and optionNames -lutinvcs.file=File -lutinvcs.logDiff=show diff -lutinvcs.module=Module lutinvcs.quit=Quit -lutinvcs.rev=Revision -lutinvcs.select=Select lutinvcs.synch.title=Synch lutinvcs.tabs.all=all lutinvcs.tabs.local=local Modified: trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-fr_FR.properties =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-fr_FR.properties 2008-03-31 20:47:26 UTC (rev 256) +++ trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-fr_FR.properties 2008-03-31 20:48:31 UTC (rev 257) @@ -1,4 +1,3 @@ -lutinvcs.action=Action lutinvcs.action.commit=commit lutinvcs.action.commitAll=tout commiter lutinvcs.action.diff=diff @@ -17,15 +16,7 @@ lutinvcs.action.tooltip.updateAll=mettre \u00E0 jour tous les fichiers lutinvcs.action.update=update lutinvcs.action.updateAll=tout mettre \u00E0 jour -lutinvcs.error.fieldmodel.already.registred=FieldAccess [{0}] is already registred -lutinvcs.error.fieldmodel.not.registred=could not found a matching entry in cache for [{0}] -lutinvcs.error.fieldmodel.unmatchin.options= -lutinvcs.file=Fichier -lutinvcs.logDiff=LogDiff -lutinvcs.module=Module lutinvcs.quit=Quitter -lutinvcs.rev=R\u00E9vision -lutinvcs.select=S\u00E9lectionner lutinvcs.synch.title=Synchronisation lutinvcs.tabs.all=all lutinvcs.tabs.local=local

1 0

[Buix-commits] r256 - trunk/lutinvcs/lutinvcs-ui/src/main/java
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 20:47:26 +0000 (Mon, 31 Mar 2008) New Revision: 256 Modified: trunk/lutinvcs/lutinvcs-ui/src/main/java/ Log: pur generation module Property changes on: trunk/lutinvcs/lutinvcs-ui/src/main/java ___________________________________________________________________ Name: svn:ignore - * */* + org org/*

1 0

[Buix-commits] r255 - trunk/lutinvcs/lutinvcs-ui/src/main/java
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 20:46:10 +0000 (Mon, 31 Mar 2008) New Revision: 255 Modified: trunk/lutinvcs/lutinvcs-ui/src/main/java/ Log: pur generation module Property changes on: trunk/lutinvcs/lutinvcs-ui/src/main/java ___________________________________________________________________ Name: svn:ignore + * */*

1 0

[Buix-commits] r254 - trunk/lutinvcs/lutinvcs-ui/src/main/java
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 20:45:05 +0000 (Mon, 31 Mar 2008) New Revision: 254 Removed: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/ Log: pur generation module

1 0

[Buix-commits] r253 - in trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs: . ui
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 20:44:09 +0000 (Mon, 31 Mar 2008) New Revision: 253 Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSRepositoryState.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/AbstractTableModel.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FieldAccess.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FieldAccessManager.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FieldModelUtil.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FileStateTableModel.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/package.html Log: pur generation module Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSRepositoryState.java (from rev 240, trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/VCSRepositoryState.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSRepositoryState.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSRepositoryState.java 2008-03-31 20:44:09 UTC (rev 253) @@ -0,0 +1,200 @@ +/* ##% +* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, +* Benjamin Poussin, Tony Chemit +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*##%*/ +package org.codelutin.vcs; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.vcs.ui.FileStateTableModel; + +import java.io.File; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; + +/** + * Permet de rechercher et conserve les differences entre le repository local et + * distant. + * + * @author poussin + * @author chemit + */ +public class VCSRepositoryState { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static protected final Log log = LogFactory.getLog(VCSRepositoryState.class); + + /** liste des �tats des fichiers scann�s */ + protected List<VCSFileState> states = new ArrayList<VCSFileState>(); + + /** tableau des model de table (un par �tat VCSState) */ + protected FileStateTableModel[] models; + + /** le r�pertoire racine du working copy local */ + protected File root; + + /** vcs states to be authorized in this model */ + protected VCSState[] acceptedStates; + + /** vcs actions to be authorized in this model */ + protected EnumSet<VCSAction> acceptedActions; + + /** vcs handler to use (lazy instanciation) */ + protected VCSHandler handler; + + public static final VCSState[] UPDATE_STATES = { + org.codelutin.vcs.VCSState.OUT_OF_DATE, + org.codelutin.vcs.VCSState.MODIFIED, + org.codelutin.vcs.VCSState.OUT_OF_DATE_AND_MODIFIED, + org.codelutin.vcs.VCSState.UNVERSIONNED, + org.codelutin.vcs.VCSState.MISSING + }; + + /** + * @param handler handlet to use + * @param root directory of root local working copy + * @param actions accepted actions + * @param modules la liste des modules a traiter + * @throws VCSException if any problem while building + */ + protected VCSRepositoryState(VCSHandler handler, File root, EnumSet<VCSAction> actions, File... modules) throws VCSException { + this.acceptedActions = actions; + this.root = root; + this.acceptedStates = UPDATE_STATES; + this.handler = handler; + // scan all modules + for (File mod : modules) { + states.addAll(doScan(mod, acceptedStates)); + } + } + + public VCSHandler getHandler() { + return handler; + } + + /** + * @param handler vcs handler to use for synch operation + * @throws VCSException if any problem while synchro + */ + public void doSynch(VCSHandler handler) throws VCSException { + long timestamp = System.nanoTime(); + for (VCSFileState fileState : states) { + fileState.doSynch(handler, timestamp); + } + } + + public File getRoot() { + return root; + } + + public List<VCSFileState> getStates() { + return states; + } + + public VCSState[] getAcceptedStates() { + return acceptedStates; + } + + public FileStateTableModel getModel(VCSState state) { + return getModels()[state.ordinal()]; + } + + + protected FileStateTableModel[] getModels() { + if (models == null) { + models = new FileStateTableModel[VCSState.values().length]; + } + return models; + } + + public void createUIModels() { + for (VCSState state : acceptedStates) { + getModels()[state.ordinal()] = new FileStateTableModel(VCSFileStateManager.filter(states, state), acceptedActions); + } + } + + public List<VCSFileState> selected(VCSState... wanted) { + if (wanted.length == 0) { + wanted = acceptedStates; + } + List<VCSFileState> result = new ArrayList<VCSFileState>(); + for (VCSState state : wanted) { + FileStateTableModel tableModel = getModel(state); + if (tableModel != null) { + result.addAll(tableModel.getSelected()); + } + } + return result; + } + + public void checkAll(boolean toUse, VCSState... wanted) { + if (wanted.length == 0) wanted = acceptedStates; + for (VCSState state : wanted) { + FileStateTableModel tableModel = getModel(state); + if (tableModel != null) { + tableModel.checkAll(0, toUse); + } + } + } + + public boolean isModelEmpty() { + for (VCSState state : acceptedStates) { + FileStateTableModel tableModel = getModel(state); + if (tableModel != null && tableModel.getRowCount() > 0) { + return false; + } + } + return true; + } + + public int getModelSelectedSize() { + int result = 0; + for (VCSState state : acceptedStates) { + result += getModelSelectedSize(state); + } + return result; + } + + public boolean isModelEmpty(VCSState state) { + FileStateTableModel tableModel = getModel(state); + return !(tableModel != null && tableModel.getRowCount() > 0); + } + + public int getModelSize(VCSState state) { + FileStateTableModel tableModel = getModel(state); + return tableModel == null ? 0 : tableModel.getRowCount(); + } + + public int getModelSelectedSize(VCSState state) { + FileStateTableModel tableModel = getModel(state); + return tableModel == null ? 0 : tableModel.getSelectedSize(); + } + + private List<VCSFileState> doScan(File module, VCSState... acceptedStates) + throws VCSException { + // obtain list of all VCSFileState found in module directory + List<VCSFileState> states; + states = VCSFileStateManager.doScan(getHandler(), module, true, acceptedStates); + return states; + } + + public EnumSet<VCSAction> getAcceptedActions() { + return acceptedActions; + } +} Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/AbstractTableModel.java (from rev 240, trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/AbstractTableModel.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/AbstractTableModel.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/AbstractTableModel.java 2008-03-31 20:44:09 UTC (rev 253) @@ -0,0 +1,190 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, +* Benjamin Poussin, Tony Chemit +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package org.codelutin.vcs.ui; + +import static org.codelutin.i18n.I18n._; + +import static java.lang.Boolean.TRUE; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** TODO-TC */ +(a)org.codelutin.i18n.I18nable +public abstract class AbstractTableModel<D> extends javax.swing.table.AbstractTableModel { + + + protected final FieldAccess<D>[] modelAccess; + protected List<D> data; + + protected final int nbOptions; + protected Map<D, Boolean>[] options; + protected final String[] optionNames; + protected final Class[] optionClass; + protected boolean[] optionChecks; + + private static final long serialVersionUID = 4697917831388337369L; + + @SuppressWarnings({"unchecked"}) + protected AbstractTableModel( + List<D> data, FieldAccess<D>[] modelAccess, + Class[] optionsClass, String[] optionsNames) throws RuntimeException { + if (optionsClass.length != optionsNames.length) + throw new RuntimeException(_("lutinvcs.error.fieldmodel.unmatchin.options")); + + this.data = data; + this.optionClass = optionsClass; + this.optionNames = optionsNames; + this.modelAccess = modelAccess; + this.nbOptions = optionsClass.length; + this.options = new Map[this.nbOptions]; + this.optionChecks = new boolean[this.nbOptions]; + } + + protected AbstractTableModel(List<D> data, FieldAccess<D>[] modelAccess, + Class optionsClass, String optionsNames) { + this(data, modelAccess, new Class[]{optionsClass}, + new String[]{optionsNames}); + } + + protected AbstractTableModel(List<D> data, FieldAccess<D>[] modelAccess) { + this(data, modelAccess, new Class[0], new String[0]); + } + + protected Map<D, Boolean> getOptionMap(int rowindex) { + if (rowindex >= nbOptions) return null; + Map<D, Boolean> map = options[rowindex]; + if (map == null) + map = options[rowindex] = new LinkedHashMap<D, Boolean>(); + return map; + } + + /** + * @param index option index + * @return Returns the selected for an option. + */ + public List<D> getSelected(int index) { + List<D> result = new ArrayList<D>(); + Map<D, Boolean> option = nbOptions == 0 ? null : options[index]; + if (index >= nbOptions || option == null) return result; + for (Map.Entry<D, Boolean> item : option.entrySet()) + if (java.lang.Boolean.TRUE.equals(item.getValue())) + result.add(item.getKey()); + return result; + } + + public int getSelectedSize(int index) { + int result = 0; + Map<D, Boolean> option = nbOptions == 0 ? null : options[index]; + if (index >= nbOptions || option == null) return result; + for (Map.Entry<D, Boolean> item : option.entrySet()) + if (java.lang.Boolean.TRUE.equals(item.getValue())) + result++; + return result; + } + + public List<D> getData() { + return data; + } + + public int getColumnCount() { + return modelAccess.length + nbOptions; + } + + public int getRowCount() { + return data.size(); + } + + public void checkAll() { + if (nbOptions != 1) return; + for (int i = 0; i < nbOptions; i++) checkAll(i); + } + + @Override + public Class<?> getColumnClass(int columnIndex) { + Class result; + if (columnIndex < nbOptions) { + + result = this.optionClass[columnIndex]; + } else { + result = FieldAccessManager.getFieldClass(modelAccess[columnIndex - nbOptions]); + } + return result; + } + + @Override + public String getColumnName(int columnIndex) { + String result; + if (columnIndex < nbOptions) + result = this.optionNames[columnIndex]; + else + result = FieldAccessManager.getFieldName(modelAccess[columnIndex - nbOptions]); + return result; + } + + @Override + public boolean isCellEditable(int rowIndex, int columnIndex) { + return columnIndex < nbOptions; + } + + @Override + public void setValueAt(Object aValue, int rowIndex, int columnIndex) { + D item = data.get(rowIndex); + if (columnIndex < nbOptions) + setOptionValueAt(item, aValue, columnIndex); + // read only data + } + + public Object getValueAt(int rowIndex, int columnIndex) { + D item = data.get(rowIndex); + if (columnIndex < nbOptions) + return getOptionValueAt(item, columnIndex); + return modelAccess[columnIndex - nbOptions].getValue(item); + } + + protected void setOptionValueAt(D item, Object aValue, int index) { + getOptionMap(index).put(item, TRUE.equals(aValue)); + } + + protected void checkAll(int index, boolean value) { + if (index >= nbOptions || nbOptions > 1) return; + for (int i = 0; i < getRowCount(); i++) + setValueAt(value, i, index); + } + + protected void checkAll(int index) { + if (index >= nbOptions || nbOptions > 1) return; + checkAll(index, optionChecks[index] = !optionChecks[index]); + } + + protected Boolean getOptionValueAt(D item, int index) { + return getOptionMap(index).get(item); + } + + protected FieldAccess[] getFiedAccess() { + return modelAccess; + } + + public void reset(List<D> states) { + data.clear(); + data.addAll(states); + } +} \ No newline at end of file Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FieldAccess.java (from rev 240, trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/FieldAccess.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FieldAccess.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FieldAccess.java 2008-03-31 20:44:09 UTC (rev 253) @@ -0,0 +1,31 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, +* Benjamin Poussin, Tony Chemit +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package org.codelutin.vcs.ui; + +/** + * A simple contract for a field access in vcs ui, says a cell + * + * @author chemit + */ +public interface FieldAccess<D> { + + Object getValue(D item); + +} Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FieldAccessManager.java (from rev 240, trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/FieldAccessManager.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FieldAccessManager.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FieldAccessManager.java 2008-03-31 20:44:09 UTC (rev 253) @@ -0,0 +1,154 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, +* Benjamin Poussin, Tony Chemit +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package org.codelutin.vcs.ui; + +import org.apache.commons.logging.Log; +import static org.apache.commons.logging.LogFactory.getLog; +import static org.codelutin.i18n.I18n._; + +/** + * Class pour gérer un cache de {@link FieldAccessEntry} indexés à partir de + * {@link FieldAccess}. + * + * @author chemit + */ +(a)org.codelutin.i18n.I18nable +public class FieldAccessManager { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = getLog(FieldAccessManager.class); + + /** cache of registred FiledModelEntry associated to a FieldAccess */ + static protected java.util.Map<FieldAccess, FieldAccessEntry> cache; + + /** + * Register a FieldAccess in the cache + * + * @param constant the constant to be used + * @param libelle name of the field (libelle to display in row header) + * @param clazz class of the object used for this field + */ + public static <D> void registerFieldAccess(FieldAccess<D> constant, String libelle, Class clazz) { + checkAlreadyRegistredEntry(constant); + FieldAccessEntry<D> entry = new FieldAccessEntry<D>(constant, libelle, clazz); + log.debug(entry); + getCache().put(constant, entry); + } + + /** + * Obtain the class of a field via his constant type safe value + * + * @param constant the constant to be used + * @return the class defined for the field + */ + public static <D> Class getFieldClass(FieldAccess<D> constant) { + FieldAccessEntry entry = getEntry(constant, true); + return entry == null ? null : entry.getClazz(); + } + + /** + * Obtain the libelle of a field via his constant type safe value + * + * @param constant the constant to be used + * @return the libelle defined for the field + */ + public static <D> String getFieldName(FieldAccess<D> constant) { + FieldAccessEntry entry = getEntry(constant, true); + return entry == null ? null : entry.getLibelle(); + } + + /** + * Obtain for a item the value of his field via his constant type safe value + * + * @param constant the constant to be used + * @param item the item to be inspect + * @return the class defined for the field + */ + public static <D> Object getFieldValue(FieldAccess<D> constant, D item) { + FieldAccessEntry<D> entry = getEntry(constant, true); + return entry == null ? null : entry.getValue(item); + } + + @SuppressWarnings({"unchecked"}) + protected static <D> FieldAccessEntry<D> getEntry(FieldAccess<D> constant, boolean safe) { + FieldAccessEntry<D> entry = getCache().get(constant); + checkExistingEntry(constant, safe, entry); + return entry; + } + + private static <D> void checkExistingEntry(FieldAccess<D> constant, boolean safe, FieldAccessEntry<D> entry) { + if (safe && entry == null) { + throw new RuntimeException(_("lutinvcs.error.fieldmodel.not.registred", constant)); + } + } + + private static <D> void checkAlreadyRegistredEntry(FieldAccess<D> constant) throws RuntimeException { + FieldAccessEntry<D> entry = getEntry(constant, false); + if (entry != null) { + throw new RuntimeException(_("lutinvcs.error.fieldmodel.already.registred", constant)); + } + } + + + private static java.util.Map<FieldAccess, FieldAccessEntry> getCache() { + if (cache == null) + cache = new java.util.HashMap<FieldAccess, FieldAccessEntry>(); + return cache; + } + + protected static class FieldAccessEntry<D> implements FieldAccess<D> { + + private final String libelle; + private final Class clazz; + private final FieldAccess<D> constant; + + FieldAccessEntry(FieldAccess<D> constant, String libelle, Class clazz) { + this.constant = constant; + // keep only translated libelle + this.libelle = _(libelle); + this.clazz = clazz; + } + + public String getLibelle() { + return libelle; + } + + public Class getClazz() { + return clazz; + } + + public Object getValue(D item) { + return constant.getValue(item); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(this.getClass().getSimpleName()); + sb.append('@').append(Math.abs(hashCode())); + sb.append(" [").append(constant).append("] [").append(libelle).append("] ["); + sb.append(clazz).append(']'); + return sb.toString(); + } + } + + protected FieldAccessManager() { + } + +} \ No newline at end of file Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FieldModelUtil.java (from rev 240, trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/FieldModelUtil.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FieldModelUtil.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FieldModelUtil.java 2008-03-31 20:44:09 UTC (rev 253) @@ -0,0 +1,121 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, +* Benjamin Poussin, Tony Chemit +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package org.codelutin.vcs.ui; + +import static org.codelutin.i18n.I18n._; +import org.codelutin.vcs.VCSFileState; + +import java.io.File; + +(a)org.codelutin.i18n.I18nable +public class FieldModelUtil { + + + static public ModuleFile<String> createModuleFileTableModel(java.util.List<String> data) { + return new ModuleFile<String>(SimpleModuleFileAccess.getAcces(), data); + } + + static public ModuleFile<String> createModuleFileTableModelWithSelect(java.util.List<String> data) { + return new ModuleFile<String>(SimpleModuleFileAccess.getAcces(), data, Boolean.class, _("lutinvcs.select")); + } + + static public <D> ModuleFile<D> createModuleFileTableModelWithSelect(FieldAccess<D>[] model, java.util.List<D> data) { + return new ModuleFile<D>(model, data, Boolean.class, _("lutinvcs.select")); + } + + static public <D> ModuleFile<D> createModuleFileTableModel(FieldAccess<D>[] model, java.util.List<D> data) { + return new ModuleFile<D>(model, data); + } + + public static class ModuleFile<D> extends AbstractTableModel<D> { + private static final long serialVersionUID = 4067521432762944991L; + + protected ModuleFile(FieldAccess<D>[] model, java.util.List<D> data, Class klazz, String select) { + super(data, model, klazz, select); + } + + protected ModuleFile(FieldAccess<D>[] model, java.util.List<D> data) { + super(data, model); + } + } + + + public static enum SimpleModuleFileWithActionAccess implements FieldAccess<VCSFileState> { + ACTION(_("lutinvcs.action"), String.class) { + public Object getValue(VCSFileState item) { + return item.getAction().getLibelle(); + } + }, + MODULE(_("lutinvcs.module"), String.class) { + public Object getValue(VCSFileState item) { + return item.getModuleName(); + } + }, + NAME(_("lutinvcs.file"), String.class) { + public Object getValue(VCSFileState item) { + return item.getModuleRelativeFileName(); + } + }; + + SimpleModuleFileWithActionAccess(String libelle, Class clazz) { + FieldAccessManager.registerFieldAccess(this, libelle, clazz); + } + } + + public static enum SimpleModuleFileAccess implements FieldAccess<String> { + + MODULE(_("lutinvcs.module"), String.class) { + public Object getValue(String item) { + return item.contains(java.io.File.separator) ? item.substring( + 0, item.lastIndexOf(java.io.File.separator)) : item; + } + }, + NAME(_("lutinvcs.file"), String.class) { + public Object getValue(String item) { + return item.contains(java.io.File.separator) ? item + .substring(item.lastIndexOf(java.io.File.separator) + 1) + : ""; + } + }; + + SimpleModuleFileAccess(String libelle, Class clazz) { + FieldAccessManager.registerFieldAccess(this, libelle, clazz); + } + + public static FieldAccess<String>[] getAcces() { + return values(); + } + + } + + public static enum SimpleFileAccess implements FieldAccess<File> { + + NAME(_("lutinvcs.file"), File.class) { + public Object getValue(File item) { + return item.getAbsolutePath(); + } + }; + + SimpleFileAccess(String libelle, Class clazz) { + FieldAccessManager.registerFieldAccess(this, libelle, clazz); + } + } + +} \ No newline at end of file Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FileStateTableModel.java (from rev 240, trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/FileStateTableModel.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FileStateTableModel.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/FileStateTableModel.java 2008-03-31 20:44:09 UTC (rev 253) @@ -0,0 +1,234 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, +* Benjamin Poussin, Tony Chemit +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package org.codelutin.vcs.ui; + +import static org.codelutin.i18n.I18n._; +import org.codelutin.vcs.VCSAction; +import org.codelutin.vcs.VCSFileState; +import org.codelutin.vcs.VCSState; + +import javax.swing.table.AbstractTableModel; +import static java.lang.Boolean.FALSE; +import static java.lang.Boolean.TRUE; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * TODO Use FieldAccessManager + * + * @author tchemit + * @see org.codelutin.vcs.ui.FieldAccessManager + * @see org.codelutin.vcs.ui.FieldModelUtil + * @see org.codelutin.vcs.ui.FieldAccess + */ + +(a)org.codelutin.i18n.I18nable +public class FileStateTableModel extends AbstractTableModel { + + private static final long serialVersionUID = 5764217576707763232L; + + public static enum FIELD_ACCESS { + MODULE(_("lutinvcs.module"), String.class) { + public Object getValue(VCSFileState item) { + return item.getModuleName(); + } + }, + NAME(_("lutinvcs.file"), String.class) { + public Object getValue(VCSFileState item) { + return item.getModuleRelativeFileName(); + } + }, + LOGDIFF(_("lutinvcs.logDiff"), String.class) { + public Object getValue(VCSFileState item) { + final String changeLog = item.getChangeLog(); + return changeLog == null ? "" : changeLog; + } + }, + REV(_("lutinvcs.rev"), Long.class) { + public Object getValue(VCSFileState item) { + return item.getRev(); + } + }; + + protected String columnName; + protected Class columnClass; + + FIELD_ACCESS(String columnName, Class columnClass) { + this.columnName = columnName; + this.columnClass = columnClass; + } + + public String getColumnName() { + return columnName; + } + + public Class getColumnClass() { + return columnClass; + } + + public abstract Object getValue(VCSFileState item); + } + + protected Map<VCSFileState, VCSAction> selected; + protected List<VCSFileState> data; + protected VCSState state; + protected List<VCSAction> actions; + + public FileStateTableModel(List<VCSFileState> data, EnumSet<VCSAction> actions) { + this.data = data; + this.selected = new HashMap<VCSFileState, VCSAction>(); + List<VCSAction> tmp = new ArrayList<VCSAction>(); + + if (!data.isEmpty()) { + // determine vcsstates used here for the moment a unique type + state = data.get(0).getState(); + + for (VCSAction action : state.getActions()) { + if (action.isVisible() && actions.contains(action)) { + tmp.add(action); + } + } + } + this.actions = tmp; + } + + /** @return Returns the selected. */ + public List<VCSFileState> getSelected() { + List<VCSFileState> result = new ArrayList<VCSFileState>(); + for (Map.Entry<VCSFileState, VCSAction> item : selected.entrySet()) + if (item.getValue() != null) { + item.getKey().setAction(item.getValue()); + result.add(item.getKey()); + } + return result; + } + + public int getSelectedSize() { + int result = 0; + for (Map.Entry<VCSFileState, VCSAction> item : selected.entrySet()) { + if (item.getValue() != null) { + result++; + } + } + return result; + } + + public List<VCSAction> getActions() { + return actions; + } + + public VCSAction getAction(int row) { + return selected.get(data.get(row)); + } + + /* (non-Javadoc) + * @see javax.swing.table.TableModel#getColumnCount() + */ + public int getColumnCount() { + return _FIELD_ACCESS.length + actions.size() - 2; + } + + /* (non-Javadoc) + * @see javax.swing.table.TableModel#getRowCount() + */ + public int getRowCount() { + return data.size(); + } + + /* (non-Javadoc) + * @see javax.swing.table.AbstractTableModel#getColumnClass(int) + */ + @Override + public Class<?> getColumnClass(int columnIndex) { + Class result; + if (columnIndex < actions.size()) { + result = Boolean.class; + } else { + result = _FIELD_ACCESS[columnIndex - actions.size()].getColumnClass(); + } + return result; + } + + /* (non-Javadoc) + * @see javax.swing.table.AbstractTableModel#getColumnName(int) + */ + @Override + public String getColumnName(int columnIndex) { + String result; + if (columnIndex < actions.size()) { + result = actions.get(columnIndex).getLibelle().substring(0, 1); + } else { + result = _FIELD_ACCESS[columnIndex - actions.size()].getColumnName(); + } + return result; + } + + /* (non-Javadoc) + * @see javax.swing.table.AbstractTableModel#isCellEditable(int, int) + */ + @Override + public boolean isCellEditable(int rowIndex, int columnIndex) { + return columnIndex < actions.size(); + } + + /* (non-Javadoc) + * @see javax.swing.table.AbstractTableModel#setValueAt(Object, int, int) + */ + @Override + public void setValueAt(Object aValue, int rowIndex, int columnIndex) { + if (columnIndex < actions.size()) { + VCSFileState item = data.get(rowIndex); + VCSAction action = actions.get(columnIndex); + final boolean b = TRUE.equals(aValue); + selected.put(item, b ? action : null); + } + } + + /* (non-Javadoc) + * @see javax.swing.table.TableModel#getValueAt(int, int) + */ + public Object getValueAt(int rowIndex, int columnIndex) { + VCSFileState item = data.get(rowIndex); + Object result; + if (getRowCount() == 0) return null; + if (columnIndex < actions.size()) { + result = selected.get(item); + VCSAction action = actions.get(columnIndex); + result = result == null || action != result ? FALSE : TRUE; + } else { + result = _FIELD_ACCESS[columnIndex - actions.size()].getValue(item); + } + + return result; + } + + + public void checkAll(int index, boolean value) { + if (actions.size() != 1 || index >= actions.size()) return; + //if (getActions().size() == 1) return; + // the only case we can automaticly check-uncheck items + for (int i = 0; i < getRowCount(); i++) setValueAt(value, i, index); + } + + private static final FIELD_ACCESS[] _FIELD_ACCESS = FIELD_ACCESS.values(); +} \ No newline at end of file Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/package.html (from rev 240, trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/package.html) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/package.html (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/package.html 2008-03-31 20:44:09 UTC (rev 253) @@ -0,0 +1,6 @@ +<html> +<body> +<h1>Lutin vcs ui package</h1> +TODO +</body> +</html> \ No newline at end of file

1 0

[Buix-commits] r252 - trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 20:43:54 +0000 (Mon, 31 Mar 2008) New Revision: 252 Removed: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/VCSRepositoryState.java Log: pur generation module Deleted: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/VCSRepositoryState.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/VCSRepositoryState.java 2008-03-31 20:43:36 UTC (rev 251) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/VCSRepositoryState.java 2008-03-31 20:43:54 UTC (rev 252) @@ -1,200 +0,0 @@ -/* ##% -* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*##%*/ -package org.codelutin.vcs; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.vcs.ui.FileStateTableModel; - -import java.io.File; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; - -/** - * Permet de rechercher et conserve les differences entre le repository local et - * distant. - * - * @author poussin - * @author chemit - */ -public class VCSRepositoryState { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static protected final Log log = LogFactory.getLog(VCSRepositoryState.class); - - /** liste des �tats des fichiers scann�s */ - protected List<VCSFileState> states = new ArrayList<VCSFileState>(); - - /** tableau des model de table (un par �tat VCSState) */ - protected FileStateTableModel[] models; - - /** le r�pertoire racine du working copy local */ - protected File root; - - /** vcs states to be authorized in this model */ - protected VCSState[] acceptedStates; - - /** vcs actions to be authorized in this model */ - protected EnumSet<VCSAction> acceptedActions; - - /** vcs handler to use (lazy instanciation) */ - protected VCSHandler handler; - - public static final VCSState[] UPDATE_STATES = { - org.codelutin.vcs.VCSState.OUT_OF_DATE, - org.codelutin.vcs.VCSState.MODIFIED, - org.codelutin.vcs.VCSState.OUT_OF_DATE_AND_MODIFIED, - org.codelutin.vcs.VCSState.UNVERSIONNED, - org.codelutin.vcs.VCSState.MISSING - }; - - /** - * @param handler handlet to use - * @param root directory of root local working copy - * @param actions accepted actions - * @param modules la liste des modules a traiter - * @throws VCSException if any problem while building - */ - protected VCSRepositoryState(VCSHandler handler, File root, EnumSet<VCSAction> actions, File... modules) throws VCSException { - this.acceptedActions = actions; - this.root = root; - this.acceptedStates = UPDATE_STATES; - this.handler = handler; - // scan all modules - for (File mod : modules) { - states.addAll(doScan(mod, acceptedStates)); - } - } - - public VCSHandler getHandler() { - return handler; - } - - /** - * @param handler vcs handler to use for synch operation - * @throws VCSException if any problem while synchro - */ - public void doSynch(VCSHandler handler) throws VCSException { - long timestamp = System.nanoTime(); - for (VCSFileState fileState : states) { - fileState.doSynch(handler, timestamp); - } - } - - public File getRoot() { - return root; - } - - public List<VCSFileState> getStates() { - return states; - } - - public VCSState[] getAcceptedStates() { - return acceptedStates; - } - - public FileStateTableModel getModel(VCSState state) { - return getModels()[state.ordinal()]; - } - - - protected FileStateTableModel[] getModels() { - if (models == null) { - models = new FileStateTableModel[VCSState.values().length]; - } - return models; - } - - public void createUIModels() { - for (VCSState state : acceptedStates) { - getModels()[state.ordinal()] = new FileStateTableModel(VCSFileStateManager.filter(states, state), acceptedActions); - } - } - - public List<VCSFileState> selected(VCSState... wanted) { - if (wanted.length == 0) { - wanted = acceptedStates; - } - List<VCSFileState> result = new ArrayList<VCSFileState>(); - for (VCSState state : wanted) { - FileStateTableModel tableModel = getModel(state); - if (tableModel != null) { - result.addAll(tableModel.getSelected()); - } - } - return result; - } - - public void checkAll(boolean toUse, VCSState... wanted) { - if (wanted.length == 0) wanted = acceptedStates; - for (VCSState state : wanted) { - FileStateTableModel tableModel = getModel(state); - if (tableModel != null) { - tableModel.checkAll(0, toUse); - } - } - } - - public boolean isModelEmpty() { - for (VCSState state : acceptedStates) { - FileStateTableModel tableModel = getModel(state); - if (tableModel != null && tableModel.getRowCount() > 0) { - return false; - } - } - return true; - } - - public int getModelSelectedSize() { - int result = 0; - for (VCSState state : acceptedStates) { - result += getModelSelectedSize(state); - } - return result; - } - - public boolean isModelEmpty(VCSState state) { - FileStateTableModel tableModel = getModel(state); - return !(tableModel != null && tableModel.getRowCount() > 0); - } - - public int getModelSize(VCSState state) { - FileStateTableModel tableModel = getModel(state); - return tableModel == null ? 0 : tableModel.getRowCount(); - } - - public int getModelSelectedSize(VCSState state) { - FileStateTableModel tableModel = getModel(state); - return tableModel == null ? 0 : tableModel.getSelectedSize(); - } - - private List<VCSFileState> doScan(File module, VCSState... acceptedStates) - throws VCSException { - // obtain list of all VCSFileState found in module directory - List<VCSFileState> states; - states = VCSFileStateManager.doScan(getHandler(), module, true, acceptedStates); - return states; - } - - public EnumSet<VCSAction> getAcceptedActions() { - return acceptedActions; - } -}

1 0

[Buix-commits] r251 - trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 20:43:36 +0000 (Mon, 31 Mar 2008) New Revision: 251 Removed: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ Log: pur generation module

1 0

[Buix-commits] r250 - trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 20:41:20 +0000 (Mon, 31 Mar 2008) New Revision: 250 Modified: trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-en_GB.properties trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-fr_FR.properties Log: begin of synch ui Modified: trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-en_GB.properties =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-en_GB.properties 2008-03-31 20:41:08 UTC (rev 249) +++ trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-en_GB.properties 2008-03-31 20:41:20 UTC (rev 250) @@ -1,16 +1,35 @@ -lutinutil.common.quit= -lutinutil.config.title= lutinvcs.action=Action -lutinvcs.action.commitAll= -lutinvcs.action.diffAll= +lutinvcs.action.commit=commit +lutinvcs.action.commitAll=commit all +lutinvcs.action.diff=diff +lutinvcs.action.diffAll=diff all lutinvcs.action.refresh= -lutinvcs.action.revertAll= -lutinvcs.action.updateAll= +lutinvcs.action.revert=revert selected files +lutinvcs.action.revertAll=revert all files +lutinvcs.action.tooltip.commit=commit selected files +lutinvcs.action.tooltip.commitAll=commit all files +lutinvcs.action.tooltip.diff=show diff for selected files +lutinvcs.action.tooltip.diffAll=show diff of all files +lutinvcs.action.tooltip.refresh=refresh selected files +lutinvcs.action.tooltip.revert=revert selected files +lutinvcs.action.tooltip.revertAll=revert all files +lutinvcs.action.tooltip.update=update selected files +lutinvcs.action.tooltip.updateAll=update all files +lutinvcs.action.update=update +lutinvcs.action.updateAll=update all lutinvcs.error.fieldmodel.already.registred=FieldAccess [{0}] is already registred lutinvcs.error.fieldmodel.not.registred=could not found a matching entry in cache for [{0}] lutinvcs.error.fieldmodel.unmatchin.options=you can not defined a such model with no the same number of optionClass and optionNames lutinvcs.file=File lutinvcs.logDiff=show diff lutinvcs.module=Module +lutinvcs.quit=Quit lutinvcs.rev=Revision lutinvcs.select=Select +lutinvcs.synch.title=Synch +lutinvcs.tabs.all=all +lutinvcs.tabs.local=local +lutinvcs.tabs.remote=remote +lutinvcs.tabs.tooltip.all=Show all files (local and remote) +lutinvcs.tabs.tooltip.local=Show all local files +lutinvcs.tabs.tooltip.remote=Show all remote files Modified: trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-fr_FR.properties =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-fr_FR.properties 2008-03-31 20:41:08 UTC (rev 249) +++ trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-fr_FR.properties 2008-03-31 20:41:20 UTC (rev 250) @@ -1,10 +1,21 @@ -lutinutil.common.quit=quitter -lutinutil.config.title= lutinvcs.action=Action +lutinvcs.action.commit=commit lutinvcs.action.commitAll=tout commiter +lutinvcs.action.diff=diff lutinvcs.action.diffAll=voir tous les diffs -lutinvcs.action.refresh=rafraichir +lutinvcs.action.refresh= +lutinvcs.action.revert=revert lutinvcs.action.revertAll=annuler les modifications +lutinvcs.action.tooltip.commit=commiter les fichiers s\u00E9lectionn\u00E9s +lutinvcs.action.tooltip.commitAll=commiter tous les fichiers +lutinvcs.action.tooltip.diff=voir les diff\u00E9rences des fichiers s\u00E9lectionn\u00E9s +lutinvcs.action.tooltip.diffAll=voir les diff\u00E9rences de tous les fichiers +lutinvcs.action.tooltip.refresh=rafra\u00EEchir +lutinvcs.action.tooltip.revert=annuler les modifications sur les fichiers s\u00E9lectionn\u00E9s +lutinvcs.action.tooltip.revertAll=annuller les modifications sur tous les fichiers +lutinvcs.action.tooltip.update=mettre \u00E0 jour les fichiers s\u00E9lectionn\u00E9s +lutinvcs.action.tooltip.updateAll=mettre \u00E0 jour tous les fichiers +lutinvcs.action.update=update lutinvcs.action.updateAll=tout mettre \u00E0 jour lutinvcs.error.fieldmodel.already.registred=FieldAccess [{0}] is already registred lutinvcs.error.fieldmodel.not.registred=could not found a matching entry in cache for [{0}] @@ -12,5 +23,13 @@ lutinvcs.file=Fichier lutinvcs.logDiff=LogDiff lutinvcs.module=Module +lutinvcs.quit=Quitter lutinvcs.rev=R\u00E9vision lutinvcs.select=S\u00E9lectionner +lutinvcs.synch.title=Synchronisation +lutinvcs.tabs.all=all +lutinvcs.tabs.local=local +lutinvcs.tabs.remote=remote +lutinvcs.tabs.tooltip.all=voir tous les fichiers modifi\u00E9s localement ou \u00E0 distance +lutinvcs.tabs.tooltip.local=voir tous les fichiers locaux +lutinvcs.tabs.tooltip.remote=voir tous les fichiers \u00E0 distance

1 0

[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
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

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/VCSFileStateImpl.java trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSUpdateDialog.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/VCSFileStateImpl.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSFileStateImpl.java 2008-03-31 20:40:35 UTC (rev 248) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSFileStateImpl.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 = file; this.key = file.getAbsolutePath().hashCode(); String path = file.getAbsolutePath(); @@ -85,7 +85,12 @@ "vcsHandler, but was : [" + file + " ::" + handler.getLocalDatabasePath() + " ]"); } - this.localPath = path.substring(rootPath.length() + 1); + if (file.equals(handler.getConfig().getLocalDatabasePath())) { + this.localPath = ""; + } else { + + this.localPath = path.substring(rootPath.length() + 1); + } // by default moduleName is the first dir of localpath (if any) int index = this.localPath.indexOf(File.separator); if (index == -1) { @@ -254,5 +259,9 @@ public void setAction(VCSAction action) { this.action = action; } + + public void setState(VCSState state) { + this.state = state; + } } Modified: trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSUpdateDialog.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSUpdateDialog.jaxx 2008-03-31 20:40:35 UTC (rev 248) +++ trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/VCSUpdateDialog.jaxx 2008-03-31 20:41:08 UTC (rev 249) @@ -1,8 +1,11 @@ -<JDialog title='lutinutil.config.title' modal='true' - defaultCloseOperation='DISPOSE_ON_CLOSE' width='500' height='300'> +<JDialog title='lutinvcs.synch.title' + defaultCloseOperation='DISPOSE_ON_CLOSE'> <style source="common.css"/> <script> + protected void selectTab(String tabname) { + cardLayout.show(preview, tabname); + } Action quitAction ; JRootPane rootPane = getRootPane(); @@ -15,49 +18,67 @@ }; rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.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='listModel'/> - <org.codelutin.vcs.ui.VCSFileStateTableModel id="allModel"/> - <org.codelutin.vcs.ui.VCSFileStateTableModel id="localModel"/> - <org.codelutin.vcs.ui.VCSFileStateTableModel id="remoteModel"/> + <org.codelutin.vcs.ui.model.SynchUIModel id="model"/> <java.awt.CardLayout id='cardLayout'/> <JPopupMenu id="tablePopupMenu" invoker='{allTable}' enabled='false'> - <JMenuItem id='diff'/> - <JMenuItem id='update'/> - <JMenuItem id='commit'/> - <JMenuItem id='revert'/> + <JMenuItem id='diff' text="lutinvcs.action.diff" toolTipText="lutinvcs.action.tooltip.diff"/> + <JMenuItem id='update' text="lutinvcs.action.update" toolTipText="lutinvcs.action.tooltip.update"/> + <JMenuItem id='commit' text="lutinvcs.action.commit" toolTipText="lutinvcs.action.tooltip.commit"/> + <JMenuItem id='revert' text="lutinvcs.action.revert" toolTipText="lutinvcs.action.tooltip.revert"/> </JPopupMenu> <Table> <row fill='both'> <cell fill='both' weightx='1'> <JToolBar> - <JButton id='refresh' text="lutinvcs.action.refresh"/> - <JButton id='diffAll' text="lutinvcs.action.diffAll"/> - <JButton id='updateAll' text="lutinvcs.action.updateAll"/> - <JButton id='commitAll' text="lutinvcs.action.commitAll"/> - <JButton id='revertAll' text="lutinvcs.action.revertAll"/> + <JToggleButton id='allTab' selected='true' buttonGroup='tabs' text='lutinvcs.tabs.all' + toolTipText="lutinvcs.tabs.tooltip.all" onActionPerformed='selectTab("all")'/> + <JToggleButton id='localTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.local' + toolTipText="lutinvcs.tabs.tooltip.local" onActionPerformed='selectTab("local")'/> + <JToggleButton id='remoteTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.remote' + toolTipText="lutinvcs.tabs.tooltip.remote" onActionPerformed='selectTab("remote")'/> + + <JButton id='refresh' text="lutinvcs.action.refresh" toolTipText="lutinvcs.action.tooltip.refresh" + icon='{createImageIcon("autoRefresh.png")}'/> + <JButton id='diffAll' text="lutinvcs.action.diffAll" toolTipText="lutinvcs.action.tooltip.diffAll" + icon='{createImageIcon("diff.png")}'/> + <JButton id='updateAll' text="lutinvcs.action.updateAll" + toolTipText="lutinvcs.action.tooltip.updateAll" icon='{createImageIcon("update.png")}'/> + <JButton id='commitAll' text="lutinvcs.action.commitAll" + toolTipText="lutinvcs.action.tooltip.commitAll" icon='{createImageIcon("commit.png")}'/> + <JButton id='revertAll' text="lutinvcs.action.revertAll" + toolTipText="lutinvcs.action.tooltip.revertAll" icon='{createImageIcon("rollback.png")}'/> </JToolBar> </cell> </row> - <row fill='both'> + <row fill='both'> <cell fill='both' weighty='1' weightx='2'> <JPanel id='preview' layout='{cardLayout}'> <JScrollPane id='allContent' styleClass='updateScroll' constraints='"all"'> - <JTable id="allTable" model="{allModel}" styleClass='updateTable'/> + <JTable id="allTable" styleClass='updateTable'/> </JScrollPane> <JScrollPane id='localContent' styleClass='updateScroll' visible='false' constraints='"local"'> - <JTable id="localTable" model="{localModel}" styleClass='updateTable'/> + <JTable id="localTable" styleClass='updateTable'/> </JScrollPane> <JScrollPane id='remoteContent' styleClass='updateScroll' visible='false' constraints='"remote"'> - <JTable id="remoteTable" model="{remoteModel}" styleClass='updateTable'/> + <JTable id="remoteTable" styleClass='updateTable'/> </JScrollPane> </JPanel> </cell> </row> <row> <cell columns='2' fill='both'> - <JButton id='quit' text='lutinutil.common.quit' action='{quitAction}'/> + <JButton id='quit' text='lutinvcs.quit' action='{quitAction}'/> </cell> </row> </Table> Modified: trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/common.css =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/common.css 2008-03-31 20:40:35 UTC (rev 248) +++ trunk/lutinvcs/lutinvcs-ui/src/main/uimodel/org/codelutin/vcs/ui/common.css 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; } JButton { - opaque:false; - borderPainted:false; - /*enabled:false;*/ - margin:0; + opaque: false; + borderPainted: false; + enabled: false; + margin: 0; } +JToggleButton { + opaque: false; + borderPainted: false; + margin: 0; +} + JMenuItem { - enabled:true; + enabled: true; } JMenu { - enabled:true; + enabled: true; } .smallSize { - font-size:9; + font-size: 9; } .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 } +; +} + .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/UITest.java =================================================================== --- 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; +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 { public static void main(String[] args) { - VCSUpdateDialog dialog =new VCSUpdateDialog(); + org.codelutin.i18n.I18n.init(); + + VCSUpdateDialog dialog = new VCSUpdateDialog(); + SynchUIModel model = dialog.getModel(); + MockVCSConfig config = new MockVCSConfig(); + File root = new File(new File("").getAbsolutePath()); + config.setLocalRoot(root); + config.setInit(true); + VCSHandlerFactory.setConfig(config); + + VCSHandler handler = VCSHandlerFactory.getHandler(); + + List<VCSFileState> datas = generateLocalFileStates(handler, new File(root, "trunk")); + datas.addAll(generateRemoteFileStates(handler, new File(root, "trunk"))); + + model.setData(datas); dialog.setVisible(true); } + + protected static List<VCSFileState> generateLocalFileStates(VCSHandler handler, File root) { + List<VCSFileState> datas = new ArrayList<VCSFileState>(); + VCSFileStateImpl state; + state = new VCSFileStateImpl(handler, new File(root, "local/file0")); + state.setState(VCSState.MODIFIED); + datas.add(state); + + state = new VCSFileStateImpl(handler, new File(root, "local/file1")); + state.setState(VCSState.UNVERSIONNED); + datas.add(state); + state = 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 = new ArrayList<VCSFileState>(); + VCSFileStateImpl state; + state = new VCSFileStateImpl(handler, new File(root, "remote/file0")); + state.setState(VCSState.MISSING); + datas.add(state); + + state = new VCSFileStateImpl(handler, new File(root, "remote/file1")); + state.setState(VCSState.OUT_OF_DATE); + datas.add(state); + state = new VCSFileStateImpl(handler, new File(root, "remote/file2")); + state.setState(VCSState.MISSING); + datas.add(state); + return datas; + } }

1 0

[Buix-commits] r248 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 20:40:35 +0000 (Mon, 31 Mar 2008) New Revision: 248 Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSFileStatesModel.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchVCSFileStatesModel.java Removed: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/VCSRepositoryModel.java Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/VCSFileStateTableModel.java Log: ui models Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSFileStatesModel.java (from rev 245, trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/VCSFileStateTableModel.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSFileStatesModel.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSFileStatesModel.java 2008-03-31 20:40:35 UTC (rev 248) @@ -0,0 +1,179 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, +* Benjamin Poussin, Tony Chemit +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package org.codelutin.vcs.ui.model; + +import static org.codelutin.i18n.I18n._; +import org.codelutin.vcs.VCSAction; +import org.codelutin.vcs.VCSFileState; +import org.codelutin.vcs.VCSState; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + +/** + * Simple Table model to display list of VCSFileState + * + * @author chemit + */ +public abstract class AbstractVCSFileStatesModel extends javax.swing.table.AbstractTableModel { + + protected List<VCSFileState> data; + + protected final String[] columnNames; + + private static final long serialVersionUID = 4697917831388337369L; + + protected AbstractVCSFileStatesModel(String[] columnNames) { + super(); + this.columnNames = columnNames; + } + + public List<VCSFileState> getData() { + return data; + } + + public int getColumnCount() { + return columnNames.length; + } + + public int getRowCount() { + return data == null ? 0 : data.size(); + } + + /*@Override + public Class<?> getColumnClass(int columnIndex) { + return String.class; + }*/ + + @Override + public String getColumnName(int columnIndex) { + return _(columnNames[columnIndex]); + } + + @Override + public boolean isCellEditable(int rowIndex, int columnIndex) { + // read only data + return false; + } + + @Override + public void setValueAt(Object aValue, int rowIndex, int columnIndex) { + // read only data + } + + + public void setData(List<VCSFileState> states) { + if (data != null) { + data.clear(); + data.addAll(states); + } else { + data = new ArrayList<VCSFileState>(states); + } + fireTableDataChanged(); + } + + public void addData(VCSFileState... states) { + if (data != null) { + data.addAll(Arrays.asList(states)); + } else { + data = new ArrayList<VCSFileState>(Arrays.asList(states)); + } + fireTableDataChanged(); + } + + public void removeData(VCSFileState... states) { + if (isEmpty()) { + return; + } + data.removeAll(Arrays.asList(states)); + fireTableDataChanged(); + } + + protected boolean isEmpty() { + return data == null || data.isEmpty(); + } + + public void clear() { + if (isEmpty()) { + return; + } + data.clear(); + fireTableDataChanged(); + } + + public VCSFileState[] getData(VCSAction action) { + if (isEmpty()) { + return new VCSFileState[0]; + } + List<VCSFileState> list = new ArrayList<VCSFileState>(data); + for (Iterator<VCSFileState> it = list.iterator(); it.hasNext();) { + VCSFileState fileState = it.next(); + List<VCSAction> actions = fileState.getState().getActions(); + if (!actions.contains(action)) { + it.remove(); + } + } + return list.toArray(new VCSFileState[list.size()]); + } + + public VCSFileState[] getData(VCSState action) { + if (isEmpty()) { + return new VCSFileState[0]; + } + List<VCSFileState> list = new ArrayList<VCSFileState>(data); + for (Iterator<VCSFileState> it = list.iterator(); it.hasNext();) { + VCSFileState fileState = it.next(); + if (!action.equals(fileState.getState())) { + it.remove(); + } + } + return list.toArray(new VCSFileState[list.size()]); + } + + public VCSState[] getStates() { + if (isEmpty()) { + return new VCSState[0]; + } + List<VCSState> result = new ArrayList<VCSState>(); + for (VCSFileState vcsFileState : data) { + VCSState state = vcsFileState.getState(); + if (state != null && !result.contains(state)) { + result.add(state); + } + } + return result.toArray(new VCSState[result.size()]); + } + + public VCSAction[] getActions() { + if (isEmpty()) { + return new VCSAction[0]; + } + List<VCSAction> result = new ArrayList<VCSAction>(); + for (VCSFileState vcsFileState : data) { + VCSAction action = vcsFileState.getAction(); + if (action != null && !result.contains(action)) { + result.add(action); + } + } + return result.toArray(new VCSAction[result.size()]); + } +} \ No newline at end of file Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java (from rev 245, trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/VCSRepositoryModel.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-03-31 20:40:35 UTC (rev 248) @@ -0,0 +1,123 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.ui.model; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.vcs.VCSFileState; +import org.codelutin.vcs.VCSHandler; +import static org.codelutin.vcs.ui.VCSUIConstants.ALL_MODEL_PROPERTY; +import static org.codelutin.vcs.ui.VCSUIConstants.LOCAL_MODEL_PROPERTY; +import static org.codelutin.vcs.ui.VCSUIConstants.REMOTE_MODEL_PROPERTY; + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +/** + * Model of a repository + * + * @author chemit + */ +public class SynchUIModel { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static protected final Log log = LogFactory.getLog(SynchUIModel.class); + + /** local root : wroking copy */ + protected File localRoot; + + /** remote root : remote url */ + protected URL remoteRoot; + + /** vcs handler to use (lazy instanciation) */ + protected VCSHandler handler; + + /** map of models */ + protected Map<String, SynchVCSFileStatesModel> models; + + public SynchUIModel() { + } + + public SynchUIModel(VCSHandler handler, File localRoot, URL remoteRoot) { + this.handler = handler; + this.localRoot = localRoot; + this.remoteRoot = remoteRoot; + } + + public void setLocalRoot(File localRoot) { + this.localRoot = localRoot; + } + + public void setRemoteRoot(URL remoteRoot) { + this.remoteRoot = remoteRoot; + } + + public SynchVCSFileStatesModel getModel(String modelName) { + SynchVCSFileStatesModel tableModel = getModels().get(modelName); + if (tableModel == null) { + getModels().put(modelName, tableModel = new SynchVCSFileStatesModel()); + } + return tableModel; + } + + public void setData(List<VCSFileState> states) { + getModel(ALL_MODEL_PROPERTY).setData(states); + List<VCSFileState> local = new ArrayList<VCSFileState>(states); + List<VCSFileState> remote = new ArrayList<VCSFileState>(); + splitStates(states, local, remote); + getModel(LOCAL_MODEL_PROPERTY).setData(local); + getModel(REMOTE_MODEL_PROPERTY).setData(remote); + } + + public void addData(List<VCSFileState> states) { + getModel(ALL_MODEL_PROPERTY).setData(states); + List<VCSFileState> local = new ArrayList<VCSFileState>(); + List<VCSFileState> remote = new ArrayList<VCSFileState>(); + splitStates(states, local, remote); + getModel(LOCAL_MODEL_PROPERTY).addData(local.toArray(new VCSFileState[local.size()])); + getModel(REMOTE_MODEL_PROPERTY).addData(remote.toArray(new VCSFileState[remote.size()])); + } + + public void removeData(List<VCSFileState> states) { + getModel(ALL_MODEL_PROPERTY).removeData(states.toArray(new VCSFileState[states.size()])); + List<VCSFileState> local = new ArrayList<VCSFileState>(); + List<VCSFileState> remote = new ArrayList<VCSFileState>(); + splitStates(states, local, remote); + getModel(LOCAL_MODEL_PROPERTY).removeData(local.toArray(new VCSFileState[local.size()])); + getModel(REMOTE_MODEL_PROPERTY).removeData(remote.toArray(new VCSFileState[remote.size()])); + } + + protected Map<String, SynchVCSFileStatesModel> getModels() { + if (models == null) { + models = new TreeMap<String, SynchVCSFileStatesModel>(); + } + return models; + } + + protected void splitStates(List<VCSFileState> states, List<VCSFileState> local, List<VCSFileState> remote) { + for (VCSFileState state : states) { + if (state.getState()!=null && state.getState().isLocal()) { + local.add(state); + } + if (state.getState()!=null && state.getState().isRemote()) { + remote.add(state); + } + } + } +} Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchVCSFileStatesModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchVCSFileStatesModel.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchVCSFileStatesModel.java 2008-03-31 20:40:35 UTC (rev 248) @@ -0,0 +1,46 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.ui.model; + +import org.codelutin.vcs.VCSFileState; +import org.codelutin.vcs.VCSState; +import org.codelutin.vcs.ui.VCSUIConstants; + +/** @author chemit */ +public class SynchVCSFileStatesModel extends AbstractVCSFileStatesModel { + private static final long serialVersionUID = -7592705623128585146L; + + public SynchVCSFileStatesModel() { + super(VCSUIConstants.SIMPLE_COLUMNS_NAMES); + } + + public Object getValueAt(int rowIndex, int columnIndex) { + if (isEmpty()) return null; + VCSFileState item = data.get(rowIndex); + Object result = null; + if (columnIndex == 0) { + // get module + result = item.getLocalPath(); + } else if (columnIndex == 1) { + // get file + result = item.getFile().getName(); + } else if (columnIndex == 2) { + // get status + VCSState state = item.getState(); + result = state==null?null:state.libelle(); + } + return result; + } +} Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/VCSFileStateTableModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/VCSFileStateTableModel.java 2008-03-31 20:40:16 UTC (rev 247) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/VCSFileStateTableModel.java 2008-03-31 20:40:35 UTC (rev 248) @@ -39,10 +39,10 @@ protected List<VCSFileState> data; + protected String[] columnNames; + private static final long serialVersionUID = 4697917831388337369L; - protected String[] columnNames; - public VCSFileStateTableModel() { super(); columnNames = VCSUIConstants.SIMPLE_COLUMNS_NAMES; Deleted: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/VCSRepositoryModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/VCSRepositoryModel.java 2008-03-31 20:40:16 UTC (rev 247) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/VCSRepositoryModel.java 2008-03-31 20:40:35 UTC (rev 248) @@ -1,124 +0,0 @@ -/** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * # #% - */ -package org.codelutin.vcs.ui.model; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.vcs.VCSAction; -import org.codelutin.vcs.VCSFileState; -import org.codelutin.vcs.VCSHandler; -import org.codelutin.vcs.VCSState; -import static org.codelutin.vcs.ui.VCSUIConstants.ALL_MODEL_PROPERTY; -import static org.codelutin.vcs.ui.VCSUIConstants.LOCAL_MODEL_PROPERTY; -import static org.codelutin.vcs.ui.VCSUIConstants.REMOTE_MODEL_PROPERTY; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -/** - * Model of a repository - * - * @author chemit - */ -public class VCSRepositoryModel { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static protected final Log log = LogFactory.getLog(VCSRepositoryModel.class); - - /** list of states of scanned files */ - protected List<VCSFileState> states = new ArrayList<VCSFileState>(); - - /** local root : wroking copy */ - protected File localRoot; - - /** remote root : remote url */ - protected URL remoteRoot; - - /** vcs states to be authorized in this model */ - protected VCSState[] acceptedStates; - - /** vcs actions to be authorized in this model */ - protected EnumSet<VCSAction> acceptedActions; - - /** vcs handler to use (lazy instanciation) */ - protected VCSHandler handler; - - /** map of models */ - protected Map<String, VCSFileStateTableModel> models; - - public VCSRepositoryModel(VCSHandler handler, File localRoot, URL remoteRoot) { - this.handler = handler; - this.localRoot = localRoot; - this.remoteRoot = remoteRoot; - } - - public VCSFileStateTableModel getModel(String modelName) { - VCSFileStateTableModel tableModel = getModels().get(modelName); - if (tableModel == null) { - getModels().put(modelName, tableModel = new VCSFileStateTableModel()); - } - return tableModel; - } - - public void setData(List<VCSFileState> states) { - getModel(ALL_MODEL_PROPERTY).setData(states); - List<VCSFileState> local = new ArrayList<VCSFileState>(states); - List<VCSFileState> remote = new ArrayList<VCSFileState>(); - splitStates(states, local, remote); - getModel(LOCAL_MODEL_PROPERTY).setData(local); - getModel(REMOTE_MODEL_PROPERTY).setData(remote); - } - - public void addData(List<VCSFileState> states) { - getModel(ALL_MODEL_PROPERTY).setData(states); - List<VCSFileState> local = new ArrayList<VCSFileState>(); - List<VCSFileState> remote = new ArrayList<VCSFileState>(); - splitStates(states, local, remote); - getModel(LOCAL_MODEL_PROPERTY).addData(local.toArray(new VCSFileState[local.size()])); - getModel(REMOTE_MODEL_PROPERTY).addData(remote.toArray(new VCSFileState[remote.size()])); - } - - public void removeData(List<VCSFileState> states) { - getModel(ALL_MODEL_PROPERTY).removeData(states.toArray(new VCSFileState[states.size()])); - List<VCSFileState> local = new ArrayList<VCSFileState>(); - List<VCSFileState> remote = new ArrayList<VCSFileState>(); - splitStates(states, local, remote); - getModel(LOCAL_MODEL_PROPERTY).removeData(local.toArray(new VCSFileState[local.size()])); - getModel(REMOTE_MODEL_PROPERTY).removeData(remote.toArray(new VCSFileState[remote.size()])); - } - - protected Map<String, VCSFileStateTableModel> getModels() { - if (models == null) { - models = new TreeMap<String, VCSFileStateTableModel>(); - } - return models; - } - - protected void splitStates(List<VCSFileState> states, List<VCSFileState> local, List<VCSFileState> remote) { - for (VCSFileState state : states) { - if (state.getState().isLocal()) { - local.add(state); - } - if (state.getState().isRemote()) { - remote.add(state); - } - } - } -}

1 0

[Buix-commits] r247 - in trunk/lutinvcs/lutinvcs-core/src/main: java/org/codelutin/vcs java/org/codelutin/vcs/mock resources/META-INF/services
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 20:40:16 +0000 (Mon, 31 Mar 2008) New Revision: 247 Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/mock/ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/mock/MockHandlerProvider.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/mock/MockVCSConfig.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/mock/MockVCSHandler.java trunk/lutinvcs/lutinvcs-core/src/main/resources/META-INF/services/org.codelutin.vcs.VCSHandlerProvider Log: add mock vcs handler Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/mock/MockHandlerProvider.java (from rev 240, trunk/lutinvcs/lutinvcs-provider-cvs/src/main/java/org/codelutin/vcs/CVSHandlerProvider.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/mock/MockHandlerProvider.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/mock/MockHandlerProvider.java 2008-03-31 20:40:16 UTC (rev 247) @@ -0,0 +1,30 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.mock; + +import org.codelutin.vcs.VCSConfig; +import org.codelutin.vcs.VCSHandlerProvider; + +/** @author chemit */ +public class MockHandlerProvider implements VCSHandlerProvider<MockVCSHandler> { + + public String getName() { + return "MOCK"; + } + + public MockVCSHandler newInstance(VCSConfig config) { + return new MockVCSHandler(config); + } +} \ No newline at end of file Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/mock/MockVCSConfig.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/mock/MockVCSConfig.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/mock/MockVCSConfig.java 2008-03-31 20:40:16 UTC (rev 247) @@ -0,0 +1,126 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.mock; + +import org.codelutin.vcs.ConnectionState; +import org.codelutin.vcs.VCSConfig; +import org.codelutin.vcs.VCSType; +import org.codelutin.vcs.VCSTypeRepo; + +import java.io.File; +import java.net.URL; + +/** @author chemit */ +public class MockVCSConfig implements VCSConfig { + + File localRoot; + URL remoteRoot; + + boolean init; + + public boolean canConnect() { + return false; + } + + public boolean isConnected() { + return false; + } + + public ConnectionState getConnectionState() { + return null; + } + + public VCSType getType() { + return VCSType.MOCK; + } + + public boolean isUseSshConnexion() { + return false; + } + + public String getHostName() { + return null; + } + + public File getKeyFile() { + return null; + } + + public String getUserName() { + return null; + } + + public boolean isNoPassPhrase() { + return false; + } + + public String getPassphrase() { + return null; + } + + public String getRemotePath() { + return null; + } + + public String getRemoteDatabase() { + return remoteRoot.toString(); + } + + public String getRemoteDatabasePath() { + return remoteRoot.toString(); + } + + public File getLocalDatabasePath() { + return localRoot; + } + + public VCSTypeRepo getTypeRepo() { + return null; + } + + public boolean isOffline() { + return false; + } + + public boolean isReadOnly() { + return false; + } + + public boolean isInit() { + return init; + } + + public void validate() { + } + + public void setUseSshConnexion(boolean useSshConnexion) { + } + + public File getSource() { + return null; + } + + public void setLocalRoot(File localRoot) { + this.localRoot = localRoot; + } + + public void setRemoteRoot(URL remoteRoot) { + this.remoteRoot = remoteRoot; + } + + public void setInit(boolean init) { + this.init = init; + } +} Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/mock/MockVCSHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/mock/MockVCSHandler.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/mock/MockVCSHandler.java 2008-03-31 20:40:16 UTC (rev 247) @@ -0,0 +1,127 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs.mock; + +import org.codelutin.vcs.AbstractVCSHandler; +import org.codelutin.vcs.VCSConfig; +import org.codelutin.vcs.VCSException; +import org.codelutin.vcs.VCSState; + +import java.io.File; +import java.io.IOException; +import java.util.Collection; +import java.util.List; + +/** @author chemit */ +public class MockVCSHandler extends AbstractVCSHandler { + + protected MockVCSHandler(VCSConfig config) { + super(config, "", ""); + } + + public void initWorkingCopy() throws VCSException { + } + + public String getRemoteUrl() { + return null; + } + + public VCSState getState(File fileState, Collection tmp) throws VCSException { + return null; + } + + public VCSState getState(File file, Collection tmp, boolean noremote) throws VCSException { + return null; + } + + public boolean isOnRemote(File file) { + return false; + } + + public boolean isUpToDate(File file) throws VCSException { + return false; + } + + public void makeRemoteDir(String commitMessage, String... dirNames) throws VCSException { + } + + public void deleteRemoteDir(String commitMessage, String... dirNames) throws VCSException { + } + + public long add(List<File> files, String msg) throws VCSException { + return 0; + } + + public void delete(List<File> files, String msg) throws VCSException { + } + + public void revert(List<File> files) throws VCSException { + } + + public long commit(List<File> files, String msg) throws VCSException { + return 0; + } + + public void update(File file, Object revision) throws VCSException { + } + + public void update(File file) throws VCSException { + } + + public void checkout(File destDir, String module, boolean recurse) throws VCSException { + } + + public void checkoutFile(File destDir, String module) throws VCSException { + } + + public long checkoutOnlyTheDirectory(File root, Object revision) throws VCSException { + return 0; + } + + public List<String> getRemoteStorageNames(File directory) throws VCSException { + return null; + } + + public Object getRevision(File f) throws VCSException { + return null; + } + + public List getLog(Object startRevision, Object endRevision, File file) throws VCSException { + return null; + } + + public String getFileContent(File file, Object revision) throws VCSException, IOException { + return null; + } + + public String getChangeLog(File file) throws VCSException { + return null; + } + + public String getDiff(File file) throws VCSException, IOException { + return null; + } + + public String getDiff(File file, Object againstRevision) throws VCSException, IOException { + return null; + } + + public void testConnection() throws VCSException { + } + + public boolean hasProtocoleChanged() throws VCSException { + return false; + } +} Copied: trunk/lutinvcs/lutinvcs-core/src/main/resources/META-INF/services/org.codelutin.vcs.VCSHandlerProvider (from rev 240, trunk/lutinvcs/lutinvcs-provider-cvs/src/main/resources/META-INF/services/org.codelutin.vcs.VCSHandlerProvider) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/resources/META-INF/services/org.codelutin.vcs.VCSHandlerProvider (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/resources/META-INF/services/org.codelutin.vcs.VCSHandlerProvider 2008-03-31 20:40:16 UTC (rev 247) @@ -0,0 +1 @@ +org.codelutin.vcs.mock.MockHandlerProvider \ No newline at end of file

1 0

[Buix-commits] r246 - trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs
by tchemit＠users.labs.libre-entreprise.org March 31, 2008

March 31, 2008

Author: tchemit Date: 2008-03-31 20:39:56 +0000 (Mon, 31 Mar 2008) New Revision: 246 Modified: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSType.java Log: add mock vcs handler Modified: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSType.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSType.java 2008-03-31 18:27:47 UTC (rev 245) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSType.java 2008-03-31 20:39:56 UTC (rev 246) @@ -26,6 +26,6 @@ */ public enum VCSType { - CVS, SVN + CVS, SVN, MOCK }

1 0