X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.proconf.g3d%2Fsrc%2Forg%2Fsimantics%2Fproconf%2Fg3d%2Fbase%2FThreeDimensionalEditorBase.java;h=39c73fddaf4cca541ca8911e7515e58c7372d01d;hb=b553dad9a38b0fa9a91926f3a4ff89b9cb8efa91;hp=0a04a229081b9ff81185f9b60d9be4acbd29a05d;hpb=477a3eae417fe71addfcf8f87dab41f87151a384;p=simantics%2F3d.git 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 0a04a229..39c73fdd 100644 --- 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; import java.awt.event.MouseEvent; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Stack; import javax.vecmath.Tuple3d; import javax.vecmath.Vector3d; import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; @@ -37,12 +33,10 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Menu; import org.eclipse.ui.IActionBars; -import org.eclipse.ui.IEditorActionBarContributor; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.commands.ICommandService; import org.eclipse.ui.internal.WorkbenchWindow; import org.simantics.db.Graph; import org.simantics.db.GraphRequestAdapter; @@ -69,7 +63,7 @@ import org.simantics.proconf.g3d.input.SWTInputProvider; import org.simantics.proconf.g3d.scenegraph.IGeometryNode; import org.simantics.proconf.g3d.scenegraph.IGraphicsNode; import org.simantics.proconf.g3d.tools.ScenegraphLockTraverser; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; import org.simantics.utils.ui.jface.MenuTools; import com.jme.math.Ray; @@ -143,6 +137,11 @@ public abstract class ThreeDimensionalEditorBase implements Runnable { this.component = component; } + protected void setRenderingComponent(JmeRenderingComponent component) { + assert(renderingComposite == null); // ensure that this is called before initialization + this.component = component; + } + // public void setActionBarContributor(IEditorActionBarContributor contributor) { // actionBarContributor = contributor; // }