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

r293 - 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:14:33 +0000 (Wed, 02 Apr 2008) New Revision: 293 Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractSynchUIHandler.java Log: handler de l'ui synch Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractSynchUIHandler.java (from rev 276, trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIHandler.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractSynchUIHandler.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractSynchUIHandler.java 2008-04-02 09:14:33 UTC (rev 293) @@ -0,0 +1,61 @@ +/** + * # #% 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.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.vcs.VCSAction; +import org.codelutin.vcs.ui.model.SynchUIModel; +import org.codelutin.vcs.ui.model.SynchVCSFileStatesModel; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + +/** @author chemit */ +public abstract class AbstractSynchUIHandler implements PropertyChangeListener { + + protected static Log log = LogFactory.getLog(AbstractSynchUIHandler.class); + + public void propertyChange(PropertyChangeEvent evt) { + //if (log.isDebugEnabled()) { + log.info(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); + //} + String action = evt.getPropertyName(); + SynchVCSFileStatesModel model = (SynchVCSFileStatesModel) evt.getNewValue(); + if (SynchUIModel.TAB_PROPERTY_CHANGED.equals(action)) { + doSelectTabAction(model); + } else if (action.endsWith("All")) { + String actionName = action.substring(0, action.length() - 3); + doAllAction(VCSAction.valueOf(actionName.toUpperCase()), model); + } else { + doSelectAction(VCSAction.valueOf(action.toUpperCase()), model); + } + } + + public abstract SynchUIModel getModel(); + + public abstract void doSelectAction(VCSAction action, SynchVCSFileStatesModel model); + + public abstract void doAllAction(VCSAction action, SynchVCSFileStatesModel model); + + public abstract void doSelectTabAction(SynchVCSFileStatesModel action); + + public void init() { + if (getModel() == null) { + throw new IllegalStateException("no model was defined for " + this); + } + getModel().addPropertyChangeListener(this); + } +}

1 0

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

02 Apr '08

