fixed PROBPLUGIN-27 using a newer version of xstream (the old one was

not compatible with java 7)

de.bmotionstudio.gef.editor/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/ext/xmlpull-1.1.3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ext/xstream-1.4.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ext/groovy-all-1.8.6.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/ext/xpp3_min-1.1.4c.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ext/xstream-1.3.1.jar" sourcepath="D:/xstream-distribution-1.3.1-src.zip"/>
 	<classpathentry exported="true" kind="lib" path="lib/ext/animation-1.2.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF

@@ -20,7 +20,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-BuddyPolicy: registered
 Bundle-Vendor: HHU Düsseldorf STUPS Group
 Export-Package: com.thoughtworks.xstream,
- com.thoughtworks.xstream.alias,
  com.thoughtworks.xstream.annotations,
  com.thoughtworks.xstream.converters,
  com.thoughtworks.xstream.converters.basic,
@@ -35,27 +34,142 @@ Export-Package: com.thoughtworks.xstream,
  com.thoughtworks.xstream.io.binary,
  com.thoughtworks.xstream.io.copy,
  com.thoughtworks.xstream.io.json,
+ com.thoughtworks.xstream.io.naming,
  com.thoughtworks.xstream.io.path,
  com.thoughtworks.xstream.io.xml,
  com.thoughtworks.xstream.io.xml.xppdom,
  com.thoughtworks.xstream.mapper,
  com.thoughtworks.xstream.persistence,
+ de.bmotionstudio.gef.editor;
+  uses:="org.eclipse.jface.wizard,
+   org.eclipse.core.runtime,
+   de.prob.core,
+   org.eclipse.gef.editparts,
+   org.eclipse.gef.palette,
+   org.eclipse.jface.action,
+   org.eclipse.gef.commands,
+   org.eclipse.core.resources,
+   org.eclipse.jface.viewers,
+   de.bmotionstudio.gef.editor.model,
+   org.eclipse.gef.ui.parts,
+   org.eclipse.gef,
+   org.eclipse.gef.ui.properties,
+   org.eclipse.jface.resource,
+   org.eclipse.gef.ui.actions,
+   org.eclipse.ui,
+   org.eclipse.ui.views.properties,
+   org.eclipse.ui.plugin,
+   de.bmotionstudio.gef.editor.part,
+   com.thoughtworks.xstream,
+   org.eclipse.ui.part,
+   org.eclipse.draw2d,
+   de.prob.core.domainobjects,
+   org.eclipse.gef.requests,
+   org.eclipse.swt.graphics,
+   org.osgi.framework,
+   org.eclipse.swt.widgets,
+   org.eclipse.gef.ui.palette",
+ de.bmotionstudio.gef.editor.attribute;uses:="org.eclipse.ui.views.properties,de.bmotionstudio.gef.editor.model",
+ de.bmotionstudio.gef.editor.command;
+  uses:="de.bmotionstudio.gef.editor.observer,
+   org.eclipse.gef.commands,
+   org.eclipse.draw2d.geometry,
+   de.bmotionstudio.gef.editor.model,
+   de.bmotionstudio.gef.editor.scheduler",
+ de.bmotionstudio.gef.editor.edit;
+  uses:="org.eclipse.jface.window,
+   org.eclipse.core.databinding,
+   de.bmotionstudio.gef.editor.part,
+   org.eclipse.draw2d,
+   org.eclipse.gef.tools,
+   org.eclipse.jface.databinding.viewers,
+   org.eclipse.jface.fieldassist,
+   org.eclipse.core.databinding.observable.value,
+   org.eclipse.jface.bindings.keys,
+   org.eclipse.jface.viewers,
+   org.eclipse.swt.graphics,
+   de.bmotionstudio.gef.editor.model,
+   org.eclipse.swt.widgets",
+ de.bmotionstudio.gef.editor.editpolicy;
+  uses:="org.eclipse.gef.commands,
+   org.eclipse.gef.requests,
+   org.eclipse.draw2d.geometry,
+   de.bmotionstudio.gef.editor.model,
+   org.eclipse.gef.editpolicies,
+   org.eclipse.draw2d,
+   org.eclipse.gef",
+ de.bmotionstudio.gef.editor.eventb;
+  uses:="org.eventb.core.basis,
+   org.eclipse.core.resources,
+   org.eventb.core.ast,
+   org.eventb.core,
+   de.bmotionstudio.gef.editor.model,
+   de.bmotionstudio.gef.editor",
+ de.bmotionstudio.gef.editor.figure;
+  uses:="org.eclipse.draw2d.geometry,
+   org.eclipse.swt.graphics,
+   de.bmotionstudio.gef.editor.model,
+   org.eclipse.draw2d",
+ de.bmotionstudio.gef.editor.library;
+  uses:="org.eclipse.ui,
+   org.eclipse.ui.part,
    de.bmotionstudio.gef.editor,
