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

r333 - in trunk/lutinvcs: lutinvcs-api/src/main/java/org/codelutin/vcs lutinvcs-core/src/main/java/org/codelutin/vcs
by tchemit＠users.labs.libre-entreprise.org 04 Apr '08

04 Apr '08

Author: tchemit Date: 2008-04-04 19:18:38 +0000 (Fri, 04 Apr 2008) New Revision: 333 Added: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/AbstractVCSHandler.java Removed: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/AbstractVCSHandler.java Modified: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandlerProvider.java Log: move AbstractVCSHandler to api module, in thaht way provider modules only depends on api module :) Copied: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/AbstractVCSHandler.java (from rev 331, trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/AbstractVCSHandler.java) =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/AbstractVCSHandler.java (rev 0) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/AbstractVCSHandler.java 2008-04-04 19:18:38 UTC (rev 333) @@ -0,0 +1,182 @@ +/* *##% +* 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; + +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; +import java.io.FilenameFilter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * abstract VCSHandler base with usefull methods that does not need vcs specific code. + * + * @author chemit + */ +public abstract class AbstractVCSHandler implements VCSHandler { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static protected final Log log = LogFactory.getLog(AbstractVCSHandler.class); + + /** + * FilenameFilter to detect all files in a vcs working copy all files and directories that must be handled by vcs + * + * @see org.codelutin.vcs.VCSHandler#getVersionnableFilenameFilter() + */ + protected final FilenameFilter versionnableFilenameFilter; + protected final FileFilter versionnableFileFilter; + protected final String confLocalDirName; + 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; + this.confLocalEntriesFilename = vCSConfLocalEntriesFilename; + this.versionnableFilenameFilter = new FilenameFilter() { + public boolean accept(File dir, String name) { + return !vCSConfLocalDirName.equals(name) && !"CVS".equals(name); + } + }; + this.versionnableFileFilter = new FileFilter() { + public boolean accept(File dir) { + return dir.isFile() || (!vCSConfLocalDirName.equals(dir.getName()) && !"CVS".equals(dir.getName())); + } + }; + fireInit(); + } + + public VCSConfig getConfig() { + return config; + } + + public File getLocalDatabasePath() { + return config.getLocalDatabasePath(); + } + + public void deleteWorkingCopy() { + if (getLocalDatabasePath().exists()) { + FileUtil.deleteRecursively(getLocalDatabasePath()); + getLocalDatabasePath().delete(); + } + } + + public FilenameFilter getVersionnableFilenameFilter() { + return versionnableFilenameFilter; + } + + public FileFilter getVersionnableFileFilter() { + return versionnableFileFilter; + } + + public String getConfLocalDirname() { + return confLocalDirName; + } + + public String getConfLocalEntriesFilename() { + return confLocalEntriesFilename; + } + + public boolean isVersionnableFile(File file) { + assertFileExists(file, "file is empty or non existant"); + return !confLocalDirName.equalsIgnoreCase(file.getName()); + } + + public List<String> getLocalStorageNames(File directory) { + List<String> result = new ArrayList<String>(); + if (directory.exists()) { + getFiles0(directory, result, ""); + } + Collections.sort(result); + 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; + final String[] strings = directory.list(versionnableFilenameFilter); + boolean first = prefix.equals(""); + final String newPrefix = (first ? "" : prefix + File.separator); + + for (String filename : strings) { + final File dir = new File(directory, filename); + if (dir.isDirectory()) + getFiles0(dir, result, newPrefix + dir.getName()); + else result.add(newPrefix + dir.getName()); + } + } + + protected void assertFileExists(File file, String msg) { + if (file == null || !file.exists()) + throw new VCSRuntimeException(msg + " (file passed : [" + file + "])"); + } +} Modified: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandlerProvider.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandlerProvider.java 2008-04-04 18:14:16 UTC (rev 332) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandlerProvider.java 2008-04-04 19:18:38 UTC (rev 333) @@ -15,13 +15,13 @@ package org.codelutin.vcs; /** - * Provider de VCSHandler + * The contract to be realized to provide a {@link VCSHandler}. * * @author chemit */ public interface VCSHandlerProvider<H extends VCSHandler> { - /** @return the name defining the vcs provider (eg SVN, CVS) */ + /** @return the identifier of the vcs provider (eg SVN, CVS, MOCK) */ String getName(); /** Deleted: 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-04 18:14:16 UTC (rev 332) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/AbstractVCSHandler.java 2008-04-04 19:18:38 UTC (rev 333) @@ -1,182 +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; - -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; -import java.io.FilenameFilter; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** - * abstract VCSHandler base with usefull methods that does not need vcs specific code. - * - * @author chemit - */ -public abstract class AbstractVCSHandler implements VCSHandler { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static protected final Log log = LogFactory.getLog(AbstractVCSHandler.class); - - /** - * FilenameFilter to detect all files in a vcs working copy all files and directories that must be handled by vcs - * - * @see org.codelutin.vcs.VCSHandler#getVersionnableFilenameFilter() - */ - protected final FilenameFilter versionnableFilenameFilter; - protected final FileFilter versionnableFileFilter; - protected final String confLocalDirName; - 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; - this.confLocalEntriesFilename = vCSConfLocalEntriesFilename; - this.versionnableFilenameFilter = new FilenameFilter() { - public boolean accept(File dir, String name) { - return !vCSConfLocalDirName.equals(name) && !"CVS".equals(name); - } - }; - this.versionnableFileFilter = new FileFilter() { - public boolean accept(File dir) { - return dir.isFile() || (!vCSConfLocalDirName.equals(dir.getName()) && !"CVS".equals(dir.getName())); - } - }; - fireInit(); - } - - public VCSConfig getConfig() { - return config; - } - - public File getLocalDatabasePath() { - return config.getLocalDatabasePath(); - } - - public void deleteWorkingCopy() { - if (getLocalDatabasePath().exists()) { - FileUtil.deleteRecursively(getLocalDatabasePath()); - getLocalDatabasePath().delete(); - } - } - - public FilenameFilter getVersionnableFilenameFilter() { - return versionnableFilenameFilter; - } - - public FileFilter getVersionnableFileFilter() { - return versionnableFileFilter; - } - - public String getConfLocalDirname() { - return confLocalDirName; - } - - public String getConfLocalEntriesFilename() { - return confLocalEntriesFilename; - } - - public boolean isVersionnableFile(File file) { - assertFileExists(file, "file is empty or non existant"); - return !confLocalDirName.equalsIgnoreCase(file.getName()); - } - - public List<String> getLocalStorageNames(File directory) { - List<String> result = new ArrayList<String>(); - if (directory.exists()) { - getFiles0(directory, result, ""); - } - Collections.sort(result); - 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; - final String[] strings = directory.list(versionnableFilenameFilter); - boolean first = prefix.equals(""); - final String newPrefix = (first ? "" : prefix + File.separator); - - for (String filename : strings) { - final File dir = new File(directory, filename); - if (dir.isDirectory()) - getFiles0(dir, result, newPrefix + dir.getName()); - else result.add(newPrefix + dir.getName()); - } - } - - protected void assertFileExists(File file, String msg) { - if (file == null || !file.exists()) - throw new VCSRuntimeException(msg + " (file passed : [" + file + "])"); - } -}

