- Buix-commits - mailman.cloud.codelutin.com

r289 - in trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui: . action
by tchemit＠users.labs.libre-entreprise.org 02 Apr '08

02 Apr '08

Author: tchemit Date: 2008-04-02 09:13:04 +0000 (Wed, 02 Apr 2008) New Revision: 289 Added: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/action/ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/action/VCSPopupAction.java Log: action de la popup Added: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/action/VCSPopupAction.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/action/VCSPopupAction.java (rev 0) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/action/VCSPopupAction.java 2008-04-02 09:13:04 UTC (rev 289) @@ -0,0 +1,45 @@ +/** + * # #% 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.action; + +import org.codelutin.vcs.VCSFileState; +import org.codelutin.vcs.ui.JSynchUI; +import org.codelutin.vcs.ui.JVCSPopup; +import org.codelutin.vcs.ui.model.AbstractVCSFileStatesModel; + +import javax.swing.ListSelectionModel; +import java.awt.event.ActionEvent; + +/** @author chemit */ +public class VCSPopupAction extends VCSAbsractAction { + private static final long serialVersionUID = -1983061535956510913L; + + protected JVCSPopup popup; + protected AbstractVCSFileStatesModel model; + protected transient ListSelectionModel selectionModel; + + public VCSPopupAction(JSynchUI ui, String modelName) { + super(ui.getModel().getHandler()); + this.model = ui.getModel().getModel(modelName); + this.popup = ui.getPopup(modelName); + this.selectionModel = ui.getTable(modelName).getSelectionModel(); + } + + public void actionPerformed(ActionEvent e) { + model.select(action, selectionModel); + VCSFileState[] states = model.getData(selectionModel); + log.info("files to treate :" + states.length); + } +}

1 0

r288 - trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 02 Apr '08

02 Apr '08

Author: tchemit Date: 2008-04-02 09:07:25 +0000 (Wed, 02 Apr 2008) New Revision: 288 Added: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java Log: la factorie des ui lutinvcs Added: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java (rev 0) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java 2008-04-02 09:07:25 UTC (rev 288) @@ -0,0 +1,34 @@ +/** + * # #% 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; + +import org.codelutin.vcs.VCSFileState; + +import java.util.List; + +/** @author chemit */ +public class VCSUIFactory { + + static JSynchUI synchUI; + + public static JSynchUI newSynchUI(List<VCSFileState> states) { + if (synchUI == null) { + synchUI = new JSynchUI(); + synchUI.setHandler(new SynchUIHandler(synchUI)); + } + synchUI.getModel().setData(states); + return synchUI; + } +}

1 0

r287 - trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 02 Apr '08

02 Apr '08

