Some api and build changes

Change-Id: I85b1ffae0255398050dd45d847fe03e26828972c

diff --git a/org.jcae.opencascade.win32.x86_64/.classpath b/org.jcae.opencascade.win32.x86_64/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..bc74aabe31ccd93a4ecd4c5733766d19686602df 100644 (file)
--- a/org.jcae.opencascade.win32.x86_64/.classpath
+++ b/org.jcae.opencascade.win32.x86_64/.classpath
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/org.simantics.g3d.csg/src/org/simantics/g3d/csg/scenegraph2/SchemaBuilder.java b/org.simantics.g3d.csg/src/org/simantics/g3d/csg/scenegraph2/SchemaBuilder.java
index b44a7693c97e89f3a4072ea0ec373fc5273c19ca..0534a314d913c99b049d92dd8b048bfee447d2e4 100644 (file)
--- a/org.simantics.g3d.csg/src/org/simantics/g3d/csg/scenegraph2/SchemaBuilder.java
+++ b/org.simantics.g3d.csg/src/org/simantics/g3d/csg/scenegraph2/SchemaBuilder.java
@@ -1,59 +1,59 @@
-/*******************************************************************************\r
- * Copyright (c) 2012, 2013 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.g3d.csg.scenegraph2;\r
-\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.objmap.graph.schema.IMappingSchema;\r
-import org.simantics.objmap.graph.schema.MappingSchemas;\r
-import org.simantics.objmap.graph.schema.SimpleSchema;\r
-import org.simantics.Simantics;\r
-\r
-public class SchemaBuilder {\r
-       \r
-       public static IMappingSchema<Resource,Object> getSchema() throws DatabaseException{\r
-               return Simantics.getSession().syncRequest(new Read<IMappingSchema<Resource,Object>>() {\r
-                       @Override\r
-                       public IMappingSchema<Resource,Object> perform(ReadGraph g)\r
-                                       throws DatabaseException {\r
-                               return getSchema(g);\r
-                       }\r
-               });\r
-       }\r
-       \r
-       public static IMappingSchema<Resource,Object> getSchema(ReadGraph g) throws DatabaseException{\r
-               try {\r
-                       SimpleSchema schema = new SimpleSchema();\r
-                       schema.addLinkType(MappingSchemas.fromAnnotations(g, BarrelNode.class));\r
-                       schema.addLinkType(MappingSchemas.fromAnnotations(g, BoxNode.class));\r
-                       schema.addLinkType(MappingSchemas.fromAnnotations(g, ConeNode.class));\r
-                       schema.addLinkType(MappingSchemas.fromAnnotations(g, CylinderNode.class));\r
-                       schema.addLinkType(MappingSchemas.fromAnnotations(g, DifferenceNode.class));\r
-                       schema.addLinkType(MappingSchemas.fromAnnotations(g, EllipticCylinderNode.class));\r
-                       schema.addLinkType(MappingSchemas.fromAnnotations(g, IntersectionNode.class));\r
-                       schema.addLinkType(MappingSchemas.fromAnnotations(g, RectangularSolidNode.class));\r
-                       schema.addLinkType(MappingSchemas.fromAnnotations(g, RegularPrismNode.class));\r
-                       schema.addLinkType(MappingSchemas.fromAnnotations(g, SphereNode.class));\r
-                       schema.addLinkType(MappingSchemas.fromAnnotations(g, TorusNode.class));\r
-                       schema.addLinkType(MappingSchemas.fromAnnotations(g, UnionNode.class));\r
-                       schema.addLinkType(MappingSchemas.fromAnnotations(g, CSGrootNode.class));\r
-                       return schema;\r
-               } catch (IllegalAccessException e) {\r
-                       throw new DatabaseException(e);\r
-               } catch (InstantiationException e) {\r
-                       throw new DatabaseException(e);\r
-               }\r
-       }\r
-\r
-}\r
+/*******************************************************************************
+ * Copyright (c) 2012, 2013 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.g3d.csg.scenegraph2;
+
+import org.simantics.Simantics;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.request.Read;
+import org.simantics.objmap.graph.schema.IMappingSchema;
+import org.simantics.objmap.graph.schema.MappingSchemas;
+import org.simantics.objmap.graph.schema.SimpleSchema;
+
+public class SchemaBuilder {
+       
+       public static IMappingSchema<Resource,Object> getSchema() throws DatabaseException{
+               return Simantics.getSession().syncRequest(new Read<IMappingSchema<Resource,Object>>() {
+                       @Override
+                       public IMappingSchema<Resource,Object> perform(ReadGraph g)
+                                       throws DatabaseException {
+                               return getSchema(g);
+                       }
+               });
+       }
+       
+       public static IMappingSchema<Resource,Object> getSchema(ReadGraph g) throws DatabaseException{
+               try {
+                       SimpleSchema schema = new SimpleSchema();
+                       schema.addLinkType(MappingSchemas.fromAnnotations(g, BarrelNode.class));
+                       schema.addLinkType(MappingSchemas.fromAnnotations(g, BoxNode.class));
+                       schema.addLinkType(MappingSchemas.fromAnnotations(g, ConeNode.class));
+                       schema.addLinkType(MappingSchemas.fromAnnotations(g, CylinderNode.class));
+                       schema.addLinkType(MappingSchemas.fromAnnotations(g, DifferenceNode.class));
+                       schema.addLinkType(MappingSchemas.fromAnnotations(g, EllipticCylinderNode.class));
+                       schema.addLinkType(MappingSchemas.fromAnnotations(g, IntersectionNode.class));
+                       schema.addLinkType(MappingSchemas.fromAnnotations(g, RectangularSolidNode.class));
+                       schema.addLinkType(MappingSchemas.fromAnnotations(g, RegularPrismNode.class));
+                       schema.addLinkType(MappingSchemas.fromAnnotations(g, SphereNode.class));
+                       schema.addLinkType(MappingSchemas.fromAnnotations(g, TorusNode.class));
+                       schema.addLinkType(MappingSchemas.fromAnnotations(g, UnionNode.class));
+                       schema.addLinkType(MappingSchemas.fromAnnotations(g, CSGrootNode.class));
+                       return schema;
+               } catch (IllegalAccessException e) {
+                       throw new DatabaseException(e);
+               } catch (InstantiationException e) {
+                       throw new DatabaseException(e);
+               }
+       }
+
+}

diff --git a/org.simantics.g3d.feature/feature.xml b/org.simantics.g3d.feature/feature.xml
index 5989d5d28599b29c88389cf8446154c278763b08..c1595fac0a1df63df2201ac4ccf0cf9d25f0409c 100644 (file)
--- a/org.simantics.g3d.feature/feature.xml
+++ b/org.simantics.g3d.feature/feature.xml
@@ -25,13 +25,6 @@
          id="vtk.lib"
          version="0.0.0"/>
 
-   <plugin
-         id="javax.vecmath"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.simantics.g3d"
          download-size="0"
@@ -52,14 +45,6 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-   <!--
-   <plugin
-         id="org.simantics.g3d.jme"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-   -->
 
    <plugin
          id="org.simantics.g3d.ontology"
@@ -81,25 +66,23 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
- 
+
    <plugin
          id="org.simantics.opencascade"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
- 
-   <!--
+
    <plugin
-         id="org.simantics.opencascade.jme"
+         id="org.simantics.opencascade.vtk"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-   -->
- 
+
    <plugin
-         id="org.simantics.opencascade.vtk"
+         id="javax.vecmath"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/AbstractVTKNodeMap.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/AbstractVTKNodeMap.java
index 8b04a7755b93cc6c79567fe4445c5644e51f2899..35d3105fb451f1debc7afca7476e5d1449099007 100644 (file)
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/AbstractVTKNodeMap.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/AbstractVTKNodeMap.java
@@ -44,7 +44,7 @@ import org.simantics.utils.ui.ExceptionUtils;
 
 import vtk.vtkProp;
 
-public abstract class AbstractVTKNodeMap<E extends IG3DNode> implements VTKNodeMap<E>, IMappingListener, RenderListener, NodeListener{
+public abstract class AbstractVTKNodeMap<E extends INode> implements VTKNodeMap<E>, IMappingListener, RenderListener, NodeListener{
 
        private static final boolean DEBUG = false;
        
@@ -90,7 +90,7 @@ public abstract class AbstractVTKNodeMap<E extends IG3DNode> implements VTKNodeM
        
        @SuppressWarnings("unchecked")
        @Override
-       public Collection<vtkProp> getRenderObjects(IG3DNode node) {
+       public Collection<vtkProp> getRenderObjects(INode node) {
                return nodeToActor.getValues((E)node);
        }
        
@@ -126,7 +126,7 @@ public abstract class AbstractVTKNodeMap<E extends IG3DNode> implements VTKNodeM
        
        @SuppressWarnings("unchecked")
        @Override
-       public void updateRenderObjectsFor(IG3DNode node) {
+       public void updateRenderObjectsFor(INode node) {
                List<vtkProp> toDelete = new ArrayList<vtkProp>();
                for (vtkProp prop : nodeToActor.getValues((E)node)) {
                        if (prop.GetVTKId() != 0) {

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/VTKNodeMap.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/VTKNodeMap.java
index e72ea80808af52a35d3a303b392d3c24834bb9a5..09d380c7e4c5cc04e3aa8f7ea36b721135cbda9d 100644 (file)
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/VTKNodeMap.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/VTKNodeMap.java
@@ -17,7 +17,7 @@ import org.simantics.g3d.scenegraph.base.INode;
 
 import vtk.vtkProp;
 
-public interface VTKNodeMap<E extends IG3DNode> extends NodeMap<vtkProp, E>{
+public interface VTKNodeMap<E extends INode> extends NodeMap<vtkProp, E>{
 
        
 

diff --git a/org.simantics.g3d/src/org/simantics/g3d/preferences/G3DPreferencePage.java b/org.simantics.g3d/src/org/simantics/g3d/preferences/G3DPreferencePage.java
index 9aa46bbf791bcbc31b2294eb779f15f78fdd8123..bc58a84b7ba08cacca4d14ae229e62f3a8ff720c 100644 (file)
--- a/org.simantics.g3d/src/org/simantics/g3d/preferences/G3DPreferencePage.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/preferences/G3DPreferencePage.java
@@ -1,14 +1,14 @@
-/*******************************************************************************\r
- * Copyright (c) 2012, 2013 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
+/*******************************************************************************
+ * Copyright (c) 2012, 2013 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
 package org.simantics.g3d.preferences;
 
 import org.eclipse.jface.preference.*;
@@ -38,7 +38,7 @@ public class G3DPreferencePage
        public G3DPreferencePage() {
                super(GRID);
                setPreferenceStore(Activator.getDefault().getPreferenceStore());
-               setDescription("3D modelling prederences");
+               setDescription("3D modelling preferences");
        }
        
        /**
@@ -50,7 +50,7 @@ public class G3DPreferencePage
        public void createFieldEditors() {
                addField(new RadioGroupFieldEditor(
                                PreferenceConstants.ORIENTATION_PRESENTATION,
-                               "OrientationPresentation", 1,
+                               "Orientation Presentation", 1,
                                new String[][] { { "&Quaternion", "quat" },
                                                { "&Axis-Angle", "aa" },{ "&Euler", "euler" } }, getFieldEditorParent()));
                String[][] eulerOrders = new String[Order.values().length][2];

diff --git a/vtk.win32.win32.x86_64/.classpath b/vtk.win32.win32.x86_64/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..bc74aabe31ccd93a4ecd4c5733766d19686602df 100644 (file)
--- a/vtk.win32.win32.x86_64/.classpath
+++ b/vtk.win32.win32.x86_64/.classpath
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>