From f9e3fe0569bf1cf3bbcdbc56fb81c736cba086f9 Mon Sep 17 00:00:00 2001 From: luukkainen Date: Wed, 29 Oct 2008 10:38:07 +0000 Subject: [PATCH] ErrorLogger moved (integration) git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/dev@7351 ac1ea38d-2e2b-0410-8846-a27921b304fc --- .../src/org/simantics/proconf/g3d/base/AppearanceTools.java | 2 +- .../src/org/simantics/proconf/g3d/base/ConstraintDetector.java | 2 +- .../org/simantics/proconf/g3d/base/ResourceTextureCache.java | 2 +- .../org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java | 2 +- .../simantics/proconf/g3d/base/ThreeDimensionalEditorBase.java | 2 +- .../simantics/proconf/g3d/base/ThreeDimensionalEditorPart.java | 2 +- .../org/simantics/proconf/g3d/base/VisualizationScheduler.java | 2 +- .../src/org/simantics/proconf/g3d/common/JmeComposite.java | 2 +- .../src/org/simantics/proconf/g3d/scenegraph/ModelNode.java | 2 +- .../proconf/g3d/scenegraph/ParameterizedModelNode.java | 2 +- .../src/org/simantics/proconf/g3d/scenegraph/ShapeNode.java | 2 +- .../src/org/simantics/proconf/g3d/views/AppearanceEditor.java | 2 +- .../simantics/proconf/g3d/views/SinglePageResourceEditor.java | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/AppearanceTools.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/AppearanceTools.java index 5cc4304b..9e506246 100644 --- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/AppearanceTools.java +++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/AppearanceTools.java @@ -28,7 +28,7 @@ import org.simantics.proconf.g3d.stubs.MultiTexture; import org.simantics.proconf.g3d.stubs.MultiTextureMode; import org.simantics.proconf.g3d.stubs.Shader; import org.simantics.proconf.g3d.stubs.Texture; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; import com.jme.image.Image; import com.jme.renderer.ColorRGBA; diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ConstraintDetector.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ConstraintDetector.java index 3a18c27c..a363db83 100644 --- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ConstraintDetector.java +++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ConstraintDetector.java @@ -21,7 +21,7 @@ import org.simantics.db.GraphRequestWithResult; import org.simantics.db.Resource; import org.simantics.db.adaption.AdaptionException; import org.simantics.proconf.g3d.Resources; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; import com.jme.renderer.ColorRGBA; import com.jme.scene.Geometry; diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ResourceTextureCache.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ResourceTextureCache.java index bbba901f..33b18900 100644 --- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ResourceTextureCache.java +++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ResourceTextureCache.java @@ -12,7 +12,7 @@ import org.simantics.proconf.g3d.stubs.ImageTexture; import org.simantics.proconf.g3d.stubs.TextureCoordinateGenerator; import org.simantics.proconf.image.interfaces.IImage; import org.simantics.proconf.image.interfaces.IImageFactory; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; import org.simantics.utils.ui.gfx.ImageUtils; import org.simantics.utils.ui.gfx.PixelDimension; diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java index adfcc652..eb243735 100644 --- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java +++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java @@ -38,7 +38,7 @@ import org.simantics.proconf.g3d.scenegraph.IGeometryNode; import org.simantics.proconf.g3d.scenegraph.IGraphicsNode; import org.simantics.proconf.g3d.scenegraph.RootGraphicsNode; import org.simantics.proconf.g3d.stubs.G3DNode; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; import org.simantics.utils.datastructures.BijectionMap; import com.jme.scene.Node; 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 fe7a2833..f415c3e3 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 @@ -63,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; diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ThreeDimensionalEditorPart.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ThreeDimensionalEditorPart.java index f2f3bc12..3e99d5ef 100644 --- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ThreeDimensionalEditorPart.java +++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ThreeDimensionalEditorPart.java @@ -26,7 +26,7 @@ import org.simantics.db.Resource; import org.simantics.db.events.GraphChangeEvent; import org.simantics.db.management.ISessionContext; import org.simantics.proconf.ui.workbench.ResourceEditorPart; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; public abstract class ThreeDimensionalEditorPart extends ResourceEditorPart implements ThreeDimensionalEditorProvider{ diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/VisualizationScheduler.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/VisualizationScheduler.java index e7011eb7..7440f825 100644 --- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/VisualizationScheduler.java +++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/VisualizationScheduler.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; /** diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/common/JmeComposite.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/common/JmeComposite.java index b1155728..9c965bcb 100644 --- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/common/JmeComposite.java +++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/common/JmeComposite.java @@ -25,7 +25,7 @@ import org.eclipse.swt.opengl.GLCanvas; import org.eclipse.swt.widgets.Composite; import org.simantics.proconf.g3d.base.JmeRenderingComponent; import org.simantics.proconf.g3d.base.ResourceTextureCache; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; import com.jme.renderer.Renderer; import com.jme.renderer.lwjgl.LWJGLRenderer; diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ModelNode.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ModelNode.java index 40e845a1..ff2b6faa 100644 --- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ModelNode.java +++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ModelNode.java @@ -22,7 +22,7 @@ import org.simantics.proconf.g3d.animation.Animatable; import org.simantics.proconf.g3d.base.ThreeDimensionalEditorBase; import org.simantics.proconf.g3d.stubs.G3DModel; import org.simantics.proconf.g3d.stubs.G3DNode; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; public class ModelNode extends AbstractGraphicsNode implements Animatable, IGeometryNode{ protected List shapes = new ArrayList(); diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ParameterizedModelNode.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ParameterizedModelNode.java index 511a2fa9..579beac2 100644 --- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ParameterizedModelNode.java +++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ParameterizedModelNode.java @@ -29,7 +29,7 @@ import org.simantics.proconf.g3d.Resources; import org.simantics.proconf.g3d.base.ThreeDimensionalEditorBase; import org.simantics.proconf.g3d.stubs.G3DModel; import org.simantics.proconf.g3d.stubs.G3DNode; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; /** * IGraphicsNode for parameterized models. Implementation assumes that G3DNode itself does not contain diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ShapeNode.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ShapeNode.java index 7c89be4d..b82265e4 100644 --- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ShapeNode.java +++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ShapeNode.java @@ -39,7 +39,7 @@ import org.simantics.proconf.g3d.stubs.Color; import org.simantics.proconf.g3d.stubs.G3DModel; import org.simantics.proconf.g3d.stubs.G3DNode; import org.simantics.proconf.g3d.stubs.Orientation; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; import com.jme.bounding.BoundingBox; import com.jme.bounding.CollisionTreeManager; diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/views/AppearanceEditor.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/views/AppearanceEditor.java index 69170787..7a971bb2 100644 --- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/views/AppearanceEditor.java +++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/views/AppearanceEditor.java @@ -51,7 +51,7 @@ import org.simantics.proconf.image.interfaces.IImage; import org.simantics.proconf.image.interfaces.IImageFactory; import org.simantics.proconf.image.ui.ImageComposite; import org.simantics.proconf.ui.utils.ResourceAdaptionUtils; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; public class AppearanceEditor extends SinglePageResourceView{ diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/views/SinglePageResourceEditor.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/views/SinglePageResourceEditor.java index 1caba9d0..073fbb6c 100644 --- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/views/SinglePageResourceEditor.java +++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/views/SinglePageResourceEditor.java @@ -28,7 +28,7 @@ import org.simantics.db.GraphRequestStatus; import org.simantics.db.Session; import org.simantics.proconf.g3d.common.StructuredResourceSelection; import org.simantics.proconf.ui.workbench.ResourceEditorPart; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; import org.simantics.utils.ui.ISelectionUtils; import org.simantics.utils.ui.jface.BaseSelectionProvider; -- 2.45.2