Author: tchemit Date: 2008-04-02 09:07:05 +0000 (Wed, 02 Apr 2008) New Revision: 287 Modified: trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui/UITest.java Log: init mocke du test 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-04-02 09:05:52 UTC (rev 286) +++ trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui/UITest.java 2008-04-02 09:07:05 UTC (rev 287) @@ -35,31 +35,38 @@ public static void main(String[] args) { org.codelutin.i18n.I18n.init(); - MockVCSConfig config = new MockVCSConfig(); - config.setLocalRoot(new File(new File("").getAbsolutePath())); - config.setInit(true); - VCSHandlerFactory.setConfig(config); + File root = new File(new File("").getAbsolutePath()); - VCSHandler handler = VCSHandlerFactory.getHandler(); + VCSHandler handler = initVCS(root); - SynchUI dialog = new SynchUI(); + List<VCSFileState> datas = generateListFileStates(handler, 20, "trunk", "local/", "remote/"); - //uiHandler.init(); - fillSynchModel(handler, dialog.getModel(), 20, "trunk", "local/", "remote/"); - SynchUIHandlerImpl uiHandler = new SynchUIHandlerImpl(dialog); - uiHandler.init(); + JSynchUI synchUI = VCSUIFactory.newSynchUI(datas); - dialog.getUi().setVisible(true); + synchUI.setVisible(true); } + public static VCSHandler initVCS(File root) { + MockVCSConfig config = new MockVCSConfig(); + config.setLocalRoot(root); + config.setInit(true); + VCSHandlerFactory.setConfig(config); + return VCSHandlerFactory.getHandler(); + } + protected static void fillSynchModel(VCSHandler handler, SynchUIModel model, int max, String prefix, String localPRefix, String remotePrefix) { + List<VCSFileState> datas = generateListFileStates(handler, max, prefix, localPRefix, remotePrefix); + model.setData(datas); + } + + private static List<VCSFileState> generateListFileStates(VCSHandler handler, 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); + 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); + return generateFileStates(handler, root, max, localPRefix, VCSState.MODIFIED, VCSState.UNVERSIONNED, VCSState.OUT_OF_DATE_AND_MODIFIED, VCSState.REMOVED); } protected static List<VCSFileState> generateRemoteFileStates(VCSHandler handler, int max, File root, String remotePRefix) {

1 0

r286 - trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 02 Apr '08

02 Apr '08

Author: tchemit Date: 2008-04-02 09:05:52 +0000 (Wed, 02 Apr 2008) New Revision: 286 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: i18n 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-04-02 09:05:20 UTC (rev 285) +++ trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-en_GB.properties 2008-04-02 09:05:52 UTC (rev 286) @@ -1,26 +0,0 @@ -lutinvcs.action.commit=commit -lutinvcs.action.commitAll=commit all -lutinvcs.action.diff=diff -lutinvcs.action.diffAll=diff all -lutinvcs.action.refresh= -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.quit=Quit -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-04-02 09:05:20 UTC (rev 285) +++ trunk/lutinvcs/lutinvcs-ui/src/main/resources/i18n/lutinvcs-ui-fr_FR.properties 2008-04-02 09:05:52 UTC (rev 286) @@ -1,26 +0,0 @@ -lutinvcs.action.commit=commit -lutinvcs.action.commitAll=tout commiter -lutinvcs.action.diff=diff -lutinvcs.action.diffAll=voir tous les diffs -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.quit=Quitter -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

r285 - trunk/lutinvcs/lutinvcs-api/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 02 Apr '08

02 Apr '08

Author: tchemit Date: 2008-04-02 09:05:20 +0000 (Wed, 02 Apr 2008) New Revision: 285 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 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-04-02 09:05:00 UTC (rev 284) +++ trunk/lutinvcs/lutinvcs-api/src/main/resources/i18n/lutinvcs-api-en_GB.properties 2008-04-02 09:05:20 UTC (rev 285) @@ -5,12 +5,14 @@ lutinvcs.action.delete=delete lutinvcs.action.diff=diff lutinvcs.action.overwriteAndUpdate=overwrite and update +lutinvcs.action.refresh= lutinvcs.action.revert=revert lutinvcs.action.update=update lutinvcs.state.missing=missing lutinvcs.state.modified=modified lutinvcs.state.outofdate=out of date lutinvcs.state.outofdateAndModified=out of date and modified +lutinvcs.state.removed=removed lutinvcs.state.unknown=unknown lutinvcs.state.unversionned=unversionned lutinvcs.state.unversionnedOrMissing=unversionned or missing 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-04-02 09:05:00 UTC (rev 284) +++ trunk/lutinvcs/lutinvcs-api/src/main/resources/i18n/lutinvcs-api-fr_FR.properties 2008-04-02 09:05:20 UTC (rev 285) @@ -1,16 +1,18 @@ -lutinvcs.action.add=Add +lutinvcs.action.add=Ajouter lutinvcs.action.changeLog=journal des changements lutinvcs.action.checkout=R\u00E9cup\u00E9rer lutinvcs.action.commit=Commiter lutinvcs.action.delete=Supprimer lutinvcs.action.diff=voir les diff\u00E9rences lutinvcs.action.overwriteAndUpdate=Update +lutinvcs.action.refresh=Rafra\u00EEchir lutinvcs.action.revert=Rollback lutinvcs.action.update=Update 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.removed=supprim\u00E9 lutinvcs.state.unknown=\u00E9tat inconnu lutinvcs.state.unversionned=non versionn\u00E9 lutinvcs.state.unversionnedOrMissing=non versionn\u00E9 ou non pr\u00E9sent localement

1 0

r284 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 02 Apr '08

02 Apr '08

Author: tchemit Date: 2008-04-02 09:05:00 +0000 (Wed, 02 Apr 2008) New Revision: 284 Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java Log: les noms des propri?\195?\169t?\195?\169s compatibles jaxx Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java 2008-04-02 09:04:33 UTC (rev 283) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java 2008-04-02 09:05:00 UTC (rev 284) @@ -27,20 +27,20 @@ }; /** model name for synchronize all tab ui */ - public static final String ALL_MODEL_PROPERTY = "model.synch.all"; + public static final String ALL_MODEL_PROPERTY = "modelSynchAll"; /** model name for synchronize local tab ui */ - public static final String LOCAL_MODEL_PROPERTY = "model.synch.local"; + public static final String LOCAL_MODEL_PROPERTY = "modelSynchLocal"; /** model name for synchronize remote tab ui */ - public static final String REMOTE_MODEL_PROPERTY = "model.synch.remote"; + public static final String REMOTE_MODEL_PROPERTY = "modelSynchRemote"; /** model name for diff ui */ - public static final String DIFF_MODEL_PROPERTY = "model.diff"; + public static final String DIFF_MODEL_PROPERTY = "modelDiff"; /** model name for commit ui */ - public static final String COMMIT_MODEL_PROPERTY = "model.commit"; + public static final String COMMIT_MODEL_PROPERTY = "modelCommit"; /** model name for confirm ui (all actions exception commit) */ - public static final String CONFIRM_MODEL_PROPERTY = "model.confirm"; + public static final String CONFIRM_MODEL_PROPERTY = "modelConfirm"; }

