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

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

April 3, 2008

Author: tchemit Date: 2008-04-03 21:53:38 +0000 (Thu, 03 Apr 2008) New Revision: 323 Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/AbstractUI.java Log: abstract dialog ui Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/AbstractUI.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/AbstractUI.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/AbstractUI.java 2008-04-03 21:53:38 UTC (rev 323) @@ -0,0 +1,51 @@ +/** + * # #% 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.ui.handler.AbstractUIHandler; +import org.codelutin.vcs.ui.model.AbstractUIModel; + +/** @author chemit */ +public class AbstractUI extends javax.swing.JDialog { + + protected final AbstractUIModel model; + + protected final AbstractUIHandler handler; + + public AbstractUI() { + // Jaxx always generate the default constructor, so need it, but DO NOT USE IT! + throw new IllegalStateException("the default constructor can NOT be used!"); + } + + public AbstractUI(AbstractUIHandler handler, AbstractUIModel model) { + this.handler = handler; + this.model = model; + UIHelper.setQuitAction(this); + } + + public AbstractUI getUi() { + return this; + } + + public AbstractUIModel getModel() { + return model; + } + + protected AbstractUIHandler getHandler() { + return handler; + } + + +}

1 0

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

April 3, 2008

Author: tchemit Date: 2008-04-03 21:53:22 +0000 (Thu, 03 Apr 2008) New Revision: 322 Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/UIHelper.java Log: UIHelper (should put inside a method to compute table size) Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/UIHelper.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/UIHelper.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/UIHelper.java 2008-04-03 21:53:22 UTC (rev 322) @@ -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; + +import javax.swing.JDialog; +import javax.swing.JRootPane; +import javax.swing.Action; +import javax.swing.AbstractAction; +import javax.swing.JComponent; +import javax.swing.KeyStroke; +import java.awt.event.ActionEvent; + +/** + * UI Helper methods + * + * @author chemit + */ +public class UIHelper { + public static void setQuitAction(final JDialog ui) { + JRootPane rootPane = ui.getRootPane(); + //rootPane.setDefaultButton(accept); + + Action quitAction = new AbstractAction("quit") { + private static final long serialVersionUID = -869095664995763057L; + + public void actionPerformed(ActionEvent e) { + ui.dispose(); + } + }; + rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "quit"); + rootPane.getActionMap().put("quit", quitAction); + } +}

1 0

r321 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs
by tchemit＠users.labs.libre-entreprise.org April 3, 2008

April 3, 2008

Author: tchemit Date: 2008-04-03 21:51:50 +0000 (Thu, 03 Apr 2008) New Revision: 321 Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSActionManager.java Log: VCSActionManager Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSActionManager.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSActionManager.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSActionManager.java 2008-04-03 21:51:50 UTC (rev 321) @@ -0,0 +1,157 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import static org.codelutin.i18n.I18n._; + +import java.util.Date; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.PriorityBlockingQueue; + +/** + * Manager used to fired vcs actions + * <p/> + * use a {@link org.codelutin.vcs.VCSActionManager.VCSActionThread}. + * + * @author chemit + */ +public class VCSActionManager { + + /** vcs actions runner thread */ + protected VCSActionThread thread; + + /** queue */ + protected PriorityBlockingQueue<QueueItem> queue; + + public boolean add(VCSAction action, VCSFileState[] states) { + QueueItem queueItem = new QueueItem(action, states); + return queue.add(queueItem); + } + + public VCSActionManager(VCSHandler handler) { + queue = new PriorityBlockingQueue<QueueItem>(1024); + thread = new VCSActionThread(handler, queue); + thread.start(); + } + + + /** @author chemit */ + public static class VCSActionThread extends Thread implements VCSHandlerEventListener { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(VCSActionThread.class); + + /** queue */ + protected BlockingQueue<QueueItem> queue; + + /** handler to use for vcs operations */ + protected VCSHandler handler; + + public VCSActionThread(VCSHandler handler, BlockingQueue<QueueItem> queue) { + super("VCSAction Thread [" + handler + "]"); + this.handler = handler; + this.queue = queue; + this.handler.addVCSHandlerEventListener(this); + } + + @Override + public void run() { + log.info("Start " + getName() + " at " + new Date()); + boolean run = true; + QueueItem item = null; + try { + while (run) { + // item qui sert a faire la simulation courante + + log.info("waiting for action..."); + item = queue.take(); + if (item.getAction() == null) { + // this is a special case to stop thread + run = false; + continue; + } + log.info("Just take " + item); + } + } + catch (Throwable eee) { + if (log.isWarnEnabled()) { + log.warn(_("lutinvcs.error.thread.action", item), eee); + } + } + log.info("Stop " + getName() + " at " + new Date()); + } + + + public void init(VCSHandlerEvent event) { + } + + public void open(VCSHandlerEvent event) { + } + + public void close(VCSHandlerEvent event) { + + handler.removeVCSHandlerEventListener(this); + if (!queue.isEmpty()) { + queue.clear(); + } + queue.add(new QueueItem(null, new VCSFileState[0])); + } + } + + public static class QueueItem implements Comparable<QueueItem> { + + protected long time; + protected VCSFileState[] states; + protected VCSAction action; + + + public QueueItem(VCSAction action, VCSFileState[] states) { + this.time = System.nanoTime(); + this.states = states; + this.action = action; + } + + public VCSAction getAction() { + return action; + } + + public VCSFileState[] getStates() { + return states; + } + + @Override + public boolean equals(Object o) { + return this == o || o instanceof QueueItem && time == ((QueueItem) o).time; + } + + @Override + public int hashCode() { + return (int) (time ^ (time >>> 32)); + } + + @Override + public String toString() { + return super.toString() + ", time:" + time + ", action:" + action + ", size:" + (states == null ? 0 : states.length); + } + + public int compareTo(QueueItem o) { + return time == o.time ? 0 : time > o.time ? 1 : -1; + } + } + + +}

1 0

r320 - trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs
by tchemit＠users.labs.libre-entreprise.org April 3, 2008

April 3, 2008

Author: tchemit Date: 2008-04-03 21:51:16 +0000 (Thu, 03 Apr 2008) New Revision: 320 Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/AbstractVCSHandler.java Log: add VCSHandlerEvent to manage life cycle of an handler (init - open - close) Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/AbstractVCSHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/AbstractVCSHandler.java 2008-04-03 21:50:11 UTC (rev 319) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/AbstractVCSHandler.java 2008-04-03 21:51:16 UTC (rev 320) @@ -22,6 +22,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; +import org.codelutin.util.ListenerSet; +import org.codelutin.vcs.VCSHandlerEvent.Type; import java.io.File; import java.io.FileFilter; @@ -51,6 +53,8 @@ protected final String confLocalEntriesFilename; protected final VCSConfig config; + protected ListenerSet<VCSHandlerEventListener> listeners = new ListenerSet<VCSHandlerEventListener>(); + protected AbstractVCSHandler(VCSConfig config, final String vCSConfLocalDirName, String vCSConfLocalEntriesFilename) { this.config = config; this.confLocalDirName = vCSConfLocalDirName; @@ -65,6 +69,7 @@ return dir.isFile() || (!vCSConfLocalDirName.equals(dir.getName()) && !"CVS".equals(dir.getName())); } }; + fireInit(); } public VCSConfig getConfig() { @@ -112,6 +117,49 @@ return result; } + public void addVCSHandlerEventListener(VCSHandlerEventListener l) { + listeners.add(l); + } + + public void removeVCSHandlerEventListener(VCSHandlerEventListener l) { + listeners.remove(l); + } + + public void open() { + fireOpen(); + } + + public void close() { + fireClose(); + } + + protected void fireInit() { + VCSHandlerEvent e = new VCSHandlerEvent(this, Type.INIT); + for (VCSHandlerEventListener l : listeners) { + l.init(e); + } + } + + protected void fireOpen() { + VCSHandlerEvent e = new VCSHandlerEvent(this, Type.OPEN); + for (VCSHandlerEventListener l : listeners) { + l.open(e); + } + } + + protected void fireClose() { + VCSHandlerEvent e = new VCSHandlerEvent(this, Type.CLOSE); + for (VCSHandlerEventListener l : listeners) { + l.close(e); + } + } + + @Override + protected void finalize() throws Throwable { + super.finalize(); + close(); + } + protected void getFiles0(File directory, List<String> result, String prefix) { //TODO put the hardcored value in a property!!! if (directory.getName().equals("data")) return;

1 0

r319 - trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs
by tchemit＠users.labs.libre-entreprise.org April 3, 2008

April 3, 2008

Author: tchemit Date: 2008-04-03 21:50:11 +0000 (Thu, 03 Apr 2008) New Revision: 319 Added: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandlerEvent.java trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandlerEventListener.java Modified: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandler.java Log: add VCSHandlerEvent to manage life cycle of an handler (init - open - close) Modified: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandler.java 2008-04-03 17:20:14 UTC (rev 318) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandler.java 2008-04-03 21:50:11 UTC (rev 319) @@ -315,4 +315,12 @@ void testConnection() throws VCSException; boolean hasProtocoleChanged() throws VCSException; + + void addVCSHandlerEventListener(VCSHandlerEventListener l); + + void removeVCSHandlerEventListener(VCSHandlerEventListener l); + + void open(); + + void close(); } \ No newline at end of file Added: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandlerEvent.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandlerEvent.java (rev 0) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandlerEvent.java 2008-04-03 21:50:11 UTC (rev 319) @@ -0,0 +1,51 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs; + +import java.util.EventObject; + +/** + * Events to be used while {@link VCSHandler} life cycle. + * + * @author chemit + * @see VCSHandlerEventListener + * @see VCSHandler + */ +public class VCSHandlerEvent extends EventObject { + + private static final long serialVersionUID = 1L; + + protected Type type; + + public enum Type { + INIT, OPEN, CLOSE + } + + /** + * Constructs a prototypical Event. + * + * @param source The object on which the Event initially occurred. + * @param type type of event + * @throws IllegalArgumentException if source is null. + */ + public VCSHandlerEvent(Object source, Type type) { + super(source); + this.type = type; + } + + public Type getType() { + return type; + } +} Added: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandlerEventListener.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandlerEventListener.java (rev 0) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandlerEventListener.java 2008-04-03 21:50:11 UTC (rev 319) @@ -0,0 +1,47 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.vcs; + +import java.util.EventListener; + +/** + * A listener on {@link org.codelutin.vcs.VCSHandler} + * + * @author chemit + */ +public interface VCSHandlerEventListener extends EventListener { + + /** + * call when vcs handler was successfull init + * + * @param event current event + */ + public void init(VCSHandlerEvent event); + + /** + * call when vcs handler was successfull open + * + * @param event current event + */ + public void open(VCSHandlerEvent event); + + /** + * call when vcs handler was closed + * + * @param event current event + */ + public void close(VCSHandlerEvent event); + +} \ No newline at end of file

1 0

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

April 3, 2008

Author: tchemit Date: 2008-04-03 17:20:14 +0000 (Thu, 03 Apr 2008) New Revision: 318 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/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/model/ConfirmUIModel.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java Log: all ui constants in VCSUIConstants 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:30 UTC (rev 317) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java 2008-04-03 17:20:14 UTC (rev 318) @@ -44,4 +44,33 @@ /** model name for diff remote tab ui */ public static final String DIFF_REMOTE_MODEL_PROPERTY = "modelDiffRemote"; + /** la propri�t� pour indiquer un changement de racine d'arbre */ + public static final String ACTION_PROPERTY_CHANGED = "action"; + + /** property to indicate change file (display a new DiffPanelUI) */ + public static final String FILE_PROPERTY_CHANGED = "file"; + + public static final String NEXT_DIFF_PROPERTY_CHANGED = "nextDiff"; + + public static final String PREVIOUS_DIFF_PROPERTY_CHANGED = "previousDiff"; + + public static final String REFRESH_PROPERTY_CHANGED = "refresh"; + + public static final String TAB_PROPERTY_CHANGED = "tab"; + + public static final String DIFF_ALL_PROPERTY_CHANGED = "diffAll"; + + public static final String COMMIT_ALL_PROPERTY_CHANGED = "commitAll"; + + public static final String UPDATE_ALL_PROPERTY_CHANGED = "updateAll"; + + public static final String REVERT_ALL_PROPERTY_CHANGED = "revertAll"; + + public static final String DIFF_PROPERTY_CHANGED = "diff"; + + public static final String COMMIT_PROPERTY_CHANGED = "commit"; + + public static final String UPDATE_PROPERTY_CHANGED = "update"; + + public static final String REVERT_PROPERTY_CHANGED = "revert"; } 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/AbstractConfirmUIHandler.java 2008-04-03 17:15:30 UTC (rev 317) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractConfirmUIHandler.java 2008-04-03 17:20:14 UTC (rev 318) @@ -18,6 +18,7 @@ import org.codelutin.vcs.VCSFileState; import org.codelutin.vcs.ui.model.AbstractVCSFileStatesModel; import org.codelutin.vcs.ui.model.ConfirmUIModel; +import org.codelutin.vcs.ui.VCSUIConstants; import javax.swing.ListSelectionModel; import java.beans.PropertyChangeEvent; @@ -33,7 +34,7 @@ //} String action = evt.getPropertyName(); - if (ConfirmUIModel.ACTION_PROPERTY_CHANGED.equals(action)) { + if (VCSUIConstants.ACTION_PROPERTY_CHANGED.equals(action)) { updateUI(); return; } 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/handler/AbstractDiffUIHandler.java 2008-04-03 17:15:30 UTC (rev 317) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractDiffUIHandler.java 2008-04-03 17:20:14 UTC (rev 318) @@ -18,6 +18,7 @@ import org.codelutin.vcs.VCSFileState; import org.codelutin.vcs.ui.model.DiffUIModel; import org.codelutin.vcs.ui.model.SimpleVCSFileStatesModel; +import org.codelutin.vcs.ui.VCSUIConstants; import java.beans.PropertyChangeEvent; @@ -30,10 +31,10 @@ //} String action = evt.getPropertyName(); - if (DiffUIModel.TAB_PROPERTY_CHANGED.equals(action)) { + if (VCSUIConstants.TAB_PROPERTY_CHANGED.equals(action)) { doSelectTab((SimpleVCSFileStatesModel) evt.getNewValue()); } else { - if (DiffUIModel.FILE_PROPERTY_CHANGED.equals(action)) { + if (VCSUIConstants.FILE_PROPERTY_CHANGED.equals(action)) { doSelectFile((VCSFileState) evt.getNewValue()); } else { try { 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/handler/AbstractSynchUIHandler.java 2008-04-03 17:15:30 UTC (rev 317) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractSynchUIHandler.java 2008-04-03 17:20:14 UTC (rev 318) @@ -17,6 +17,7 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.ui.model.SimpleVCSFileStatesModel; import org.codelutin.vcs.ui.model.SynchUIModel; +import org.codelutin.vcs.ui.VCSUIConstants; import java.beans.PropertyChangeEvent; @@ -29,7 +30,7 @@ //} String action = evt.getPropertyName(); SimpleVCSFileStatesModel model = (SimpleVCSFileStatesModel) evt.getNewValue(); - if (SynchUIModel.TAB_PROPERTY_CHANGED.equals(action)) { + if (VCSUIConstants.TAB_PROPERTY_CHANGED.equals(action)) { doSelectTabAction(model); } else if (action.endsWith("All")) { try { Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java 2008-04-03 17:15:30 UTC (rev 317) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java 2008-04-03 17:20:14 UTC (rev 318) @@ -17,6 +17,7 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; import org.codelutin.vcs.VCSHandler; +import org.codelutin.vcs.ui.VCSUIConstants; import java.net.URL; import java.util.ArrayList; @@ -29,10 +30,6 @@ */ public class ConfirmUIModel extends AbstractUIModel { - - /** la propri�t� pour indiquer un changement de racine d'arbre */ - public static final String ACTION_PROPERTY_CHANGED = "tab"; - /** local root : wroking copy */ protected URL localRoot; @@ -95,7 +92,7 @@ public void setAction(VCSAction action) { VCSAction oldAction = this.action; this.action = action; - firePropertyChange(ACTION_PROPERTY_CHANGED, oldAction, action); + firePropertyChange(VCSUIConstants.ACTION_PROPERTY_CHANGED, oldAction, action); } public VCSAction getAction() { Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java 2008-04-03 17:15:30 UTC (rev 317) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java 2008-04-03 17:20:14 UTC (rev 318) @@ -20,6 +20,7 @@ import static org.codelutin.vcs.ui.VCSUIConstants.SYNCH_ALL_MODEL_PROPERTY; import static org.codelutin.vcs.ui.VCSUIConstants.SYNCH_LOCAL_MODEL_PROPERTY; import static org.codelutin.vcs.ui.VCSUIConstants.SYNCH_REMOTE_MODEL_PROPERTY; +import org.codelutin.vcs.ui.VCSUIConstants; import java.net.URL; import java.util.ArrayList; @@ -32,24 +33,6 @@ */ public class DiffUIModel extends AbstractUIModel { - /** property to indicate change tab */ - public static final String TAB_PROPERTY_CHANGED = "tab"; - - /** property to indicate change file (display a new DiffPanelUI) */ - public static final String FILE_PROPERTY_CHANGED = "file"; - - public static final String NEXT_DIFF_PROPERTY_CHANGED = "nextDiff"; - - public static final String PREVIOUS_DIFF_PROPERTY_CHANGED = "previousDiff"; - - public static final String REFRESH_PROPERTY_CHANGED = "refresh"; - - public static final String COMMIT_PROPERTY_CHANGED = "commit"; - - public static final String UPDATE_PROPERTY_CHANGED = "update"; - - public static final String REVERT_PROPERTY_CHANGED = "revert"; - /** local root : wroking copy */ protected URL leftRoot; @@ -84,13 +67,13 @@ public void setTabModel(AbstractVCSFileStatesModel tabModel) { AbstractVCSFileStatesModel oldTabModel = this.tabModel; this.tabModel = tabModel; - firePropertyChange(TAB_PROPERTY_CHANGED, oldTabModel, tabModel); + firePropertyChange(VCSUIConstants.TAB_PROPERTY_CHANGED, oldTabModel, tabModel); } public void setFileModel(VCSFileState fileModel) { VCSFileState oldFileModel = this.fileModel; this.fileModel = fileModel; - firePropertyChange(TAB_PROPERTY_CHANGED, oldFileModel, tabModel); + firePropertyChange(VCSUIConstants.TAB_PROPERTY_CHANGED, oldFileModel, tabModel); } public AbstractVCSFileStatesModel getTabModel(String tabModel) { 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-03 17:15:30 UTC (rev 317) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-04-03 17:20:14 UTC (rev 318) @@ -20,6 +20,7 @@ import static org.codelutin.vcs.ui.VCSUIConstants.SYNCH_ALL_MODEL_PROPERTY; import static org.codelutin.vcs.ui.VCSUIConstants.SYNCH_LOCAL_MODEL_PROPERTY; import static org.codelutin.vcs.ui.VCSUIConstants.SYNCH_REMOTE_MODEL_PROPERTY; +import org.codelutin.vcs.ui.VCSUIConstants; import java.io.File; import java.net.URL; @@ -33,25 +34,6 @@ */ public class SynchUIModel extends AbstractUIModel { - /** la propri�t� pour indiquer un changement de racine d'arbre */ - public static final String TAB_PROPERTY_CHANGED = "tab"; - - public static final String DIFF_ALL_PROPERTY_CHANGED = "diffAll"; - - public static final String COMMIT_ALL_PROPERTY_CHANGED = "commitAll"; - - public static final String UPDATE_ALL_PROPERTY_CHANGED = "updateAll"; - - public static final String REVERT_ALL_PROPERTY_CHANGED = "revertAll"; - - public static final String DIFF_PROPERTY_CHANGED = "diff"; - - public static final String COMMIT_PROPERTY_CHANGED = "commit"; - - public static final String UPDATE_PROPERTY_CHANGED = "update"; - - public static final String REVERT_PROPERTY_CHANGED = "revert"; - /** local root : wroking copy */ protected File localRoot; @@ -87,7 +69,7 @@ public void setTabModel(AbstractVCSFileStatesModel tabModel) { AbstractVCSFileStatesModel oldTabModel = this.tabModel; this.tabModel = tabModel; - firePropertyChange(TAB_PROPERTY_CHANGED, oldTabModel, tabModel); + firePropertyChange(VCSUIConstants.TAB_PROPERTY_CHANGED, oldTabModel, tabModel); } public AbstractVCSFileStatesModel getTabModel(String tabModel) {

1 0

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

April 3, 2008

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

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

April 3, 2008

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

r315 - trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org April 3, 2008

April 3, 2008

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

r314 - trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org April 3, 2008

April 3, 2008

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