- de.bmotionstudio.gef.editor.attribute,
- de.bmotionstudio.gef.editor.command,
- de.bmotionstudio.gef.editor.edit,
- de.bmotionstudio.gef.editor.editpolicy,
- de.bmotionstudio.gef.editor.figure,
- de.bmotionstudio.gef.editor.library,
- de.bmotionstudio.gef.editor.eventb,
+   org.eclipse.jface.action,
+   org.eclipse.gef.dnd,
+   org.eclipse.gef.commands,
+   org.eclipse.jface.viewers,
+   org.eclipse.swt.graphics,
+   org.eclipse.draw2d.geometry,
    de.bmotionstudio.gef.editor.model,
+   org.eclipse.swt.widgets,
+   org.eclipse.gef",
+ de.bmotionstudio.gef.editor.model;
+  uses:="org.eclipse.core.runtime,
+   de.bmotionstudio.gef.editor.attribute,
+   de.bmotionstudio.gef.editor,
    de.bmotionstudio.gef.editor.observer,
- de.bmotionstudio.gef.editor.part,
- de.bmotionstudio.gef.editor.property,
+   org.eclipse.gef.commands,
+   org.eclipse.core.resources,
+   org.eclipse.swt.graphics,
+   org.eclipse.draw2d.geometry,
+   org.eclipse.gef.rulers,
+   de.bmotionstudio.gef.editor.scheduler",
+ de.bmotionstudio.gef.editor.observer;
+  uses:="org.eclipse.swt.graphics,
+   de.bmotionstudio.gef.editor.model,
+   org.eclipse.draw2d,
    de.bmotionstudio.gef.editor.scheduler,
- de.bmotionstudio.gef.editor.util
+   de.bmotionstudio.gef.editor",
+ de.bmotionstudio.gef.editor.part;
+  uses:="de.bmotionstudio.gef.editor.observer,
+   org.eclipse.core.runtime,
+   org.eclipse.gef.editparts,
+   org.eclipse.swt.graphics,
+   de.bmotionstudio.gef.editor.model,
+   org.eclipse.draw2d,
+   de.bmotionstudio.gef.editor.library,
+   org.eclipse.gef",
+ de.bmotionstudio.gef.editor.property;
+  uses:="org.eclipse.swt.events,
+   org.eclipse.ui.views.properties,
+   org.eclipse.swt.graphics,
+   org.eclipse.jface.viewers,
+   org.eclipse.swt.widgets,
+   org.eclipse.jface.dialogs,
+   de.bmotionstudio.gef.editor.library",
+ de.bmotionstudio.gef.editor.scheduler;
+  uses:="de.bmotionstudio.gef.editor.observer,
+   org.eclipse.swt.graphics,
+   de.bmotionstudio.gef.editor.model,
+   de.bmotionstudio.gef.editor",
+ de.bmotionstudio.gef.editor.util;
+  uses:="org.eclipse.jface.viewers,
+   de.bmotionstudio.gef.editor.model,
+   org.eclipse.swt.widgets,
+   de.bmotionstudio.gef.editor"
 Bundle-ClassPath: lib/ext/xpp3_min-1.1.4c.jar,
- lib/ext/xstream-1.3.1.jar,
  lib/ext/animation-1.2.0.jar,
  .,
- lib/ext/groovy-all-1.8.6.jar
+ lib/ext/groovy-all-1.8.6.jar,
+ lib/ext/xstream-1.4.3.jar,
+ lib/ext/xmlpull-1.1.3.1.jar

de.bmotionstudio.gef.editor/build.properties

@@ -6,5 +6,8 @@ bin.includes = plugin.xml,\
                icons/,\
                schema/,\
                lib/,\
-               lib/ext/groovy-all-1.8.6.jar
+               lib/ext/groovy-all-1.8.6.jar,\
+               lib/ext/xstream-1.4.3.jar,\
+               lib/ext/xmlpull-1.1.3.1.jar
+bin.excludes = lib/ext/xstream-1.3.1.jar
 

de.bmotionstudio.gef.editor/plugin.xml

@@ -264,7 +264,7 @@
       </control>
       <control
             groupid="de.bmotionstudio.gef.editor.railway.group"
-            icon="icons/icon_signal.gif"
+            icon="icons/eclipse16/smartmode_co.gif"
             id="de.bmotionstudio.gef.editor.light"
             name="Light"
             service="de.bmotionstudio.gef.editor.service.LightService">