1 0

r283 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action
by tchemit＠users.labs.libre-entreprise.org 02 Apr '08

02 Apr '08

Author: tchemit Date: 2008-04-02 09:04:33 +0000 (Wed, 02 Apr 2008) New Revision: 283 Removed: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSSynchAction.java Log: no way ! Deleted: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSSynchAction.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSSynchAction.java 2008-04-02 08:55:49 UTC (rev 282) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSSynchAction.java 2008-04-02 09:04:33 UTC (rev 283) @@ -1,37 +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.action; - -import org.codelutin.vcs.VCSAction; -import org.codelutin.vcs.ui.model.SynchUIHandler; - -import java.awt.event.ActionEvent; - -/** @author chemit */ -public class VCSSynchAction extends VCSAbsractAction { - - private static final long serialVersionUID = 5214785331070517352L; - - protected transient SynchUIHandler uiHandler; - - public VCSSynchAction(SynchUIHandler uiHandler, VCSAction action) { - super(uiHandler.getModel().getHandler(), action); - this.uiHandler = uiHandler; - } - - public void actionPerformed(ActionEvent e) { - - } -}

1 0

r282 - trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 02 Apr '08

02 Apr '08

Author: tchemit Date: 2008-04-02 08:55:49 +0000 (Wed, 02 Apr 2008) New Revision: 282 Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-en_GB.properties trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-fr_FR.properties Log: popup pour les actions sur la selection des lignes l'ui de synch avance bien Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-en_GB.properties =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-en_GB.properties 2008-04-02 08:55:11 UTC (rev 281) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-en_GB.properties 2008-04-02 08:55:49 UTC (rev 282) @@ -1,21 +1,21 @@ lutinvcs.action.commit=commit -lutinvcs.action.commitAll=commit all -lutinvcs.action.diff=diff -lutinvcs.action.diffAll=diff all -lutinvcs.action.refresh= +lutinvcs.action.delete=delete +lutinvcs.action.diff=show diff +lutinvcs.action.refresh=refresh 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.delete=delete +lutinvcs.action.tooltip.deleteAll=delete 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.refreshAll=refrsh all 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.quit=Quit lutinvcs.synch.title=Synch lutinvcs.tabs.all=all Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-fr_FR.properties =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-fr_FR.properties 2008-04-02 08:55:11 UTC (rev 281) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-fr_FR.properties 2008-04-02 08:55:49 UTC (rev 282) @@ -1,21 +1,21 @@ -lutinvcs.action.commit=commit -lutinvcs.action.commitAll=tout commiter -lutinvcs.action.diff=diff -lutinvcs.action.diffAll=voir tous les diffs -lutinvcs.action.refresh= -lutinvcs.action.revert=revert -lutinvcs.action.revertAll=annuler les modifications +lutinvcs.action.commit=committer +lutinvcs.action.delete=supprimer +lutinvcs.action.diff=voir les diff +lutinvcs.action.refresh=rafra\u00EEchir +lutinvcs.action.revert=annuler les modifications lutinvcs.action.tooltip.commit=commiter les fichiers s\u00E9lectionn\u00E9s lutinvcs.action.tooltip.commitAll=commiter tous les fichiers +lutinvcs.action.tooltip.delete=supprimer les fichiers s\u00E9lectionn\u00E9s +lutinvcs.action.tooltip.deleteAll=supprimer 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.refreshAll=rafra\u00EEchir tous les fichiers 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.revertAll=annuler 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.action.update=mettre \u00E0 jour lutinvcs.quit=Quitter lutinvcs.synch.title=Synchronisation lutinvcs.tabs.all=all

