Author: chatellier Date: 2011-06-17 09:41:30 +0000 (Fri, 17 Jun 2011) New Revision: 3418 Log: Fix vcs delete diff Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2011-06-17 08:39:59 UTC (rev 3417) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2011-06-17 09:41:30 UTC (rev 3418) @@ -191,15 +191,4 @@ public void reload() { content = null; } - - /** - * Return diff between current file content and VCS file content. - * - * @return diff as string - * @throws VCSException - * @throws IOException - */ - public String diff() throws VCSException, IOException { - return getVCS().getDiff(getFile()); - } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2011-06-17 08:39:59 UTC (rev 3417) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2011-06-17 09:41:30 UTC (rev 3418) @@ -136,11 +136,11 @@ * @return Le storage pour la regle */ static public ScriptStorage getCommunityScript(String name) { - String cacheName = getContextDatabaseCacheKey(name); + String cacheName = getCommunityDatabaseCacheKey(name); ScriptStorage result = scriptsCache.get(cacheName); if (result == null) { - result = new ScriptStorage(getContextDatabaseDirectory(), - getScriptDirectory(), name); + result = new ScriptStorage(getCommunityDatabaseDirectory(), + getCommunityScriptDirectory(), name); scriptsCache.put(cacheName, result); } return result; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2011-06-17 08:39:59 UTC (rev 3417) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2011-06-17 09:41:30 UTC (rev 3418) @@ -28,6 +28,7 @@ import static org.nuiton.i18n.I18n._; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -327,7 +328,7 @@ } try { - getVCS().delete(files, _("isisfish.versionStorage.removed")); + getCurrentVCS().delete(files, _("isisfish.versionStorage.removed")); } catch (VCSException eee) { throw new StorageException( _("isisfish.error.delete.vcs.files"), eee); @@ -362,15 +363,26 @@ */ public void update() throws VCSException { prepare(); - getVCS().update(getFile(), true); + getCurrentVCS().update(getFile(), true); } public boolean isUpToDate() throws VCSException { prepare(); - return getVCS().isUpToDate(getFile()); + return getCurrentVCS().isUpToDate(getFile()); } /** + * Return diff between current file content and VCS file content. + * + * @return diff as string + * @throws VCSException + * @throws IOException + */ + public String diff() throws VCSException, IOException { + return getCurrentVCS().getDiff(getFile()); + } + + /** * Permet de ramener tout un répertoire du VCS. Utile seulement pour le * premier lancement pour scipts et exports. *