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

r299 - in trunk/lutinvcs: lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model lutinvcs-ui/src/main/java/org/codelutin/vcs/ui lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/action
by tchemit＠users.labs.libre-entreprise.org April 2, 2008

April 2, 2008

Author: tchemit Date: 2008-04-02 14:35:41 +0000 (Wed, 02 Apr 2008) New Revision: 299 Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSFileStatesModel.java trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/action/VCSPopupAction.java Log: mise en place filtre sur selectionModel et action (pour les actions de la popup : on poss?\195?\168de deja une selection de lignes puis on sous-filtre sur l'action) Modified: 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/AbstractVCSFileStatesModel.java 2008-04-02 09:15:47 UTC (rev 298) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSFileStatesModel.java 2008-04-02 14:35:41 UTC (rev 299) @@ -143,17 +143,30 @@ return list.toArray(new VCSFileState[list.size()]); } - public void select(VCSAction action, ListSelectionModel selectionModel) { + /** + * restrict in model, only lines with given action enabled + * + * @param action current action to filter + * @param selectionModel current selection where to filter + * @param reset if <code>true</code> means take + */ + public void select(VCSAction action, ListSelectionModel selectionModel, boolean reset) { if (isEmpty()) { return; } selectionModel.setValueIsAdjusting(true); - selectionModel.clearSelection(); + if (reset) { + selectionModel.clearSelection(); + } for (int i = 0; i < data.size(); i++) { VCSFileState fileState = data.get(i); List<VCSAction> actions = fileState.getState().getActions(); - if (actions.contains(action)) { - selectionModel.addSelectionInterval(i, i); + if (reset) { + if (actions.contains(action)) { + selectionModel.addSelectionInterval(i, i); + } + } else if (!actions.contains(action)) { + selectionModel.removeSelectionInterval(i, i); } } selectionModel.setValueIsAdjusting(false); Modified: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java 2008-04-02 09:15:47 UTC (rev 298) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java 2008-04-02 14:35:41 UTC (rev 299) @@ -60,7 +60,7 @@ log.info("refresh :" + model.size()); model.refresh(model.getStates()); } else { - model.select(action, selectionModel); + model.select(action, selectionModel, true); // do action on selected items doSelectAction(action, model); } Modified: 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 2008-04-02 09:15:47 UTC (rev 298) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/action/VCSPopupAction.java 2008-04-02 14:35:41 UTC (rev 299) @@ -38,8 +38,12 @@ } public void actionPerformed(ActionEvent e) { - model.select(action, selectionModel); + // select only lines for this action inside already selected lines + model.select(action, selectionModel, false); + // obtain thoses lines VCSFileState[] states = model.getData(selectionModel); + // do real vcs action on thoses lines + //TODO delegate to VCSActionThread ? log.info("files to treate :" + states.length); } }

1 0

r298 - trunk/lutinvcs
by tchemit＠users.labs.libre-entreprise.org April 2, 2008

April 2, 2008

Author: tchemit Date: 2008-04-02 09:15:47 +0000 (Wed, 02 Apr 2008) New Revision: 298 Modified: trunk/lutinvcs/pom.xml Log: on deploy les sources et javadocs uniquement a un goal deploy Modified: trunk/lutinvcs/pom.xml =================================================================== --- trunk/lutinvcs/pom.xml 2008-04-02 09:15:20 UTC (rev 297) +++ trunk/lutinvcs/pom.xml 2008-04-02 09:15:47 UTC (rev 298) @@ -140,7 +140,7 @@ <artifactId>maven-source-plugin</artifactId> <executions> <execution> - <phase>verify</phase> + <phase>deploy</phase> <goals> <goal>jar</goal> </goals> @@ -152,7 +152,7 @@ <artifactId>maven-javadoc-plugin</artifactId> <executions> <execution> - <phase>verify</phase> + <phase>deploy</phase> <goals> <goal>jar</goal> </goals>

1 0

r297 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model
by tchemit＠users.labs.libre-entreprise.org April 2, 2008

April 2, 2008

Author: tchemit Date: 2008-04-02 09:15:20 +0000 (Wed, 02 Apr 2008) New Revision: 297 Removed: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIHandler.java Log: go away :) Deleted: 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/model/SynchUIHandler.java 2008-04-02 09:15:14 UTC (rev 296) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIHandler.java 2008-04-02 09:15:20 UTC (rev 297) @@ -1,62 +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 java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - -/** @author chemit */ -public abstract class SynchUIHandler implements PropertyChangeListener { - - protected static Log log = LogFactory.getLog(SynchUIHandler.class); - - public void propertyChange(PropertyChangeEvent evt) { - //if (log.isDebugEnabled()) { - log.info(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); - //} - - } - - protected SynchUIHandler() { - } - - public abstract SynchUIModel getModel(); - - public void init() { - if (getModel() == null) { - throw new IllegalStateException("no model was defined for " + this); - } - getModel().addPropertyChangeListener(SynchUIModel.TAB_PROPERTY_CHANGED, this); - } - - public void dispatchAction(String action) { - if (action.endsWith("All")) { - doAllAction(action.substring(0, action.length() - 3)); - } else { - doSelectAction(action); - } - } - - protected void doSelectAction(String action) { - log.info(action); - } - - protected void doAllAction(String action) { - log.info(action); - } -}

1 0

r296 - trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org April 2, 2008

April 2, 2008

Author: tchemit Date: 2008-04-02 09:15:14 +0000 (Wed, 02 Apr 2008) New Revision: 296 Removed: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandlerImpl.java Log: go away :) Deleted: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandlerImpl.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandlerImpl.java 2008-04-02 09:14:59 UTC (rev 295) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandlerImpl.java 2008-04-02 09:15:14 UTC (rev 296) @@ -1,50 +0,0 @@ -package org.codelutin.vcs.ui; - -import org.codelutin.vcs.VCSAction; -import org.codelutin.vcs.ui.model.SynchUIHandler; -import org.codelutin.vcs.ui.model.SynchUIModel; -import org.codelutin.vcs.ui.model.SynchVCSFileStatesModel; - -import java.beans.PropertyChangeEvent; -import java.util.ArrayList; -import java.util.List; - -/** @author chemit */ -public class SynchUIHandlerImpl extends SynchUIHandler { - - final SynchUI ui; - - public SynchUIHandlerImpl(SynchUI ui) { - this.ui = ui; - } - - public void init() { - super.init(); - this.ui.selectTab(VCSUIConstants.ALL_MODEL_PROPERTY); - } - - @Override - public void propertyChange(PropertyChangeEvent evt) { - super.propertyChange(evt); - - SynchVCSFileStatesModel model = (SynchVCSFileStatesModel) evt.getNewValue(); - - String tabModelName = ui.getModel().getTabModelName(model); - 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.getRefresh().setEnabled(hasActions); - } - - public SynchUIModel getModel() { - return ui.getModel(); - } -}

1 0

r295 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model
by tchemit＠users.labs.libre-entreprise.org April 2, 2008

April 2, 2008

Author: tchemit Date: 2008-04-02 09:14:59 +0000 (Wed, 02 Apr 2008) New Revision: 295 Modified: 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 Log: models d'ui Modified: 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/AbstractVCSFileStatesModel.java 2008-04-02 09:14:45 UTC (rev 294) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractVCSFileStatesModel.java 2008-04-02 09:14:59 UTC (rev 295) @@ -24,6 +24,7 @@ import org.codelutin.vcs.VCSFileState; import org.codelutin.vcs.VCSState; +import javax.swing.ListSelectionModel; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -36,14 +37,17 @@ */ public abstract class AbstractVCSFileStatesModel extends javax.swing.table.AbstractTableModel { + protected final String name; + protected List<VCSFileState> data; protected final String[] columnNames; private static final long serialVersionUID = 4697917831388337369L; - protected AbstractVCSFileStatesModel(String[] columnNames) { + protected AbstractVCSFileStatesModel(String name, String[] columnNames) { super(); + this.name = name; this.columnNames = columnNames; } @@ -51,6 +55,10 @@ return data; } + public String getName() { + return name; + } + public int getColumnCount() { return columnNames.length; } @@ -135,6 +143,22 @@ return list.toArray(new VCSFileState[list.size()]); } + public void select(VCSAction action, ListSelectionModel selectionModel) { + if (isEmpty()) { + return; + } + selectionModel.setValueIsAdjusting(true); + selectionModel.clearSelection(); + for (int i = 0; i < data.size(); i++) { + VCSFileState fileState = data.get(i); + List<VCSAction> actions = fileState.getState().getActions(); + if (actions.contains(action)) { + selectionModel.addSelectionInterval(i, i); + } + } + selectionModel.setValueIsAdjusting(false); + } + public VCSFileState[] getData(VCSState action) { if (isEmpty()) { return new VCSFileState[0]; @@ -179,4 +203,65 @@ return result.toArray(new VCSAction[result.size()]); } + public VCSFileState[] getData(ListSelectionModel selectionModel) { + if (isEmpty() || selectionModel.isSelectionEmpty()) { + return new VCSFileState[0]; + } + List<VCSFileState> list = new ArrayList<VCSFileState>(); + for (int i = 0, max = size(); i < max; i++) { + if (selectionModel.isSelectedIndex(i)) { + list.add(data.get(i)); + } + } + return list.toArray(new VCSFileState[list.size()]); + } + + public VCSAction[] getActions(ListSelectionModel selectionModel) { + if (isEmpty() || selectionModel.isSelectionEmpty()) { + return new VCSAction[0]; + } + List<VCSAction> result = new ArrayList<VCSAction>(); + for (VCSState vcsFileState : getStates(selectionModel)) { + List<VCSAction> action = vcsFileState.getActions(); + for (VCSAction vcsAction : action) { + if (vcsAction != null && !result.contains(vcsAction)) { + result.add(vcsAction); + } + } + } + return result.toArray(new VCSAction[result.size()]); + } + + public VCSState[] getStates(ListSelectionModel selectionModel) { + if (isEmpty() || selectionModel.isSelectionEmpty()) { + return new VCSState[0]; + } + List<VCSState> result = new ArrayList<VCSState>(); + for (int i = 0, max = size(); i < max; i++) { + if (selectionModel.isSelectedIndex(i)) { + VCSFileState vcsFileState = data.get(i); + VCSState state = vcsFileState.getState(); + if (state != null && !result.contains(state)) { + result.add(state); + } + } + } + return result.toArray(new VCSState[result.size()]); + } + + + @Override + public String toString() { + return super.toString() + "<name:" + name + ", size:" + (isEmpty() ? "0" : size()) + '>'; + } + + public void refresh(VCSState... states) { + //TODO launch refreshaction on given states + + } + + + public int size() { + return data.size(); + } } \ No newline at end of file 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-04-02 09:14:45 UTC (rev 294) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-04-02 09:14:59 UTC (rev 295) @@ -16,9 +16,9 @@ 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.VCSAction; 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; @@ -29,9 +29,6 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.TreeMap; /** * Model of a repository @@ -72,13 +69,14 @@ protected VCSHandler handler; /** map of models */ - protected Map<String, SynchVCSFileStatesModel> models; + protected List<SynchVCSFileStatesModel> models; /** support for change properties support */ protected PropertyChangeSupport changeSupport; /** current tab displayed */ protected AbstractVCSFileStatesModel tabModel; + /** current action to fired */ protected VCSAction action; @@ -109,15 +107,6 @@ return getModel(tabModel); } - public String getTabModelName(AbstractVCSFileStatesModel model) { - for (Entry<String, SynchVCSFileStatesModel> entry : models.entrySet()) { - if (model.equals(entry.getValue())) { - return entry.getKey(); - } - } - return null; - } - public void setLocalRoot(File localRoot) { this.localRoot = localRoot; } @@ -127,9 +116,15 @@ } public SynchVCSFileStatesModel getModel(String modelName) { - SynchVCSFileStatesModel tableModel = getModels().get(modelName); + SynchVCSFileStatesModel tableModel = null; + for (SynchVCSFileStatesModel model : getModels()) { + if (modelName.equals(model.getName())) { + tableModel = model; + break; + } + } if (tableModel == null) { - getModels().put(modelName, tableModel = new SynchVCSFileStatesModel()); + getModels().add(tableModel = new SynchVCSFileStatesModel(modelName)); } return tableModel; } @@ -220,9 +215,9 @@ changeSupport.firePropertyChange(propertyName, oldValue, newValue); } - protected Map<String, SynchVCSFileStatesModel> getModels() { + protected List<SynchVCSFileStatesModel> getModels() { if (models == null) { - models = new TreeMap<String, SynchVCSFileStatesModel>(); + models = new ArrayList<SynchVCSFileStatesModel>(); } return models; } 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-04-02 09:14:45 UTC (rev 294) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchVCSFileStatesModel.java 2008-04-02 09:14:59 UTC (rev 295) @@ -16,14 +16,17 @@ import org.codelutin.vcs.VCSFileState; import org.codelutin.vcs.VCSState; +import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.ui.VCSUIConstants; +import javax.swing.ListSelectionModel; + /** @author chemit */ public class SynchVCSFileStatesModel extends AbstractVCSFileStatesModel { private static final long serialVersionUID = -7592705623128585146L; - public SynchVCSFileStatesModel() { - super(VCSUIConstants.SIMPLE_COLUMNS_NAMES); + public SynchVCSFileStatesModel(String name) { + super(name, VCSUIConstants.SIMPLE_COLUMNS_NAMES); } public Object getValueAt(int rowIndex, int columnIndex) { @@ -43,4 +46,5 @@ } return result; } + }

1 0

r294 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action
by tchemit＠users.labs.libre-entreprise.org April 2, 2008

April 2, 2008

Author: tchemit Date: 2008-04-02 09:14:45 +0000 (Wed, 02 Apr 2008) New Revision: 294 Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSAbsractAction.java Log: action abstraite de vcs Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSAbsractAction.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSAbsractAction.java 2008-04-02 09:14:33 UTC (rev 293) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSAbsractAction.java 2008-04-02 09:14:45 UTC (rev 294) @@ -14,6 +14,8 @@ */ 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.VCSHandler; @@ -22,15 +24,19 @@ /** @author chemit */ public abstract class VCSAbsractAction extends AbstractAction { - protected final VCSAction action; + protected static Log log = LogFactory.getLog(VCSAbsractAction.class); + protected VCSAction action; + protected transient VCSHandler handler; private static final long serialVersionUID = 1074145285171920255L; - public VCSAbsractAction(VCSHandler handler, VCSAction action) { + public VCSAbsractAction(VCSHandler handler) { this.handler = handler; + } + + public void setAction(VCSAction action) { this.action = action; } - }

1 0

r293 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action
by tchemit＠users.labs.libre-entreprise.org April 2, 2008

April 2, 2008

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 April 2, 2008

April 2, 2008

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 April 2, 2008

April 2, 2008

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 April 2, 2008

April 2, 2008

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