git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/dev@9354 ac1ea38d...

[simantics/3d.git] / org.simantics.proconf.g3d / src / org / simantics / proconf / g3d / base / ThreeDimensionalEditorBase.java

diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ThreeDimensionalEditorBase.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ThreeDimensionalEditorBase.java
index 0a04a229081b9ff81185f9b60d9be4acbd29a05d..39c73fddaf4cca541ca8911e7515e58c7372d01d 100644 (file)
--- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ThreeDimensionalEditorBase.java
+++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ThreeDimensionalEditorBase.java
@@ -12,16 +12,12 @@ package org.simantics.proconf.g3d.base;
 \r
 import java.awt.event.MouseEvent;\r
 import java.util.ArrayList;\r
-import java.util.HashMap;\r
 import java.util.List;\r
-import java.util.Map;\r
-import java.util.Stack;\r
 \r
 import javax.vecmath.Tuple3d;\r
 import javax.vecmath.Vector3d;\r
 \r
 import org.eclipse.jface.action.Action;\r
-import org.eclipse.jface.action.IContributionItem;\r
 import org.eclipse.jface.action.IMenuListener;\r
 import org.eclipse.jface.action.IMenuManager;\r
 import org.eclipse.jface.action.IToolBarManager;\r
@@ -37,12 +33,10 @@ import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Menu;\r
 import org.eclipse.ui.IActionBars;\r
-import org.eclipse.ui.IEditorActionBarContributor;\r
 import org.eclipse.ui.ISharedImages;\r
 import org.eclipse.ui.IWorkbenchActionConstants;\r
 import org.eclipse.ui.IWorkbenchPart;\r
 import org.eclipse.ui.PlatformUI;\r
-import org.eclipse.ui.commands.ICommandService;\r
 import org.eclipse.ui.internal.WorkbenchWindow;\r
 import org.simantics.db.Graph;\r
 import org.simantics.db.GraphRequestAdapter;\r
@@ -69,7 +63,7 @@ import org.simantics.proconf.g3d.input.SWTInputProvider;
 import org.simantics.proconf.g3d.scenegraph.IGeometryNode;\r
 import org.simantics.proconf.g3d.scenegraph.IGraphicsNode;\r
 import org.simantics.proconf.g3d.tools.ScenegraphLockTraverser;\r
-import org.simantics.utils.ErrorLogger;\r
+import org.simantics.utils.ui.ErrorLogger;\r
 import org.simantics.utils.ui.jface.MenuTools;\r
 \r
 import com.jme.math.Ray;\r
@@ -143,6 +137,11 @@ public abstract class ThreeDimensionalEditorBase implements  Runnable {
        this.component = component;\r
     }\r
     \r
+    protected void setRenderingComponent(JmeRenderingComponent component) {\r
+       assert(renderingComposite == null); // ensure that this is called before initialization\r
+       this.component = component;\r
+    }\r
+    \r
 //    public void setActionBarContributor(IEditorActionBarContributor contributor) {\r
 //     actionBarContributor = contributor;\r
 //    }\r