diff --git a/src/main/java/jaist/css/covis/PPPath.java b/src/main/java/jaist/css/covis/PPPath.java index f1511c7..7f328b0 100644 --- a/src/main/java/jaist/css/covis/PPPath.java +++ b/src/main/java/jaist/css/covis/PPPath.java @@ -6,10 +6,8 @@ import java.awt.Stroke; import java.awt.geom.Path2D; import java.awt.geom.Rectangle2D; -import java.util.List; import java.awt.geom.Ellipse2D; -import org.piccolo2d.PNode; import org.piccolo2d.nodes.PPath; /** @@ -36,7 +34,7 @@ if (aShape != null) append(aShape, false); } public void setPathTo(final Shape aShape) { - this.getPath().reset(); + this.getPathReference().reset(); append(aShape, false); } public void setPathToRectangle(float x, float y, float width, float height){ diff --git a/src/main/java/jaist/css/covis/cls/Anchor.java b/src/main/java/jaist/css/covis/cls/Anchor.java index d562efe..eb0579d 100644 --- a/src/main/java/jaist/css/covis/cls/Anchor.java +++ b/src/main/java/jaist/css/covis/cls/Anchor.java @@ -9,7 +9,6 @@ import org.piccolo2d.PNode; import org.piccolo2d.event.PInputEvent; -import org.piccolo2d.nodes.PPath; import org.piccolo2d.nodes.PText; import org.piccolo2d.util.PBounds; import org.piccolo2d.util.PDimension; diff --git a/src/main/java/jaist/css/covis/cls/VarField.java b/src/main/java/jaist/css/covis/cls/VarField.java index ccaa8f0..59e1c5e 100644 --- a/src/main/java/jaist/css/covis/cls/VarField.java +++ b/src/main/java/jaist/css/covis/cls/VarField.java @@ -134,6 +134,7 @@ Variable var = null; try { var = new Variable(ClassStamp.selectedType.cv_type.newInstance(true), fmenu.window.frame, buffer,false); + var.setPathToRectangle(0, 0, 250, 40); } catch (InvocationTargetException e1) { e1.printStackTrace(); } @@ -168,6 +169,8 @@ Variable var = null; try { var = new Variable(cs.cv_type.newInstance(true), buffer.getWindow().frame, buffer,false); + var.setPathToRectangle(0, 0, 250, 40); + } catch (InvocationTargetException e1) { e1.printStackTrace(); } diff --git a/src/main/java/jaist/css/covis/cls/Variable.java b/src/main/java/jaist/css/covis/cls/Variable.java index 58784f0..318046c 100644 --- a/src/main/java/jaist/css/covis/cls/Variable.java +++ b/src/main/java/jaist/css/covis/cls/Variable.java @@ -13,7 +13,6 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Hashtable; -import java.util.List; import java.util.TreeMap; import javax.swing.JFrame; @@ -128,7 +127,6 @@ type = cv_class.getClass(); elementType = type; } - setPathToRectangle(0, 0, 250, 40); setPaint(cv_class.getClassColor()); setStrokePaint(Color.gray); setStroke(new BasicStroke(1)); diff --git a/src/main/java/jaist/css/covis/cls/VariableM.java b/src/main/java/jaist/css/covis/cls/VariableM.java index 666cdd6..c37af50 100644 --- a/src/main/java/jaist/css/covis/cls/VariableM.java +++ b/src/main/java/jaist/css/covis/cls/VariableM.java @@ -5,7 +5,6 @@ import jaist.css.covis.hist.CVHist_Var; import java.util.ArrayList; -import java.util.List; import java.util.TreeMap; import javax.swing.JFrame; @@ -29,19 +28,7 @@ object = obj; setVarName_Base(_varname); -// setPaint(cv_class.getClassColor()); setStrokePaint(null); -// setStroke(new BasicStroke(1)); - -// co.setScale(0.3f); -// addChild(cv_class); -// layout(0); - -// addAttribute("info", "ClassStamp "+this.toString()); -//// addAttribute("selectable", this); -// addAttribute("moveTargetY", this); -// addAttribute("dragLayout", this); - addAttribute("info", null); addAttribute("moveTargetY", null);