diff --git a/plugins/org.eclipse.elk.alg.vertiflex/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.alg.vertiflex/META-INF/MANIFEST.MF index f568b8aa8..e2b843c0d 100644 --- a/plugins/org.eclipse.elk.alg.vertiflex/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.alg.vertiflex/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 -Automatic-Module-Name: org.eclipse.elk.alg.yconstree +Automatic-Module-Name: org.eclipse.elk.alg.vertiflex Bundle-ManifestVersion: 2 -Bundle-Name: ELK Y Constraint Tree Layout Algorithm +Bundle-Name: VertiFlex Tree Layout Algorithm Bundle-SymbolicName: org.eclipse.elk.alg.vertiflex;singleton:=true Bundle-Version: 0.9.0.qualifier Bundle-Vendor: Eclipse Modeling Project diff --git a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/InternalProperties.java b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/InternalProperties.java index 3699e49a4..61d19d591 100644 --- a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/InternalProperties.java +++ b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/InternalProperties.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.elk.alg.vertiflex; -import org.eclipse.elk.alg.vertiflex.p3relative.OutlineNode; +import org.eclipse.elk.alg.vertiflex.p2relative.OutlineNode; import org.eclipse.elk.core.options.CoreOptions; import org.eclipse.elk.core.options.PortConstraints; import org.eclipse.elk.graph.ElkNode; diff --git a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/VertiFlexLayoutProvider.java b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/VertiFlexLayoutProvider.java index 14429e87a..bbf799d3d 100644 --- a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/VertiFlexLayoutProvider.java +++ b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/VertiFlexLayoutProvider.java @@ -12,10 +12,10 @@ import java.util.List; import org.eclipse.elk.alg.vertiflex.options.VertiFlexOptions; -import org.eclipse.elk.alg.vertiflex.p2yplacement.NodeYPlacerStrategy; -import org.eclipse.elk.alg.vertiflex.p3relative.RelativeXPlacerStrategy; -import org.eclipse.elk.alg.vertiflex.p4absolute.AbsoluteXPlacerStrategy; -import org.eclipse.elk.alg.vertiflex.p5edgerouting.EdgerouterStrategy; +import org.eclipse.elk.alg.vertiflex.p1yplacement.NodeYPlacerStrategy; +import org.eclipse.elk.alg.vertiflex.p2relative.RelativeXPlacerStrategy; +import org.eclipse.elk.alg.vertiflex.p3absolute.AbsoluteXPlacerStrategy; +import org.eclipse.elk.alg.vertiflex.p4edgerouting.EdgerouterStrategy; import org.eclipse.elk.core.AbstractLayoutProvider; import org.eclipse.elk.core.UnsupportedConfigurationException; import org.eclipse.elk.core.alg.AlgorithmAssembler; diff --git a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2yplacement/NodeYPlacer.java b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p1yplacement/NodeYPlacer.java similarity index 98% rename from plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2yplacement/NodeYPlacer.java rename to plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p1yplacement/NodeYPlacer.java index efae083a8..9940134c4 100644 --- a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2yplacement/NodeYPlacer.java +++ b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p1yplacement/NodeYPlacer.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.elk.alg.vertiflex.p2yplacement; +package org.eclipse.elk.alg.vertiflex.p1yplacement; import org.eclipse.elk.alg.vertiflex.InternalProperties; import org.eclipse.elk.alg.vertiflex.VertiFlexLayoutPhases; diff --git a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2yplacement/NodeYPlacerStrategy.java b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p1yplacement/NodeYPlacerStrategy.java similarity index 96% rename from plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2yplacement/NodeYPlacerStrategy.java rename to plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p1yplacement/NodeYPlacerStrategy.java index cd6520d1f..d44db9011 100644 --- a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2yplacement/NodeYPlacerStrategy.java +++ b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p1yplacement/NodeYPlacerStrategy.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.elk.alg.vertiflex.p2yplacement; +package org.eclipse.elk.alg.vertiflex.p1yplacement; import org.eclipse.elk.alg.vertiflex.VertiFlexLayoutPhases; import org.eclipse.elk.core.alg.ILayoutPhase; diff --git a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3relative/NodeComparator.java b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2relative/NodeComparator.java similarity index 94% rename from plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3relative/NodeComparator.java rename to plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2relative/NodeComparator.java index 63a9150cf..7a5857a3d 100644 --- a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3relative/NodeComparator.java +++ b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2relative/NodeComparator.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.elk.alg.vertiflex.p3relative; +package org.eclipse.elk.alg.vertiflex.p2relative; import org.eclipse.elk.graph.ElkNode; diff --git a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3relative/OutlineNode.java b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2relative/OutlineNode.java similarity index 97% rename from plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3relative/OutlineNode.java rename to plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2relative/OutlineNode.java index 58635e0b9..af7fc438c 100644 --- a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3relative/OutlineNode.java +++ b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2relative/OutlineNode.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.elk.alg.vertiflex.p3relative; +package org.eclipse.elk.alg.vertiflex.p2relative; /** * An outline node is the basic building block of outline. It has a position and a reference to the next outline node. diff --git a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3relative/RelativeXPlacer.java b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2relative/RelativeXPlacer.java similarity index 99% rename from plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3relative/RelativeXPlacer.java rename to plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2relative/RelativeXPlacer.java index fd3ddf451..2484715bc 100644 --- a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3relative/RelativeXPlacer.java +++ b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2relative/RelativeXPlacer.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.elk.alg.vertiflex.p3relative; +package org.eclipse.elk.alg.vertiflex.p2relative; import java.util.ArrayList; import java.util.Collections; diff --git a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3relative/RelativeXPlacerStrategy.java b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2relative/RelativeXPlacerStrategy.java similarity index 96% rename from plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3relative/RelativeXPlacerStrategy.java rename to plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2relative/RelativeXPlacerStrategy.java index bbae6fc83..07e56a0f5 100644 --- a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3relative/RelativeXPlacerStrategy.java +++ b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p2relative/RelativeXPlacerStrategy.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.elk.alg.vertiflex.p3relative; +package org.eclipse.elk.alg.vertiflex.p2relative; import org.eclipse.elk.alg.vertiflex.VertiFlexLayoutPhases; import org.eclipse.elk.core.alg.ILayoutPhase; diff --git a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p4absolute/AbsoluteXPlacer.java b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3absolute/AbsoluteXPlacer.java similarity index 98% rename from plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p4absolute/AbsoluteXPlacer.java rename to plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3absolute/AbsoluteXPlacer.java index ec33b05ed..49d413e1e 100644 --- a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p4absolute/AbsoluteXPlacer.java +++ b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3absolute/AbsoluteXPlacer.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.elk.alg.vertiflex.p4absolute; +package org.eclipse.elk.alg.vertiflex.p3absolute; import org.eclipse.elk.alg.vertiflex.InternalProperties; import org.eclipse.elk.alg.vertiflex.VertiFlexLayoutPhases; diff --git a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p4absolute/AbsoluteXPlacerStrategy.java b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3absolute/AbsoluteXPlacerStrategy.java similarity index 91% rename from plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p4absolute/AbsoluteXPlacerStrategy.java rename to plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3absolute/AbsoluteXPlacerStrategy.java index 31cd49310..6c024f5da 100644 --- a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p4absolute/AbsoluteXPlacerStrategy.java +++ b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p3absolute/AbsoluteXPlacerStrategy.java @@ -7,10 +7,10 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.elk.alg.vertiflex.p4absolute; +package org.eclipse.elk.alg.vertiflex.p3absolute; import org.eclipse.elk.alg.vertiflex.VertiFlexLayoutPhases; -import org.eclipse.elk.alg.vertiflex.p3relative.RelativeXPlacer; +import org.eclipse.elk.alg.vertiflex.p2relative.RelativeXPlacer; import org.eclipse.elk.core.alg.ILayoutPhase; import org.eclipse.elk.core.alg.ILayoutPhaseFactory; import org.eclipse.elk.graph.ElkNode; diff --git a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p5edgerouting/Edgerouter.java b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p4edgerouting/Edgerouter.java similarity index 98% rename from plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p5edgerouting/Edgerouter.java rename to plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p4edgerouting/Edgerouter.java index ac307cd8b..38d9524cb 100644 --- a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p5edgerouting/Edgerouter.java +++ b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p4edgerouting/Edgerouter.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.elk.alg.vertiflex.p5edgerouting; +package org.eclipse.elk.alg.vertiflex.p4edgerouting; import org.eclipse.elk.alg.vertiflex.InternalProperties; import org.eclipse.elk.alg.vertiflex.VertiFlexLayoutPhases; diff --git a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p5edgerouting/EdgerouterStrategy.java b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p4edgerouting/EdgerouterStrategy.java similarity index 91% rename from plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p5edgerouting/EdgerouterStrategy.java rename to plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p4edgerouting/EdgerouterStrategy.java index 6a6591e2b..acd5ec52e 100644 --- a/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p5edgerouting/EdgerouterStrategy.java +++ b/plugins/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/p4edgerouting/EdgerouterStrategy.java @@ -7,10 +7,10 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.elk.alg.vertiflex.p5edgerouting; +package org.eclipse.elk.alg.vertiflex.p4edgerouting; import org.eclipse.elk.alg.vertiflex.VertiFlexLayoutPhases; -import org.eclipse.elk.alg.vertiflex.p3relative.RelativeXPlacer; +import org.eclipse.elk.alg.vertiflex.p2relative.RelativeXPlacer; import org.eclipse.elk.core.alg.ILayoutPhase; import org.eclipse.elk.core.alg.ILayoutPhaseFactory; import org.eclipse.elk.graph.ElkNode;