Moved animation stubs for g2d.stubs to animation plug-in

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/dev@7605 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.proconf.g3d.shapeeditor/META-INF/MANIFEST.MF b/org.simantics.proconf.g3d.shapeeditor/META-INF/MANIFEST.MF
index 332d852c758602c4929adf00347db130e85808d5..78767ca9e0c9e3af28f73e25ade5856d312ff6fe 100644 (file)
--- a/org.simantics.proconf.g3d.shapeeditor/META-INF/MANIFEST.MF
+++ b/org.simantics.proconf.g3d.shapeeditor/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.ui,
  org.simantics.image.stubs,
  org.simantics.layer0.stubs,
  org.simantics.layer0.utils,
- org.simantics.g2d.stubs,
  org.simantics.utils,
  org.simantics.proconf.g3d.occ,
  org.simantics.proconf.ui,

diff --git a/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/ShapeEditorResources.java b/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/ShapeEditorResources.java
index 1548881cc4d64aaf3534796debe5f0a627870db0..f125b757b426705697166fb25f1343305d9d0d2f 100644 (file)
--- a/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/ShapeEditorResources.java
+++ b/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/ShapeEditorResources.java
@@ -14,7 +14,7 @@ import org.simantics.proconf.g3d.csg.stubs.CSGResource;
 import org.simantics.db.Builtins;\r
 import org.simantics.db.Graph;\r
 import org.simantics.equation.stubs.EquationResource;\r
-import org.simantics.g2d.stubs.anim.AnimationResource;\r
+import org.simantics.animation.stubs.AnimationResource;\r
 import org.simantics.animation.curve.CurveBuilder;\r
 import org.simantics.animation.curve.CurveBuilderImpl;\r
 import org.simantics.proconf.g3d.stubs.G3DResource;\r

diff --git a/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/tools/AnimationContribution.java b/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/tools/AnimationContribution.java
index 87e7de65a504e47075aecad153fe0d494720d7ae..ee33b45bad53b907f66dd1b8f4286dd41415c567 100644 (file)
--- a/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/tools/AnimationContribution.java
+++ b/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/tools/AnimationContribution.java
@@ -38,10 +38,10 @@ import org.simantics.db.GraphRequestAdapter;
 import org.simantics.db.GraphRequestStatus;\r
 import org.simantics.db.GraphRequestWithResult;\r
 import org.simantics.db.Resource;\r
-import org.simantics.g2d.stubs.anim.Animation;\r
-import org.simantics.g2d.stubs.anim.Interpolator;\r
-import org.simantics.g2d.stubs.anim.ScalarInterpolator;\r
-import org.simantics.g2d.stubs.anim.SlerpInterpolator;\r
+import org.simantics.animation.stubs.Animation;\r
+import org.simantics.animation.stubs.Interpolator;\r
+import org.simantics.animation.stubs.ScalarInterpolator;\r
+import org.simantics.animation.stubs.SlerpInterpolator;\r
 import org.simantics.layer0.utils.EntityFactory;\r
 import org.simantics.layer0.utils.IEntity;\r
 import org.simantics.layer0.utils.Property;\r
@@ -599,7 +599,7 @@ public class AnimationContribution implements EditorContribution {
                        }\r
                        Animation animation = getAnimation(graph);\r
                        Collection<Interpolator> interpolators = animation.getInterpolator();\r
-                       for (org.simantics.g2d.stubs.anim.Interpolator interpolator : interpolators) {\r
+                       for (org.simantics.animation.stubs.Interpolator interpolator : interpolators) {\r
                        IEntity target = interpolator.getTarget();\r
                        // check all model properties\r
                        G3DModel model = parent.getModel(graph);\r

diff --git a/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/tools/ParameterizationContribution.java b/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/tools/ParameterizationContribution.java
index 3f1fefadee5c294404daeee3bbdaa42a506e9256..54a21056ec1ca6a82b876883179c679d00d8ef77 100644 (file)
--- a/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/tools/ParameterizationContribution.java
+++ b/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/tools/ParameterizationContribution.java
@@ -36,8 +36,8 @@ import org.simantics.db.GraphRequestAdapter;
 import org.simantics.db.GraphRequestStatus;\r
 import org.simantics.db.Resource;\r
 import org.simantics.equation.stubs.SecondOrderScalarPolynomial;\r
-import org.simantics.g2d.stubs.anim.Animation;\r
-import org.simantics.g2d.stubs.anim.Interpolator;\r
+import org.simantics.animation.stubs.Animation;\r
+import org.simantics.animation.stubs.Interpolator;\r
 import org.simantics.layer0.utils.EntityFactory;\r
 import org.simantics.layer0.utils.IEntity;\r
 import org.simantics.layer0.utils.ResourceDebugUtils;\r

diff --git a/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/views/ParameterizationEditor.java b/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/views/ParameterizationEditor.java
index 07dc17cd955630db309fddcb511f1aeebada0427..bc5f3ccd30bbcbb9f3c142f24fd3342ca0f65a41 100644 (file)
--- a/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/views/ParameterizationEditor.java
+++ b/org.simantics.proconf.g3d.shapeeditor/src/org/simantics/proconf/g3d/shapeeditor/views/ParameterizationEditor.java
@@ -34,8 +34,8 @@ import org.simantics.db.GraphRequestAdapter;
 import org.simantics.db.GraphRequestStatus;\r
 import org.simantics.db.Resource;\r
 import org.simantics.equation.stubs.SecondOrderScalarPolynomial;\r
-import org.simantics.g2d.stubs.anim.Animation;\r
-import org.simantics.g2d.stubs.anim.Interpolator;\r
+import org.simantics.animation.stubs.Animation;\r
+import org.simantics.animation.stubs.Interpolator;\r
 import org.simantics.layer0.utils.ResourceDebugUtils;\r
 import org.simantics.layer0.utils.IEntity;\r
 import org.simantics.layer0.utils.EntityFactory;\r