Skip to content

Commit

Permalink
Refactor phase packages
Browse files Browse the repository at this point in the history 
Number phase packages to correspond to the phases declared in the
phases enum.
  • Loading branch information
@Eddykasp
Eddykasp committed Oct 19, 2023
1 parent 625b72c commit 2e1f8e6
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions plugins/org.eclipse.elk.alg.vertiflex/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...s/org.eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/InternalProperties.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ....eclipse.elk.alg.vertiflex/src/org/eclipse/elk/alg/vertiflex/VertiFlexLayoutProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...g/vertiflex/p2yplacement/NodeYPlacer.java → ...g/vertiflex/p1yplacement/NodeYPlacer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...lex/p2yplacement/NodeYPlacerStrategy.java → ...lex/p1yplacement/NodeYPlacerStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../vertiflex/p3relative/NodeComparator.java → .../vertiflex/p2relative/NodeComparator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...alg/vertiflex/p3relative/OutlineNode.java → ...alg/vertiflex/p2relative/OutlineNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...vertiflex/p3relative/RelativeXPlacer.java → ...vertiflex/p2relative/RelativeXPlacer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...x/p3relative/RelativeXPlacerStrategy.java → ...x/p2relative/RelativeXPlacerStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...vertiflex/p4absolute/AbsoluteXPlacer.java → ...vertiflex/p3absolute/AbsoluteXPlacer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...x/p4absolute/AbsoluteXPlacerStrategy.java → ...x/p3absolute/AbsoluteXPlacerStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...g/vertiflex/p5edgerouting/Edgerouter.java → ...g/vertiflex/p4edgerouting/Edgerouter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...lex/p5edgerouting/EdgerouterStrategy.java → ...lex/p4edgerouting/EdgerouterStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2e1f8e6

Please sign in to comment.