Author: tchemit Date: 2008-04-02 09:14:16 +0000 (Wed, 02 Apr 2008) New Revision: 292 Modified: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSAction.java Log: ajout action refresh Modified: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSAction.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSAction.java 2008-04-02 09:14:02 UTC (rev 291) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSAction.java 2008-04-02 09:14:16 UTC (rev 292) @@ -38,7 +38,8 @@ */ @org.codelutin.i18n.I18nable public enum VCSAction { - + /** to refresh the state of a file on repository */ + REFRESH(n_("lutinvcs.action.refresh"), true, false, false, false), /** to add an unversionned file on repository */ ADD(n_("lutinvcs.action.add"), true, false, true, true), /** to delete locally and from repository */

1 0

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

02 Apr '08

Author: tchemit Date: 2008-04-02 09:14:02 +0000 (Wed, 02 Apr 2008) New Revision: 291 Modified: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSState.java Log: action revert accepssible sur plus d'?\195?\169tat vcs + ajout action delete Modified: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSState.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSState.java 2008-04-02 09:13:17 UTC (rev 290) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSState.java 2008-04-02 09:14:02 UTC (rev 291) @@ -11,6 +11,7 @@ import static org.codelutin.vcs.VCSAction.REVERT; import static org.codelutin.vcs.VCSAction.UPDATE; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -81,7 +82,7 @@ * <li>{@link VCSAction#ADD}</li> * </ul> */ - UNVERSIONNED("unversionned", n_("lutinvcs.state.unversionned"), true, false, ADD), + UNVERSIONNED("unversionned", n_("lutinvcs.state.unversionned"), true, false, ADD, REVERT), /** * when a file exists on remote repository but not locally. @@ -109,9 +110,12 @@ UNVERSIONNED_OR_MISSING("unversionnedOrMissing", n_("lutinvcs.state.unversionnedOrMissing"), true, true, ADD, UPDATE), + REMOVED("removed", n_("lutinvcs.state.removed"), true, false, DELETE, REVERT), + /** to deal with other cases (...) */ UNKNOWN("unknown", n_("lutinvcs.state.unknown"), true, false); + /** libelle to be used */ private final String libelle; /** key of the state */ @@ -125,7 +129,10 @@ VCSState(String key, String libelle, boolean local, boolean remote, VCSAction... actions) { this.libelle = libelle; - this.actions = Collections.unmodifiableList(Arrays.asList(actions)); + List<VCSAction> actions1 = new ArrayList<VCSAction>(Arrays.asList(actions)); + // refresh action is enabled for all states + actions1.add(VCSAction.REFRESH); + this.actions = Collections.unmodifiableList(actions1); this.key = key; this.local = local; this.remote = remote;

1 0

r290 - 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:13:17 +0000 (Wed, 02 Apr 2008) New Revision: 290 Added: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java Log: handler de l'ui synch Copied: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java (from rev 276, trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandlerImpl.java) =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java (rev 0) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java 2008-04-02 09:13:17 UTC (rev 290) @@ -0,0 +1,162 @@ +package org.codelutin.vcs.ui; + +import org.codelutin.vcs.VCSAction; +import org.codelutin.vcs.VCSFileState; +import org.codelutin.vcs.ui.action.AbstractSynchUIHandler; +import org.codelutin.vcs.ui.action.VCSPopupAction; +import org.codelutin.vcs.ui.model.AbstractVCSFileStatesModel; +import org.codelutin.vcs.ui.model.SynchUIModel; +import org.codelutin.vcs.ui.model.SynchVCSFileStatesModel; + +import javax.swing.JTable; +import javax.swing.ListSelectionModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; + +/** @author chemit */ +public class SynchUIHandler extends AbstractSynchUIHandler implements ListSelectionListener { + + protected final JSynchUI ui; + + public SynchUIHandler(JSynchUI ui) { + super(); + this.ui = ui; + } + + @Override + public void init() { + super.init(); + initTab(VCSUIConstants.ALL_MODEL_PROPERTY); + initTab(VCSUIConstants.LOCAL_MODEL_PROPERTY); + initTab(VCSUIConstants.REMOTE_MODEL_PROPERTY); + } + + private void initTab(String modelName) { + JTable table = ui.getTable(modelName); + SynchVCSFileStatesModel fileStatesModel = getModel().getModel(modelName); + table.setModel(fileStatesModel); + table.getSelectionModel().addListSelectionListener(this); + table.addMouseListener(new ListMouseListener(ui, fileStatesModel)); + JVCSPopup jvcsPopup = ui.getPopup(modelName); + jvcsPopup.setInvoker(table); + jvcsPopup.setDispatchAction(new VCSPopupAction(ui, modelName)); + } + + public SynchUIModel getModel() { + return ui.getModel(); + } + + public void doAllAction(VCSAction action, SynchVCSFileStatesModel model) { + log.info(action + " : " + model); + JTable table = ui.getTable(model.getName()); + ListSelectionModel selectionModel = table.getSelectionModel(); + if (action == VCSAction.REFRESH) { + selectionModel.clearSelection(); + // do refresh of all states + log.info("refresh :" + model.size()); + model.refresh(model.getStates()); + } else { + model.select(action, selectionModel); + // do action on selected items + doSelectAction(action, model); + } + } + + public void doSelectAction(VCSAction action, SynchVCSFileStatesModel model) { + log.info(action + " : " + model); + JTable table = ui.getTable(model.getName()); + ListSelectionModel selectionModel = table.getSelectionModel(); + if (selectionModel.isSelectionEmpty()) { + // nothing to do + return; + } + VCSFileState[] states = model.getData(selectionModel); + log.info("files to treate :" + states.length); + + } + + public void doSelectTabAction(SynchVCSFileStatesModel model) { + log.info(model); + + String tabModelName = model.getName(); + ui.cardLayout.show(ui.preview, tabModelName); + VCSAction[] actions = model.getActions(); + List<String> acts = new ArrayList<String>(); + for (VCSAction action : actions) { + acts.add(action.name().toLowerCase()); + } + boolean hasActions = actions.length > 0; + ui.getDiffAll().setEnabled(hasActions && acts.contains("diff")); + ui.getUpdateAll().setEnabled(hasActions && acts.contains("update")); + ui.getCommitAll().setEnabled(hasActions && acts.contains("commit")); + ui.getRevertAll().setEnabled(hasActions && acts.contains("revert")); + ui.getDeleteAll().setEnabled(hasActions && acts.contains("delete")); + ui.getRefreshAll().setEnabled(hasActions); + } + + public void valueChanged(ListSelectionEvent e) { + ListSelectionModel list = (ListSelectionModel) e.getSource(); + if (!list.getValueIsAdjusting()) { + log.info(list); + } + } + + private class ListMouseListener extends MouseAdapter { + + private final AbstractVCSFileStatesModel model; + private final ListSelectionModel selectionModel; + private final JTable jTable; + private final JVCSPopup jPopupMenu; + + public ListMouseListener(JSynchUI ui, AbstractVCSFileStatesModel model) { + this.model = model; + String modelName = model.getName(); + + jPopupMenu = ui.getPopup(modelName); + + jTable = ui.getTable(modelName); + selectionModel = jTable.getSelectionModel(); + // init actions + + } + + @Override + public void mousePressed(MouseEvent e) { + super.mousePressed(e); + initPopup(e); + } + + @Override + public void mouseReleased(MouseEvent e) { + super.mouseReleased(e); + initPopup(e); + } + + @Override + public void mouseClicked(MouseEvent e) { + // nothing to do + } + + protected void initPopup(MouseEvent e) { + if (e.isPopupTrigger() && !selectionModel.isSelectionEmpty()) { + List<String> acts = new ArrayList<String>(); + for (VCSAction action : model.getActions(selectionModel)) { + acts.add(action.name().toLowerCase()); + } + boolean hasActions = !acts.isEmpty(); + jPopupMenu.getDiff().setEnabled(hasActions && acts.contains("diff")); + jPopupMenu.getUpdate().setEnabled(hasActions && acts.contains("update")); + jPopupMenu.getCommit().setEnabled(hasActions && acts.contains("commit")); + jPopupMenu.getRevert().setEnabled(hasActions && acts.contains("revert")); + jPopupMenu.getDelete().setEnabled(hasActions && acts.contains("delete")); + jPopupMenu.getRefresh().setEnabled(hasActions); + // display popup + jPopupMenu.show(jTable, e.getX(), e.getY()); + } + } + } +}

1 0

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