Changeset 97 for trunk/src/org/expeditee/items/Text.java

Timestamp:

06/10/08 10:03:03 (16 years ago)

Author:

ra33

Message:

Lots of changes!!

File:

• trunk/src/org/expeditee/items/Text.java (modified) (10 diffs)

trunk/src/org/expeditee/items/Text.java

@@ -76 +76 @@
         private int _maxWidth = -1;
 
-        private int _justification = Item.JUSTIFICATION_NONE;
+        private Justification _justification = Justification.none;
 
         private int _spacing = -1;
@@ -131 +131 @@
                 super();
                 setID(id);
+        }
+
+        public Text(int i, String string, Color foreground, Color background) {
+                this(i, string);
+                this.setColor(foreground);
+                this.setBackgroundColor(background);
         }
 
@@ -169 +175 @@
          *            The justification to apply to this Text item
          */
-        public void setJustification(int just) {
+        public void setJustification(Justification just) {
                 _justification = just;
                 rejustify();
@@ -180 +186 @@
          * @return The justification of this Text item
          */
-        public int getJustification() {
+        public Justification getJustification() {
                 return _justification;
         }
@@ -188 +194 @@
                         return 0;
 
-                if (getJustification() == Item.JUSTIFICATION_CENTER)
+                if (getJustification() == Justification.center)
                         return (int) ((getWidth() - layout.getAdvance()) / 2);
-                else if (getJustification() == Item.JUSTIFICATION_RIGHT)
+                else if (getJustification() == Justification.right)
                         return (int) (getWidth() - layout.getAdvance());
 
@@ -1115 +1121 @@
                         _lineOffsets.add(_lineBreaker.getPosition());
 
-                        if (getWidth() > 0 && getJustification() == Item.JUSTIFICATION_FULL
+                        if (getWidth() > 0 && getJustification() == Justification.full
                                         && _lineBreaker.getPosition() < _text.length())
                                 layout = layout.getJustifiedLayout(width);
@@ -1177 +1183 @@
                         _lineOffsets.add(_lineBreaker.getPosition());
 
-                        if (getWidth() > 0 && getJustification() == Item.JUSTIFICATION_FULL
+                        if (getWidth() > 0 && getJustification() == Justification.full
                                         && _lineBreaker.getPosition() < _text.length())
                                 layout = layout.getJustifiedLayout(width);
@@ -1379 +1385 @@
                 // copy standard item values
                 Item.DuplicateItem(this, copy);
-
+                
                 // copy values specific to text items
                 copy.setSpacing(getSpacing());
@@ -1389 +1395 @@
                 copy.setFont(getFont());
                 copy.setText(_text.toString());
+                //copy._poly = new Polygon(_poly.xpoints,_poly.ypoints, _poly.npoints);
 
                 return copy;
@@ -1524 +1531 @@
                         lines.addAll(merger.getLines());
                         for (Line line : lines) {
-                                line.replaceEnd(merger, this);
+                                line.replaceLineEnd(merger, this);
                         }
                         merger.delete();