merge fixing

This commit is contained in:
Sampo Niskanen 2011-01-09 09:02:58 +00:00
parent d2637f4bbd
commit e8abfbd306

View File

@ -3,10 +3,10 @@
*/
package net.sf.openrocket.gui.print.components;
import net.sf.openrocket.gui.print.OpenRocketPrintable;
import net.sf.openrocket.gui.print.PrintableContext;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.rocketcomponent.Stage;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import javax.swing.JTree;
import javax.swing.event.TreeExpansionEvent;
@ -15,10 +15,11 @@ import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.ExpandVetoException;
import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import net.sf.openrocket.gui.print.OpenRocketPrintable;
import net.sf.openrocket.gui.print.PrintableContext;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.rocketcomponent.Stage;
/**
* A specialized JTree for displaying various rocket items that can be printed.
@ -58,12 +59,12 @@ public class RocketPrintTree extends JTree {
*
* @return an instance of JTree
*/
public static RocketPrintTree create (String rocketName, RocketComponent[] stages) {
public static RocketPrintTree create(String rocketName, List<RocketComponent> stages) {
Vector root = new Vector();
Vector toAddTo = root;
if (stages != null) {
if (stages.length > 1) {
if (stages.size() > 1) {
final Vector parent = new NamedVector(rocketName != null ? rocketName : "Rocket");
root.add(parent);
@ -82,9 +83,11 @@ public class RocketPrintTree extends JTree {
tree.addTreeWillExpandListener
(new TreeWillExpandListener() {
@Override
public void treeWillExpand(TreeExpansionEvent e) {
}
@Override
public void treeWillCollapse(TreeExpansionEvent e)
throws ExpandVetoException {
throw new ExpandVetoException(e, "you can't collapse this JTree");
@ -109,9 +112,11 @@ public class RocketPrintTree extends JTree {
tree.addTreeWillExpandListener
(new TreeWillExpandListener() {
@Override
public void treeWillExpand(TreeExpansionEvent e) {
}
@Override
public void treeWillCollapse(TreeExpansionEvent e)
throws ExpandVetoException {
throw new ExpandVetoException(e, "you can't collapse this JTree");
@ -141,6 +146,7 @@ public class RocketPrintTree extends JTree {
*
* @param path the path (row)
*/
@Override
public void addSelectionPath(TreePath path) {
theCheckBoxSelectionModel.addSelectionPath(path);
}
@ -242,6 +248,7 @@ class NamedVector extends Vector<CheckBoxNode> {
}
}
@Override
public String toString() {
return name;
}