]> gerrit.simantics Code Review - simantics/platform.git/blobdiff - bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/SheetClass.java
Use Consumer interface instead of deprecated Callback interface
[simantics/platform.git] / bundles / org.simantics.spreadsheet.ui / src / org / simantics / spreadsheet / ui / SheetClass.java
index 7c9cd844fb2d49e46b038eff9aa218181cd22e3d..3c7c0cbab194be970c129cb459f99c46a36036f4 100644 (file)
-/*******************************************************************************\r
- * Copyright (c) 2007- VTT Technical Research Centre of Finland.\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.spreadsheet.ui;\r
-\r
-import java.awt.Shape;\r
-import java.awt.geom.Rectangle2D;\r
-\r
-import org.simantics.db.Resource;\r
-import org.simantics.g2d.element.ElementClass;\r
-import org.simantics.g2d.element.ElementHints;\r
-import org.simantics.g2d.element.ElementUtils;\r
-import org.simantics.g2d.element.IElement;\r
-import org.simantics.g2d.element.SceneGraphNodeKey;\r
-import org.simantics.g2d.element.handler.InternalSize;\r
-import org.simantics.g2d.element.handler.Outline;\r
-import org.simantics.g2d.element.handler.SceneGraph;\r
-import org.simantics.g2d.element.handler.impl.BorderColorImpl;\r
-import org.simantics.g2d.element.handler.impl.DefaultTransform;\r
-import org.simantics.g2d.element.handler.impl.SimpleElementLayers;\r
-import org.simantics.scenegraph.Node;\r
-import org.simantics.scenegraph.g2d.G2DParentNode;\r
-import org.simantics.spreadsheet.Adaptable;\r
-import org.simantics.utils.datastructures.Callback;\r
-import org.simantics.utils.datastructures.hints.IHintContext.Key;\r
-import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;\r
-\r
-/**\r
- * @author Antti Villberg\r
- */\r
-public class SheetClass {\r
-\r
-       public static final Key  KEY_SERVER_INTERFACE = new KeyOf(Adaptable.class, "SERVER_INTERFACE");\r
-\r
-       public static final Key  KEY_SHEET = new KeyOf(Resource.class, "SHEET");\r
-       public static final Key  KEY_RVI = new KeyOf(String.class, "RVI");\r
-       public static final Key  KEY_SG_NODE             = new SceneGraphNodeKey(Node.class, "SG_NODE");\r
-\r
-       public static class SheetSGNode implements SceneGraph, InternalSize, Outline {\r
-\r
-               private static final long serialVersionUID = -5823585015844593347L;\r
-\r
-               static final SheetSGNode INSTANCE = new SheetSGNode();\r
-\r
-               @Override\r
-               public void init(final IElement e, final G2DParentNode parent) {\r
-\r
-                       // Create node if it doesn't exist yet\r
-                       SheetNode node = (SheetNode)e.getHint(KEY_SG_NODE);\r
-                       if(node == null || node.getBounds() == null || node.getParent() != parent) {\r
-\r
-                               node = parent.addNode(ElementUtils.generateNodeId(e), SheetNode.class);\r
-\r
-                               e.setHint(KEY_SG_NODE, node);\r
-\r
-                               Adaptable serverInterface = e.getHint(KEY_SERVER_INTERFACE);\r
-                               node.init(serverInterface);\r
-\r
-                               Callback<Node> callback = e.getHint(ElementHints.KEY_SG_CALLBACK);\r
-                               if(callback != null)\r
-                                       callback.run(node);\r
-\r
-                               System.out.println("SHEET PARENT NODE: " + parent);\r
-                               node.setBounds(new Rectangle2D.Double(0, 0, 400, 200));\r
-\r
-                       }\r
-\r
-                       update(e);\r
-\r
-               }\r
-\r
-               public void update(IElement e) {\r
-               }\r
-\r
-               @Override\r
-               public void cleanup(IElement e) {\r
-                       SheetNode node = (SheetNode)e.removeHint(KEY_SG_NODE);\r
-                       if (node != null)\r
-                               node.remove();\r
-               }\r
-\r
-               @Override\r
-               public Rectangle2D getBounds(IElement e, Rectangle2D size) {\r
-                       Rectangle2D shape = new Rectangle2D.Double(0, 0, 0, 0);\r
-\r
-                       SheetNode node = (SheetNode)e.getHint(KEY_SG_NODE);\r
-                       if(node != null && node.getBounds() != null) {\r
-                               shape = node.getBounds().getBounds2D();\r
-                       }\r
-\r
-                       if(size != null) size.setRect(shape);\r
-                       return shape;\r
-               }\r
-\r
-               @Override\r
-               public Shape getElementShape(IElement e) {\r
-                       Shape shape = new Rectangle2D.Double(0, 0, 0, 0);\r
-\r
-                       SheetNode node = (SheetNode)e.getHint(KEY_SG_NODE);\r
-                       if(node != null && node.getBounds() != null) {\r
-                               shape = node.getBounds();\r
-                       }\r
-\r
-                       return shape;\r
-               }\r
-\r
-       }\r
-\r
-\r
-       public static final ElementClass INSTANCE =\r
-                       ElementClass.compile(\r
-                                       DefaultTransform.INSTANCE,\r
-                                       BorderColorImpl.BLACK,\r
-                                       SheetSGNode.INSTANCE,\r
-                                       SimpleElementLayers.INSTANCE\r
-                                       );\r
-\r
-}\r
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * 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.spreadsheet.ui;
+
+import java.awt.Shape;
+import java.awt.geom.Rectangle2D;
+import java.util.function.Consumer;
+
+import org.simantics.db.Resource;
+import org.simantics.g2d.element.ElementClass;
+import org.simantics.g2d.element.ElementHints;
+import org.simantics.g2d.element.ElementUtils;
+import org.simantics.g2d.element.IElement;
+import org.simantics.g2d.element.SceneGraphNodeKey;
+import org.simantics.g2d.element.handler.InternalSize;
+import org.simantics.g2d.element.handler.Outline;
+import org.simantics.g2d.element.handler.SceneGraph;
+import org.simantics.g2d.element.handler.impl.BorderColorImpl;
+import org.simantics.g2d.element.handler.impl.DefaultTransform;
+import org.simantics.g2d.element.handler.impl.SimpleElementLayers;
+import org.simantics.scenegraph.Node;
+import org.simantics.scenegraph.g2d.G2DParentNode;
+import org.simantics.spreadsheet.Adaptable;
+import org.simantics.utils.datastructures.hints.IHintContext.Key;
+import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
+
+/**
+ * @author Antti Villberg
+ */
+public class SheetClass {
+
+       public static final Key  KEY_SERVER_INTERFACE = new KeyOf(Adaptable.class, "SERVER_INTERFACE");
+
+       public static final Key  KEY_SHEET = new KeyOf(Resource.class, "SHEET");
+       public static final Key  KEY_RVI = new KeyOf(String.class, "RVI");
+       public static final Key  KEY_SG_NODE             = new SceneGraphNodeKey(Node.class, "SG_NODE");
+
+       public static class SheetSGNode implements SceneGraph, InternalSize, Outline {
+
+               private static final long serialVersionUID = -5823585015844593347L;
+
+               static final SheetSGNode INSTANCE = new SheetSGNode();
+
+               @Override
+               public void init(final IElement e, final G2DParentNode parent) {
+
+                       // Create node if it doesn't exist yet
+                       SheetNode node = (SheetNode)e.getHint(KEY_SG_NODE);
+                       if(node == null || node.getBounds() == null || node.getParent() != parent) {
+
+                               node = parent.addNode(ElementUtils.generateNodeId(e), SheetNode.class);
+
+                               e.setHint(KEY_SG_NODE, node);
+
+                               Adaptable serverInterface = e.getHint(KEY_SERVER_INTERFACE);
+                               node.init(serverInterface);
+
+                               Consumer<Node> callback = e.getHint(ElementHints.KEY_SG_CALLBACK);
+                               if(callback != null)
+                                       callback.accept(node);
+
+                               System.out.println("SHEET PARENT NODE: " + parent);
+                               node.setBounds(new Rectangle2D.Double(0, 0, 400, 200));
+
+                       }
+
+                       update(e);
+
+               }
+
+               public void update(IElement e) {
+               }
+
+               @Override
+               public void cleanup(IElement e) {
+                       SheetNode node = (SheetNode)e.removeHint(KEY_SG_NODE);
+                       if (node != null)
+                               node.remove();
+               }
+
+               @Override
+               public Rectangle2D getBounds(IElement e, Rectangle2D size) {
+                       Rectangle2D shape = new Rectangle2D.Double(0, 0, 0, 0);
+
+                       SheetNode node = (SheetNode)e.getHint(KEY_SG_NODE);
+                       if(node != null && node.getBounds() != null) {
+                               shape = node.getBounds().getBounds2D();
+                       }
+
+                       if(size != null) size.setRect(shape);
+                       return shape;
+               }
+
+               @Override
+               public Shape getElementShape(IElement e) {
+                       Shape shape = new Rectangle2D.Double(0, 0, 0, 0);
+
+                       SheetNode node = (SheetNode)e.getHint(KEY_SG_NODE);
+                       if(node != null && node.getBounds() != null) {
+                               shape = node.getBounds();
+                       }
+
+                       return shape;
+               }
+
+       }
+
+
+       public static final ElementClass INSTANCE =
+                       ElementClass.compile(
+                                       DefaultTransform.INSTANCE,
+                                       BorderColorImpl.BLACK,
+                                       SheetSGNode.INSTANCE,
+                                       SimpleElementLayers.INSTANCE
+                                       );
+
+}