Merge pull request praxis-live#26 from codelerity/graph-refactor

Refactor praxislive.graph into praxislive.pxr.graph
codelerity · Jul 11, 2024 · cf33a57 · cf33a57
2 parents 1ca7e38 + c0d8b6d
commit cf33a57
Show file tree

Hide file tree

Showing 28 changed files with 32 additions and 103 deletions.
diff --git a/modules/praxislive.graph/pom.xml b/modules/praxislive.graph/pom.xml
diff --git a/modules/praxislive.pxr.graph/pom.xml b/modules/praxislive.pxr.graph/pom.xml
@@ -38,11 +38,6 @@
       <artifactId>praxislive-code</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.praxislive.ide</groupId>
-      <artifactId>praxislive-graph</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.praxislive.ide</groupId>
       <artifactId>praxislive-model</artifactId>

diff --git a/...raxislive.pxr.graph/src/main/java/org/praxislive/ide/pxr/graph/AddPortToParentAction.java b/...raxislive.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
@@ -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
@@ -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
@@ -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/...raxislive/ide/graph/AlignWithSupport.java → ...ide/pxr/graph/scene/AlignWithSupport.java b/...raxislive/ide/graph/AlignWithSupport.java → ...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/...a/org/praxislive/ide/graph/Alignment.java → ...islive/ide/pxr/graph/scene/Alignment.java b/...a/org/praxislive/ide/graph/Alignment.java → ...islive/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/...g/praxislive/ide/graph/CommentWidget.java → ...ve/ide/pxr/graph/scene/CommentWidget.java b/...g/praxislive/ide/graph/CommentWidget.java → ...ve/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/...java/org/praxislive/ide/graph/EdgeID.java → ...raxislive/ide/pxr/graph/scene/EdgeID.java b/...java/org/praxislive/ide/graph/EdgeID.java → ...raxislive/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/.../org/praxislive/ide/graph/EdgeWidget.java → ...slive/ide/pxr/graph/scene/EdgeWidget.java b/.../org/praxislive/ide/graph/EdgeWidget.java → ...slive/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/.../praxislive/ide/graph/GlyphSetWidget.java → ...e/ide/pxr/graph/scene/GlyphSetWidget.java b/.../praxislive/ide/graph/GlyphSetWidget.java → ...e/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/...a/org/praxislive/ide/graph/LAFScheme.java → ...islive/ide/pxr/graph/scene/LAFScheme.java b/...a/org/praxislive/ide/graph/LAFScheme.java → ...islive/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/...praxislive/ide/graph/MinimizeAbility.java → .../ide/pxr/graph/scene/MinimizeAbility.java b/...praxislive/ide/graph/MinimizeAbility.java → .../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/.../org/praxislive/ide/graph/NodeWidget.java → ...slive/ide/pxr/graph/scene/NodeWidget.java b/.../org/praxislive/ide/graph/NodeWidget.java → ...slive/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/...xislive/ide/graph/ObjectSceneAdaptor.java → ...e/pxr/graph/scene/ObjectSceneAdaptor.java b/...xislive/ide/graph/ObjectSceneAdaptor.java → ...e/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/.../java/org/praxislive/ide/graph/PinID.java → ...praxislive/ide/pxr/graph/scene/PinID.java b/.../java/org/praxislive/ide/graph/PinID.java → ...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/...a/org/praxislive/ide/graph/PinWidget.java → ...islive/ide/pxr/graph/scene/PinWidget.java b/...a/org/praxislive/ide/graph/PinWidget.java → ...islive/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/...ive/ide/graph/PraxisConnectDecorator.java → ...r/graph/scene/PraxisConnectDecorator.java b/...ive/ide/graph/PraxisConnectDecorator.java → ...r/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/...e/ide/graph/PraxisCycleFocusProvider.java → ...graph/scene/PraxisCycleFocusProvider.java b/...e/ide/graph/PraxisCycleFocusProvider.java → ...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/...axislive/ide/graph/PraxisGraphLayout.java → ...de/pxr/graph/scene/PraxisGraphLayout.java b/...axislive/ide/graph/PraxisGraphLayout.java → ...de/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/...raxislive/ide/graph/PraxisGraphScene.java → ...ide/pxr/graph/scene/PraxisGraphScene.java b/...raxislive/ide/graph/PraxisGraphScene.java → ...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/...e/ide/graph/PraxisKeyboardMoveAction.java → ...graph/scene/PraxisKeyboardMoveAction.java b/...e/ide/graph/PraxisKeyboardMoveAction.java → ...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/...xislive/ide/graph/PraxisMoveProvider.java → ...e/pxr/graph/scene/PraxisMoveProvider.java b/...xislive/ide/graph/PraxisMoveProvider.java → ...e/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/...live/ide/graph/resources/vmd-collapse.png → ...xr/graph/scene/resources/vmd-collapse.png b/...live/ide/graph/resources/vmd-collapse.png → ...xr/graph/scene/resources/vmd-collapse.png
diff --git a/...islive/ide/graph/resources/vmd-expand.png → .../pxr/graph/scene/resources/vmd-expand.png b/...islive/ide/graph/resources/vmd-expand.png → .../pxr/graph/scene/resources/vmd-expand.png
diff --git a/...raxislive/ide/graph/resources/vmd-pin.png → ...ide/pxr/graph/scene/resources/vmd-pin.png b/...raxislive/ide/graph/resources/vmd-pin.png → ...ide/pxr/graph/scene/resources/vmd-pin.png
diff --git a/pom.xml b/pom.xml
@@ -40,7 +40,6 @@
     <module>modules/praxislive.core.ui</module>
     <module>modules/praxislive.editor</module>
     <module>modules/praxislive.editor.saveflash</module>
-    <module>modules/praxislive.graph</module>
     <module>modules/praxislive.model</module>
     <module>modules/praxislive.opengl</module>
     <module>modules/praxislive.project</module>