diff --git a/modules/praxislive.graph/pom.xml b/modules/praxislive.graph/pom.xml deleted file mode 100644 index 5b9a2f61..00000000 --- a/modules/praxislive.graph/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - 4.0.0 - - org.praxislive.ide - praxislive-parent - 6.0.0-SNAPSHOT - ../../pom.xml - - - praxislive-graph - nbm - - PraxisLIVE-Graph - - - org.praxislive.ide.graph - - - - - org.netbeans.api - org-netbeans-api-visual - ${netbeans.version} - jar - - - org.netbeans.api - org-openide-util-lookup - ${netbeans.version} - jar - - - org.netbeans.api - org-openide-util-ui - ${netbeans.version} - jar - - - - - - - org.apache.netbeans.utilities - nbm-maven-plugin - - ${nbm.codeNameBase} - - org.praxislive.ide.graph - - - true - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - diff --git a/modules/praxislive.pxr.graph/pom.xml b/modules/praxislive.pxr.graph/pom.xml index 3bda2eff..2682f7da 100644 --- a/modules/praxislive.pxr.graph/pom.xml +++ b/modules/praxislive.pxr.graph/pom.xml @@ -38,11 +38,6 @@ praxislive-code ${project.version} - - org.praxislive.ide - praxislive-graph - ${project.version} - org.praxislive.ide praxislive-model diff --git a/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/AddPortToParentAction.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/AddPortToParentAction.java index 49b84fd2..3d77bc65 100644 --- a/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/AddPortToParentAction.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/AddPortToParentAction.java @@ -24,7 +24,7 @@ import org.praxislive.core.PortAddress; import org.praxislive.core.Value; import org.praxislive.core.types.PMap; -import org.praxislive.ide.graph.PinID; +import org.praxislive.ide.pxr.graph.scene.PinID; import org.praxislive.ide.model.ContainerProxy; import org.praxislive.ide.properties.PraxisProperty; import java.awt.EventQueue; diff --git a/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/Colors.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/Colors.java index 07a22167..be2c1fdc 100644 --- a/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/Colors.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/Colors.java @@ -22,7 +22,7 @@ package org.praxislive.ide.pxr.graph; import java.awt.Color; -import org.praxislive.ide.graph.LAFScheme; +import org.praxislive.ide.pxr.graph.scene.LAFScheme; /** * diff --git a/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/ConnectAction.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/ConnectAction.java index 5dfbc49b..a09041c8 100644 --- a/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/ConnectAction.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/ConnectAction.java @@ -43,13 +43,13 @@ import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import org.praxislive.core.PortInfo; -import org.praxislive.ide.graph.PinID; import org.praxislive.ide.model.ProxyException; import org.openide.awt.CloseButtonFactory; import org.openide.nodes.Node; import org.openide.util.Exceptions; import org.openide.util.NbBundle; import org.praxislive.core.Connection; +import org.praxislive.ide.pxr.graph.scene.PinID; /** * diff --git a/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/GraphEditor.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/GraphEditor.java index c86ad560..dbd9b375 100644 --- a/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/GraphEditor.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/GraphEditor.java @@ -61,14 +61,14 @@ import org.praxislive.ide.core.api.Callback; import org.praxislive.ide.core.api.Syncable; import org.praxislive.ide.core.ui.api.Actions; -import org.praxislive.ide.graph.Alignment; -import org.praxislive.ide.graph.EdgeID; -import org.praxislive.ide.graph.EdgeWidget; -import org.praxislive.ide.graph.NodeWidget; -import org.praxislive.ide.graph.ObjectSceneAdaptor; -import org.praxislive.ide.graph.PinID; -import org.praxislive.ide.graph.PinWidget; -import org.praxislive.ide.graph.PraxisGraphScene; +import org.praxislive.ide.pxr.graph.scene.Alignment; +import org.praxislive.ide.pxr.graph.scene.EdgeID; +import org.praxislive.ide.pxr.graph.scene.EdgeWidget; +import org.praxislive.ide.pxr.graph.scene.NodeWidget; +import org.praxislive.ide.pxr.graph.scene.ObjectSceneAdaptor; +import org.praxislive.ide.pxr.graph.scene.PinID; +import org.praxislive.ide.pxr.graph.scene.PinWidget; +import org.praxislive.ide.pxr.graph.scene.PraxisGraphScene; import org.praxislive.ide.model.ComponentProxy; import org.praxislive.ide.model.ContainerProxy; import org.praxislive.ide.model.RootProxy; diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/AlignWithSupport.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/AlignWithSupport.java similarity index 99% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/AlignWithSupport.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/AlignWithSupport.java index 9a963ed9..f60fc013 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/AlignWithSupport.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/AlignWithSupport.java @@ -40,7 +40,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; import java.awt.Point; import java.awt.Rectangle; diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/Alignment.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/Alignment.java similarity index 96% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/Alignment.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/Alignment.java index 703fa3d4..6dbc83b2 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/Alignment.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/Alignment.java @@ -19,7 +19,7 @@ * Please visit https://www.praxislive.org if you need additional information or * have any questions. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; /** * Types of positional alignment, for use with widget elements such as diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/CommentWidget.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/CommentWidget.java similarity index 97% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/CommentWidget.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/CommentWidget.java index 0415e2f0..e75685dd 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/CommentWidget.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/CommentWidget.java @@ -19,7 +19,7 @@ * Please visit https://www.praxislive.org if you need additional information or * have any questions. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; import java.awt.Color; import java.awt.Dimension; diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/EdgeID.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/EdgeID.java similarity index 98% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/EdgeID.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/EdgeID.java index ccbf7166..f7d04621 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/EdgeID.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/EdgeID.java @@ -19,7 +19,7 @@ * Please visit https://www.praxislive.org if you need additional information or * have any questions. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; /** * ID of a connection (edge) between two pin IDs on nodes. diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/EdgeWidget.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/EdgeWidget.java similarity index 99% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/EdgeWidget.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/EdgeWidget.java index e4f9bf3c..0d76f99a 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/EdgeWidget.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/EdgeWidget.java @@ -40,7 +40,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; import java.awt.Graphics2D; import java.awt.Point; diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/GlyphSetWidget.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/GlyphSetWidget.java similarity index 98% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/GlyphSetWidget.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/GlyphSetWidget.java index 3c094260..2544144b 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/GlyphSetWidget.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/GlyphSetWidget.java @@ -40,7 +40,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; import org.netbeans.api.visual.layout.LayoutFactory; import org.netbeans.api.visual.widget.ImageWidget; diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/LAFScheme.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/LAFScheme.java similarity index 96% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/LAFScheme.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/LAFScheme.java index 1d018c8b..76f80a5c 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/LAFScheme.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/LAFScheme.java @@ -40,7 +40,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; import java.awt.BasicStroke; import java.awt.Color; @@ -68,7 +68,7 @@ public class LAFScheme { = BorderFactory.createOpaqueBorder(2, 2, 2, 2); private static final PointShape POINT_SHAPE_IMAGE = PointShapeFactory.createImagePointShape( - ImageUtilities.loadImage("org/praxislive/ide/graph/resources/vmd-pin.png")); // NOI18N + ImageUtilities.loadImage("org/praxislive/ide/pxr/graph/scene/resources/vmd-pin.png")); // NOI18N private static final Colors DEFAULT_RESOURCES = new Colors(new Color(0x748CC0), new Color(0xBACDF0)); @@ -189,8 +189,8 @@ protected boolean isNodeMinimizeButtonOnRight(NodeWidget widget) { protected Image getMinimizeWidgetImage(NodeWidget widget) { return widget.isMinimized() - ? ImageUtilities.loadImage("org/praxislive/ide/graph/resources/vmd-expand.png") // NOI18N - : ImageUtilities.loadImage("org/praxislive/ide/graph/resources/vmd-collapse.png"); // NOI18N + ? ImageUtilities.loadImage("org/praxislive/ide/pxr/graph/scene/resources/vmd-expand.png") // NOI18N + : ImageUtilities.loadImage("org/praxislive/ide/pxr/graph/scene/resources/vmd-collapse.png"); // NOI18N } protected void installUI(EdgeWidget widget) { diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/MinimizeAbility.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/MinimizeAbility.java similarity index 97% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/MinimizeAbility.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/MinimizeAbility.java index 92797ef3..b16a813c 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/MinimizeAbility.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/MinimizeAbility.java @@ -40,7 +40,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; /** * This interface represents an ability to collapse and expand a widget. It is diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/NodeWidget.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/NodeWidget.java similarity index 99% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/NodeWidget.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/NodeWidget.java index e70a56fd..2409bc72 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/NodeWidget.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/NodeWidget.java @@ -40,7 +40,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; import java.awt.Color; import java.awt.Cursor; diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/ObjectSceneAdaptor.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/ObjectSceneAdaptor.java similarity index 97% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/ObjectSceneAdaptor.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/ObjectSceneAdaptor.java index 06f84e1f..f3c207d2 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/ObjectSceneAdaptor.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/ObjectSceneAdaptor.java @@ -19,7 +19,7 @@ * Please visit https://www.praxislive.org if you need additional information or * have any questions. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; import java.util.Set; import org.netbeans.api.visual.model.ObjectSceneEvent; diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PinID.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PinID.java similarity index 98% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PinID.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PinID.java index 67770408..5b45e7bb 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PinID.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PinID.java @@ -19,7 +19,7 @@ * Please visit https://www.praxislive.org if you need additional information or * have any questions. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; /** * ID of a pin on a node. diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PinWidget.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PinWidget.java similarity index 99% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PinWidget.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PinWidget.java index ca7571c1..35a4bbe2 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PinWidget.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PinWidget.java @@ -40,7 +40,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; import java.awt.Point; import java.awt.Rectangle; diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisConnectDecorator.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisConnectDecorator.java similarity index 98% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisConnectDecorator.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisConnectDecorator.java index fb4e37f7..821a5949 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisConnectDecorator.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisConnectDecorator.java @@ -19,7 +19,7 @@ * Please visit https://www.praxislive.org if you need additional information or * have any questions. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; import java.awt.Point; import org.netbeans.api.visual.action.ConnectDecorator; diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisCycleFocusProvider.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisCycleFocusProvider.java similarity index 99% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisCycleFocusProvider.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisCycleFocusProvider.java index 671cca45..ac32dc22 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisCycleFocusProvider.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisCycleFocusProvider.java @@ -40,7 +40,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; import java.awt.Point; import java.util.ArrayList; diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisGraphLayout.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisGraphLayout.java similarity index 99% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisGraphLayout.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisGraphLayout.java index 287410f3..d9eca8ac 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisGraphLayout.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisGraphLayout.java @@ -40,7 +40,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; import java.awt.Dimension; import java.awt.Point; diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisGraphScene.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisGraphScene.java similarity index 99% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisGraphScene.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisGraphScene.java index 24da416a..2cb9da0b 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisGraphScene.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisGraphScene.java @@ -40,7 +40,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; import java.awt.Color; import java.awt.Point; diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisKeyboardMoveAction.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisKeyboardMoveAction.java similarity index 98% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisKeyboardMoveAction.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisKeyboardMoveAction.java index 4b106003..5ac4832e 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisKeyboardMoveAction.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisKeyboardMoveAction.java @@ -19,7 +19,7 @@ * Please visit https://www.praxislive.org if you need additional information or * have any questions. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; import java.awt.Point; import java.awt.event.KeyEvent; diff --git a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisMoveProvider.java b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisMoveProvider.java similarity index 99% rename from modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisMoveProvider.java rename to modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisMoveProvider.java index c3994f11..277dacad 100644 --- a/modules/praxislive.graph/src/main/java/org/praxislive/ide/graph/PraxisMoveProvider.java +++ b/modules/praxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/scene/PraxisMoveProvider.java @@ -40,7 +40,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.praxislive.ide.graph; +package org.praxislive.ide.pxr.graph.scene; import java.awt.BasicStroke; import java.awt.Color; diff --git a/modules/praxislive.graph/src/main/resources/org/praxislive/ide/graph/resources/vmd-collapse.png b/modules/praxislive.pxr.graph/src/main/resources/org/praxislive/ide/pxr/graph/scene/resources/vmd-collapse.png similarity index 100% rename from modules/praxislive.graph/src/main/resources/org/praxislive/ide/graph/resources/vmd-collapse.png rename to modules/praxislive.pxr.graph/src/main/resources/org/praxislive/ide/pxr/graph/scene/resources/vmd-collapse.png diff --git a/modules/praxislive.graph/src/main/resources/org/praxislive/ide/graph/resources/vmd-expand.png b/modules/praxislive.pxr.graph/src/main/resources/org/praxislive/ide/pxr/graph/scene/resources/vmd-expand.png similarity index 100% rename from modules/praxislive.graph/src/main/resources/org/praxislive/ide/graph/resources/vmd-expand.png rename to modules/praxislive.pxr.graph/src/main/resources/org/praxislive/ide/pxr/graph/scene/resources/vmd-expand.png diff --git a/modules/praxislive.graph/src/main/resources/org/praxislive/ide/graph/resources/vmd-pin.png b/modules/praxislive.pxr.graph/src/main/resources/org/praxislive/ide/pxr/graph/scene/resources/vmd-pin.png similarity index 100% rename from modules/praxislive.graph/src/main/resources/org/praxislive/ide/graph/resources/vmd-pin.png rename to modules/praxislive.pxr.graph/src/main/resources/org/praxislive/ide/pxr/graph/scene/resources/vmd-pin.png diff --git a/pom.xml b/pom.xml index b09593d9..72dcff5f 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,6 @@ modules/praxislive.core.ui modules/praxislive.editor modules/praxislive.editor.saveflash - modules/praxislive.graph modules/praxislive.model modules/praxislive.opengl modules/praxislive.project