From a776787607c664445ae302ca003dea864e67bb7a Mon Sep 17 00:00:00 2001 From: luukkainen Date: Mon, 10 Nov 2008 15:11:11 +0000 Subject: [PATCH] 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 --- .../META-INF/MANIFEST.MF | 1 - .../proconf/g3d/shapeeditor/ShapeEditorResources.java | 2 +- .../g3d/shapeeditor/tools/AnimationContribution.java | 10 +++++----- .../tools/ParameterizationContribution.java | 4 ++-- .../g3d/shapeeditor/views/ParameterizationEditor.java | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/org.simantics.proconf.g3d.shapeeditor/META-INF/MANIFEST.MF b/org.simantics.proconf.g3d.shapeeditor/META-INF/MANIFEST.MF index 332d852c..78767ca9 100644 --- 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 1548881c..f125b757 100644 --- 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; import org.simantics.db.Graph; import org.simantics.equation.stubs.EquationResource; -import org.simantics.g2d.stubs.anim.AnimationResource; +import org.simantics.animation.stubs.AnimationResource; import org.simantics.animation.curve.CurveBuilder; import org.simantics.animation.curve.CurveBuilderImpl; import org.simantics.proconf.g3d.stubs.G3DResource; 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 87e7de65..ee33b45b 100644 --- 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; import org.simantics.db.GraphRequestWithResult; import org.simantics.db.Resource; -import org.simantics.g2d.stubs.anim.Animation; -import org.simantics.g2d.stubs.anim.Interpolator; -import org.simantics.g2d.stubs.anim.ScalarInterpolator; -import org.simantics.g2d.stubs.anim.SlerpInterpolator; +import org.simantics.animation.stubs.Animation; +import org.simantics.animation.stubs.Interpolator; +import org.simantics.animation.stubs.ScalarInterpolator; +import org.simantics.animation.stubs.SlerpInterpolator; import org.simantics.layer0.utils.EntityFactory; import org.simantics.layer0.utils.IEntity; import org.simantics.layer0.utils.Property; @@ -599,7 +599,7 @@ public class AnimationContribution implements EditorContribution { } Animation animation = getAnimation(graph); Collection interpolators = animation.getInterpolator(); - for (org.simantics.g2d.stubs.anim.Interpolator interpolator : interpolators) { + for (org.simantics.animation.stubs.Interpolator interpolator : interpolators) { IEntity target = interpolator.getTarget(); // check all model properties G3DModel model = parent.getModel(graph); 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 3f1fefad..54a21056 100644 --- 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; import org.simantics.db.Resource; import org.simantics.equation.stubs.SecondOrderScalarPolynomial; -import org.simantics.g2d.stubs.anim.Animation; -import org.simantics.g2d.stubs.anim.Interpolator; +import org.simantics.animation.stubs.Animation; +import org.simantics.animation.stubs.Interpolator; import org.simantics.layer0.utils.EntityFactory; import org.simantics.layer0.utils.IEntity; import org.simantics.layer0.utils.ResourceDebugUtils; 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 07dc17cd..bc5f3ccd 100644 --- 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; import org.simantics.db.Resource; import org.simantics.equation.stubs.SecondOrderScalarPolynomial; -import org.simantics.g2d.stubs.anim.Animation; -import org.simantics.g2d.stubs.anim.Interpolator; +import org.simantics.animation.stubs.Animation; +import org.simantics.animation.stubs.Interpolator; import org.simantics.layer0.utils.ResourceDebugUtils; import org.simantics.layer0.utils.IEntity; import org.simantics.layer0.utils.EntityFactory; -- 2.45.2