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

[Buix-commits] r317 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 03 Apr '08

03 Apr '08

Author: tchemit Date: 2008-04-03 17:15:30 +0000 (Thu, 03 Apr 2008) New Revision: 317 Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java Log: after remove some old ui classes 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-03 17:15:19 UTC (rev 316) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java 2008-04-03 17:15:30 UTC (rev 317) @@ -44,9 +44,4 @@ /** model name for diff remote tab ui */ public static final String DIFF_REMOTE_MODEL_PROPERTY = "modelDiffRemote"; - /** model name for commit ui */ - public static final String COMMIT_MODEL_PROPERTY = "modelCommit"; - - /** model name for confirm ui (all actions exception commit) */ - public static final String CONFIRM_MODEL_PROPERTY = "modelConfirm"; }

1 0

[Buix-commits] r316 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model
by tchemit＠users.labs.libre-entreprise.org 03 Apr '08

03 Apr '08

Author: tchemit Date: 2008-04-03 17:15:19 +0000 (Thu, 03 Apr 2008) New Revision: 316 Removed: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/VCSFileStateTableModel.java Log: after remove some old ui classes Deleted: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/VCSFileStateTableModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/VCSFileStateTableModel.java 2008-04-03 17:13:23 UTC (rev 315) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/VCSFileStateTableModel.java 2008-04-03 17:15:19 UTC (rev 316) @@ -1,205 +0,0 @@ -/* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package org.codelutin.vcs.ui.model; - -import static org.codelutin.i18n.I18n._; -import org.codelutin.vcs.VCSAction; -import org.codelutin.vcs.VCSFileState; -import org.codelutin.vcs.VCSState; -import org.codelutin.vcs.ui.VCSUIConstants; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - -/** - * Simple Table model to display list of VCSFileState - * - * @author chemit - */ -public class VCSFileStateTableModel extends javax.swing.table.AbstractTableModel { - - protected List<VCSFileState> data; - - protected String[] columnNames; - - private static final long serialVersionUID = 4697917831388337369L; - - public VCSFileStateTableModel() { - super(); - columnNames = VCSUIConstants.SIMPLE_COLUMNS_NAMES; - } - - public VCSFileStateTableModel(String[] columnNames) { - super(); - this.columnNames = columnNames; - } - - public VCSFileStateTableModel(List<VCSFileState> data) throws RuntimeException { - super(); - setData(data); - } - - public List<VCSFileState> getData() { - return data; - } - - public int getColumnCount() { - return columnNames.length; - } - - public int getRowCount() { - return data == null ? 0 : data.size(); - } - - @Override - public Class<?> getColumnClass(int columnIndex) { - return String.class; - } - - @Override - public String getColumnName(int columnIndex) { - return _(columnNames[columnIndex]); - } - - @Override - public boolean isCellEditable(int rowIndex, int columnIndex) { - return false; - } - - @Override - public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - // read only data - } - - public Object getValueAt(int rowIndex, int columnIndex) { - if (isEmpty()) return null; - VCSFileState item = data.get(rowIndex); - Object result = null; - if (columnIndex == 0) { - // get module - result = item.getModuleName(); - } else if (columnIndex == 1) { - // get file - result = item.getFile().getName(); - } else if (columnIndex == 2) { - // get status - result = item.getState(); - } - return result; - } - - public void setData(List<VCSFileState> states) { - if (data != null) { - data.clear(); - data.addAll(states); - } else { - data = new ArrayList<VCSFileState>(states); - } - fireTableDataChanged(); - } - - public void addData(VCSFileState... states) { - if (data != null) { - data.addAll(Arrays.asList(states)); - } else { - data = new ArrayList<VCSFileState>(Arrays.asList(states)); - } - fireTableDataChanged(); - } - - public void removeData(VCSFileState... states) { - if (isEmpty()) { - return; - } - data.removeAll(Arrays.asList(states)); - fireTableDataChanged(); - } - - private boolean isEmpty() { - return data == null || data.isEmpty(); - } - - public void clear() { - if (isEmpty()) { - return; - } - data.clear(); - fireTableDataChanged(); - } - - public VCSFileState[] getData(VCSAction action) { - if (isEmpty()) { - return new VCSFileState[0]; - } - List<VCSFileState> list = new ArrayList<VCSFileState>(data); - for (Iterator<VCSFileState> it = list.iterator(); it.hasNext();) { - VCSFileState fileState = it.next(); - List<VCSAction> actions = fileState.getState().getActions(); - if (!actions.contains(action)) { - it.remove(); - } - } - return list.toArray(new VCSFileState[list.size()]); - } - - public VCSFileState[] getData(VCSState action) { - if (isEmpty()) { - return new VCSFileState[0]; - } - List<VCSFileState> list = new ArrayList<VCSFileState>(data); - for (Iterator<VCSFileState> it = list.iterator(); it.hasNext();) { - VCSFileState fileState = it.next(); - if (!action.equals(fileState.getState())) { - it.remove(); - } - } - return list.toArray(new VCSFileState[list.size()]); - } - - public VCSState[] getStates() { - if (isEmpty()) { - return new VCSState[0]; - } - List<VCSState> result = new ArrayList<VCSState>(); - for (VCSFileState vcsFileState : data) { - VCSState state = vcsFileState.getState(); - if (state != null && !result.contains(state)) { - result.add(state); - } - } - return result.toArray(new VCSState[result.size()]); - } - - public VCSAction[] getActions() { - if (isEmpty()) { - return new VCSAction[0]; - } - List<VCSAction> result = new ArrayList<VCSAction>(); - for (VCSFileState vcsFileState : data) { - VCSAction action = vcsFileState.getAction(); - if (action != null && !result.contains(action)) { - result.add(action); - } - } - return result.toArray(new VCSAction[result.size()]); - } -} \ No newline at end of file

1 0

[Buix-commits] r315 - trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 03 Apr '08

03 Apr '08

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

1 0

[Buix-commits] r314 - trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 03 Apr '08

03 Apr '08

Author: tchemit Date: 2008-04-03 17:13:09 +0000 (Thu, 03 Apr 2008) New Revision: 314 Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx 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/JVCSPopup.jaxx Log: move to handler package Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx 2008-04-03 17:13:00 UTC (rev 313) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx 2008-04-03 17:13:09 UTC (rev 314) @@ -3,7 +3,7 @@ <script> import org.codelutin.vcs.VCSAction; - import org.codelutin.vcs.ui.action.AbstractConfirmUIHandler; + import org.codelutin.vcs.ui.handler.AbstractConfirmUIHandler; protected AbstractConfirmUIHandler handler; Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx 2008-04-03 17:13:00 UTC (rev 313) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx 2008-04-03 17:13:09 UTC (rev 314) @@ -3,7 +3,7 @@ <script> import org.codelutin.vcs.VCSAction; - import org.codelutin.vcs.ui.action.AbstractDiffUIHandler; + import org.codelutin.vcs.ui.handler.AbstractDiffUIHandler; import org.codelutin.vcs.ui.VCSUIConstants; protected AbstractDiffUIHandler handler; 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-03 17:13:00 UTC (rev 313) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx 2008-04-03 17:13:09 UTC (rev 314) @@ -3,7 +3,7 @@ <script> import org.codelutin.vcs.VCSAction; - import org.codelutin.vcs.ui.action.AbstractSynchUIHandler; + import org.codelutin.vcs.ui.handler.AbstractSynchUIHandler; protected AbstractSynchUIHandler handler; @@ -121,7 +121,7 @@ </row>  <!--row> Modified: 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 2008-04-03 17:13:00 UTC (rev 313) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JVCSPopup.jaxx 2008-04-03 17:13:09 UTC (rev 314) @@ -1,7 +1,7 @@ <JPopupMenu> <script> import org.codelutin.vcs.VCSAction; - import org.codelutin.vcs.ui.action.VCSAbsractAction; + import org.codelutin.vcs.ui.handler.VCSAbsractAction; protected VCSAbsractAction dispatchAction;

1 0

[Buix-commits] r313 - trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 03 Apr '08

03 Apr '08

Author: tchemit Date: 2008-04-03 17:13:00 +0000 (Thu, 03 Apr 2008) New Revision: 313 Modified: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ConfirmUIHandler.java trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/DiffUIHandler.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/VCSPopupAction.java trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java Log: move to handler package Modified: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ConfirmUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ConfirmUIHandler.java 2008-04-03 17:12:49 UTC (rev 312) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ConfirmUIHandler.java 2008-04-03 17:13:00 UTC (rev 313) @@ -15,7 +15,7 @@ package org.codelutin.vcs.ui; import org.codelutin.vcs.VCSAction; -import org.codelutin.vcs.ui.action.AbstractConfirmUIHandler; +import org.codelutin.vcs.ui.handler.AbstractConfirmUIHandler; import org.codelutin.vcs.ui.model.ConfirmUIModel; import javax.swing.JTable; Modified: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/DiffUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/DiffUIHandler.java 2008-04-03 17:12:49 UTC (rev 312) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/DiffUIHandler.java 2008-04-03 17:13:00 UTC (rev 313) @@ -16,7 +16,7 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; -import org.codelutin.vcs.ui.action.AbstractDiffUIHandler; +import org.codelutin.vcs.ui.handler.AbstractDiffUIHandler; import org.codelutin.vcs.ui.model.AbstractVCSFileStatesModel; import org.codelutin.vcs.ui.model.DiffUIModel; import org.codelutin.vcs.ui.model.SimpleVCSFileStatesModel; 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-03 17:12:49 UTC (rev 312) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java 2008-04-03 17:13:00 UTC (rev 313) @@ -2,7 +2,7 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; -import org.codelutin.vcs.ui.action.AbstractSynchUIHandler; +import org.codelutin.vcs.ui.handler.AbstractSynchUIHandler; import org.codelutin.vcs.ui.model.AbstractVCSFileStatesModel; import org.codelutin.vcs.ui.model.SimpleVCSFileStatesModel; import org.codelutin.vcs.ui.model.SynchUIModel; Modified: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSPopupAction.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSPopupAction.java 2008-04-03 17:12:49 UTC (rev 312) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSPopupAction.java 2008-04-03 17:13:00 UTC (rev 313) @@ -16,7 +16,7 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; -import org.codelutin.vcs.ui.action.VCSAbsractAction; +import org.codelutin.vcs.ui.handler.VCSAbsractAction; import org.codelutin.vcs.ui.model.AbstractVCSFileStatesModel; import javax.swing.ListSelectionModel; Modified: 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 2008-04-03 17:12:49 UTC (rev 312) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java 2008-04-03 17:13:00 UTC (rev 313) @@ -15,7 +15,7 @@ package org.codelutin.vcs.ui; import org.codelutin.vcs.VCSFileState; -import org.codelutin.vcs.ui.action.AbstractUIHandler; +import org.codelutin.vcs.ui.handler.AbstractUIHandler; import java.util.HashMap; import java.util.List;

1 0

[Buix-commits] r312 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 03 Apr '08

03 Apr '08

Author: tchemit Date: 2008-04-03 17:12:49 +0000 (Thu, 03 Apr 2008) New Revision: 312 Removed: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/ Log: move to handler package

1 0

[Buix-commits] r311 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action
by tchemit＠users.labs.libre-entreprise.org 03 Apr '08

03 Apr '08

Author: tchemit Date: 2008-04-03 17:12:08 +0000 (Thu, 03 Apr 2008) New Revision: 311 Removed: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractSynchUIHandler.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractUIHandler.java Log: move to handler package Deleted: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractSynchUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractSynchUIHandler.java 2008-04-03 17:12:00 UTC (rev 310) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractSynchUIHandler.java 2008-04-03 17:12:08 UTC (rev 311) @@ -1,59 +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.SimpleVCSFileStatesModel; -import org.codelutin.vcs.ui.model.SynchUIModel; - -import java.beans.PropertyChangeEvent; - -/** @author chemit */ -public abstract class AbstractSynchUIHandler extends AbstractUIHandler<SynchUIModel> { - - public void propertyChange(PropertyChangeEvent evt) { - //if (log.isDebugEnabled()) { - log.info(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); - //} - String action = evt.getPropertyName(); - SimpleVCSFileStatesModel model = (SimpleVCSFileStatesModel) evt.getNewValue(); - if (SynchUIModel.TAB_PROPERTY_CHANGED.equals(action)) { - doSelectTabAction(model); - } else if (action.endsWith("All")) { - try { - String actionName = action.substring(0, action.length() - 3); - VCSAction vcsAction = VCSAction.valueOf(actionName.toUpperCase()); - doAllAction(vcsAction, model); - } catch (IllegalArgumentException e) { - // ignore it ? - } - } else { - try { - VCSAction vcsAction = VCSAction.valueOf(action.toUpperCase()); - doSelectAction(vcsAction, model); - } catch (IllegalArgumentException e) { - // ignore it ? - } - - } - } - - public abstract void doSelectAction(VCSAction action, SimpleVCSFileStatesModel model); - - public abstract void doAllAction(VCSAction action, SimpleVCSFileStatesModel model); - - public abstract void doSelectTabAction(SimpleVCSFileStatesModel action); - -} Deleted: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractUIHandler.java 2008-04-03 17:12:00 UTC (rev 310) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractUIHandler.java 2008-04-03 17:12:08 UTC (rev 311) @@ -1,42 +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.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.vcs.ui.model.AbstractUIModel; - -import javax.swing.ListSelectionModel; -import javax.swing.JDialog; -import java.beans.PropertyChangeListener; - -/** @author chemit */ -public abstract class AbstractUIHandler<M extends AbstractUIModel> implements PropertyChangeListener { - - protected static Log log = LogFactory.getLog(AbstractConfirmUIHandler.class); - - public abstract M getModel(); - - public abstract JDialog getUi(); - - public abstract ListSelectionModel getSelectionModel(); - - public void init() { - if (getModel() == null) { - throw new IllegalStateException("no model was defined for " + this); - } - getModel().addPropertyChangeListener(this); - } -}

1 0

[Buix-commits] r310 - in trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui: . action handler
by tchemit＠users.labs.libre-entreprise.org 03 Apr '08

03 Apr '08

Author: tchemit Date: 2008-04-03 17:12:00 +0000 (Thu, 03 Apr 2008) New Revision: 310 Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/ Removed: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractConfirmUIHandler.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractDiffUIHandler.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSAbsractAction.java Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractConfirmUIHandler.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractDiffUIHandler.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractSynchUIHandler.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractUIHandler.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/VCSAbsractAction.java Log: move to handler package Deleted: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractConfirmUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractConfirmUIHandler.java 2008-04-03 17:04:28 UTC (rev 309) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractConfirmUIHandler.java 2008-04-03 17:12:00 UTC (rev 310) @@ -1,57 +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.VCSFileState; -import org.codelutin.vcs.ui.model.AbstractVCSFileStatesModel; -import org.codelutin.vcs.ui.model.ConfirmUIModel; - -import javax.swing.ListSelectionModel; -import java.beans.PropertyChangeEvent; - -/** @author chemit */ -public abstract class AbstractConfirmUIHandler extends AbstractUIHandler<ConfirmUIModel> { - - protected abstract void updateUI(); - - public void propertyChange(PropertyChangeEvent evt) { - //if (log.isDebugEnabled()) { - log.info(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); - //} - String action = evt.getPropertyName(); - - if (ConfirmUIModel.ACTION_PROPERTY_CHANGED.equals(action)) { - updateUI(); - return; - } - try { - String commitMessage = (String) evt.getNewValue(); - VCSAction vcsAction = VCSAction.valueOf(action.toUpperCase()); - doAction(vcsAction, commitMessage, getModel().getModel()); - } catch (IllegalArgumentException e) { - // ignore ite - } - } - - public void doAction(VCSAction action, String commitMessage, AbstractVCSFileStatesModel model) { - ListSelectionModel selectionModel = getSelectionModel(); - model.select(action, selectionModel, false); - VCSFileState[] data = model.getData(selectionModel); - //TODO fire vcs action on given data - log.info("action:" + action + ", message:" + commitMessage + ", nb files:" + data.length); - } - -} \ No newline at end of file Deleted: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractDiffUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractDiffUIHandler.java 2008-04-03 17:04:28 UTC (rev 309) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractDiffUIHandler.java 2008-04-03 17:12:00 UTC (rev 310) @@ -1,59 +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.VCSFileState; -import org.codelutin.vcs.ui.model.DiffUIModel; -import org.codelutin.vcs.ui.model.SimpleVCSFileStatesModel; - -import java.beans.PropertyChangeEvent; - -/** @author chemit */ -public abstract class AbstractDiffUIHandler extends AbstractUIHandler<DiffUIModel> { - - public void propertyChange(PropertyChangeEvent evt) { - //if (log.isDebugEnabled()) { - log.info(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); - //} - String action = evt.getPropertyName(); - - if (DiffUIModel.TAB_PROPERTY_CHANGED.equals(action)) { - doSelectTab((SimpleVCSFileStatesModel) evt.getNewValue()); - } else { - if (DiffUIModel.FILE_PROPERTY_CHANGED.equals(action)) { - doSelectFile((VCSFileState) evt.getNewValue()); - } else { - try { - VCSAction vcsAction = VCSAction.valueOf(action.toUpperCase()); - doAction(vcsAction, (VCSFileState) evt.getNewValue()); - } catch (IllegalArgumentException e) { - // ignore ite - } - } - } - } - - public abstract void doSelectTab(SimpleVCSFileStatesModel action); - - public abstract void doSelectFile(VCSFileState model); - - public abstract void doAction(VCSAction action, VCSFileState model); - - public abstract void gotoNextDiff(); - - public abstract void gotoPreviousDiff(); - -} \ No newline at end of file Deleted: 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-03 17:04:28 UTC (rev 309) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSAbsractAction.java 2008-04-03 17:12:00 UTC (rev 310) @@ -1,42 +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.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.vcs.VCSAction; -import org.codelutin.vcs.VCSHandler; - -import javax.swing.AbstractAction; - -/** @author chemit */ -public abstract class VCSAbsractAction extends AbstractAction { - - 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) { - this.handler = handler; - } - - public void setAction(VCSAction action) { - this.action = action; - } -} Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler (from rev 308, trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action) Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractConfirmUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractConfirmUIHandler.java 2008-04-03 17:04:04 UTC (rev 308) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractConfirmUIHandler.java 2008-04-03 17:12:00 UTC (rev 310) @@ -12,7 +12,7 @@ * - Suite 330, Boston, MA 02111-1307, USA. * # #% */ -package org.codelutin.vcs.ui.action; +package org.codelutin.vcs.ui.handler; import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractDiffUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractDiffUIHandler.java 2008-04-03 17:04:04 UTC (rev 308) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractDiffUIHandler.java 2008-04-03 17:12:00 UTC (rev 310) @@ -12,7 +12,7 @@ * - Suite 330, Boston, MA 02111-1307, USA. * # #% */ -package org.codelutin.vcs.ui.action; +package org.codelutin.vcs.ui.handler; import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractSynchUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractSynchUIHandler.java 2008-04-03 17:04:04 UTC (rev 308) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractSynchUIHandler.java 2008-04-03 17:12:00 UTC (rev 310) @@ -12,7 +12,7 @@ * - Suite 330, Boston, MA 02111-1307, USA. * # #% */ -package org.codelutin.vcs.ui.action; +package org.codelutin.vcs.ui.handler; import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.ui.model.SimpleVCSFileStatesModel; Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/AbstractUIHandler.java 2008-04-03 17:04:04 UTC (rev 308) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractUIHandler.java 2008-04-03 17:12:00 UTC (rev 310) @@ -12,7 +12,7 @@ * - Suite 330, Boston, MA 02111-1307, USA. * # #% */ -package org.codelutin.vcs.ui.action; +package org.codelutin.vcs.ui.handler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/VCSAbsractAction.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/action/VCSAbsractAction.java 2008-04-03 17:04:04 UTC (rev 308) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/VCSAbsractAction.java 2008-04-03 17:12:00 UTC (rev 310) @@ -12,7 +12,7 @@ * - Suite 330, Boston, MA 02111-1307, USA. * # #% */ -package org.codelutin.vcs.ui.action; +package org.codelutin.vcs.ui.handler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

[Buix-commits] r309 - trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org 03 Apr '08

03 Apr '08

Author: tchemit Date: 2008-04-03 17:04:28 +0000 (Thu, 03 Apr 2008) New Revision: 309 Removed: trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/action/ Log: uis

1 0

[Buix-commits] r308 - trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 03 Apr '08

03 Apr '08

Author: tchemit Date: 2008-04-03 17:04:04 +0000 (Thu, 03 Apr 2008) New Revision: 308 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: uis 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-03 17:02:06 UTC (rev 307) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-en_GB.properties 2008-04-03 17:04:04 UTC (rev 308) @@ -1,3 +1,4 @@ +lutinvcs.accept=Accept lutinvcs.action.commit=commit lutinvcs.action.delete=delete lutinvcs.action.diff=show diff @@ -2,9 +3,12 @@ lutinvcs.action.refresh=refresh -lutinvcs.action.revert=revert selected files +lutinvcs.action.revert=revert 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.diff=show diff of selected files lutinvcs.action.tooltip.diffAll=show diff of all files +lutinvcs.action.tooltip.lastMessages= +lutinvcs.action.tooltip.nextDiff=next diff +lutinvcs.action.tooltip.previousDiff=previous diff lutinvcs.action.tooltip.refresh=refresh selected files @@ -16,9 +20,15 @@ lutinvcs.action.tooltip.update=update selected files lutinvcs.action.tooltip.updateAll=update all files lutinvcs.action.update=update -lutinvcs.quit=Quit +lutinvcs.commit.message=Please fill a message for your commit +lutinvcs.confirm.message=Message TODO +lutinvcs.confirm.title=Confirm UI +lutinvcs.diff.title=Diff UI lutinvcs.synch.title=Synch lutinvcs.tabs.all=all +lutinvcs.tabs.diff.tooltip.all=both local and remote modifed files +lutinvcs.tabs.diff.tooltip.local=only local modified files +lutinvcs.tabs.diff.tooltip.remote=only remote modified files lutinvcs.tabs.local=local lutinvcs.tabs.remote=remote lutinvcs.tabs.tooltip.all=Show all files (local and remote) 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-03 17:02:06 UTC (rev 307) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/resources/i18n/lutinvcs-ui-jaxx-fr_FR.properties 2008-04-03 17:04:04 UTC (rev 308) @@ -1,3 +1,4 @@ +lutinvcs.accept=Accepter lutinvcs.action.commit=committer lutinvcs.action.delete=supprimer lutinvcs.action.diff=voir les diff @@ -7,18 +8,27 @@ 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.diff=voir tous les 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.lastMessages= +lutinvcs.action.tooltip.nextDiff=voir la prochaine diff\u00E9rence +lutinvcs.action.tooltip.previousDiff=voir la diff\u00E9rence pr\u00E9c\u00E9dente +lutinvcs.action.tooltip.refresh=rafra\u00EEchir tous les fichiers s\u00E9lectionn\u00E9s 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=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=mettre \u00E0 jour -lutinvcs.quit=Quitter +lutinvcs.commit.message=Renseigner le message de commit +lutinvcs.confirm.message=Message TODO +lutinvcs.confirm.title=Confirm UI +lutinvcs.diff.title=Diff UI lutinvcs.synch.title=Synchronisation lutinvcs.tabs.all=all +lutinvcs.tabs.diff.tooltip.all=voir tous les fichiers modifi\u00E9s +lutinvcs.tabs.diff.tooltip.local=voir les fichiers locaux modifi\u00E9es +lutinvcs.tabs.diff.tooltip.remote=voir les fichiers distants modifi\u00E9s lutinvcs.tabs.local=local lutinvcs.tabs.remote=remote lutinvcs.tabs.tooltip.all=voir tous les fichiers modifi\u00E9s localement ou \u00E0 distance

1 0