diff --git a/CHANGES b/CHANGES index e112f73acf61a36e6e05ea42e6ea134b2fb2fa27..717ce890f0f6e37160d383a98a2ff744c4a4c2d9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +v1.7.2 +------ + +* Fixed: StorageManager.reserveName() was not detecting anymore (since + 6f64d9e845, i.e. since v1.6) that a workflow's name was already used. + v1.7.1 ------ diff --git a/src/eu/telecom_bretagne/praxis/client/StorageManager.java b/src/eu/telecom_bretagne/praxis/client/StorageManager.java index 66858ecf238b084dfeb6e0e9d5ae0b7f4d55b127..19626e9a66a57bc67a64e17921c3db3c9f4c2012 100644 --- a/src/eu/telecom_bretagne/praxis/client/StorageManager.java +++ b/src/eu/telecom_bretagne/praxis/client/StorageManager.java @@ -397,10 +397,10 @@ public class StorageManager */ synchronized public static boolean reserveName(String name) { - File reserved = new File(rootWorkflowDirectoryPath(name)); - if (Arrays.asList(getAllWorkflowsNames()).contains(reserved)) + if (Arrays.asList(getAllWorkflowsNames()).contains(name)) return false; - reservedNames.add(new File(rootWorkflowDirectoryPath(name))); + File reserved = new File(rootWorkflowDirectoryPath(name)); + reservedNames.add(reserved); return true; } diff --git a/src/eu/telecom_bretagne/praxis/common/ReleaseInfo.java b/src/eu/telecom_bretagne/praxis/common/ReleaseInfo.java index 6dc34dbaffa6e154f9ae78823f51bce3b4c995cf..82660a341e8626fa2893264aac7e5703a4d494a9 100644 --- a/src/eu/telecom_bretagne/praxis/common/ReleaseInfo.java +++ b/src/eu/telecom_bretagne/praxis/common/ReleaseInfo.java @@ -7,15 +7,15 @@ package eu.telecom_bretagne.praxis.common; */ public abstract class ReleaseInfo { - public static final String release = "1.7.1"; + public static final String release = "1.7.2"; public static final int revision = 0; public static final int application_revision = Configuration.getInt("revision"); - public static final String release_date = "2012-08-12"; + public static final String release_date = "2012-08-14"; - public static final String package_date = "2012-08-12"; + public static final String package_date = "2012-08-14"; /** * Returns a array of three strings: the release, the application_revision number, and the release date diff --git a/src/eu/telecom_bretagne/praxis/core/resource/ParameterDescription.java b/src/eu/telecom_bretagne/praxis/core/resource/ParameterDescription.java index 02e5ee3ee8bf3bacd7c0cfa6ba46b07eff1b9d80..0e3546923ac6f4caddf453bc39507e8887664065 100644 --- a/src/eu/telecom_bretagne/praxis/core/resource/ParameterDescription.java +++ b/src/eu/telecom_bretagne/praxis/core/resource/ParameterDescription.java @@ -260,7 +260,7 @@ public class ParameterDescription implements Serializable public ParameterDescription(String valueTemplate, String valueTemplateTarget, String dependence, String valueConstraint, String valueConstraintDescription, String description, String displayName, String id, int indentation, boolean ishidden, boolean ismandatory, - boolean honorDoNotExportFlag, int position, ParameterType type, List<IOType> types, + boolean isUserBound, int position, ParameterType type, List<IOType> types, String vdef, Item[] vlist, int parameterCount) { this.valueTemplate = valueTemplate; @@ -274,7 +274,7 @@ public class ParameterDescription implements Serializable this.indentation = indentation; this.ishidden = ishidden; this.ismandatory = ismandatory; - this.isUserBound = honorDoNotExportFlag; + this.isUserBound = isUserBound; this.position = position; setTypeAndVdef(type, vdef); this.types = types; diff --git a/src/eu/telecom_bretagne/praxis/core/workflow/Workflow.java b/src/eu/telecom_bretagne/praxis/core/workflow/Workflow.java index 4ed85ed7682d6f3513fb8aecc30679c5b034f42a..20376743f24a43fee4b146ffaddcc3770e273471 100644 --- a/src/eu/telecom_bretagne/praxis/core/workflow/Workflow.java +++ b/src/eu/telecom_bretagne/praxis/core/workflow/Workflow.java @@ -391,7 +391,7 @@ public class Workflow implements java.io.Serializable public Workflow clone() { Workflow clone; try { - clone = new Workflow(toXMLDocument(false), new XMLWarnings()); + clone = new Workflow(toXMLDocument(true), new XMLWarnings()); } catch (InvalidXMLException e) { // Sounds impossible. If this happens, there's something wrong in the implementation itself! Log.log.log(Level.SEVERE, "Ooops, unable to clone() ?!!", e);