Merge branch 'README' into ui-activities-1.5
diff --git a/pom.xml b/pom.xml
index 44b46e0..62f4e5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.taverna.t2</groupId>
<artifactId>ui-activities</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.5</version>
</parent>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>disabled-activity-ui</artifactId>
@@ -48,12 +48,12 @@
<dependency>
<groupId>javax.help</groupId>
<artifactId>javahelp</artifactId>
- <version>2.0.02</version>
+ <version>${javahelp.version}</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.lang</groupId>
<artifactId>uibuilder</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>${t2.lang.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledConfigView.java b/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledConfigView.java
index 709d1d3..19b1aba 100644
--- a/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledConfigView.java
+++ b/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledConfigView.java
@@ -55,6 +55,7 @@
import net.sf.taverna.t2.lang.uibuilder.UIBuilder;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.DomDriver;
public class DisabledConfigView extends ActivityConfigurationPanel<DisabledActivity, ActivityAndBeanWrapper> {
@@ -77,7 +78,7 @@
this,
"net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.DisabledConfigView");
configuration = activity.getConfiguration();
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new DomDriver());
Activity a = configuration.getActivity();
xstream.setClassLoader(a.getClass().getClassLoader());
Object origConfig = configuration.getBean();
@@ -116,7 +117,7 @@
newConfig.setBean(clonedConfig);
configuration = newConfig;
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new DomDriver());
xstream.setClassLoader(configuration.getActivity().getClass().getClassLoader());
origConfigXML = xstream.toXML(clonedConfig);
@@ -129,7 +130,7 @@
}
public boolean isConfigurationChanged() {
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new DomDriver());
xstream.setClassLoader(configuration.getActivity().getClass().getClassLoader());
return (!xstream.toXML(clonedConfig).equals(origConfigXML));
}