1 0

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

04 Apr '08

Author: tchemit Date: 2008-04-04 18:14:16 +0000 (Fri, 04 Apr 2008) New Revision: 332 Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java Log: always fire changed action 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 22:23:44 UTC (rev 331) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java 2008-04-04 18:14:16 UTC (rev 332) @@ -58,9 +58,9 @@ } public void setAction(VCSAction action) { - VCSAction oldAction = this.action; this.action = action; - firePropertyChange(ACTION_PROPERTY_CHANGED, oldAction, action); + // never propagate old action, since need always the property changed + firePropertyChange(ACTION_PROPERTY_CHANGED, null, action); } public void addCommitMessage(String commitMessage) {

1 0

r331 - 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 22:23:44 +0000 (Thu, 03 Apr 2008) New Revision: 331 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/JSynchUI.jaxx Log: use AbstractUI 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 22:23:09 UTC (rev 330) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JConfirmUI.jaxx 2008-04-03 22:23:44 UTC (rev 331) @@ -1,74 +1,71 @@ -<JDialog title='lutinvcs.confirm.title' id='ui' defaultCloseOperation='DISPOSE_ON_CLOSE' modal='true'> +<org.codelutin.vcs.ui.AbstractUI title='lutinvcs.confirm.title' defaultCloseOperation='DISPOSE_ON_CLOSE' modal='true'> <style source="common.css"/> <script> - import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.ui.handler.AbstractConfirmUIHandler; + import org.codelutin.vcs.ui.model.ConfirmUIModel ; - protected AbstractConfirmUIHandler handler; - public JConfirmUI(AbstractConfirmUIHandler handler) { - this.handler =handler; - JRootPane rootPane = ui.getRootPane(); - //rootPane.setDefaultButton(accept); + super(handler,new ConfirmUIModel()); - Action quitAction = new AbstractAction("cancel") { - private static final long serialVersionUID = -869095664995763057L; - public void actionPerformed(ActionEvent e) { - ui.dispose(); - } - }; - Action acceptAction= new AbstractAction("accept") { private static final long serialVersionUID = -869095664995763055L; public void actionPerformed(ActionEvent e) { - model.doAction(commitMessage.getText()); + getHandler().doAction(getCommitMessage().getText(),getModel().getModel()); } }; - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"),"quit"); - rootPane.getActionMap().put("quit", quitAction); accept.setAction((acceptAction)); } protected AbstractConfirmUIHandler getHandler() { - return handler; + return (AbstractConfirmUIHandler) super.getHandler(); } + public ConfirmUIModel getModel() { + return (ConfirmUIModel) super.getModel(); + } + protected void showLastMessages() { } </script> - <org.codelutin.vcs.ui.model.ConfirmUIModel id="model"/> - - <Table> <row fill='both'> <cell fill='both'> <JLabel id="actionLabel" text="lutinvcs.confirm.message"/> </cell> </row> - <row fill='both'> <cell fill='both' weightx='1'> <Table id="toolbar" fill='both'> <row> - <cell fill='both'> - <JLabel id="actionCommitLabel" text="lutinvcs.commit.message"/> + <cell> + <JToolBar id='tool'> + <Table fill='both' insets='0,0,0,0'> + <row> + <cell fill='both'> + <JLabel id="actionCommitLabel" text="lutinvcs.commit.message"/> + </cell> + <cell fill='both' weightx="1"> + <JLabel/> + </cell> + <cell anchor='east'> + <JButton id='lastMessages' + toolTipText="lutinvcs.action.tooltip.lastMessages" + icon='{createImageIcon("recent_msgs.png")}' + onActionPerformed='showLastMessages()'/> + </cell> + </row> + </Table> + + </JToolBar> </cell> - <cell fill='both'> - <JLabel/> - </cell> - <cell fill='horizontal' anchor='east'> - <JButton id='lastMessages' toolTipText="lutinvcs.action.tooltip.lastMessages" - icon='{createImageIcon("recent_messages.png")}' - onActionPerformed='showLastMessages()'/> - </cell> </row> <row fill='both'> <cell fill='both' columns='3' weightx='1' weighty='1'> - <JScrollPane id="commitScroll" height='60' verticalScrollBarPolicy="20"> -  + <JScrollPane id="commitScroll" height='90' verticalScrollBarPolicy="20" + columnHeaderView="{tool}"> <JTextArea id="commitMessage" constructorParams="4,50"/> </JScrollPane> </cell> @@ -80,7 +77,7 @@ <row> <cell fill='both' weightx='1' weighty='1'> <JScrollPane id='content' styleClass='confirmScroll'> - <JTable id="contentTable" styleClass='confirmTable' model="{model.getModel()}"/> + <JTable id="contentTable" styleClass='confirmTable' model="{getModel().getModel()}"/> </JScrollPane> </cell> </row> @@ -90,4 +87,4 @@ </cell> </row> </Table> -</JDialog> +</org.codelutin.vcs.ui.AbstractUI> 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 22:23:09 UTC (rev 330) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx 2008-04-03 22:23:44 UTC (rev 331) @@ -1,12 +1,25 @@ -<JDialog title='lutinvcs.synch.title' id='ui' defaultCloseOperation='DISPOSE_ON_CLOSE'> +<org.codelutin.vcs.ui.AbstractUI title='lutinvcs.synch.title' modal="true" defaultCloseOperation='DISPOSE_ON_CLOSE'> <style source="common.css"/> <script> import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.ui.handler.AbstractSynchUIHandler; + import org.codelutin.vcs.ui.model.SynchUIModel; - protected AbstractSynchUIHandler handler; + public JSynchUI(AbstractSynchUIHandler handler) { + super(handler,new SynchUIModel()); + } + @Override + protected AbstractSynchUIHandler getHandler() { + return (AbstractSynchUIHandler) handler; + } + + @Override + public SynchUIModel getModel() { + return (SynchUIModel) super.getModel(); + } + public JTable getTable(String modelName) { return (JTable) get$objectMap().get(modelName+"Table"); } @@ -24,39 +37,16 @@ super.setVisible(b); } - public JSynchUI(AbstractSynchUIHandler handler) { - this.handler =handler; - } - - protected AbstractSynchUIHandler getHandler() { - return handler; - } - - protected void setHandler(AbstractSynchUIHandler handler) { - this.handler = handler; - } - protected void selectTab(String tabname) { - model.setTabModel(model.getModel(tabname)); + getModel().setTabModel(getModel().getModel(tabname)); } protected void doAllAction(VCSAction action) { - model.doAllAction(action); + getModel().doAllAction(action); } - - Action quitAction; - JRootPane rootPane = ui.getRootPane(); - 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); </script> - <org.codelutin.vcs.ui.model.SynchUIModel id="model"/> +  <java.awt.CardLayout id='cardLayout'/> @@ -119,28 +109,5 @@ </JPanel> </cell> </row> -  -  </Table> -</JDialog> +</org.codelutin.vcs.ui.AbstractUI>

1 0

r330 - trunk/lutinvcs/lutinvcs-ui-jaxx
by tchemit＠users.labs.libre-entreprise.org 03 Apr '08

03 Apr '08

Author: tchemit Date: 2008-04-03 22:23:09 +0000 (Thu, 03 Apr 2008) New Revision: 330 Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/pom.xml Log: clean pom Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/pom.xml =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/pom.xml 2008-04-03 22:22:26 UTC (rev 329) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/pom.xml 2008-04-03 22:23:09 UTC (rev 330) @@ -17,11 +17,6 @@ <version>0.1-SNAPSHOT</version> <description>Librairy of VCS ui generated by jaxx</description> - <properties> -  -  - </properties> - <build> <plugins> <plugin> @@ -46,7 +41,6 @@ <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>0.2-SNAPSHOT</version> <configuration> <src>${maven.src.dir}/main/uimodel</src> <out>${maven.src.dir}/main/java</out> @@ -66,7 +60,6 @@ </dependency--> <dependency> <groupId>lutinlib.vcs</groupId> -  <artifactId>lutinvcs-core</artifactId> <scope>compile</scope> <version>${current.version}</version> @@ -89,19 +82,12 @@ </plugins> </build> -  <dependencies> <dependency> <groupId>lutinlib.vcs</groupId> <artifactId>lutinvcs-core</artifactId> <scope>compile</scope> </dependency> -  -  <dependency> <groupId>lutinlib</groupId> <artifactId>jaxx</artifactId>

1 0

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

03 Apr '08

Author: tchemit Date: 2008-04-03 22:22:26 +0000 (Thu, 03 Apr 2008) New Revision: 329 Modified: trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui/UITest.java Log: close handler (to stop VCSActionThread) Modified: trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui/UITest.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui/UITest.java 2008-04-03 22:22:03 UTC (rev 328) +++ trunk/lutinvcs/lutinvcs-ui/src/test/java/org/codelutin/vcs/ui/UITest.java 2008-04-03 22:22:26 UTC (rev 329) @@ -41,9 +41,11 @@ List<VCSFileState> datas = generateListFileStates(handler, 20, "trunk", "local/", "remote/"); - JSynchUI synchUI = VCSUIFactory.newSynchUI(datas); + JSynchUI synchUI = VCSUIFactory.newSynchUI(handler, datas); synchUI.setVisible(true); + + handler.close(); } public static VCSHandler initVCS(File root) {

1 0

r328 - 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 22:22:03 +0000 (Thu, 03 Apr 2008) New Revision: 328 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: vcsHandler in UIHandler 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 22:21:13 UTC (rev 327) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/ConfirmUIHandler.java 2008-04-03 22:22:03 UTC (rev 328) @@ -15,20 +15,19 @@ package org.codelutin.vcs.ui; import org.codelutin.vcs.VCSAction; +import org.codelutin.vcs.VCSHandler; import org.codelutin.vcs.ui.handler.AbstractConfirmUIHandler; import org.codelutin.vcs.ui.model.ConfirmUIModel; -import javax.swing.JTable; import javax.swing.ListSelectionModel; -import java.beans.PropertyChangeEvent; /** @author chemit */ public class ConfirmUIHandler extends AbstractConfirmUIHandler { protected final JConfirmUI ui; - public ConfirmUIHandler() { - super(); + public ConfirmUIHandler(VCSHandler handler) { + super(handler); this.ui = new JConfirmUI(this); } @@ -41,18 +40,19 @@ } public ListSelectionModel getSelectionModel() { - JTable table = ui.getContentTable(); - return table.getSelectionModel(); + return ui.getContentTable().getSelectionModel(); } protected void updateUI() { VCSAction action = ui.getModel().getAction(); ui.getAccept().setText(action.getLibelle()); ui.getToolbar().setVisible(action.isCommit()); + ui.getHandler().getSelectionModel().setSelectionInterval(0, getModel().getModel().size() - 1); } - public void propertyChange(PropertyChangeEvent evt) { - super.propertyChange(evt); + protected void updateMessageUI() { + // update message history combo box ? + ui.getLastMessages().setEnabled(!getModel().getCommitMessages().isEmpty()); + } - } } 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 22:21:13 UTC (rev 327) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/DiffUIHandler.java 2008-04-03 22:22:03 UTC (rev 328) @@ -16,6 +16,7 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; +import org.codelutin.vcs.VCSHandler; import org.codelutin.vcs.ui.handler.AbstractDiffUIHandler; import org.codelutin.vcs.ui.model.AbstractVCSFileStatesModel; import org.codelutin.vcs.ui.model.DiffUIModel; @@ -28,8 +29,8 @@ protected final JDiffUI ui; - public DiffUIHandler() { - super(); + public DiffUIHandler(VCSHandler handler) { + super(handler); this.ui = new JDiffUI(this); } 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 22:21:13 UTC (rev 327) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/SynchUIHandler.java 2008-04-03 22:22:03 UTC (rev 328) @@ -2,6 +2,7 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; +import org.codelutin.vcs.VCSHandler; import org.codelutin.vcs.ui.handler.AbstractSynchUIHandler; import org.codelutin.vcs.ui.model.AbstractVCSFileStatesModel; import org.codelutin.vcs.ui.model.SimpleVCSFileStatesModel; @@ -22,8 +23,8 @@ protected final JSynchUI ui; - public SynchUIHandler() { - super(); + public SynchUIHandler(VCSHandler handler) { + super(handler); this.ui = new JSynchUI(this); } @@ -78,10 +79,11 @@ } VCSFileState[] states = model.getData(selectionModel); log.info("files to treate :" + states.length); - JConfirmUI confirmUI = VCSUIFactory.newConfirmUI(Arrays.asList(states)); + JConfirmUI confirmUI = VCSUIFactory.newConfirmUI(getHandler(), Arrays.asList(states)); confirmUI.getModel().setAction(action); - confirmUI.getHandler().getSelectionModel().setSelectionInterval(0, states.length - 1); confirmUI.setVisible(true); + //TODO SynchModel should listener for modification on ActionManagerQueue thread + log.info("TODO refresh states for files..."); } public void doSelectTabAction(SimpleVCSFileStatesModel model) { @@ -105,8 +107,8 @@ public void valueChanged(ListSelectionEvent e) { ListSelectionModel list = (ListSelectionModel) e.getSource(); - if (!list.getValueIsAdjusting()) { - log.info(list); + if (!list.getValueIsAdjusting() && log.isDebugEnabled()) { + log.debug(list); } } 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 22:21:13 UTC (rev 327) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSPopupAction.java 2008-04-03 22:22:03 UTC (rev 328) @@ -35,7 +35,7 @@ protected transient ListSelectionModel selectionModel; public VCSPopupAction(JSynchUI ui, String modelName) { - super(ui.getModel().getHandler()); + super(ui.getHandler().getHandler()); this.model = ui.getModel().getModel(modelName); this.selectionModel = ui.getTable(modelName).getSelectionModel(); } @@ -52,7 +52,7 @@ // refresh ui, and update list if needed } else { // show confirm action ui - JConfirmUI confirmUI = VCSUIFactory.newConfirmUI(Arrays.asList(states)); + JConfirmUI confirmUI = VCSUIFactory.newConfirmUI(getHandler(), Arrays.asList(states)); confirmUI.getModel().setAction(action); confirmUI.getHandler().getSelectionModel().setSelectionInterval(0, states.length - 1); confirmUI.setVisible(true); 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 22:21:13 UTC (rev 327) +++ trunk/lutinvcs/lutinvcs-ui/src/main/java/org/codelutin/vcs/ui/VCSUIFactory.java 2008-04-03 22:22:03 UTC (rev 328) @@ -15,8 +15,10 @@ package org.codelutin.vcs.ui; import org.codelutin.vcs.VCSFileState; +import org.codelutin.vcs.VCSHandler; import org.codelutin.vcs.ui.handler.AbstractUIHandler; +import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -37,18 +39,18 @@ protected static JDiffUI diffUI; protected static JConfirmUI confirmUI; - public static JSynchUI newSynchUI(List<VCSFileState> states) { - SynchUIHandler result = newHandler(SynchUIHandler.class, states); + public static JSynchUI newSynchUI(VCSHandler handler, List<VCSFileState> states) { + SynchUIHandler result = newHandler(handler, SynchUIHandler.class, states); return result.getUi(); } - public static JDiffUI newDiffUI(List<VCSFileState> states) { - DiffUIHandler result = newHandler(DiffUIHandler.class, states); + public static JDiffUI newDiffUI(VCSHandler handler, List<VCSFileState> states) { + DiffUIHandler result = newHandler(handler, DiffUIHandler.class, states); return result.getUi(); } - public static JConfirmUI newConfirmUI(List<VCSFileState> states) { - ConfirmUIHandler result = newHandler(ConfirmUIHandler.class, states); + public static JConfirmUI newConfirmUI(VCSHandler handler, List<VCSFileState> states) { + ConfirmUIHandler result = newHandler(handler, ConfirmUIHandler.class, states); return result.getUi(); } @@ -60,18 +62,22 @@ } @SuppressWarnings({"unchecked"}) - protected static <H extends AbstractUIHandler> H newHandler(Class<H> klass, List<VCSFileState> states) { + protected static <H extends AbstractUIHandler> H newHandler(VCSHandler handler, Class<H> klass, List<VCSFileState> states) { H result; result = (H) getCache().get(klass); if (result == null) { try { - result = klass.newInstance(); + result = klass.getConstructor(VCSHandler.class).newInstance(handler); result.init(); getCache().put(klass, result); } catch (InstantiationException e) { throw new IllegalStateException("could not instanciate ui handler " + klass + " for reason : " + e.getMessage()); } catch (IllegalAccessException e) { throw new IllegalStateException("could not instanciate ui handler " + klass + " for reason : " + e.getMessage()); + } catch (InvocationTargetException e) { + throw new IllegalStateException("could not instanciate ui handler " + klass + " for reason : " + e.getMessage()); + } catch (NoSuchMethodException e) { + throw new IllegalStateException("could not instanciate ui handler " + klass + " for reason : " + e.getMessage()); } } result.getModel().setData(states);

1 0

r327 - in trunk/lutinvcs/lutinvcs-core/src/main: java/org/codelutin/vcs/ui/handler resources/i18n
by tchemit＠users.labs.libre-entreprise.org 03 Apr '08

03 Apr '08

Author: tchemit Date: 2008-04-03 22:21:13 +0000 (Thu, 03 Apr 2008) New Revision: 327 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/resources/i18n/lutinvcs-core-en_GB.properties trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-fr_FR.properties Log: vcsHandler in UIHandler 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 22:19:40 UTC (rev 326) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractConfirmUIHandler.java 2008-04-03 22:21:13 UTC (rev 327) @@ -15,44 +15,76 @@ package org.codelutin.vcs.ui.handler; import org.codelutin.vcs.VCSAction; +import org.codelutin.vcs.VCSActionManager; import org.codelutin.vcs.VCSFileState; +import org.codelutin.vcs.VCSHandler; +import org.codelutin.vcs.ui.VCSUIConstants; 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; -/** @author chemit */ +/** + * Abstract ConfirmUI handler + * + * @author chemit + */ public abstract class AbstractConfirmUIHandler extends AbstractUIHandler<ConfirmUIModel> { + protected final VCSActionManager actionManager; + + + protected AbstractConfirmUIHandler(VCSHandler handler) { + super(handler); + this.actionManager = new VCSActionManager(handler); + } + protected abstract void updateUI(); + protected abstract void updateMessageUI(); + public void propertyChange(PropertyChangeEvent evt) { - //if (log.isDebugEnabled()) { - log.info(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); - //} + if (log.isDebugEnabled()) { + log.debug(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); + } String action = evt.getPropertyName(); if (VCSUIConstants.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 + + if (VCSUIConstants.MESSAGE_HISTORY_PROPERTY_CHANGED.equals(action)) { + updateMessageUI(); + return; } + + throw new IllegalStateException("unimplemented property changed : " + evt); } - 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); + public void doAction(String commitMessage, AbstractVCSFileStatesModel model) { + + VCSAction action = getModel().getAction(); + + VCSFileState[] data = selectData(model, action, false); + + if (action.isCommit()) { + getModel().addCommitMessage(commitMessage); + + } else { + commitMessage = null; + } + + if (log.isDebugEnabled()) { + log.debug("action:" + action + ", message:" + commitMessage + ", nb files:" + data.length); + } + + actionManager.add(action, data); + + // dispose ui + getUi().dispose(); + } + } \ No newline at end of file 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 22:19:40 UTC (rev 326) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractDiffUIHandler.java 2008-04-03 22:21:13 UTC (rev 327) @@ -16,6 +16,7 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; +import org.codelutin.vcs.VCSHandler; import org.codelutin.vcs.ui.model.DiffUIModel; import org.codelutin.vcs.ui.model.SimpleVCSFileStatesModel; import org.codelutin.vcs.ui.VCSUIConstants; @@ -25,6 +26,10 @@ /** @author chemit */ public abstract class AbstractDiffUIHandler extends AbstractUIHandler<DiffUIModel> { + protected AbstractDiffUIHandler(VCSHandler handler) { + super(handler); + } + public void propertyChange(PropertyChangeEvent evt) { //if (log.isDebugEnabled()) { log.info(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); 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 22:19:40 UTC (rev 326) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractSynchUIHandler.java 2008-04-03 22:21:13 UTC (rev 327) @@ -15,6 +15,7 @@ package org.codelutin.vcs.ui.handler; import org.codelutin.vcs.VCSAction; +import org.codelutin.vcs.VCSHandler; import org.codelutin.vcs.ui.model.SimpleVCSFileStatesModel; import org.codelutin.vcs.ui.model.SynchUIModel; import org.codelutin.vcs.ui.VCSUIConstants; @@ -24,6 +25,10 @@ /** @author chemit */ public abstract class AbstractSynchUIHandler extends AbstractUIHandler<SynchUIModel> { + protected AbstractSynchUIHandler(VCSHandler handler) { + super(handler); + } + public void propertyChange(PropertyChangeEvent evt) { //if (log.isDebugEnabled()) { log.info(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue()); 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/handler/AbstractUIHandler.java 2008-04-03 22:19:40 UTC (rev 326) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/AbstractUIHandler.java 2008-04-03 22:21:13 UTC (rev 327) @@ -17,6 +17,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.vcs.ui.model.AbstractUIModel; +import org.codelutin.vcs.ui.model.AbstractVCSFileStatesModel; +import org.codelutin.vcs.VCSFileState; +import org.codelutin.vcs.VCSAction; +import org.codelutin.vcs.VCSHandler; import javax.swing.ListSelectionModel; import javax.swing.JDialog; @@ -33,10 +37,27 @@ public abstract ListSelectionModel getSelectionModel(); + /** vcs handler to use (lazy instanciation) */ + protected VCSHandler handler; + + public VCSHandler getHandler() { + return handler; + } + + protected AbstractUIHandler(VCSHandler handler) { + this.handler = handler; + } + public void init() { if (getModel() == null) { throw new IllegalStateException("no model was defined for " + this); } getModel().addPropertyChangeListener(this); } + + protected VCSFileState[] selectData(AbstractVCSFileStatesModel model, VCSAction action, boolean b) { + ListSelectionModel selectionModel = getSelectionModel(); + model.select(action, selectionModel, b); + return model.getData(selectionModel); + } } 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 22:19:40 UTC (rev 326) +++ trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-en_GB.properties 2008-04-03 22:21:13 UTC (rev 327) @@ -1,6 +1,7 @@ lutinvcs.error.checkout.dir=Can''t checkout dir {0} 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.error.thread.action= lutinvcs.file=File lutinvcs.module=Module 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 22:19:40 UTC (rev 326) +++ trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-fr_FR.properties 2008-04-03 22:21:13 UTC (rev 327) @@ -1,6 +1,7 @@ lutinvcs.error.checkout.dir=Can''t checkout dir {0} 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.error.thread.action= lutinvcs.file=Fichier lutinvcs.module=Module lutinvcs.status=Status

1 0

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

03 Apr '08

Author: tchemit Date: 2008-04-03 22:19:40 +0000 (Thu, 03 Apr 2008) New Revision: 326 Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/VCSAbsractAction.java Log: add getter 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/handler/VCSAbsractAction.java 2008-04-03 21:55:12 UTC (rev 325) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/handler/VCSAbsractAction.java 2008-04-03 22:19:40 UTC (rev 326) @@ -39,4 +39,8 @@ public void setAction(VCSAction action) { this.action = action; } + + public VCSHandler getHandler() { + return handler; + } }

1 0

r325 - in 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 21:55:12 +0000 (Thu, 03 Apr 2008) New Revision: 325 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/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: no handler in model + clean confirm model 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 21:54:08 UTC (rev 324) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/VCSUIConstants.java 2008-04-03 21:55:12 UTC (rev 325) @@ -44,10 +44,13 @@ /** 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 */ + /** model name for diff remote tab ui */ + public static final String CONFIRM_MODEL_PROPERTY = "modelConfirm"; + public static final String ACTION_PROPERTY_CHANGED = "action"; - /** property to indicate change file (display a new DiffPanelUI) */ + public static final String MESSAGE_HISTORY_PROPERTY_CHANGED = "historyMessage"; + public static final String FILE_PROPERTY_CHANGED = "file"; public static final String NEXT_DIFF_PROPERTY_CHANGED = "nextDiff"; 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 21:54:08 UTC (rev 324) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/ConfirmUIModel.java 2008-04-03 21:55:12 UTC (rev 325) @@ -16,10 +16,10 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; -import org.codelutin.vcs.VCSHandler; -import org.codelutin.vcs.ui.VCSUIConstants; +import static org.codelutin.vcs.ui.VCSUIConstants.ACTION_PROPERTY_CHANGED; +import static org.codelutin.vcs.ui.VCSUIConstants.CONFIRM_MODEL_PROPERTY; +import static org.codelutin.vcs.ui.VCSUIConstants.MESSAGE_HISTORY_PROPERTY_CHANGED; -import java.net.URL; import java.util.ArrayList; import java.util.List; @@ -30,41 +30,45 @@ */ public class ConfirmUIModel extends AbstractUIModel { - /** local root : wroking copy */ - protected URL localRoot; - - /** remote root : remote url */ - protected URL remoteRoot; - - /** model */ + /** list of states */ protected SimpleVCSFileStatesModel model; + /** history of commit messages */ + protected List<String> commitMessages; + /** current action to fired */ protected VCSAction action; - protected List<String> messageHistory; - - public ConfirmUIModel() { + public AbstractVCSFileStatesModel getModel() { + if (model == null) { + model = new SimpleVCSFileStatesModel(CONFIRM_MODEL_PROPERTY); + } + return model; } - public ConfirmUIModel(VCSHandler handler, URL leftRoot, URL rightRoot) { - this.handler = handler; - this.localRoot = leftRoot; - this.remoteRoot = rightRoot; + public VCSAction getAction() { + return action; } - public AbstractVCSFileStatesModel getModel() { - if (model == null) { - model = new SimpleVCSFileStatesModel(action + ""); + public List<String> getCommitMessages() { + if (commitMessages == null) { + commitMessages = new ArrayList<String>(); } - return model; + return commitMessages; } - public List<String> getMessageHistory() { - if (messageHistory == null) { - messageHistory = new ArrayList<String>(); + public void setAction(VCSAction action) { + VCSAction oldAction = this.action; + this.action = action; + firePropertyChange(ACTION_PROPERTY_CHANGED, oldAction, action); + } + + public void addCommitMessage(String commitMessage) { + if (commitMessage != null && !commitMessage.isEmpty() && !getCommitMessages().contains(commitMessage)) { + // add message in history + getCommitMessages().add(commitMessage); + firePropertyChange(MESSAGE_HISTORY_PROPERTY_CHANGED, null, commitMessage); } - return messageHistory; } public void setData(List<VCSFileState> states) { @@ -79,25 +83,4 @@ getModel().removeData(states.toArray(new VCSFileState[states.size()])); } - public void doAction(String commitMesssage) { - if (model == null || action == null) { - return; - } - if (commitMesssage != null && !getMessageHistory().contains(commitMesssage)) { - getMessageHistory().add(commitMesssage); - } - firePropertyChange(action.name().toLowerCase(), null, commitMesssage); - } - - public void setAction(VCSAction action) { - VCSAction oldAction = this.action; - this.action = action; - firePropertyChange(VCSUIConstants.ACTION_PROPERTY_CHANGED, oldAction, action); - } - - public VCSAction getAction() { - return action; - } - - } \ No newline at end of file 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 21:54:08 UTC (rev 324) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java 2008-04-03 21:55:12 UTC (rev 325) @@ -16,11 +16,10 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; -import org.codelutin.vcs.VCSHandler; +import org.codelutin.vcs.ui.VCSUIConstants; 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; @@ -54,8 +53,7 @@ public DiffUIModel() { } - public DiffUIModel(VCSHandler handler, URL leftRoot, URL rightRoot) { - this.handler = handler; + public DiffUIModel(URL leftRoot, URL rightRoot) { this.leftRoot = leftRoot; this.rightRoot = rightRoot; } 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 21:54:08 UTC (rev 324) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/SynchUIModel.java 2008-04-03 21:55:12 UTC (rev 325) @@ -16,11 +16,10 @@ import org.codelutin.vcs.VCSAction; import org.codelutin.vcs.VCSFileState; -import org.codelutin.vcs.VCSHandler; +import org.codelutin.vcs.ui.VCSUIConstants; 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; @@ -52,16 +51,11 @@ public SynchUIModel() { } - public SynchUIModel(VCSHandler handler, File localRoot, URL remoteRoot) { - this.handler = handler; + public SynchUIModel(File localRoot, URL remoteRoot) { this.localRoot = localRoot; this.remoteRoot = remoteRoot; } - public VCSHandler getHandler() { - return handler; - } - public AbstractVCSFileStatesModel getTabModel() { return tabModel; }

1 0

r324 - 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 21:54:08 +0000 (Thu, 03 Apr 2008) New Revision: 324 Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractUIModel.java Log: no handler in model Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractUIModel.java 2008-04-03 21:53:38 UTC (rev 323) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/ui/model/AbstractUIModel.java 2008-04-03 21:54:08 UTC (rev 324) @@ -29,14 +29,10 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static protected final Log log = LogFactory.getLog(AbstractUIModel.class); - /** vcs handler to use (lazy instanciation) */ - protected VCSHandler handler; + /** support for change properties support */ protected PropertyChangeSupport changeSupport; - public VCSHandler getHandler() { - return handler; - } public abstract void setData(List<VCSFileState> states);

1 0