Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Zest 2.0] Cleanup compiler warnings in SpaceTreeLayoutAlgorithm (pt1) #505

Merged
merged 1 commit into from
Aug 19, 2024
Merged

[Zest 2.0] Cleanup compiler warnings in SpaceTreeLayoutAlgorithm (pt1) #505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions ...clipse.zest.layouts/src/org/eclipse/zest/layouts/algorithms/SpaceTreeLayoutAlgorithm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,15 @@ protected void addChild(TreeLayoutObserver.TreeNode child) {
child2.setSubgraph(null);

if (child.depth >= 0) {
((SpaceTreeLayer) spaceTreeLayers.get(child.depth)).removeNode(child2);
spaceTreeLayers.get(child.depth).removeNode(child2);
}

if (expanded) {
child.depth = this.depth + 1;

SpaceTreeLayer childLayer;
if (child.depth < spaceTreeLayers.size()) {
childLayer = ((SpaceTreeLayer) spaceTreeLayers.get(child.depth));
childLayer = (spaceTreeLayers.get(child.depth));
} else {
spaceTreeLayers.add(childLayer = new SpaceTreeLayer(child.depth));
}
Expand Down Expand Up @@ -184,7 +184,7 @@ public void adjustPosition(DisplayIndependentPoint preferredLocation) { // !
double newPositionInLayer = (direction == BOTTOM_UP || direction == TOP_DOWN) ? preferredLocation.x
: preferredLocation.y;
if (((SpaceTreeNode) parent).expanded) {
((SpaceTreeLayer) spaceTreeLayers.get(depth)).moveNode(this, newPositionInLayer);
spaceTreeLayers.get(depth).moveNode(this, newPositionInLayer);
centerParentsTopDown();
}
}
Expand Down Expand Up @@ -215,7 +215,7 @@ public void refreshSubgraphLocation() {
}
subgraph.setLocation(x, y);
}
((SpaceTreeLayer) spaceTreeLayers.get(depth)).refreshThickness();
spaceTreeLayers.get(depth).refreshThickness();
}

