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

r439 - in trunk/lutinvcs: lutinvcs-core/src/main/java/org/codelutin/vcs/util lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/model lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui
by tchemit＠users.labs.libre-entreprise.org April 6, 2008

April 6, 2008

Author: tchemit Date: 2008-04-06 21:47:39 +0000 (Sun, 06 Apr 2008) New Revision: 439 Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/util/VCSEntryImpl.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractDiffUI.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractSynchUI.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractTabUI.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java 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 Log: begin of diff ui Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/util/VCSEntryImpl.java =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/util/VCSEntryImpl.java 2008-04-06 19:29:20 UTC (rev 438) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/util/VCSEntryImpl.java 2008-04-06 21:47:39 UTC (rev 439) @@ -124,4 +124,7 @@ } } + public String toString() { + return super.toString() + " " + localFile + " : " + state; + } } Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractDiffUI.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractDiffUI.java 2008-04-06 19:29:20 UTC (rev 438) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractDiffUI.java 2008-04-06 21:47:39 UTC (rev 439) @@ -14,11 +14,14 @@ */ package org.codelutin.vcs.ui; +import org.codelutin.vcs.VCSEntry; import org.codelutin.vcs.type.VCSAction; +import org.codelutin.vcs.ui.handler.DiffUIHandler; import org.codelutin.vcs.ui.model.DiffUIModel; -import org.codelutin.vcs.ui.handler.DiffUIHandler; +import javax.swing.AbstractButton; import javax.swing.JButton; +import java.util.List; /** @author chemit */ public abstract class AbstractDiffUI extends AbstractTabUI { @@ -27,6 +30,16 @@ public abstract JButton getPreviousDiff(); + public abstract JButton getRefresh(); + + public abstract JButton getUpdate(); + + public abstract JButton getCommit(); + + public abstract JButton getRevert(); + + public abstract JButton getDelete(); + @Override public DiffUIModel getModel() { return (DiffUIModel) model; @@ -37,10 +50,29 @@ return (DiffUIHandler) handler; } - protected void selectFile() { - getModel().setFileModel(model.getEntriesModel().getDisplayedEntries(getHandler().getSelectionModel()).get(0)); + public void selectFile() { + List<VCSEntry> vcsEntryList = model.getEntriesModel().getDisplayedEntries(getHandler().getSelectionModel()); + if (!vcsEntryList.isEmpty()) { + getModel().setFileModel(vcsEntryList.get(0)); + } else { + getModel().setFileModel(null); + } } + @Override + public void setVisible(boolean b) { + if (b) { + AbstractButton button = getButton(handler.getLocation()); + if (button == null) { + button = getAllTab(); + } + button.doClick(); + if (getTable(getModel().getEntriesModel().getLocation()).getRowCount() > 0) + getHandler().getSelectionModel().setSelectionInterval(0, 0); + } + super.setVisible(b); + } + protected void doAction(VCSAction action) { getHandler().doAction(action, getModel().getFileModel()); } Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractSynchUI.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractSynchUI.java 2008-04-06 19:29:20 UTC (rev 438) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractSynchUI.java 2008-04-06 21:47:39 UTC (rev 439) @@ -16,10 +16,11 @@ import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSEntryLocation; +import org.codelutin.vcs.ui.handler.SynchUIHandler; import org.codelutin.vcs.ui.model.SynchUIModel; -import org.codelutin.vcs.ui.handler.SynchUIHandler; import javax.swing.JButton; +import javax.swing.AbstractButton; /** @author chemit */ public abstract class AbstractSynchUI extends AbstractTabUI { @@ -53,6 +54,18 @@ return (SynchUIHandler) handler; } + @Override + public void setVisible(boolean b) { + if (b) { + AbstractButton button = getButton(handler.getLocation()); + if (button == null) { + button = getAllTab(); + } + button.doClick(); + } + super.setVisible(b); + } + public AbstractVCSPopup getPopup(VCSEntryLocation modelName) { switch (modelName) { case ALL: @@ -67,6 +80,7 @@ throw new IllegalStateException("no popup found for " + modelName); } + protected void doAction(VCSAction action, boolean useSelection) { getHandler().doAction(action, useSelection); } Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractTabUI.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractTabUI.java 2008-04-06 19:29:20 UTC (rev 438) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractTabUI.java 2008-04-06 21:47:39 UTC (rev 439) @@ -22,11 +22,14 @@ import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.JToggleButton; +import javax.swing.AbstractButton; import java.awt.CardLayout; /** @author chemit */ public abstract class AbstractTabUI extends AbstractUI { + public abstract jaxx.runtime.swing.JAXXButtonGroup getTabs(); + public abstract JToggleButton getAllTab(); public abstract JToggleButton getLocalTab(); @@ -65,14 +68,25 @@ return (AbstractTabUIHandler) handler; } - @Override + /*@Override public void setVisible(boolean b) { - if (handler.getLocation() == VCSEntryLocation.UNKNOW) { - // first launch, no tab model selected,choose one - getAllTab().doClick(); + if (b) { + switch (handler.getLocation()) { + + case LOCAL: + getLocalTab().doClick(); + break; + case REMOTE: + getRemoteTab().doClick(); + break; + case ALL: + case UNKNOW: + getAllTab().doClick(); + break; + } } super.setVisible(b); - } + }*/ public JTable getTable(VCSEntryLocation modelName) { switch (modelName) { @@ -88,6 +102,20 @@ throw new IllegalStateException("no table found for " + modelName); } + public AbstractButton getButton(VCSEntryLocation modelName) { + switch (modelName) { + case ALL: + return getAllTab(); + case LOCAL: + return getLocalTab(); + case REMOTE: + return getRemoteTab(); + case UNKNOW: + break; + } + throw new IllegalStateException("no popup found for " + modelName); + } + protected void setLocation(VCSEntryLocation location) { getModel().setLocation(location); } Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java 2008-04-06 19:29:20 UTC (rev 438) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/VCSInitializer.java 2008-04-06 21:47:39 UTC (rev 439) @@ -33,6 +33,7 @@ TagManager.registerDefaultNamespace("AbstractConfirmUI", "org.codelutin.vcs.ui.*"); TagManager.registerDefaultNamespace("AbstractSynchUI", "org.codelutin.vcs.ui.*"); TagManager.registerDefaultNamespace("AbstractDiffUI", "org.codelutin.vcs.ui.*"); + TagManager.registerDefaultNamespace("DiffPanelUI", "org.codelutin.vcs.ui.*"); TagManager.registerDefaultNamespace("AbstractVCSPopup", "org.codelutin.vcs.ui.*"); TagManager.registerDefaultNamespace("JVCSPopup", "org.codelutin.vcs.ui.*"); Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java 2008-04-06 19:29:20 UTC (rev 438) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java 2008-04-06 21:47:39 UTC (rev 439) @@ -18,9 +18,15 @@ import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSEntryLocation; import org.codelutin.vcs.ui.AbstractDiffUI; +import org.codelutin.vcs.ui.model.AbstractVCSEntriesTableModel; import org.codelutin.vcs.ui.model.DiffUIModel; +import javax.swing.JTable; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; import java.beans.PropertyChangeEvent; +import java.util.ArrayList; +import java.util.List; /** @author chemit */ public class DiffUIHandler extends org.codelutin.vcs.ui.handler.AbstractTabUIHandler<DiffUIModel, AbstractDiffUI> { @@ -50,20 +56,51 @@ @Override public void doSelectLocation(VCSEntryLocation location) { + super.doSelectLocation(location); + AbstractVCSEntriesTableModel fileStatesModel = getModel().getEntriesModel(); + if (fileStatesModel.getRowCount() > 0) { + getSelectionModel().addSelectionInterval(0, 0); + } else { + getSelectionModel().clearSelection(); + } } protected void initTab(VCSEntryLocation location) { - //TODO + JTable table = getUi().getTable(location); + final AbstractVCSEntriesTableModel fileStatesModel = getModel().getEntriesModel(); + table.setModel(fileStatesModel); + table.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { + if (!e.getValueIsAdjusting()) { + getUi().selectFile(); + } + } + }); } public void doSelectFile(VCSEntry model) { - //TODO + + boolean hasActions = false; + List<String> acts = new ArrayList<String>(); + + if (model != null) { + List<VCSAction> actions = model.getState().getActions(); + for (VCSAction action : actions) { + acts.add(action.name().toLowerCase()); + } + hasActions = !actions.isEmpty(); + } + getUi().getUpdate().setEnabled(hasActions && acts.contains("update")); + getUi().getCommit().setEnabled(hasActions && acts.contains("commit")); + getUi().getRevert().setEnabled(hasActions && acts.contains("revert")); + getUi().getDelete().setEnabled(hasActions && acts.contains("delete")); + getUi().getRefresh().setEnabled(hasActions); } public void doAction(VCSAction action, VCSEntry model) { - //TODO + log.info(action + " : " + model); } public void gotoNextDiff() { Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java 2008-04-06 19:29:20 UTC (rev 438) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java 2008-04-06 21:47:39 UTC (rev 439) @@ -3,16 +3,17 @@ import org.codelutin.vcs.VCSEntry; import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSEntryLocation; +import org.codelutin.vcs.ui.AbstractConfirmUI; +import org.codelutin.vcs.ui.AbstractDiffUI; +import org.codelutin.vcs.ui.AbstractSynchUI; +import org.codelutin.vcs.ui.AbstractVCSPopup; +import org.codelutin.vcs.ui.VCSUIFactory; import org.codelutin.vcs.ui.model.AbstractVCSEntriesTableModel; import org.codelutin.vcs.ui.model.SynchUIModel; -import org.codelutin.vcs.ui.AbstractSynchUI; -import org.codelutin.vcs.ui.AbstractConfirmUI; -import org.codelutin.vcs.ui.VCSUIFactory; -import org.codelutin.vcs.ui.AbstractVCSPopup; +import javax.swing.AbstractAction; import javax.swing.JTable; import javax.swing.ListSelectionModel; -import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -66,6 +67,16 @@ } if (action == VCSAction.DIFF) { // show diff ui + AbstractDiffUI diffUI = VCSUIFactory.newDiffUI(); + List<VCSEntry> vcsEntryList; + if (useSelection) { + vcsEntryList = entries; + } else { + // take all entries + vcsEntryList = model.filter(action, model.getEntries()); + } + diffUI.getModel().init(model.getLocation(), vcsEntryList.toArray(new VCSEntry[vcsEntryList.size()])); + diffUI.setVisible(true); return; } log.info("files to treate :" + entries.size()); Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java 2008-04-06 19:29:20 UTC (rev 438) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/model/DiffUIModel.java 2008-04-06 21:47:39 UTC (rev 439) @@ -15,6 +15,7 @@ package org.codelutin.vcs.ui.model; import org.codelutin.vcs.VCSEntry; +import org.codelutin.vcs.type.VCSEntryLocation; /** * Model of a repository @@ -37,4 +38,11 @@ public VCSEntry getFileModel() { return fileModel; } + + public void init(VCSEntryLocation location, VCSEntry[] states) { + getEntriesModel().clear(); + getEntriesModel().populate(VCSEntryLocation.ALL, states); + setFileModel(null); + setLocation(location); + } } \ No newline at end of file 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-06 19:29:20 UTC (rev 438) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JDiffUI.jaxx 2008-04-06 21:47:39 UTC (rev 439) @@ -1,4 +1,5 @@ -<AbstractDiffUI title='lutinvcs.diff.title' id='diffui' defaultCloseOperation='DISPOSE_ON_CLOSE'> +<AbstractDiffUI title='lutinvcs.diff.title' modal="true" defaultCloseOperation='DISPOSE_ON_CLOSE' + height='600' width='500'> <style source="common.css"/> <java.awt.CardLayout id='cardLayout'/> @@ -6,7 +7,7 @@ <row fill='both'> <cell fill='both' weightx='1'> <JToolBar> - <JToggleButton id='allTab' selected='true' buttonGroup='tabs' mnemonic="A" + <JToggleButton id='allTab' selected='false' buttonGroup='tabs' mnemonic="A" toolTipText="lutinvcs.tabs.diff.tooltip.all" icon='{createImageIcon("remote_vs_local.png")}' onActionPerformed='setLocation(org.codelutin.vcs.type.VCSEntryLocation.ALL)'/> @@ -49,19 +50,33 @@ </cell> </row> <row fill='both'> - <cell fill='both' weighty='1' weightx='2'> + <cell fill='both'> <JPanel id='preview' layout='{cardLayout}'> - <JScrollPane id='allContent' styleClass='diffScroll' constraints='"taball"'> - <JTable id="allTable" styleClass='diffTable' onMouseClicked="selectFile()"/> + <JScrollPane id='allContent' styleClass='diffScroll' constraints='"taball"' height='100'> + <JTable id="allTable" styleClass='diffTable' onMouseClicked="selectFile()" selectionMode="0"/> </JScrollPane> - <JScrollPane id='localContent' styleClass='diffScroll' constraints='"tablocal"'> - <JTable id="localTable" styleClass='diffTable' onMouseClicked="selectFile()"/> + <JScrollPane id='localContent' styleClass='diffScroll' constraints='"tablocal"' height='100'> + <JTable id="localTable" styleClass='diffTable' onMouseClicked="selectFile()" selectionMode="0"/> </JScrollPane> - <JScrollPane id='remoteContent' styleClass='diffScroll' constraints='"tabremote"'> - <JTable id="remoteTable" styleClass='diffTable' onMouseClicked="selectFile()"/> + <JScrollPane id='remoteContent' styleClass='diffScroll' constraints='"tabremote"' height='100'> + <JTable id="remoteTable" styleClass='diffTable' onMouseClicked="selectFile()" + selectionMode="0"/> </JScrollPane> </JPanel> </cell> </row> + <row> + <cell fill='both' weighty='1' weightx='2'> +  + <JSplitPane id='splitPane2' orientation='horizontal' oneTouchExpandable='true'> + <JScrollPane id='remoteScroll' styleClass='updateScroll'> + <JTextArea id="remoteEditorContent"/> + </JScrollPane> + <JScrollPane id='localScroll' styleClass='updateScroll'> + <JTextArea id="localEditorContent"/> + </JScrollPane> + </JSplitPane> + </cell> + </row> </Table> </AbstractDiffUI> 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-06 19:29:20 UTC (rev 438) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/main/uimodel/org/codelutin/vcs/ui/JSynchUI.jaxx 2008-04-06 21:47:39 UTC (rev 439) @@ -1,4 +1,4 @@ -<AbstractSynchUI title='lutinvcs.synch.title' modal="true" defaultCloseOperation='DISPOSE_ON_CLOSE'> +<AbstractSynchUI title='lutinvcs.synch.title' defaultCloseOperation='DISPOSE_ON_CLOSE'> <style source="common.css"/> <java.awt.CardLayout id='cardLayout'/>

1 0

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

April 6, 2008

Author: tchemit Date: 2008-04-06 19:29:20 +0000 (Sun, 06 Apr 2008) New Revision: 438 Modified: trunk/lutinvcs/pom.xml Log: remove module api, now just the core-module :) Modified: trunk/lutinvcs/pom.xml =================================================================== --- trunk/lutinvcs/pom.xml 2008-04-06 19:28:34 UTC (rev 437) +++ trunk/lutinvcs/pom.xml 2008-04-06 19:29:20 UTC (rev 438) @@ -19,14 +19,12 @@ <artifactId>lutinvcs</artifactId> <modules> - <module>lutinvcs-api</module> <module>lutinvcs-core</module> <module>lutinvcs-provider-mock</module> <module>lutinvcs-provider-cvs</module> <module>lutinvcs-provider-svn</module> <module>lutinvcs-ui-common</module> <module>lutinvcs-ui-jaxx</module> -  <module>lutinvcs-all</module> </modules>

1 0

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

April 6, 2008

Author: tchemit Date: 2008-04-06 19:28:34 +0000 (Sun, 06 Apr 2008) New Revision: 437 Removed: trunk/lutinvcs/lutinvcs-api/ Log: remove module api, now just the core-module :)

1 0

r436 - in trunk/lutinvcs: lutinvcs-core/src/main/resources/i18n lutinvcs-provider-cvs lutinvcs-provider-mock lutinvcs-provider-svn lutinvcs-ui-jaxx
by tchemit＠users.labs.libre-entreprise.org April 6, 2008

April 6, 2008

Author: tchemit Date: 2008-04-06 19:26:53 +0000 (Sun, 06 Apr 2008) New Revision: 436 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 trunk/lutinvcs/lutinvcs-provider-cvs/pom.xml trunk/lutinvcs/lutinvcs-provider-mock/pom.xml trunk/lutinvcs/lutinvcs-provider-svn/pom.xml trunk/lutinvcs/lutinvcs-ui-jaxx/pom.xml Log: remove module api, now just the core-module :) 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-06 19:23:45 UTC (rev 435) +++ trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-en_GB.properties 2008-04-06 19:26:53 UTC (rev 436) @@ -1,4 +1,3 @@ -lutinvcs.error.thread.action= lutinvcs.action.add=add lutinvcs.action.changeLog=changeLog lutinvcs.action.checkout=checkout @@ -14,6 +13,7 @@ lutinvcs.error.connexion.noopen=connexion {0} was not opened lutinvcs.error.provider.init.connexion=could not instanciate connexion {0}, for provider {1}, reason\: {2} lutinvcs.error.provider.init.handler=could not instanciate handler {0}, for provider {1}, reason\: {2} +lutinvcs.error.thread.action= lutinvcs.location.all=All lutinvcs.location.local=Local lutinvcs.location.remote=Remote 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-06 19:23:45 UTC (rev 435) +++ trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-fr_FR.properties 2008-04-06 19:26:53 UTC (rev 436) @@ -1,4 +1,3 @@ -lutinvcs.error.thread.action= lutinvcs.action.add=Ajouter lutinvcs.action.changeLog=journal des changements lutinvcs.action.checkout=R\u00E9cup\u00E9rer @@ -14,6 +13,7 @@ lutinvcs.error.connexion.noopen=La connexion {0} n''a pas \u00E9t\u00E9 ouverte lutinvcs.error.provider.init.connexion=Erreur lors de l''instanciation de la connexion {0}, provider {1}, cause\: {2} lutinvcs.error.provider.init.handler=Erreur lors de l''instanciation du handler {0}, provider {1}, cause\: {2} +lutinvcs.error.thread.action= lutinvcs.location.all=All lutinvcs.location.local=Local lutinvcs.location.remote=Remote @@ -27,4 +27,3 @@ lutinvcs.state.unversionned=non versionn\u00E9 lutinvcs.state.unversionnedOrMissing=non versionn\u00E9 ou non pr\u00E9sent localement lutinvcs.state.uptodate=fichier \u00E0 jour - Modified: trunk/lutinvcs/lutinvcs-provider-cvs/pom.xml =================================================================== --- trunk/lutinvcs/lutinvcs-provider-cvs/pom.xml 2008-04-06 19:23:45 UTC (rev 435) +++ trunk/lutinvcs/lutinvcs-provider-cvs/pom.xml 2008-04-06 19:26:53 UTC (rev 436) @@ -39,7 +39,7 @@ <dependencies> <dependency> <groupId>lutinlib.vcs</groupId> - <artifactId>lutinvcs-api</artifactId> + <artifactId>lutinvcs-core</artifactId> <scope>compile</scope> </dependency> <dependency> Modified: trunk/lutinvcs/lutinvcs-provider-mock/pom.xml =================================================================== --- trunk/lutinvcs/lutinvcs-provider-mock/pom.xml 2008-04-06 19:23:45 UTC (rev 435) +++ trunk/lutinvcs/lutinvcs-provider-mock/pom.xml 2008-04-06 19:26:53 UTC (rev 436) @@ -39,7 +39,7 @@ <dependencies> <dependency> <groupId>lutinlib.vcs</groupId> - <artifactId>lutinvcs-api</artifactId> + <artifactId>lutinvcs-core</artifactId> <scope>compile</scope> </dependency> </dependencies> Modified: trunk/lutinvcs/lutinvcs-provider-svn/pom.xml =================================================================== --- trunk/lutinvcs/lutinvcs-provider-svn/pom.xml 2008-04-06 19:23:45 UTC (rev 435) +++ trunk/lutinvcs/lutinvcs-provider-svn/pom.xml 2008-04-06 19:26:53 UTC (rev 436) @@ -39,7 +39,7 @@ <dependencies> <dependency> <groupId>lutinlib.vcs</groupId> - <artifactId>lutinvcs-api</artifactId> + <artifactId>lutinvcs-core</artifactId> <scope>compile</scope> </dependency> <dependency> Modified: trunk/lutinvcs/lutinvcs-ui-jaxx/pom.xml =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/pom.xml 2008-04-06 19:23:45 UTC (rev 435) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/pom.xml 2008-04-06 19:26:53 UTC (rev 436) @@ -83,18 +83,8 @@ </build> <dependencies> -  <dependency> <groupId>lutinlib.vcs</groupId> - <artifactId>lutinvcs-provider-mock</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>lutinlib.vcs</groupId> <artifactId>lutinvcs-ui-common</artifactId> <scope>compile</scope> </dependency>

1 0

r435 - in trunk/lutinvcs: lutinvcs-api/src/main/java/org/codelutin/vcs lutinvcs-core/src/main/java/org/codelutin/vcs lutinvcs-core/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org April 6, 2008

April 6, 2008

Author: tchemit Date: 2008-04-06 19:23:45 +0000 (Sun, 06 Apr 2008) New Revision: 435 Removed: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/package.html Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/package.html 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: remove module api, now just the core-module :) Deleted: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/package.html =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/package.html 2008-04-06 19:17:37 UTC (rev 434) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/package.html 2008-04-06 19:23:45 UTC (rev 435) @@ -1,11 +0,0 @@ -<html> -<body> -<h1>Lutin vcs api</h1> -Ensemble de l'api de base pour g�rer des Versionning Concurrent System (aka -<code>vcs</code>) tel que CVS ou SVN. - -On retrouve dans ce paquetage, uniquement des d�finitions de types. - -Auncune impl�mentation n'est fournie dans ce paquetage. -</body> -</html> \ No newline at end of file Modified: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/package.html =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/package.html 2008-04-06 19:17:37 UTC (rev 434) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/package.html 2008-04-06 19:23:45 UTC (rev 435) @@ -1,11 +1,13 @@ <html> <body> -<h1>Lutin vcs</h1> +<h1>Lutin vcs core</h1> Ensemble de l'api de base pour g�rer des Versionning Concurrent System (aka <code>vcs</code>) tel que CVS ou SVN. -On retrouve ici des interfaces, des classes g�n�riques et les objets li�s aux vcs. +On retrouve dans ce paquetage, uniquement des d�finitions de types. -Auncune impl�mentation n'est fournit actuellement ici. +Auncune impl�mentation de provider n'est fournie dans ce paquetage. + +La classe <code>VCSFactory</code> permet d'obtenir les connexions. TOOD Finir la doc. </body> </html> \ No newline at end of file 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-06 19:17:37 UTC (rev 434) +++ trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-en_GB.properties 2008-04-06 19:23:45 UTC (rev 435) @@ -1 +1,29 @@ lutinvcs.error.thread.action= +lutinvcs.action.add=add +lutinvcs.action.changeLog=changeLog +lutinvcs.action.checkout=checkout +lutinvcs.action.commit=commit +lutinvcs.action.delete=delete +lutinvcs.action.diff=diff +lutinvcs.action.overwriteAndUpdate=overwrite and update +lutinvcs.action.refresh= +lutinvcs.action.revert=revert +lutinvcs.action.update=update +lutinvcs.error.checkout.dir=Can''t checkout dir {0} +lutinvcs.error.connexion.noinit=connexion {0} was not init +lutinvcs.error.connexion.noopen=connexion {0} was not opened +lutinvcs.error.provider.init.connexion=could not instanciate connexion {0}, for provider {1}, reason\: {2} +lutinvcs.error.provider.init.handler=could not instanciate handler {0}, for provider {1}, reason\: {2} +lutinvcs.location.all=All +lutinvcs.location.local=Local +lutinvcs.location.remote=Remote +lutinvcs.location.unknown=Unknow +lutinvcs.state.missing=missing +lutinvcs.state.modified=modified +lutinvcs.state.outofdate=out of date +lutinvcs.state.outofdateAndModified=out of date and modified +lutinvcs.state.removed=removed +lutinvcs.state.unknown=unknown +lutinvcs.state.unversionned=unversionned +lutinvcs.state.unversionnedOrMissing=unversionned or missing +lutinvcs.state.uptodate=uptodate 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-06 19:17:37 UTC (rev 434) +++ trunk/lutinvcs/lutinvcs-core/src/main/resources/i18n/lutinvcs-core-fr_FR.properties 2008-04-06 19:23:45 UTC (rev 435) @@ -1 +1,30 @@ lutinvcs.error.thread.action= +lutinvcs.action.add=Ajouter +lutinvcs.action.changeLog=journal des changements +lutinvcs.action.checkout=R\u00E9cup\u00E9rer +lutinvcs.action.commit=Commiter +lutinvcs.action.delete=Supprimer +lutinvcs.action.diff=voir les diff\u00E9rences +lutinvcs.action.overwriteAndUpdate=Update +lutinvcs.action.refresh=Rafra\u00EEchir +lutinvcs.action.revert=Annuler les modifications +lutinvcs.action.update=Mettre \u00E0 jour +lutinvcs.error.checkout.dir=Ne peut pas uploader le fichier ''{0}'' +lutinvcs.error.connexion.noinit=La connexion {0} n''a pas \u00E9t\u00E9 initialis\u00E9e +lutinvcs.error.connexion.noopen=La connexion {0} n''a pas \u00E9t\u00E9 ouverte +lutinvcs.error.provider.init.connexion=Erreur lors de l''instanciation de la connexion {0}, provider {1}, cause\: {2} +lutinvcs.error.provider.init.handler=Erreur lors de l''instanciation du handler {0}, provider {1}, cause\: {2} +lutinvcs.location.all=All +lutinvcs.location.local=Local +lutinvcs.location.remote=Remote +lutinvcs.location.unknown=Unknow +lutinvcs.state.missing=non pr\u00E9sent +lutinvcs.state.modified=modifi\u00E9 +lutinvcs.state.outofdate=obsol\u00E8te +lutinvcs.state.outofdateAndModified=modifi\u00E9 et obsol\u00E8te +lutinvcs.state.removed=supprim\u00E9 +lutinvcs.state.unknown=\u00E9tat inconnu +lutinvcs.state.unversionned=non versionn\u00E9 +lutinvcs.state.unversionnedOrMissing=non versionn\u00E9 ou non pr\u00E9sent localement +lutinvcs.state.uptodate=fichier \u00E0 jour +

1 0

r434 - trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler
by tchemit＠users.labs.libre-entreprise.org April 6, 2008

April 6, 2008

Author: tchemit Date: 2008-04-06 19:17:37 +0000 (Sun, 06 Apr 2008) New Revision: 434 Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java Log: remove module api, now just the core-module :) Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java 2008-04-06 19:17:09 UTC (rev 433) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java 2008-04-06 19:17:37 UTC (rev 434) @@ -85,16 +85,14 @@ AbstractVCSEntriesTableModel fileStatesModel = getModel().getEntriesModel(); table.setModel(fileStatesModel); table.addMouseListener(new ListMouseListener(getUi(), fileStatesModel, location)); - AbstractVCSPopup popup = getUi().getPopup(location); - popup.setDispatchAction(new AbstractAction() { + getUi().getPopup(location).setDispatchAction(new AbstractAction() { private static final long serialVersionUID = 8622118724992019898L; public void actionPerformed(ActionEvent e) { doAction(VCSAction.valueOf(e.getActionCommand()), true); } - }); }

1 0

r433 - 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 April 6, 2008

April 6, 2008

Author: tchemit Date: 2008-04-06 19:17:09 +0000 (Sun, 06 Apr 2008) New Revision: 433 Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSCommon.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSConnexion.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSConnexionConfig.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSEntries.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSEntry.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSException.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSHandler.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSProvider.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSRevision.java trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSRuntimeException.java Removed: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSCommon.java trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSConnexion.java trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSConnexionConfig.java trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSEntries.java trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSEntry.java trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSException.java trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandler.java trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSProvider.java trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSRevision.java trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSRuntimeException.java Log: remove module api, now just the core-module :) Deleted: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSCommon.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSCommon.java 2008-04-06 19:16:23 UTC (rev 432) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSCommon.java 2008-04-06 19:17:09 UTC (rev 433) @@ -1,302 +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.codelutin.vcs.type.VCSState; - -import java.io.File; -import java.io.FileFilter; -import java.io.FilenameFilter; -import java.io.IOException; -import java.util.Collection; -import java.util.List; - -/** - * Contract of operations to realized by a handler or a connexion - * - * @author chemit - */ - -public interface VCSCommon { - - /** - * init working copy, says if it is the first we use it it, we will checkout - * the databaseDirectory directory - * - * @throws org.codelutin.vcs.VCSException if any exception while init - */ - void initWorkingCopy() throws VCSException; - - /** delete the local working copy with all his files */ - void deleteWorkingCopy(); - - /** - * @return a <code>FilenameFilter<code> to detect all files and directories in a vcs working copy that - * must be handled by vcs - */ - FilenameFilter getVersionnableFilenameFilter(); - - /** - * @return a <code>FileFilter<code> to detect all files and directories in a vcs working copy that - * must be handled by vcs - */ - FileFilter getVersionnableFileFilter(); - - /** - * @return name of directory used by vcs to store in working copy, a data's - * directory configuration (e.g CVS for cvs and .svn for svn) - */ - String getConfLocalDirname(); - - /** - * @return name of the file used by vcs to store in working copy - * configuration directory entries of data's directory (e.g Entries - * for cvs and entries for svn) - */ - String getConfLocalEntriesFilename(); - - VCSState getState(File file, Collection tmp) throws VCSException; - - VCSState getState(File file, Collection tmp, boolean noremote) throws VCSException; - - /** - * @param file file to test - * @return <code>true</code> if <code>file</code> is on remote - * repository, <code>false</code> otherwise. - */ - boolean isOnRemote(File file); - - /** - * @param file file to test - * @return <code>true</code> if file is uptodate,<code>false</code> - * otherwise. - * @throws org.codelutin.vcs.VCSException if any exception while operation - */ - boolean isUpToDate(File file) throws VCSException; - - /** - * @param file file to test - * @return <code>true</code> if file is handled by VCS,<code>false</code> - * otherwise. - */ - boolean isVersionnableFile(File file); - - /** - * add on remote repository somes directories - * - * @param commitMessage commit message - * @param dirNames names of the directories to create on remote repository (could - * used multi-level directories) - * @throws org.codelutin.vcs.VCSException if any exception while operation - */ - void makeRemoteDir(String commitMessage, String... dirNames) - throws VCSException; - - /** - * delete on remote repository somes directories - * - * @param commitMessage commit message - * @param dirNames names of the directories to delete on remote repository (could - * used multi-level directories) - * @throws org.codelutin.vcs.VCSException if any exception while operation - */ - void deleteRemoteDir(String commitMessage, String... dirNames) - throws VCSException; - - /** - * add a list of files into repository - * - * @param files files to add - * @param msg message for VCS commit, if <code>null</code> then no commit - * is performed - * @return revision of the operation - * @throws org.codelutin.vcs.VCSException if any exception while operation - */ - long add(List<File> files, String msg) throws VCSException; - - // void add(File file, String msg) throws VCSException; - - /** - * delete a list of files from repository - * - * @param files files to delete - * @param msg message for VCS commit, if <code>null</code> then no commit - * is performed - * @throws org.codelutin.vcs.VCSException if any exception while operation - */ - void delete(List<File> files, String msg) throws VCSException; - - /** - * revert a list of files from repository - * - * @param files files to revert - * @throws org.codelutin.vcs.VCSException if any exception while operation - */ - void revert(List<File> files) throws VCSException; - - /** - * commit a list of files into repository - * - * @param files files to commit - * @param msg message for VCS commit - * @return revision of the operation - * @throws org.codelutin.vcs.VCSException if any exception while operation - */ - long commit(List<File> files, String msg) throws VCSException; - - /** - * update a file to repository to a certain revision - * - * @param file file to update - * @param revision object representing a revision for the current VCS - * @throws org.codelutin.vcs.VCSException if any exception while operation - */ - void update(File file, Object revision) throws VCSException; - - /** - * update a file to repository - * - * @param file file to update - * @throws org.codelutin.vcs.VCSException if any exception while operation - */ - void update(File file) throws VCSException; - - /** - * checkout a module from repository to a local file - * - * @param destDir local file where to checkout - * @param module module's name to checkout - * @param recurse flag to say to recurse checkout or not. - * @throws org.codelutin.vcs.VCSException if any exception while operation - */ - void checkout(File destDir, String module, boolean recurse) throws VCSException; - - void checkoutFile(File destDir, String module) throws VCSException; - - long checkoutOnlyTheDirectory(File root, Object revision) throws VCSException; - - /** - * TODO This is not the good place : VCS != Storage - * - * @param directory directory to treate - * @return TODO - * @throws org.codelutin.vcs.VCSException TODO - */ - List<String> getRemoteStorageNames(File directory) throws VCSException; - - /** - * TODO This is not the good place : VCS != Storage - * - * @param directory directory to treate - * @return TODO - */ - List<String> getLocalStorageNames(File directory); - - /** - * @param f local file to treate - * @return current local revision of a file - * @throws org.codelutin.vcs.VCSException TODO - */ - Object getRevision(File f) throws VCSException; - - /** - * Obtain the list of log entries for the file - * - * @param startRevision TODO - * @param endRevision TODO - * @param file file to treate - * @return list of log entries for this file between two revisions - * @throws org.codelutin.vcs.VCSException if any exception while grabbing infos - */ - List getLog(Object startRevision, Object endRevision, File file) - throws VCSException; - - /** - * obtain the content of a file for a specific revision - * - * @param file file to obtain - * @param revision revision treated - * @return the content of the file on repository for the specific revision - * passed as arguement. - * @throws org.codelutin.vcs.VCSException if any exception while operation - * @throws java.io.IOException TODO - */ - String getFileContent(File file, Object revision) throws VCSException, IOException; - - /** - * Build the changelog for <code>file</code> from current revision of this - * local file against head repository head version. For each revision - * between current revision and head revision of this file, we give the - * following informations : - * <ul> - * <li>revision number</li> - * <li>author</li> - * <li>date</li> - * <li>commit message</li> - * </ul> - * - * @param file file to treate - * @return a string representation of change log for the local file to the - * head ? - * @throws org.codelutin.vcs.VCSException if any exception while building changelog - */ - String getChangeLog(File file) throws VCSException; - - /** - * Generate in the ouputstream the diff between the current revision of the - * local file against headest revision on repository. - * If file is uptodate, then does nothing. - * - * @param file the file to treate - * @return the diff - * @throws org.codelutin.vcs.VCSException inf any exception while building diff, such as : - * <ul> - * <li>unversionned file</li> - * <li>unexistant file locally</li> - * <li>locally modified file ?</li> - * <li>...</li> - * </ul> - * @throws java.io.IOException if io problem with streams - */ - String getDiff(File file) throws VCSException, IOException; - - - /** - * Generate in the ouputstream the diff between the current revision of the - * local file against another revision (<code>againstRevision</code>) on - * repository. - * If file is uptodate, then does nothing. - * - * @param file the file to treate - * @param againstRevision the against revision to use - * @return the diff - * @throws org.codelutin.vcs.VCSException inf any exception while building diff, such as : - * <ul> - * <li>unversionned file</li> - * <li>unexistant file locally</li> - * <li>locally modified file ?</li> - * <li>...</li> - * </ul> - * @throws java.io.IOException if problem with streams - */ - String getDiff(File file, Object againstRevision) throws VCSException, IOException; - - boolean hasProtocoleChanged() throws VCSException; -} \ No newline at end of file Deleted: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSConnexion.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSConnexion.java 2008-04-06 19:16:23 UTC (rev 432) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSConnexion.java 2008-04-06 19:17:09 UTC (rev 433) @@ -1,117 +0,0 @@ -/** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * # #% - */ -package org.codelutin.vcs; - -import org.codelutin.vcs.type.VCSConnexionMode; -import org.codelutin.vcs.event.VCSConnexionEventListener; - -import java.io.File; -import java.net.URI; - -/** - * Contract to be realized for a connexion to a vcs. - * - * The method {@link #init(VCSConnexionConfig)} must be invoked before using the connexion. - * - * Note: you should not instanciate directly this class but use - * {@link org.codelutin.vcs.VCSProvider#newConnection(org.codelutin.vcs.type.VCSConnexionMode , VCSConnexionConfig)} instead. - * - * @author chemit - */ -public interface VCSConnexion<H extends VCSHandler> extends VCSCommon { - - /** @return the handler */ - H getHandler(); - - /** - * Initialize the connexion. - * - * If connexion can not be established, then the method {@link #hasFailed()} will always - * return <code>true</code>. - * - * @param config config to be used to initialize the connexion. - */ - void init(VCSConnexionConfig config); - - /** - * @return the working copy used, can be null if no working copy exists. - * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. - */ - File getWorkingCopy() throws IllegalStateException; - - /** - * @return the URI used to connect to vcs - * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. - */ - URI getRemoteURI() throws IllegalStateException; - - /** - * @return the mode of this connexion - * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. - */ - VCSConnexionMode getMode() throws IllegalStateException; - - /** - * @return the config of the connexion - * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. - */ - VCSConnexionConfig getConfig() throws IllegalStateException; - - /** - * test if connection is ok - * - * @throws VCSException if any problem - */ - void testConnection() throws VCSException; - - /** - * Close connexion. - * - * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. - */ - void open() throws IllegalStateException; - - /** - * Close connexion. - * - * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. - */ - void close() throws IllegalStateException; - - /** - * @return <code>true</code> if connexion is opened, <code>false</code> otherwise - * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. - */ - boolean isOpen() throws IllegalStateException; - - /** - * @return <code>true</code> if connexion is closed, <code>false</code> otherwise - * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. - */ - boolean isClosed() throws IllegalStateException; - - /** - * @return <code>true</code> if connexion has failed, <code>false</code> otherwise - * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. - */ - boolean hasFailed() throws IllegalStateException; - - /** @param l the listener to add */ - void addVCSConnexionEventListener(VCSConnexionEventListener l); - - /** @param l the listener to remove */ - void removeVCSConnexionEventListener(VCSConnexionEventListener l); - -} Deleted: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSConnexionConfig.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSConnexionConfig.java 2008-04-06 19:16:23 UTC (rev 432) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSConnexionConfig.java 2008-04-06 19:17:09 UTC (rev 433) @@ -1,90 +0,0 @@ -/* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 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.codelutin.vcs.type.VCSTypeRepo; - -import java.io.File; - -/** - * Contract to be realized by a VCSConnexion configuration. - * - * This class has no logic, ans is a <code>POJO</code>. - * - * @author chemit - */ -public interface VCSConnexionConfig { - - /** @return the type of vcs used */ - String getType(); - - /** @return <code>true</code> if ssh connexion is used */ - boolean isUseSshConnexion(); - - /** @return the url of hostname */ - String getHostName(); - - /** @return location of the private ssh2 key file */ - File getKeyFile(); - - /** @return the user connexion login */ - String getUserName(); - - /** @return <code>true</code> if user ssh2 pair keys use a passphrase */ - boolean isNoPassPhrase(); - - String getPassphrase(); - - /** @return the full location path of the remote container of module */ - String getRemotePath(); - - /** @return the name of remote module */ - String getRemoteDatabase(); - - /** @return the full url path to the remote repository (with module name include) */ - String getRemoteDatabasePath(); - - File getLocalDatabasePath(); - - /** @return the type of reposotory used (head,tags,branches,...) */ - VCSTypeRepo getTypeRepo(); - - - void setHostName(String hostName); - - void setKeyFile(File keyFile); - - void setLocalDatabasePath(File localDatabasePath); - - void setNoPassPhrase(boolean noPassPhrase); - - void setPassPhrase(String passPhrase); - - void setRemoteDatabase(String remoteDatabase); - - void setRemotePath(String remotePath); - - void setType(String type); - - void setTypeRepo(VCSTypeRepo typeRepo); - - void setUserName(String userName); - - void setUseSshConnexion(boolean newValue); -} \ No newline at end of file Deleted: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSEntries.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSEntries.java 2008-04-06 19:16:23 UTC (rev 432) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSEntries.java 2008-04-06 19:17:09 UTC (rev 433) @@ -1,141 +0,0 @@ -/** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * # #% - */ -package org.codelutin.vcs; - -import org.codelutin.vcs.type.VCSAction; -import org.codelutin.vcs.type.VCSEntryLocation; -import org.codelutin.vcs.type.VCSState; - -import javax.swing.ListSelectionModel; -import java.util.List; - -/** - * Contract of list of VCSEntry - * - * @author chemit - */ -public interface VCSEntries { - - /** - * Discover and Populate with all local and remote entries. - * - * @param timestamp gloabal timestamp to apply - * @param connexion connexion used to populate - * @throws VCSException if any pb with vcs io - */ - void populate(VCSConnexion connexion, long timestamp) throws VCSException; - - /** - * Populate with no discovering for a given list of local relative paths for a given location type. - * - * Note : We always used the filesystem path separator to encode paths. - * - * @param relativeLocalPaths list of local relative path to populate - * @param location location to be used - * @param timestamp gloabal timestamp to apply - * @param connexion connexion used tro refresh - * @throws VCSException if any pb with vcs io - */ - void populate(VCSConnexion connexion, List<String> relativeLocalPaths, VCSEntryLocation location, long timestamp) throws VCSException; - - /** - * Populate from pre-computed entries. No discovering is done, nor vcs io operations. - * - * @param location given location to use - * @param states pre-computed states to populate - */ - void populate(VCSEntryLocation location, VCSEntry[] states); - - /** - * refresh state of the entry. - * - * @param entries entries to refresh - * @param timestamp global timestamp to apply - * @throws IllegalStateException if entry was never populated - */ - void refresh(List<VCSEntry> entries, long timestamp) throws IllegalStateException; - - /** - * obtain the array of all {@link VCSAction} found in the given entries - * - * @param entries entries to scan - * @return array of {@link VCSAction} found in entires - */ - VCSAction[] getActions(List<VCSEntry> entries); - - /** - * obtain the array of all {@link VCSState} found in the given entries - * - * @param entries entries to scan - * @return array of {@link VCSState found in entires - */ - VCSState[] getStates(List<VCSEntry> entries); - - /** clear the internal list of entries. */ - void clear(); - - /** - * obtain the list of all entries. - * - * @return list of all entries - * @throws IllegalStateException if entry was never populated - */ - List<VCSEntry> getEntries() throws IllegalStateException; - - /** - * obtain the list of all entries for a given connexion - * - * @param connexion filter connexion - * @param entries entries to filter - * @return list of all entries for a given connexion - */ - List<VCSEntry> filter(VCSConnexion connexion, List<VCSEntry> entries); - - /** - * obtain the list of all entries for a given location - * - * @param location filter location - * @param entries entries to filter - * @return list of all entries for a given connexion - */ - List<VCSEntry> filter(VCSEntryLocation location, List<VCSEntry> entries); - - /** - * obtain the list of all entries for a given state - * - * @param state filter state - * @param entries entries to filter - * @return list of all entries for a given connexion - */ - List<VCSEntry> filter(VCSState state, List<VCSEntry> entries); - - /** - * obtain the list of all entries for a given selection model - * - * @param selectionModel filter from selection model - * @param entries entries to filter - * @return list of all entries for a given connexion - */ - List<VCSEntry> filter(ListSelectionModel selectionModel, List<VCSEntry> entries); - - /** - * obtain the list of all entries for a given action - * - * @param action filter state - * @param entries entries to filter - * @return list of all entries for a given connexion - */ - List<VCSEntry> filter(VCSAction action, List<VCSEntry> entries); -} Deleted: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSEntry.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSEntry.java 2008-04-06 19:16:23 UTC (rev 432) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSEntry.java 2008-04-06 19:17:09 UTC (rev 433) @@ -1,128 +0,0 @@ -/** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * # #% - */ -package org.codelutin.vcs; - -import org.codelutin.vcs.type.VCSEntryLocation; -import org.codelutin.vcs.type.VCSState; - -import java.io.BufferedReader; -import java.io.File; -import java.io.Serializable; - -/** - * Contract of an entry in VCS (a file or a dir) - * - * @author chemit - */ -public interface VCSEntry extends Serializable { - - /** - * Populate the state of the entry, this method calls {@link #refresh(long)} method. - * - * @param timestamp gloabal timestamp to apply - * @throws VCSException if anypb with vcs io - */ - void populate(long timestamp) throws VCSException; - - /** - * refresh state of the entry. - * - * @param timestamp global timestamp to apply - * @throws IllegalStateException if entry was never populated - * @throws VCSException if anypb with vcs io - */ - void refresh(long timestamp) throws IllegalStateException, VCSException; - - /** - * Obtain the relative path from root repository to the entry. - * - * Note: We use the filesystem path separator, could not be the same on remote - * - * @return the relativePath from local root repository to the entry - */ - String getRelativeLocalPath(); - - /** - * Obtain the relative path from root repository to the entry. - * - * Note: We use the '/' as path separator, could not be the same on local - * - * @return the relativePath from remote root repository to the entry - */ - String getRelativeRemotePath(); - - /** - * Obtain the projected entry on local working copy. - * - * Note : the file could not exists. - * - * @return the local file represented by this entry - */ - File getFile(); - - /** @return connexion used */ - VCSConnexion getConnexion(); - - /** - * @return the location of entry - * @throws IllegalStateException if entry was never populated - * @see VCSEntryLocation - */ - VCSEntryLocation getLocation() throws IllegalStateException; - - /** - * @return the last state found for the entry - * @throws IllegalStateException if entry was never populated - */ - VCSState getState() throws IllegalStateException; - - /** - * @return the timestamp of the last state synchronization for the entry - * @throws IllegalStateException if entry was never populated - */ - long getTimestamp() throws IllegalStateException; - - /** - * @return the rev of entry - * @throws IllegalStateException if entry was never populated - */ - String getRev() throws IllegalStateException; - - /** - * @return the changelog of entry from local aginst remote - * @throws IllegalStateException if entry was never populated - */ - BufferedReader getChangeLog() throws IllegalStateException; - - /** - * @return the diff of entry from local aginst remote - * @throws IllegalStateException if entry was never populated - */ - BufferedReader getDiff() throws IllegalStateException; - - /** - * @return the local entry content - * @throws IllegalStateException if entry was never populated, or entry is a directory - */ - BufferedReader getLocalContent() throws IllegalStateException; - - /** - * @return the remote entry content - * @throws IllegalStateException if entry was never populated, or entry is a directory - */ - BufferedReader getRemoteContent() throws IllegalStateException; - - void setState(VCSState state); -} \ No newline at end of file Deleted: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSException.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSException.java 2008-04-06 19:16:23 UTC (rev 432) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSException.java 2008-04-06 19:17:09 UTC (rev 433) @@ -1,51 +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; - - -/** - * A generic vcs exception. - * - * @author chemit - */ - -public class VCSException extends Exception { - - private static final long serialVersionUID = -2665066202505740998L; - - public VCSException() { - super(); - } - - public VCSException(String message) { - super(message); - } - - public VCSException(String message, Throwable cause) { - super(message, cause); - } - - public VCSException(Throwable cause) { - super(cause); - } - -} - - Deleted: 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-06 19:16:23 UTC (rev 432) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandler.java 2008-04-06 19:17:09 UTC (rev 433) @@ -1,40 +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; - -/** - * Contract of an VCS handler - * - * @author chemit - */ - -public interface VCSHandler<C extends VCSConnexion> extends VCSCommon { - - /** - * Attach a connexion to handler. - * - * Note : This method MUST be called before all. - * - * @param connexion the connexion to attach - */ - void setConnexion(C connexion); - - -} \ No newline at end of file Deleted: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSProvider.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSProvider.java 2008-04-06 19:16:23 UTC (rev 432) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSProvider.java 2008-04-06 19:17:09 UTC (rev 433) @@ -1,50 +0,0 @@ -/** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * # #% - */ -package org.codelutin.vcs; - -import org.codelutin.vcs.type.VCSConnexionMode; - -/** - * The contract to be realized to provide vcs communication. - * - * Acts as a handler and connexion factory and manage a single handler instance - * - * @author chemit - * @see VCSHandler - * @see VCSConnexion - */ -public interface VCSProvider<C extends VCSConnexion, H extends VCSHandler<C>> { - - /** @return the identifier of the vcs provider (eg SVN, CVS, MOCK) */ - String getName(); - - /** @return the class of implementation of handler to use for this provider */ - Class<H> getHandlerImpl(); - - /** @return the imclass of implementation of connexion to use for this provider */ - Class<C> getConnexionImpl(); - - /** - * Instanciate an new connexion for a given config, and init it. - * - * Note : After this method connexion is init, but not opened. - * - * @param mode the mode required - * @param config the config to be used - * @return the new connexion initialized but not opened. - */ - C newConnection(VCSConnexionMode mode, VCSConnexionConfig config); - -} Deleted: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSRevision.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSRevision.java 2008-04-06 19:16:23 UTC (rev 432) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSRevision.java 2008-04-06 19:17:09 UTC (rev 433) @@ -1,21 +0,0 @@ -/** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * # #% - */ -package org.codelutin.vcs; - -/** @author chemit */ -public interface VCSRevision { - - String getValue(); -} Deleted: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSRuntimeException.java =================================================================== --- trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSRuntimeException.java 2008-04-06 19:16:23 UTC (rev 432) +++ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSRuntimeException.java 2008-04-06 19:17:09 UTC (rev 433) @@ -1,51 +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; - - -/** - * A generic runtime vcs exception. - * - * @author chemit - */ - -public class VCSRuntimeException extends RuntimeException { - - private static final long serialVersionUID = -2665066202505740998L; - - public VCSRuntimeException() { - super(); - } - - public VCSRuntimeException(String message) { - super(message); - } - - public VCSRuntimeException(String message, Throwable cause) { - super(message, cause); - } - - public VCSRuntimeException(Throwable cause) { - super(cause); - } - -} - - Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSCommon.java (from rev 430, trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSCommon.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSCommon.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSCommon.java 2008-04-06 19:17:09 UTC (rev 433) @@ -0,0 +1,302 @@ +/* *##% +* 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.codelutin.vcs.type.VCSState; + +import java.io.File; +import java.io.FileFilter; +import java.io.FilenameFilter; +import java.io.IOException; +import java.util.Collection; +import java.util.List; + +/** + * Contract of operations to realized by a handler or a connexion + * + * @author chemit + */ + +public interface VCSCommon { + + /** + * init working copy, says if it is the first we use it it, we will checkout + * the databaseDirectory directory + * + * @throws org.codelutin.vcs.VCSException if any exception while init + */ + void initWorkingCopy() throws VCSException; + + /** delete the local working copy with all his files */ + void deleteWorkingCopy(); + + /** + * @return a <code>FilenameFilter<code> to detect all files and directories in a vcs working copy that + * must be handled by vcs + */ + FilenameFilter getVersionnableFilenameFilter(); + + /** + * @return a <code>FileFilter<code> to detect all files and directories in a vcs working copy that + * must be handled by vcs + */ + FileFilter getVersionnableFileFilter(); + + /** + * @return name of directory used by vcs to store in working copy, a data's + * directory configuration (e.g CVS for cvs and .svn for svn) + */ + String getConfLocalDirname(); + + /** + * @return name of the file used by vcs to store in working copy + * configuration directory entries of data's directory (e.g Entries + * for cvs and entries for svn) + */ + String getConfLocalEntriesFilename(); + + VCSState getState(File file, Collection tmp) throws VCSException; + + VCSState getState(File file, Collection tmp, boolean noremote) throws VCSException; + + /** + * @param file file to test + * @return <code>true</code> if <code>file</code> is on remote + * repository, <code>false</code> otherwise. + */ + boolean isOnRemote(File file); + + /** + * @param file file to test + * @return <code>true</code> if file is uptodate,<code>false</code> + * otherwise. + * @throws org.codelutin.vcs.VCSException if any exception while operation + */ + boolean isUpToDate(File file) throws VCSException; + + /** + * @param file file to test + * @return <code>true</code> if file is handled by VCS,<code>false</code> + * otherwise. + */ + boolean isVersionnableFile(File file); + + /** + * add on remote repository somes directories + * + * @param commitMessage commit message + * @param dirNames names of the directories to create on remote repository (could + * used multi-level directories) + * @throws org.codelutin.vcs.VCSException if any exception while operation + */ + void makeRemoteDir(String commitMessage, String... dirNames) + throws VCSException; + + /** + * delete on remote repository somes directories + * + * @param commitMessage commit message + * @param dirNames names of the directories to delete on remote repository (could + * used multi-level directories) + * @throws org.codelutin.vcs.VCSException if any exception while operation + */ + void deleteRemoteDir(String commitMessage, String... dirNames) + throws VCSException; + + /** + * add a list of files into repository + * + * @param files files to add + * @param msg message for VCS commit, if <code>null</code> then no commit + * is performed + * @return revision of the operation + * @throws org.codelutin.vcs.VCSException if any exception while operation + */ + long add(List<File> files, String msg) throws VCSException; + + // void add(File file, String msg) throws VCSException; + + /** + * delete a list of files from repository + * + * @param files files to delete + * @param msg message for VCS commit, if <code>null</code> then no commit + * is performed + * @throws org.codelutin.vcs.VCSException if any exception while operation + */ + void delete(List<File> files, String msg) throws VCSException; + + /** + * revert a list of files from repository + * + * @param files files to revert + * @throws org.codelutin.vcs.VCSException if any exception while operation + */ + void revert(List<File> files) throws VCSException; + + /** + * commit a list of files into repository + * + * @param files files to commit + * @param msg message for VCS commit + * @return revision of the operation + * @throws org.codelutin.vcs.VCSException if any exception while operation + */ + long commit(List<File> files, String msg) throws VCSException; + + /** + * update a file to repository to a certain revision + * + * @param file file to update + * @param revision object representing a revision for the current VCS + * @throws org.codelutin.vcs.VCSException if any exception while operation + */ + void update(File file, Object revision) throws VCSException; + + /** + * update a file to repository + * + * @param file file to update + * @throws org.codelutin.vcs.VCSException if any exception while operation + */ + void update(File file) throws VCSException; + + /** + * checkout a module from repository to a local file + * + * @param destDir local file where to checkout + * @param module module's name to checkout + * @param recurse flag to say to recurse checkout or not. + * @throws org.codelutin.vcs.VCSException if any exception while operation + */ + void checkout(File destDir, String module, boolean recurse) throws VCSException; + + void checkoutFile(File destDir, String module) throws VCSException; + + long checkoutOnlyTheDirectory(File root, Object revision) throws VCSException; + + /** + * TODO This is not the good place : VCS != Storage + * + * @param directory directory to treate + * @return TODO + * @throws org.codelutin.vcs.VCSException TODO + */ + List<String> getRemoteStorageNames(File directory) throws VCSException; + + /** + * TODO This is not the good place : VCS != Storage + * + * @param directory directory to treate + * @return TODO + */ + List<String> getLocalStorageNames(File directory); + + /** + * @param f local file to treate + * @return current local revision of a file + * @throws org.codelutin.vcs.VCSException TODO + */ + Object getRevision(File f) throws VCSException; + + /** + * Obtain the list of log entries for the file + * + * @param startRevision TODO + * @param endRevision TODO + * @param file file to treate + * @return list of log entries for this file between two revisions + * @throws org.codelutin.vcs.VCSException if any exception while grabbing infos + */ + List getLog(Object startRevision, Object endRevision, File file) + throws VCSException; + + /** + * obtain the content of a file for a specific revision + * + * @param file file to obtain + * @param revision revision treated + * @return the content of the file on repository for the specific revision + * passed as arguement. + * @throws org.codelutin.vcs.VCSException if any exception while operation + * @throws java.io.IOException TODO + */ + String getFileContent(File file, Object revision) throws VCSException, IOException; + + /** + * Build the changelog for <code>file</code> from current revision of this + * local file against head repository head version. For each revision + * between current revision and head revision of this file, we give the + * following informations : + * <ul> + * <li>revision number</li> + * <li>author</li> + * <li>date</li> + * <li>commit message</li> + * </ul> + * + * @param file file to treate + * @return a string representation of change log for the local file to the + * head ? + * @throws org.codelutin.vcs.VCSException if any exception while building changelog + */ + String getChangeLog(File file) throws VCSException; + + /** + * Generate in the ouputstream the diff between the current revision of the + * local file against headest revision on repository. + * If file is uptodate, then does nothing. + * + * @param file the file to treate + * @return the diff + * @throws org.codelutin.vcs.VCSException inf any exception while building diff, such as : + * <ul> + * <li>unversionned file</li> + * <li>unexistant file locally</li> + * <li>locally modified file ?</li> + * <li>...</li> + * </ul> + * @throws java.io.IOException if io problem with streams + */ + String getDiff(File file) throws VCSException, IOException; + + + /** + * Generate in the ouputstream the diff between the current revision of the + * local file against another revision (<code>againstRevision</code>) on + * repository. + * If file is uptodate, then does nothing. + * + * @param file the file to treate + * @param againstRevision the against revision to use + * @return the diff + * @throws org.codelutin.vcs.VCSException inf any exception while building diff, such as : + * <ul> + * <li>unversionned file</li> + * <li>unexistant file locally</li> + * <li>locally modified file ?</li> + * <li>...</li> + * </ul> + * @throws java.io.IOException if problem with streams + */ + String getDiff(File file, Object againstRevision) throws VCSException, IOException; + + boolean hasProtocoleChanged() throws VCSException; +} \ No newline at end of file Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSConnexion.java (from rev 430, trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSConnexion.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSConnexion.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSConnexion.java 2008-04-06 19:17:09 UTC (rev 433) @@ -0,0 +1,117 @@ +/** + * # #% 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.codelutin.vcs.type.VCSConnexionMode; +import org.codelutin.vcs.event.VCSConnexionEventListener; + +import java.io.File; +import java.net.URI; + +/** + * Contract to be realized for a connexion to a vcs. + * + * The method {@link #init(VCSConnexionConfig)} must be invoked before using the connexion. + * + * Note: you should not instanciate directly this class but use + * {@link org.codelutin.vcs.VCSProvider#newConnection(org.codelutin.vcs.type.VCSConnexionMode , VCSConnexionConfig)} instead. + * + * @author chemit + */ +public interface VCSConnexion<H extends VCSHandler> extends VCSCommon { + + /** @return the handler */ + H getHandler(); + + /** + * Initialize the connexion. + * + * If connexion can not be established, then the method {@link #hasFailed()} will always + * return <code>true</code>. + * + * @param config config to be used to initialize the connexion. + */ + void init(VCSConnexionConfig config); + + /** + * @return the working copy used, can be null if no working copy exists. + * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. + */ + File getWorkingCopy() throws IllegalStateException; + + /** + * @return the URI used to connect to vcs + * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. + */ + URI getRemoteURI() throws IllegalStateException; + + /** + * @return the mode of this connexion + * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. + */ + VCSConnexionMode getMode() throws IllegalStateException; + + /** + * @return the config of the connexion + * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. + */ + VCSConnexionConfig getConfig() throws IllegalStateException; + + /** + * test if connection is ok + * + * @throws VCSException if any problem + */ + void testConnection() throws VCSException; + + /** + * Close connexion. + * + * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. + */ + void open() throws IllegalStateException; + + /** + * Close connexion. + * + * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. + */ + void close() throws IllegalStateException; + + /** + * @return <code>true</code> if connexion is opened, <code>false</code> otherwise + * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. + */ + boolean isOpen() throws IllegalStateException; + + /** + * @return <code>true</code> if connexion is closed, <code>false</code> otherwise + * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. + */ + boolean isClosed() throws IllegalStateException; + + /** + * @return <code>true</code> if connexion has failed, <code>false</code> otherwise + * @throws IllegalStateException if {@link #init(VCSConnexionConfig)} was not invoked before. + */ + boolean hasFailed() throws IllegalStateException; + + /** @param l the listener to add */ + void addVCSConnexionEventListener(VCSConnexionEventListener l); + + /** @param l the listener to remove */ + void removeVCSConnexionEventListener(VCSConnexionEventListener l); + +} Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSConnexionConfig.java (from rev 430, trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSConnexionConfig.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSConnexionConfig.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSConnexionConfig.java 2008-04-06 19:17:09 UTC (rev 433) @@ -0,0 +1,90 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 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.codelutin.vcs.type.VCSTypeRepo; + +import java.io.File; + +/** + * Contract to be realized by a VCSConnexion configuration. + * + * This class has no logic, ans is a <code>POJO</code>. + * + * @author chemit + */ +public interface VCSConnexionConfig { + + /** @return the type of vcs used */ + String getType(); + + /** @return <code>true</code> if ssh connexion is used */ + boolean isUseSshConnexion(); + + /** @return the url of hostname */ + String getHostName(); + + /** @return location of the private ssh2 key file */ + File getKeyFile(); + + /** @return the user connexion login */ + String getUserName(); + + /** @return <code>true</code> if user ssh2 pair keys use a passphrase */ + boolean isNoPassPhrase(); + + String getPassphrase(); + + /** @return the full location path of the remote container of module */ + String getRemotePath(); + + /** @return the name of remote module */ + String getRemoteDatabase(); + + /** @return the full url path to the remote repository (with module name include) */ + String getRemoteDatabasePath(); + + File getLocalDatabasePath(); + + /** @return the type of reposotory used (head,tags,branches,...) */ + VCSTypeRepo getTypeRepo(); + + + void setHostName(String hostName); + + void setKeyFile(File keyFile); + + void setLocalDatabasePath(File localDatabasePath); + + void setNoPassPhrase(boolean noPassPhrase); + + void setPassPhrase(String passPhrase); + + void setRemoteDatabase(String remoteDatabase); + + void setRemotePath(String remotePath); + + void setType(String type); + + void setTypeRepo(VCSTypeRepo typeRepo); + + void setUserName(String userName); + + void setUseSshConnexion(boolean newValue); +} \ No newline at end of file Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSEntries.java (from rev 430, trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSEntries.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSEntries.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSEntries.java 2008-04-06 19:17:09 UTC (rev 433) @@ -0,0 +1,141 @@ +/** + * # #% 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.codelutin.vcs.type.VCSAction; +import org.codelutin.vcs.type.VCSEntryLocation; +import org.codelutin.vcs.type.VCSState; + +import javax.swing.ListSelectionModel; +import java.util.List; + +/** + * Contract of list of VCSEntry + * + * @author chemit + */ +public interface VCSEntries { + + /** + * Discover and Populate with all local and remote entries. + * + * @param timestamp gloabal timestamp to apply + * @param connexion connexion used to populate + * @throws VCSException if any pb with vcs io + */ + void populate(VCSConnexion connexion, long timestamp) throws VCSException; + + /** + * Populate with no discovering for a given list of local relative paths for a given location type. + * + * Note : We always used the filesystem path separator to encode paths. + * + * @param relativeLocalPaths list of local relative path to populate + * @param location location to be used + * @param timestamp gloabal timestamp to apply + * @param connexion connexion used tro refresh + * @throws VCSException if any pb with vcs io + */ + void populate(VCSConnexion connexion, List<String> relativeLocalPaths, VCSEntryLocation location, long timestamp) throws VCSException; + + /** + * Populate from pre-computed entries. No discovering is done, nor vcs io operations. + * + * @param location given location to use + * @param states pre-computed states to populate + */ + void populate(VCSEntryLocation location, VCSEntry[] states); + + /** + * refresh state of the entry. + * + * @param entries entries to refresh + * @param timestamp global timestamp to apply + * @throws IllegalStateException if entry was never populated + */ + void refresh(List<VCSEntry> entries, long timestamp) throws IllegalStateException; + + /** + * obtain the array of all {@link VCSAction} found in the given entries + * + * @param entries entries to scan + * @return array of {@link VCSAction} found in entires + */ + VCSAction[] getActions(List<VCSEntry> entries); + + /** + * obtain the array of all {@link VCSState} found in the given entries + * + * @param entries entries to scan + * @return array of {@link VCSState found in entires + */ + VCSState[] getStates(List<VCSEntry> entries); + + /** clear the internal list of entries. */ + void clear(); + + /** + * obtain the list of all entries. + * + * @return list of all entries + * @throws IllegalStateException if entry was never populated + */ + List<VCSEntry> getEntries() throws IllegalStateException; + + /** + * obtain the list of all entries for a given connexion + * + * @param connexion filter connexion + * @param entries entries to filter + * @return list of all entries for a given connexion + */ + List<VCSEntry> filter(VCSConnexion connexion, List<VCSEntry> entries); + + /** + * obtain the list of all entries for a given location + * + * @param location filter location + * @param entries entries to filter + * @return list of all entries for a given connexion + */ + List<VCSEntry> filter(VCSEntryLocation location, List<VCSEntry> entries); + + /** + * obtain the list of all entries for a given state + * + * @param state filter state + * @param entries entries to filter + * @return list of all entries for a given connexion + */ + List<VCSEntry> filter(VCSState state, List<VCSEntry> entries); + + /** + * obtain the list of all entries for a given selection model + * + * @param selectionModel filter from selection model + * @param entries entries to filter + * @return list of all entries for a given connexion + */ + List<VCSEntry> filter(ListSelectionModel selectionModel, List<VCSEntry> entries); + + /** + * obtain the list of all entries for a given action + * + * @param action filter state + * @param entries entries to filter + * @return list of all entries for a given connexion + */ + List<VCSEntry> filter(VCSAction action, List<VCSEntry> entries); +} Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSEntry.java (from rev 430, trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSEntry.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSEntry.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSEntry.java 2008-04-06 19:17:09 UTC (rev 433) @@ -0,0 +1,128 @@ +/** + * # #% 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.codelutin.vcs.type.VCSEntryLocation; +import org.codelutin.vcs.type.VCSState; + +import java.io.BufferedReader; +import java.io.File; +import java.io.Serializable; + +/** + * Contract of an entry in VCS (a file or a dir) + * + * @author chemit + */ +public interface VCSEntry extends Serializable { + + /** + * Populate the state of the entry, this method calls {@link #refresh(long)} method. + * + * @param timestamp gloabal timestamp to apply + * @throws VCSException if anypb with vcs io + */ + void populate(long timestamp) throws VCSException; + + /** + * refresh state of the entry. + * + * @param timestamp global timestamp to apply + * @throws IllegalStateException if entry was never populated + * @throws VCSException if anypb with vcs io + */ + void refresh(long timestamp) throws IllegalStateException, VCSException; + + /** + * Obtain the relative path from root repository to the entry. + * + * Note: We use the filesystem path separator, could not be the same on remote + * + * @return the relativePath from local root repository to the entry + */ + String getRelativeLocalPath(); + + /** + * Obtain the relative path from root repository to the entry. + * + * Note: We use the '/' as path separator, could not be the same on local + * + * @return the relativePath from remote root repository to the entry + */ + String getRelativeRemotePath(); + + /** + * Obtain the projected entry on local working copy. + * + * Note : the file could not exists. + * + * @return the local file represented by this entry + */ + File getFile(); + + /** @return connexion used */ + VCSConnexion getConnexion(); + + /** + * @return the location of entry + * @throws IllegalStateException if entry was never populated + * @see VCSEntryLocation + */ + VCSEntryLocation getLocation() throws IllegalStateException; + + /** + * @return the last state found for the entry + * @throws IllegalStateException if entry was never populated + */ + VCSState getState() throws IllegalStateException; + + /** + * @return the timestamp of the last state synchronization for the entry + * @throws IllegalStateException if entry was never populated + */ + long getTimestamp() throws IllegalStateException; + + /** + * @return the rev of entry + * @throws IllegalStateException if entry was never populated + */ + String getRev() throws IllegalStateException; + + /** + * @return the changelog of entry from local aginst remote + * @throws IllegalStateException if entry was never populated + */ + BufferedReader getChangeLog() throws IllegalStateException; + + /** + * @return the diff of entry from local aginst remote + * @throws IllegalStateException if entry was never populated + */ + BufferedReader getDiff() throws IllegalStateException; + + /** + * @return the local entry content + * @throws IllegalStateException if entry was never populated, or entry is a directory + */ + BufferedReader getLocalContent() throws IllegalStateException; + + /** + * @return the remote entry content + * @throws IllegalStateException if entry was never populated, or entry is a directory + */ + BufferedReader getRemoteContent() throws IllegalStateException; + + void setState(VCSState state); +} \ No newline at end of file Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSException.java (from rev 430, trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSException.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSException.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSException.java 2008-04-06 19:17:09 UTC (rev 433) @@ -0,0 +1,51 @@ +/* *##% +* 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; + + +/** + * A generic vcs exception. + * + * @author chemit + */ + +public class VCSException extends Exception { + + private static final long serialVersionUID = -2665066202505740998L; + + public VCSException() { + super(); + } + + public VCSException(String message) { + super(message); + } + + public VCSException(String message, Throwable cause) { + super(message, cause); + } + + public VCSException(Throwable cause) { + super(cause); + } + +} + + Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSHandler.java (from rev 430, trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSHandler.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSHandler.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSHandler.java 2008-04-06 19:17:09 UTC (rev 433) @@ -0,0 +1,40 @@ +/* *##% +* 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; + +/** + * Contract of an VCS handler + * + * @author chemit + */ + +public interface VCSHandler<C extends VCSConnexion> extends VCSCommon { + + /** + * Attach a connexion to handler. + * + * Note : This method MUST be called before all. + * + * @param connexion the connexion to attach + */ + void setConnexion(C connexion); + + +} \ No newline at end of file Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSProvider.java (from rev 430, trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSProvider.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSProvider.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSProvider.java 2008-04-06 19:17:09 UTC (rev 433) @@ -0,0 +1,50 @@ +/** + * # #% 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.codelutin.vcs.type.VCSConnexionMode; + +/** + * The contract to be realized to provide vcs communication. + * + * Acts as a handler and connexion factory and manage a single handler instance + * + * @author chemit + * @see VCSHandler + * @see VCSConnexion + */ +public interface VCSProvider<C extends VCSConnexion, H extends VCSHandler<C>> { + + /** @return the identifier of the vcs provider (eg SVN, CVS, MOCK) */ + String getName(); + + /** @return the class of implementation of handler to use for this provider */ + Class<H> getHandlerImpl(); + + /** @return the imclass of implementation of connexion to use for this provider */ + Class<C> getConnexionImpl(); + + /** + * Instanciate an new connexion for a given config, and init it. + * + * Note : After this method connexion is init, but not opened. + * + * @param mode the mode required + * @param config the config to be used + * @return the new connexion initialized but not opened. + */ + C newConnection(VCSConnexionMode mode, VCSConnexionConfig config); + +} Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSRevision.java (from rev 430, trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSRevision.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSRevision.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSRevision.java 2008-04-06 19:17:09 UTC (rev 433) @@ -0,0 +1,21 @@ +/** + * # #% 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; + +/** @author chemit */ +public interface VCSRevision { + + String getValue(); +} Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSRuntimeException.java (from rev 430, trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/VCSRuntimeException.java) =================================================================== --- trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSRuntimeException.java (rev 0) +++ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/VCSRuntimeException.java 2008-04-06 19:17:09 UTC (rev 433) @@ -0,0 +1,51 @@ +/* *##% +* 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; + + +/** + * A generic runtime vcs exception. + * + * @author chemit + */ + +public class VCSRuntimeException extends RuntimeException { + + private static final long serialVersionUID = -2665066202505740998L; + + public VCSRuntimeException() { + super(); + } + + public VCSRuntimeException(String message) { + super(message); + } + + public VCSRuntimeException(String message, Throwable cause) { + super(message, cause); + } + + public VCSRuntimeException(Throwable cause) { + super(cause); + } + +} + +

1 0

r432 - 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 April 6, 2008

April 6, 2008

Author: tchemit Date: 2008-04-06 19:16:23 +0000 (Sun, 06 Apr 2008) New Revision: 432 Added: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/event/ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/type/ trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/util/ Removed: trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/event/ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/type/ trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/util/ Log: remove module api, now just the core-module :) Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/event (from rev 430, trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/event) Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/type (from rev 430, trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/type) Copied: trunk/lutinvcs/lutinvcs-core/src/main/java/org/codelutin/vcs/util (from rev 430, trunk/lutinvcs/lutinvcs-api/src/main/java/org/codelutin/vcs/util)

1 0

r431 - in trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui: . handler
by tchemit＠users.labs.libre-entreprise.org April 6, 2008

April 6, 2008

Author: tchemit Date: 2008-04-06 19:06:37 +0000 (Sun, 06 Apr 2008) New Revision: 431 Removed: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/VCSAbsractAction.java Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/AbstractTabUIHandler.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/ConfirmUIHandler.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java Log: clean code + suppress unused action Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java 2008-04-06 18:49:38 UTC (rev 430) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/AbstractVCSPopup.java 2008-04-06 19:06:37 UTC (rev 431) @@ -15,15 +15,15 @@ package org.codelutin.vcs.ui; import org.codelutin.vcs.type.VCSAction; -import org.codelutin.vcs.ui.handler.VCSAbsractAction; +import javax.swing.AbstractAction; import javax.swing.JMenuItem; import java.awt.event.ActionEvent; /** @author chemit */ public abstract class AbstractVCSPopup extends javax.swing.JPopupMenu { - protected VCSAbsractAction dispatchAction; + protected AbstractAction dispatchAction; public abstract JMenuItem getRefresh(); @@ -37,12 +37,12 @@ public abstract JMenuItem getDelete(); - public void setDispatchAction(VCSAbsractAction action) { + public void setDispatchAction(javax.swing.AbstractAction action) { this.dispatchAction = action; } protected void doAction(VCSAction action, JMenuItem item) { - dispatchAction.setAction(action); + //dispatchAction.setAction(action); ActionEvent e = new ActionEvent(item, 1, action.name()); dispatchAction.actionPerformed(e); } Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/AbstractTabUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/AbstractTabUIHandler.java 2008-04-06 18:49:38 UTC (rev 430) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/AbstractTabUIHandler.java 2008-04-06 19:06:37 UTC (rev 431) @@ -52,7 +52,6 @@ public void doSelectLocation(VCSEntryLocation location) { log.info(location); getUi().getCardLayout().show(getUi().getPreview(), "tab" + location.name().toLowerCase()); - } } \ No newline at end of file Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/ConfirmUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/ConfirmUIHandler.java 2008-04-06 18:49:38 UTC (rev 430) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/ConfirmUIHandler.java 2008-04-06 19:06:37 UTC (rev 431) @@ -16,9 +16,9 @@ import org.codelutin.vcs.VCSEntry; import org.codelutin.vcs.type.VCSAction; +import org.codelutin.vcs.ui.AbstractConfirmUI; import org.codelutin.vcs.ui.model.AbstractVCSEntriesTableModel; import org.codelutin.vcs.ui.model.ConfirmUIModel; -import org.codelutin.vcs.ui.AbstractConfirmUI; import javax.swing.ListSelectionModel; import java.beans.PropertyChangeEvent; @@ -27,21 +27,6 @@ /** @author chemit */ public class ConfirmUIHandler extends org.codelutin.vcs.ui.handler.AbstractUIHandler<ConfirmUIModel, AbstractConfirmUI> { - - public ConfirmUIHandler() { - super(); - //this.ui = new JConfirmUI(this); - } - - /*public void setUi(AbstractConfirmUI ui) { - this.ui = ui; - }*/ - - /*public ConfirmUIModel getModel() { - return getUi().getModel(); - }*/ - - public Class<AbstractConfirmUI> getUiClass() { return AbstractConfirmUI.class; } Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java 2008-04-06 18:49:38 UTC (rev 430) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/DiffUIHandler.java 2008-04-06 19:06:37 UTC (rev 431) @@ -17,32 +17,15 @@ import org.codelutin.vcs.VCSEntry; import org.codelutin.vcs.type.VCSAction; import org.codelutin.vcs.type.VCSEntryLocation; -import org.codelutin.vcs.ui.model.DiffUIModel; import org.codelutin.vcs.ui.AbstractDiffUI; +import org.codelutin.vcs.ui.model.DiffUIModel; import java.beans.PropertyChangeEvent; /** @author chemit */ public class DiffUIHandler extends org.codelutin.vcs.ui.handler.AbstractTabUIHandler<DiffUIModel, AbstractDiffUI> { - //protected AbstractDiffUI ui; - public DiffUIHandler() { - //this.ui = new JDiffUI(this); - } - - /*public AbstractDiffUI getUi() { - return ui; - }*/ - - /*public void setUi(AbstractDiffUI ui) { - this.ui = ui; - } - - public DiffUIModel getModel() { - return ui.getModel(); - }*/ - public Class<AbstractDiffUI> getUiClass() { return AbstractDiffUI.class; } Modified: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java 2008-04-06 18:49:38 UTC (rev 430) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/SynchUIHandler.java 2008-04-06 19:06:37 UTC (rev 431) @@ -12,6 +12,7 @@ import javax.swing.JTable; import javax.swing.ListSelectionModel; +import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -21,12 +22,6 @@ /** @author chemit */ public class SynchUIHandler extends org.codelutin.vcs.ui.handler.AbstractTabUIHandler<SynchUIModel, AbstractSynchUI> { - //protected AbstractSynchUI ui; - - public SynchUIHandler() { - //this.ui = new JSynchUI(this); - } - public Class<AbstractSynchUI> getUiClass() { return AbstractSynchUI.class; } @@ -35,26 +30,6 @@ return SynchUIModel.class; } - /*public void setUi(AbstractSynchUI ui) { - this.ui = ui; - } - - public AbstractSynchUI getUi() { - return ui; - }*/ - - /*public SynchUIModel getModel() { - return ui.getModel(); - }*/ - - /*public void doAllAction(VCSAction action) { - doAction(action, false); - } - - public void doSelectAction(VCSAction action) { - doAction(action, true); - }*/ - @Override public void doSelectLocation(VCSEntryLocation location) { @@ -112,12 +87,14 @@ table.addMouseListener(new ListMouseListener(getUi(), fileStatesModel, location)); AbstractVCSPopup popup = getUi().getPopup(location); - popup.setDispatchAction(new VCSAbsractAction() { + popup.setDispatchAction(new AbstractAction() { + private static final long serialVersionUID = 8622118724992019898L; public void actionPerformed(ActionEvent e) { - doAction(action, false); + doAction(VCSAction.valueOf(e.getActionCommand()), true); } + }); } Deleted: trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/VCSAbsractAction.java =================================================================== --- trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/VCSAbsractAction.java 2008-04-06 18:49:38 UTC (rev 430) +++ trunk/lutinvcs/lutinvcs-ui-common/src/main/java/org/codelutin/vcs/ui/handler/VCSAbsractAction.java 2008-04-06 19:06:37 UTC (rev 431) @@ -1,39 +0,0 @@ -/** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * # #% - */ -package org.codelutin.vcs.ui.handler; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.vcs.type.VCSAction; - -import javax.swing.AbstractAction; - -/** @author chemit */ -public abstract class VCSAbsractAction extends AbstractAction { - - protected static Log log = LogFactory.getLog(VCSAbsractAction.class); - - protected VCSAction action; - - private static final long serialVersionUID = 1074145285171920255L; - - public VCSAbsractAction() { - } - - public void setAction(VCSAction action) { - this.action = action; - } - -}

1 0

r430 - trunk/lutinvcs/lutinvcs-ui-jaxx/src/test/resources
by tchemit＠users.labs.libre-entreprise.org April 6, 2008

April 6, 2008

Author: tchemit Date: 2008-04-06 18:49:38 +0000 (Sun, 06 Apr 2008) New Revision: 430 Removed: trunk/lutinvcs/lutinvcs-ui-jaxx/src/test/resources/log4j.properties Log: create lutinvcs-all module (will be also used to make global tests) Deleted: trunk/lutinvcs/lutinvcs-ui-jaxx/src/test/resources/log4j.properties =================================================================== --- trunk/lutinvcs/lutinvcs-ui-jaxx/src/test/resources/log4j.properties 2008-04-06 18:36:31 UTC (rev 429) +++ trunk/lutinvcs/lutinvcs-ui-jaxx/src/test/resources/log4j.properties 2008-04-06 18:49:38 UTC (rev 430) @@ -1,9 +0,0 @@ -# Global logging configuration -log4j.rootLogger=ERROR, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n -#log4j.appender.stdout.layout.ConversionPattern=%%c=%c %%C=%C %%d=%d %%F=%F %%l=%l %%L=%L %%m=%m %%M=%M %%p=%p %%r=%r %%t=%t %%x=%x %%X=%X -# package level -log4j.logger.org.codelutin=INFO

1 0