1 0

r281 - trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 02 Apr '08

02 Apr '08

Author: tchemit Date: 2008-04-02 08:55:11 +0000 (Wed, 02 Apr 2008) New Revision: 281 Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx Log: popup pour les actions sur la selection des lignes l'ui de synch avance bien Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx 2008-04-02 08:53:39 UTC (rev 280) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx 2008-04-02 08:55:11 UTC (rev 281) @@ -1,10 +1,42 @@ -<JDialog title='lutinvcs.synch.title' id='ui' - defaultCloseOperation='DISPOSE_ON_CLOSE'> +<JDialog title='lutinvcs.synch.title' id='ui' defaultCloseOperation='DISPOSE_ON_CLOSE'> <style source="common.css"/> <script> import org.codelutin.vcs.VCSAction; + import org.codelutin.vcs.ui.action.AbstractSynchUIHandler; + protected AbstractSynchUIHandler handler; + + public JTable getTable(String modelName) { + return (JTable) get$objectMap().get(modelName+"Table"); + } + + public JVCSPopup getPopup(String modelName) { + return (JVCSPopup) get$objectMap().get(modelName+"Popup"); + } + + @Override + public void setVisible(boolean b) { + if (getHandler().getModel().getTabModel() == null) { + getHandler().init(); + // first launch, no tab model selected,choose one + selectTab(VCSUIConstants.ALL_MODEL_PROPERTY); + } + super.setVisible(b); + } + + public JSynchUI(AbstractSynchUIHandler handler) { + this.handler =handler; + } + + protected AbstractSynchUIHandler getHandler() { + return handler; + } + + protected void setHandler(AbstractSynchUIHandler handler) { + this.handler = handler; + } + protected void selectTab(String tabname) { model.setTabModel(model.getModel(tabname)); } @@ -12,8 +44,8 @@ protected void doAllAction(VCSAction action) { model.doAllAction(action); } + Action quitAction; - JRootPane rootPane = ui.getRootPane(); rootPane.setDefaultButton(quit); quitAction = new AbstractAction(quit.getText()) { @@ -24,79 +56,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> -  - <org.codelutin.vcs.ui.model.SynchUIModel id="model"/> - <DefaultListModel id='listModel'/> -  -  <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 enabled='false'> </JPopupMenu> + <org.codelutin.vcs.ui.JVCSPopup id="modelSynchAllPopup"/> + <org.codelutin.vcs.ui.JVCSPopup id="modelSynchLocalPopup"/> + <org.codelutin.vcs.ui.JVCSPopup id="modelSynchRemotePopup"/> <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("model.synch.all")'/> + onActionPerformed='selectTab("modelSynchAll")'/> <JToggleButton id='localTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.local' - mnemonic="L" - toolTipText="lutinvcs.tabs.tooltip.local" - onActionPerformed='selectTab("model.synch.local")'/> + mnemonic="L" toolTipText="lutinvcs.tabs.tooltip.local" + onActionPerformed='selectTab("modelSynchLocal")'/> <JToggleButton id='remoteTab' selected='false' buttonGroup='tabs' text='lutinvcs.tabs.remote' - mnemonic="R" - toolTipText="lutinvcs.tabs.tooltip.remote" - onActionPerformed='selectTab("model.synch.remote")'/> + mnemonic="R" toolTipText="lutinvcs.tabs.tooltip.remote" + onActionPerformed='selectTab("modelSynchRemote")'/> - <JButton id='refresh' text="lutinvcs.action.refresh" toolTipText="lutinvcs.action.tooltip.refresh" - icon='{createImageIcon("autoRefresh.png")}'/> + <JButton id='refreshAll' toolTipText="lutinvcs.action.tooltip.refreshAll" + icon='{createImageIcon("autoRefresh.png")}' + onActionPerformed='doAllAction(VCSAction.REFRESH)'/> - <JButton id='diffAll' text="lutinvcs.action.diffAll" toolTipText="lutinvcs.action.tooltip.diffAll" + <JButton id='diffAll' toolTipText="lutinvcs.action.tooltip.diffAll" icon='{createImageIcon("diff.png")}' onActionPerformed='doAllAction(VCSAction.DIFF)'/> - <JButton id='updateAll' text="lutinvcs.action.updateAll" - onActionPerformed='doAllAction(VCSAction.UPDATE)' - toolTipText="lutinvcs.action.tooltip.updateAll" icon='{createImageIcon("update.png")}'/> + <JButton id='updateAll' toolTipText="lutinvcs.action.tooltip.updateAll" + icon='{createImageIcon("update.png")}' + onActionPerformed='doAllAction(VCSAction.UPDATE)'/> - <JButton id='commitAll' text="lutinvcs.action.commitAll" - onActionPerformed='doAllAction(VCSAction.COMMIT)' - toolTipText="lutinvcs.action.tooltip.commitAll" icon='{createImageIcon("commit.png")}'/> + <JButton id='commitAll' toolTipText="lutinvcs.action.tooltip.commitAll" + icon='{createImageIcon("commit.png")}' + onActionPerformed='doAllAction(VCSAction.COMMIT)'/> - <JButton id='revertAll' text="lutinvcs.action.revertAll" - onActionPerformed='doAllAction(VCSAction.REVERT)' - toolTipText="lutinvcs.action.tooltip.revertAll" icon='{createImageIcon("rollback.png")}'/> + <JButton id='revertAll' toolTipText="lutinvcs.action.tooltip.revertAll" + icon='{createImageIcon("rollback.png")}' + onActionPerformed='doAllAction(VCSAction.REVERT)'/> + + <JButton id='deleteAll' toolTipText="lutinvcs.action.tooltip.deleteAll" + icon='{createImageIcon("remove.png")}' + onActionPerformed='doAllAction(VCSAction.DELETE)'/> </JToolBar> </cell> </row> <row fill='both'> <cell fill='both' weighty='1' weightx='2'> <JPanel id='preview' layout='{cardLayout}'> - <JScrollPane id='allContent' styleClass='updateScroll' constraints='"model.synch.all"'> - <JTable id="allTable" styleClass='updateTable'/> + <JScrollPane id='allContent' styleClass='updateScroll' constraints='"modelSynchAll"'> + <JTable id="modelSynchAllTable" styleClass='updateTable'/> </JScrollPane> - <JScrollPane id='localContent' styleClass='updateScroll' constraints='"model.synch.local"'> - <JTable id="localTable" styleClass='updateTable'/> + <JScrollPane id='localContent' styleClass='updateScroll' constraints='"modelSynchLocal"'> + <JTable id="modelSynchLocalTable" styleClass='updateTable'/> </JScrollPane> - <JScrollPane id='remoteContent' styleClass='updateScroll' constraints='"model.synch.remote"'> - <JTable id="remoteTable" styleClass='updateTable'/> + <JScrollPane id='remoteContent' styleClass='updateScroll' constraints='"modelSynchRemote"'> + <JTable id="modelSynchRemoteTable" styleClass='updateTable'/> </JScrollPane> </JPanel> </cell> Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx (rev 0) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx 2008-04-02 08:55:11 UTC (rev 281) @@ -0,0 +1,30 @@ +<JPopupMenu enabled='false'> + <script> + import org.codelutin.vcs.VCSAction; + import org.codelutin.vcs.ui.action.VCSAbsractAction; + + protected VCSAbsractAction dispatchAction; + + protected void setDispatchAction(VCSAbsractAction action) { + this.dispatchAction=action; + } + + protected void doAction(VCSAction action,JMenuItem item) { + dispatchAction.setAction(action); + ActionEvent e = new ActionEvent( item,1,action.name()); + dispatchAction.actionPerformed(e); + } + </script> + <JMenuItem id='refresh' text="lutinvcs.action.refresh" toolTipText="lutinvcs.action.tooltip.refresh" + icon='{createImageIcon("autoRefresh.png")}' onActionPerformed='doAction(VCSAction.REFRESH,refresh)'/> + <JMenuItem id='diff' text="lutinvcs.action.diff" toolTipText="lutinvcs.action.tooltip.diff" + icon='{createImageIcon("diff.png")}' onActionPerformed='doAction(VCSAction.DIFF,diff)'/> + <JMenuItem id='update' text="lutinvcs.action.update" toolTipText="lutinvcs.action.tooltip.update" + icon='{createImageIcon("update.png")}' onActionPerformed='doAction(VCSAction.UPDATE,update)'/> + <JMenuItem id='commit' text="lutinvcs.action.commit" toolTipText="lutinvcs.action.tooltip.commit" + icon='{createImageIcon("commit.png")}' onActionPerformed='doAction(VCSAction.COMMIT,commit)'/> + <JMenuItem id='revert' text="lutinvcs.action.revert" toolTipText="lutinvcs.action.tooltip.revert" + icon='{createImageIcon("rollback.png")}' onActionPerformed='doAction(VCSAction.REVERT,revert)'/> + <JMenuItem id='delete' text="lutinvcs.action.delete" toolTipText="lutinvcs.action.tooltip.delete" + icon='{createImageIcon("remove.png")}' onActionPerformed='doAction(VCSAction.DELETE,delete)'/> +</JPopupMenu>

1 0

r280 - trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons
by tchemit＠users.labs.libre-entreprise.org 02 Apr '08

02 Apr '08

Author: tchemit Date: 2008-04-02 08:53:39 +0000 (Wed, 02 Apr 2008) New Revision: 280 Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/BUTTON32.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/Button_C32.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/actionSelect.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/both_mod.png trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/delete.gif trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remove.png Log: new icons Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/BUTTON32.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/BUTTON32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/Button_C32.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/Button_C32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/actionSelect.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/actionSelect.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/both_mod.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/both_mod.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/delete.gif =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/delete.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remove.png =================================================================== (Binary files differ) Property changes on: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/icons/remove.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0