public double spaceRequiredForNode() {
Expand Down Expand Up @@ -264,19 +264,19 @@ public boolean childrenPositionsOK(ArrayList nodesToCheck) {
}
SpaceTreeNode child = ((SpaceTreeNode) node.children.get(0));
if (child.positionInLayer > node.positionInLayer) {
((SpaceTreeLayer) spaceTreeLayers.get(node.depth)).moveNode(node, child.positionInLayer);
spaceTreeLayers.get(node.depth).moveNode(node, child.positionInLayer);
if (child.positionInLayer > node.positionInLayer) {
((SpaceTreeLayer) spaceTreeLayers.get(child.depth)).moveNode(child, node.positionInLayer);
spaceTreeLayers.get(child.depth).moveNode(child, node.positionInLayer);
if (child.positionInLayer > node.positionInLayer) {
return false;
}
}
}
child = ((SpaceTreeNode) node.children.get(node.children.size() - 1));
if (child.positionInLayer < node.positionInLayer) {
((SpaceTreeLayer) spaceTreeLayers.get(node.depth)).moveNode(node, child.positionInLayer);
spaceTreeLayers.get(node.depth).moveNode(node, child.positionInLayer);
if (child.positionInLayer < node.positionInLayer) {
((SpaceTreeLayer) spaceTreeLayers.get(child.depth)).moveNode(child, node.positionInLayer);
spaceTreeLayers.get(child.depth).moveNode(child, node.positionInLayer);
if (child.positionInLayer < node.positionInLayer) {
return false;
}
Expand All @@ -295,7 +295,7 @@ public void centerParentsBottomUp() {
if (depth >= 0) {
SpaceTreeNode firstChild = (SpaceTreeNode) children.get(0);
SpaceTreeNode lastChild = (SpaceTreeNode) children.get(children.size() - 1);
SpaceTreeLayer layer = (SpaceTreeLayer) spaceTreeLayers.get(depth);
SpaceTreeLayer layer = spaceTreeLayers.get(depth);
layer.moveNode(this, (firstChild.positionInLayer + lastChild.positionInLayer) / 2);
}
}
Expand All @@ -316,7 +316,7 @@ public void centerParentsTopDown() {
if (lastChild.positionInLayer + lastChild.spaceRequiredForNode() / 2 + offset > availableSpace) {
offset = availableSpace - lastChild.positionInLayer - lastChild.spaceRequiredForNode() / 2;
}
SpaceTreeLayer layer = (SpaceTreeLayer) spaceTreeLayers.get(depth + 1);
SpaceTreeLayer layer = spaceTreeLayers.get(depth + 1);
layer.fitNodesWithinBounds(children, firstChild.positionInLayer + offset,
lastChild.positionInLayer + offset);

Expand Down Expand Up @@ -400,7 +400,7 @@ public boolean flushLocationChanges(double thicknessSoFar) {
}
}
if (expanded && subgraph == null) {
thicknessSoFar += (depth >= 0 ? ((SpaceTreeLayer) spaceTreeLayers.get(depth)).thickness : 0) + layerGap;
thicknessSoFar += (depth >= 0 ? spaceTreeLayers.get(depth).thickness : 0) + layerGap;
for (Object child2 : children) {
SpaceTreeNode child = (SpaceTreeNode) child2;
madeChanges = child.flushLocationChanges(thicknessSoFar) || madeChanges;
Expand Down Expand Up @@ -488,14 +488,14 @@ public void addNodes(List nodesToAdd) {

public void removeNode(SpaceTreeNode node) {
if (nodes.remove(node)) {
((SpaceTreeLayer) spaceTreeLayers.get(depth + 1)).removeNodes(node.children);
spaceTreeLayers.get(depth + 1).removeNodes(node.children);
refreshThickness();
}
}

public void removeNodes(List nodesToRemove) {
if (this.nodes.removeAll(nodesToRemove)) {
SpaceTreeLayer nextLayer = ((SpaceTreeLayer) spaceTreeLayers.get(depth + 1));
SpaceTreeLayer nextLayer = (spaceTreeLayers.get(depth + 1));
for (Object element : nodesToRemove) {
SpaceTreeNode nodeToRemove = (SpaceTreeNode) element;
nextLayer.removeNodes(nodeToRemove.children);
Expand Down Expand Up @@ -644,7 +644,7 @@ private void moveNodeForward(SpaceTreeNode nodeToMove, double newPosition) {
if (currentNodeToMove.firstChild) {
SpaceTreeNode parent = (SpaceTreeNode) currentNodeToMove.parent;
if (depth > 0 && parent.positionInLayer <= newPositionForCurrent) {
SpaceTreeLayer parentLayer = (SpaceTreeLayer) spaceTreeLayers.get(depth - 1);
SpaceTreeLayer parentLayer = spaceTreeLayers.get(depth - 1);
parentLayer.moveNodeForward(parent, newPositionForCurrent);
if (parent.positionInLayer < newPositionForCurrent) {
double delta = newPositionForCurrent - parent.positionInLayer;
Expand All @@ -662,7 +662,7 @@ private void moveNodeForward(SpaceTreeNode nodeToMove, double newPosition) {
// try to move all the children, that is move the
// first child and the rest will be pushed
SpaceTreeNode firstChild = (SpaceTreeNode) currentNodeToMove.children.get(0);
SpaceTreeLayer childLayer = (SpaceTreeLayer) spaceTreeLayers.get(depth + 1);
SpaceTreeLayer childLayer = spaceTreeLayers.get(depth + 1);
double expectedDistanceBetweenChildren = currentNodeToMove.spaceRequiredForChildren()
- firstChild.spaceRequiredForNode() / 2 - lastChild.spaceRequiredForNode() / 2;
childLayer.moveNodeForward(firstChild,
Expand Down Expand Up @@ -754,7 +754,7 @@ private void moveNodeBackward(SpaceTreeNode nodeToMove, double newPosition) {
if (currentNodeToMove.lastChild) {
SpaceTreeNode parent = (SpaceTreeNode) currentNodeToMove.parent;
if (depth > 0 && parent.positionInLayer >= newPositionForCurrent) {
SpaceTreeLayer parentLayer = (SpaceTreeLayer) spaceTreeLayers.get(depth - 1);
SpaceTreeLayer parentLayer = spaceTreeLayers.get(depth - 1);
parentLayer.moveNodeBackward(parent, newPositionForCurrent);
if (parent.positionInLayer > newPositionForCurrent) {
double delta = parent.positionInLayer - newPositionForCurrent;
Expand All @@ -772,7 +772,7 @@ private void moveNodeBackward(SpaceTreeNode nodeToMove, double newPosition) {
// last child and the rest will be pushed
SpaceTreeNode lastChild = (SpaceTreeNode) currentNodeToMove.children
.get(currentNodeToMove.children.size() - 1);
SpaceTreeLayer childLayer = (SpaceTreeLayer) spaceTreeLayers.get(depth + 1);
SpaceTreeLayer childLayer = spaceTreeLayers.get(depth + 1);
double expectedDistanceBetweenChildren = currentNodeToMove.spaceRequiredForChildren()
- firstChild.spaceRequiredForNode() / 2 - lastChild.spaceRequiredForNode() / 2;
childLayer.moveNodeBackward(lastChild,
Expand Down Expand Up @@ -818,7 +818,7 @@ public String toString() {

private void collapseNode(SpaceTreeNode node) {
node.expanded = false;
SpaceTreeLayer layer = (SpaceTreeLayer) spaceTreeLayers.get(node.depth + 1);
SpaceTreeLayer layer = spaceTreeLayers.get(node.depth + 1);
layer.removeNodes(node.children);
for (Object child2 : node.children) {
SpaceTreeNode child = (SpaceTreeNode) child2;
Expand All @@ -843,7 +843,7 @@ public void setExpanded(LayoutContext context, NodeLayout node, boolean expanded
refreshLayout(true);
} else if (spaceTreeNode.expanded) {
spaceTreeNode.expanded = false;
((SpaceTreeLayer) spaceTreeLayers.get(spaceTreeNode.depth + 1)).removeNodes(spaceTreeNode.children);
spaceTreeLayers.get(spaceTreeNode.depth + 1).removeNodes(spaceTreeNode.children);
refreshLayout(true);
}
}
Expand Down Expand Up @@ -873,7 +873,7 @@ public void maximizeExpansion(SpaceTreeNode nodeToExpand) {
double availableSpace = getAvailableSpace();
double requiredSpace = 0;

((SpaceTreeLayer) spaceTreeLayers.get(nodeToExpand.depth + 1)).removeNodes(nodeToExpand.children);
spaceTreeLayers.get(nodeToExpand.depth + 1).removeNodes(nodeToExpand.children);

ArrayList nodesInThisLayer = null;
ArrayList nodesInNextLayer = new ArrayList();
Expand Down Expand Up @@ -914,7 +914,7 @@ public void maximizeExpansion(SpaceTreeNode nodeToExpand) {
|| (layer < 1 && nodeToExpand.depth + layer < 1)) && !nodesInNextLayer.isEmpty()) {
// add next layer and center its nodes

SpaceTreeLayer childLayer = (SpaceTreeLayer) spaceTreeLayers.get(nodeToExpand.depth + layer + 1);
SpaceTreeLayer childLayer = spaceTreeLayers.get(nodeToExpand.depth + layer + 1);
childLayer.addNodes(nodesInNextLayer);
SpaceTreeNode firstChild = ((SpaceTreeNode) nodesInNextLayer.get(0));
SpaceTreeNode lastChild = ((SpaceTreeNode) nodesInNextLayer.get(nodesInNextLayer.size() - 1));
Expand Down Expand Up @@ -1036,7 +1036,7 @@ private boolean defaultNodeHandle(LayoutContext context, NodeLayout node) {

private double availableSpace;

private final ArrayList spaceTreeLayers = new ArrayList();
private final List<SpaceTreeLayer> spaceTreeLayers = new ArrayList<>();

/**
* If not null, this node and all of its children shall not be collapsed during
Expand Down Expand Up @@ -1232,7 +1232,7 @@ private class NodeSnapshot {
private NodeSnapshot[][] takeSnapShot() {
NodeSnapshot[][] result = new NodeSnapshot[spaceTreeLayers.size()][];
for (int i = 0; i < result.length; i++) {
SpaceTreeLayer layer = (SpaceTreeLayer) spaceTreeLayers.get(i);
SpaceTreeLayer layer = spaceTreeLayers.get(i);
result[i] = new NodeSnapshot[layer.nodes.size()];
for (int j = 0; j < result[i].length; j++) {
result[i][j] = new NodeSnapshot();
Expand All @@ -1251,7 +1251,7 @@ private NodeSnapshot[][] takeSnapShot() {
*/
private void revertToShanpshot(NodeSnapshot[][] snapShot) {
for (int i = 0; i < snapShot.length; i++) {
SpaceTreeLayer layer = (SpaceTreeLayer) spaceTreeLayers.get(i);
SpaceTreeLayer layer = spaceTreeLayers.get(i);
layer.nodes.clear();
for (int j = 0; j < snapShot[i].length; j++) {
snapShot[i][j].node.positionInLayer = snapShot[i][j].position;
Expand Down
Loading