diff --git a/org.eclipse.emf.cdo.threedee.ui/src/org/eclipse/emf/cdo/threedee/ui/nodes/old/RepositoryNode.java b/org.eclipse.emf.cdo.threedee.ui.examples/src/org/eclipse/emf/cdo/threedee/ui/examples/RepositoryNode.java
similarity index 89%
rename from org.eclipse.emf.cdo.threedee.ui/src/org/eclipse/emf/cdo/threedee/ui/nodes/old/RepositoryNode.java
rename to org.eclipse.emf.cdo.threedee.ui.examples/src/org/eclipse/emf/cdo/threedee/ui/examples/RepositoryNode.java
index 04110cf..cc7f603 100644
--- a/org.eclipse.emf.cdo.threedee.ui/src/org/eclipse/emf/cdo/threedee/ui/nodes/old/RepositoryNode.java
+++ b/org.eclipse.emf.cdo.threedee.ui.examples/src/org/eclipse/emf/cdo/threedee/ui/examples/RepositoryNode.java
@@ -8,19 +8,16 @@
* Contributors:
* Martin Fluegge - initial API and implementation
*/
-package org.eclipse.emf.cdo.threedee.ui.nodes.old;
+package org.eclipse.emf.cdo.threedee.ui.examples;
-import org.eclipse.emf.cdo.threedee.common.Element;
import org.eclipse.emf.cdo.threedee.ui.ThreeDeeUtil;
import com.sun.j3d.utils.geometry.Box;
-import com.sun.j3d.utils.geometry.Primitive;
import com.sun.j3d.utils.image.TextureLoader;
import javax.media.j3d.Appearance;
import javax.media.j3d.ColoringAttributes;
import javax.media.j3d.Material;
-import javax.media.j3d.Node;
import javax.media.j3d.Shape3D;
import javax.media.j3d.Texture;
import javax.media.j3d.TextureAttributes;
@@ -120,16 +117,4 @@
appearance.setTexture(texture);
shape.setAppearance(appearance);
}
-
- /**
- * @author Martin Fluegge
- */
- public static class Factory implements INodeFactory
- {
- public Node createNode(Element element)
- {
- return new RepositoryNode(.1f, .1f, .1f, Primitive.GENERATE_TEXTURE_COORDS,
- ThreeDeeUtil.getDefaultAppearance(new Color3f(Color.green)));
- }
- }
}
diff --git a/org.eclipse.emf.cdo.threedee.ui/META-INF/MANIFEST.MF b/org.eclipse.emf.cdo.threedee.ui/META-INF/MANIFEST.MF
index 35f3359..7a1fe6c 100644
--- a/org.eclipse.emf.cdo.threedee.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.cdo.threedee.ui/META-INF/MANIFEST.MF
@@ -14,5 +14,5 @@
Export-Package: org.eclipse.emf.cdo.threedee.ui;version="1.0.0",
org.eclipse.emf.cdo.threedee.ui.bundle;version="1.0.0",
org.eclipse.emf.cdo.threedee.ui.layouts;version="1.0.0",
- org.eclipse.emf.cdo.threedee.ui.nodes;version="1.0.0",
- org.eclipse.emf.cdo.threedee.ui.nodes.old;version="1.0.0"
+ org.eclipse.emf.cdo.threedee.ui.nodes;version="1.0.0"
+
diff --git a/org.eclipse.emf.cdo.threedee.ui/src/org/eclipse/emf/cdo/threedee/ui/nodes/old/EPackageRegistryNode.java b/org.eclipse.emf.cdo.threedee.ui/src/org/eclipse/emf/cdo/threedee/ui/nodes/old/EPackageRegistryNode.java
deleted file mode 100644
index 8187c5d..0000000
--- a/org.eclipse.emf.cdo.threedee.ui/src/org/eclipse/emf/cdo/threedee/ui/nodes/old/EPackageRegistryNode.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
- * 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.threedee.ui.nodes.old;
-
-import org.eclipse.emf.cdo.threedee.common.Element;
-import org.eclipse.emf.cdo.threedee.ui.ThreeDeeUtil;
-
-import com.sun.j3d.utils.geometry.Sphere;
-
-import javax.media.j3d.Appearance;
-import javax.media.j3d.Node;
-
-import java.awt.Color;
-
-/**
- * @author Martin Fluegge
- */
-public class EPackageRegistryNode extends Sphere
-{
- public EPackageRegistryNode()
- {
- super(.1f, ThreeDeeUtil.getDefaultAppearance(Color.green));
- setCapability(Appearance.ALLOW_RENDERING_ATTRIBUTES_WRITE);
- setCapability(Appearance.ALLOW_RENDERING_ATTRIBUTES_READ);
- }
-
- /**
- * @author Martin Fluegge
- */
- public static class Factory implements INodeFactory
- {
- public Node createNode(Element element)
- {
- return new EPackageRegistryNode();
- }
- }
-}
diff --git a/org.eclipse.emf.cdo.threedee.ui/src/org/eclipse/emf/cdo/threedee/ui/nodes/old/INodeFactory.java b/org.eclipse.emf.cdo.threedee.ui/src/org/eclipse/emf/cdo/threedee/ui/nodes/old/INodeFactory.java
deleted file mode 100644
index 1d4d52c..0000000
--- a/org.eclipse.emf.cdo.threedee.ui/src/org/eclipse/emf/cdo/threedee/ui/nodes/old/INodeFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
- * 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:
- * Martin Fluegge - initial API and implementation
- * Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.threedee.ui.nodes.old;
-
-import org.eclipse.emf.cdo.threedee.common.Element;
-
-import javax.media.j3d.Node;
-
-import java.util.HashMap;
-
-/**
- * @author Martin Fluegge
- */
-public interface INodeFactory
-{
- public Node createNode(Element element);
-
- /**
- * @author Eike Stepper
- */
- public static class Registry extends HashMap<String, INodeFactory>
- {
- public static final INodeFactory.Registry INSTANCE = new Registry();
-
- private static final long serialVersionUID = 1L;
-
- static
- {
- // INSTANCE.put("Repository", new RepositoryNode.Factory());
- // INSTANCE.put("TCPConnector", new TCPConnectorNode.Factory());
- // INSTANCE.put("EPackageRegistry", new EPackageRegistryNode.Factory());
- }
- }
-}
diff --git a/org.eclipse.emf.cdo.threedee.ui/src/org/eclipse/emf/cdo/threedee/ui/nodes/old/TCPConnectorNode.java b/org.eclipse.emf.cdo.threedee.ui/src/org/eclipse/emf/cdo/threedee/ui/nodes/old/TCPConnectorNode.java
deleted file mode 100644
index 408701e..0000000
--- a/org.eclipse.emf.cdo.threedee.ui/src/org/eclipse/emf/cdo/threedee/ui/nodes/old/TCPConnectorNode.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
- * 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.threedee.ui.nodes.old;
-
-import org.eclipse.emf.cdo.threedee.common.Element;
-import org.eclipse.emf.cdo.threedee.ui.ThreeDeeUtil;
-
-import com.sun.j3d.utils.geometry.Sphere;
-
-import javax.media.j3d.Appearance;
-import javax.media.j3d.Node;
-
-import java.awt.Color;
-
-/**
- * @author Martin Fluegge
- */
-public class TCPConnectorNode extends Sphere
-{
- public TCPConnectorNode()
- {
- super(.1f, ThreeDeeUtil.getDefaultAppearance(Color.magenta));
- setCapability(Appearance.ALLOW_RENDERING_ATTRIBUTES_WRITE);
- setCapability(Appearance.ALLOW_RENDERING_ATTRIBUTES_READ);
- }
-
- /**
- * @author Martin Fluegge
- */
- public static class Factory implements INodeFactory
- {
- public Node createNode(Element element)
- {
- return new TCPConnectorNode();
- }
- }
-}
