This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new f68de43b27 connection layout AOBE fix
new 79b0a45b51 Merge pull request #5819 from ebarboni/visualapilayout
f68de43b27 is described below
commit f68de43b27e4a652d59de56dfa3223040ea6b6f2
Author: Eric Barboni <[email protected]>
AuthorDate: Wed Apr 12 18:33:23 2023 +0200
connection layout AOBE fix
---
.../visual/layout/ConnectionWidgetLayout.java | 2 +-
.../visual/layout/ConnectionWidgetLayoutTest.java | 130 +++++++++++++++++++++
2 files changed, 131 insertions(+), 1 deletion(-)
diff --git
a/platform/api.visual/src/org/netbeans/modules/visual/layout/ConnectionWidgetLayout.java
b/platform/api.visual/src/org/netbeans/modules/visual/layout/ConnectionWidgetLayout.java
index e5e56e1ddc..680c023e81 100644
---
a/platform/api.visual/src/org/netbeans/modules/visual/layout/ConnectionWidgetLayout.java
+++
b/platform/api.visual/src/org/netbeans/modules/visual/layout/ConnectionWidgetLayout.java
@@ -86,7 +86,7 @@ public final class ConnectionWidgetLayout implements Layout {
connectionWidget.calculateRouting ();
java.util.List<Point> controlPoints =
connectionWidget.getControlPoints ();
- boolean empty = controlPoints == null || controlPoints.size () <= 0;
+ boolean empty = controlPoints == null || controlPoints.size () <= 1;
double totalDistance = 0.0;
double[] distances = new double[empty ? 0 : controlPoints.size () - 1];
diff --git
a/platform/api.visual/test/unit/src/org/netbeans/modules/visual/layout/ConnectionWidgetLayoutTest.java
b/platform/api.visual/test/unit/src/org/netbeans/modules/visual/layout/ConnectionWidgetLayoutTest.java
new file mode 100644
index 0000000000..6d508a2402
--- /dev/null
+++
b/platform/api.visual/test/unit/src/org/netbeans/modules/visual/layout/ConnectionWidgetLayoutTest.java
@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.visual.layout;
+
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Test;
+import
org.netbeans.api.visual.layout.LayoutFactory.ConnectionWidgetLayoutAlignment;
+import org.netbeans.api.visual.widget.ConnectionWidget;
+import org.netbeans.api.visual.widget.Scene;
+import org.netbeans.api.visual.widget.Widget;
+import org.netbeans.modules.visual.framework.VisualTestCase;
+
+public class ConnectionWidgetLayoutTest extends VisualTestCase {
+
+ public ConnectionWidgetLayoutTest(String testName) {
+ super(testName);
+ }
+
+ @Test
+ public void testConnectionWidgetLayoutNoControlPoint() {
+ Scene scene = new Scene();
+ ConnectionWidget w1 = new ConnectionWidget(scene);
+
+ ConnectionWidgetLayout connectionWidgetLayout = new
ConnectionWidgetLayout();
+ List<Point> lc = new ArrayList<>();
+ w1.setControlPoints(lc, true);
+ connectionWidgetLayout.layout(w1);
+ }
+
+ @Test
+ public void testConnectionWidgetLayoutTwoControlPoint() {
+ Scene scene = new Scene();
+ ConnectionWidget w1 = new ConnectionWidget(scene);
+ ConnectionWidgetLayout connectionWidgetLayout = new
ConnectionWidgetLayout();
+ List<Point> lc = new ArrayList<>();
+ lc.add(new Point());
+ lc.add(new Point());
+ w1.setControlPoints(lc, true);
+ connectionWidgetLayout.layout(w1);
+ }
+
+ @Test
+ public void testConnectionWidgetLayoutOnControlPointPercentageInRange() {
+ Scene scene = new Scene();
+ ConnectionWidget w1 = new ConnectionWidget(scene);
+ ConnectionWidgetLayout connectionWidgetLayout = new
ConnectionWidgetLayout();
+ List<Point> lc = new ArrayList<>();
+ lc.add(new Point());
+ w1.setControlPoints(lc, true);
+ Widget w2 = new Widget(scene);
+ w1.addChild(w2);
+ connectionWidgetLayout.setConstraint(w2,
ConnectionWidgetLayoutAlignment.BOTTOM_CENTER, .5f);
+ connectionWidgetLayout.layout(w1);
+ }
+
+ @Test
+ public void testConnectionWidgetLayoutOnControlPointPercentageUpperRange()
{
+ Scene scene = new Scene();
+ ConnectionWidget w1 = new ConnectionWidget(scene);
+ ConnectionWidgetLayout connectionWidgetLayout = new
ConnectionWidgetLayout();
+ List<Point> lc = new ArrayList<>();
+ lc.add(new Point());
+ w1.setControlPoints(lc, true);
+ Widget w2 = new Widget(scene);
+ w1.addChild(w2);
+ connectionWidgetLayout.setConstraint(w2,
ConnectionWidgetLayoutAlignment.BOTTOM_CENTER, 1.0f);
+ connectionWidgetLayout.layout(w1);
+ }
+
+ @Test
+ public void testConnectionWidgetLayoutOnControlPointPercentageLowerRange()
{
+ Scene scene = new Scene();
+ ConnectionWidget w1 = new ConnectionWidget(scene);
+ ConnectionWidgetLayout connectionWidgetLayout = new
ConnectionWidgetLayout();
+ List<Point> lc = new ArrayList<>();
+ lc.add(new Point());
+ w1.setControlPoints(lc, true);
+ Widget w2 = new Widget(scene);
+ w1.addChild(w2);
+ connectionWidgetLayout.setConstraint(w2,
ConnectionWidgetLayoutAlignment.BOTTOM_CENTER, 1.0f);
+ connectionWidgetLayout.layout(w1);
+ }
+
+
+ @Test
+ public void testConnectionWidgetLayoutOnControlPointPlainBelowZero() {
+ Scene scene = new Scene();
+ ConnectionWidget w1 = new ConnectionWidget(scene);
+ ConnectionWidgetLayout connectionWidgetLayout = new
ConnectionWidgetLayout();
+ List<Point> lc = new ArrayList<>();
+ lc.add(new Point());
+ w1.setControlPoints(lc, true);
+ Widget w2 = new Widget(scene);
+ w1.addChild(w2);
+ connectionWidgetLayout.setConstraint(w2,
ConnectionWidgetLayoutAlignment.BOTTOM_CENTER, -1);
+ connectionWidgetLayout.layout(w1);
+ }
+
+ @Test
+ public void testConnectionWidgetLayoutOnControlPointPlainAboveZero() {
+ Scene scene = new Scene();
+ ConnectionWidget w1 = new ConnectionWidget(scene);
+ ConnectionWidgetLayout connectionWidgetLayout = new
ConnectionWidgetLayout();
+ List<Point> lc = new ArrayList<>();
+ lc.add(new Point());
+ w1.setControlPoints(lc, true);
+ Widget w2 = new Widget(scene);
+ w1.addChild(w2);
+ connectionWidgetLayout.setConstraint(w2,
ConnectionWidgetLayoutAlignment.BOTTOM_CENTER, 1);
+ connectionWidgetLayout.layout(w1);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
