Merge changes Ia3e00f11,I7f3a3a75

[simantics/3d.git] / org.simantics.g3d.csg / src / org / simantics / g3d / csg / actions / AddPrimitiveAction2.java

diff --git a/org.simantics.g3d.csg/src/org/simantics/g3d/csg/actions/AddPrimitiveAction2.java b/org.simantics.g3d.csg/src/org/simantics/g3d/csg/actions/AddPrimitiveAction2.java
index 3a16a21d35362e9f3c310158cb505030dcaa6a5e..55748e782adb1f3afd99d6ae23411d6cf1a8b223 100644 (file)
--- a/org.simantics.g3d.csg/src/org/simantics/g3d/csg/actions/AddPrimitiveAction2.java
+++ b/org.simantics.g3d.csg/src/org/simantics/g3d/csg/actions/AddPrimitiveAction2.java
@@ -1,46 +1,46 @@
-/*******************************************************************************\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.actions;\r
-\r
-import org.eclipse.jface.action.Action;\r
-import org.simantics.g3d.csg.scenegraph2.CSGnode;\r
-import org.simantics.g3d.csg.scenegraph2.CSGrootNode;\r
-import org.simantics.utils.ui.ExceptionUtils;\r
-\r
-public class AddPrimitiveAction2 extends Action {\r
-       \r
-       CSGrootNode root;\r
-       Class<? extends CSGnode> primitiveClass;\r
-       public AddPrimitiveAction2(CSGrootNode root, Class<? extends CSGnode> primitiveClass)  {\r
-               super();\r
-               String name = primitiveClass.getSimpleName();\r
-               if (name.endsWith("Node"))\r
-                       name = name.substring(0,name.length()-4);\r
-               setText(name);\r
-               this.primitiveClass = primitiveClass;\r
-               this.root = root;\r
-       }\r
-       \r
-       @Override\r
-       public void run() {\r
-               try {\r
-                       CSGnode node = primitiveClass.newInstance();\r
-                       String name = root.getUniqueName(node.getClass().getSimpleName());\r
-                       node.setName(name);\r
-                       root.addChild(node);\r
-                       root.getNodeMap().commit();\r
-               } catch (Exception e) {\r
-                       ExceptionUtils.logAndShowError("Cannot create primitive.", 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.actions;
+
+import org.eclipse.jface.action.Action;
+import org.simantics.g3d.csg.scenegraph2.CSGnode;
+import org.simantics.g3d.csg.scenegraph2.CSGrootNode;
+import org.simantics.utils.ui.ExceptionUtils;
+
+public class AddPrimitiveAction2 extends Action {
+       
+       CSGrootNode root;
+       Class<? extends CSGnode> primitiveClass;
+       public AddPrimitiveAction2(CSGrootNode root, Class<? extends CSGnode> primitiveClass)  {
+               super();
+               String name = primitiveClass.getSimpleName();
+               if (name.endsWith("Node"))
+                       name = name.substring(0,name.length()-4);
+               setText(name);
+               this.primitiveClass = primitiveClass;
+               this.root = root;
+       }
+       
+       @Override
+       public void run() {
+               try {
+                       CSGnode node = primitiveClass.newInstance();
+                       String name = root.getUniqueName(node.getClass().getSimpleName());
+                       node.setName(name);
+                       root.addChild(node);
+                       root.getNodeMap().commit("Add primitive");
+               } catch (Exception e) {
+                       ExceptionUtils.logAndShowError("Cannot create primitive.", e);
+               }
+       }
+
+}