Changeset 279
- Timestamp:
- 08/26/08 14:18:34 (16 years ago)
- Location:
- trunk/src/org/expeditee/items/widgets
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/items/widgets/Browser.java
r228 r279 53 53 54 54 @Override 55 public void set Data(List<String> data) {56 super.set Data(data);55 public void setSourceData(List<String> data) { 56 super.setSourceData(data); 57 57 if (data != null && data.size() > 0) { 58 58 navigate(data.get(0)); -
trunk/src/org/expeditee/items/widgets/InteractiveWidget.java
r278 r279 1569 1569 return null; 1570 1570 } 1571 1572 public void setColor(Color c) { 1571 1572 /** 1573 * Sets the border color for the widget. 1574 * That is, for the source (so it is remembered) and also for all the 1575 * corners/edges. 1576 * 1577 * @param c 1578 * The color to set. 1579 */ 1580 public void setWidgetEdgeColor(Color c) { 1581 for (Item i : _expediteeItems) i.setColor(c); 1582 // Above indirectly invokes setSourceBorderColor accordingly 1583 } 1584 1585 /** 1586 * Sets the thickness of the widget edge. 1587 * 1588 * @see Item#setThickness(float) 1589 * 1590 * @param thickness 1591 * The new thickness to set. 1592 */ 1593 public void setWidgetEdgeThickness(float thickness) { 1594 for (Item i : _expediteeItems) i.setThickness(thickness); 1595 // Above indirectly invokes setSourceThickness accordingly 1596 } 1597 1598 // TODO: Maybe rename setSource* .. to update* ... These should actually be friendly! 1599 public void setSourceColor(Color c) { 1573 1600 _textRepresentation.setColor(c); 1574 1601 } 1575 1602 1576 public void set BorderColor(Color c) {1603 public void setSourceBorderColor(Color c) { 1577 1604 _textRepresentation.setBorderColor(c); 1578 1605 } 1579 1606 1580 public void set FillColor(Color c) {1607 public void setSourceFillColor(Color c) { 1581 1608 _textRepresentation.setFillColor(c); 1582 1609 } 1583 1610 1584 public void set Thickness(float newThickness, boolean setConnected) {1611 public void setSourceThickness(float newThickness, boolean setConnected) { 1585 1612 _textRepresentation.setThickness(newThickness, setConnected); 1586 1613 } 1587 1614 1588 public void set Data(List<String> data) {1615 public void setSourceData(List<String> data) { 1589 1616 _textRepresentation.setData(data); 1590 1617 } 1591 1618 1592 1619 protected Point getOrigin() { 1593 return _d1.getPosition(); 1620 return _d1.getPosition(); // BROOK: This flips around ... the origin can be any point 1594 1621 } 1595 1622 -
trunk/src/org/expeditee/items/widgets/WidgetCorner.java
r278 r279 4 4 import java.awt.Graphics2D; 5 5 import java.awt.Polygon; 6 import java.awt.geom.Point2D;7 6 import java.util.List; 8 7 … … 156 155 @Override 157 156 public void setData(List<String> data) { 158 _widgetSource.set Data(data);157 _widgetSource.setSourceData(data); 159 158 } 160 159 … … 171 170 newThickness = minThickness; 172 171 super.setThickness(newThickness, setConnected); 173 _widgetSource.set Thickness(newThickness, false);172 _widgetSource.setSourceThickness(newThickness, false); 174 173 } 175 174 } … … 179 178 if (_widgetSource != null) { 180 179 super.setColor(color); 181 _widgetSource.set BorderColor(color);180 _widgetSource.setSourceBorderColor(color); 182 181 } 183 182 } -
trunk/src/org/expeditee/items/widgets/WidgetEdge.java
r228 r279 124 124 newThickness = minThickness; 125 125 super.setThickness(newThickness, setConnected); 126 _widgetSource.set Thickness(newThickness, false);126 _widgetSource.setSourceThickness(newThickness, false); 127 127 } 128 128 } … … 140 140 if (_widgetSource != null) { 141 141 super.setColor(c); 142 _widgetSource.set BorderColor(c);142 _widgetSource.setSourceBorderColor(c); 143 143 } 144 144 } … … 146 146 @Override 147 147 public void setData(List<String> data) { 148 _widgetSource.set Data(data);148 _widgetSource.setSourceData(data); 149 149 } 150 150 } -
trunk/src/org/expeditee/items/widgets/charts/AbstractChart.java
r278 r279 103 103 104 104 if (e.isShiftDown()) { 105 set FillColor(null);105 setSourceFillColor(null); 106 106 } else { 107 107 Color newColor = ColorUtils.getNextColor( 108 108 getSource().getFillColor(), 109 109 Frame.COLOR_WHEEL, null); 110 set FillColor(newColor);110 setSourceFillColor(newColor); 111 111 } 112 112 } else { … … 117 117 getSource().getColor(), Item.COLOR_WHEEL, 118 118 null); 119 set Color(newColor);119 setSourceColor(newColor); 120 120 } 121 121 } … … 167 167 super._swingComponent = cp; 168 168 169 set Color(getSource().getColor());170 set BorderColor(getSource().getBorderColor());171 set FillColor(getSource().getFillColor());169 setSourceColor(getSource().getColor()); 170 setSourceBorderColor(getSource().getBorderColor()); 171 setSourceFillColor(getSource().getFillColor()); 172 172 setBackgroundColor(getSource().getBackgroundColor()); 173 set Thickness(getSource().getThickness(), false);173 setSourceThickness(getSource().getThickness(), false); 174 174 } 175 175 … … 294 294 295 295 @Override 296 public void set Color(Color c) {297 super.set Color(c);296 public void setSourceColor(Color c) { 297 super.setSourceColor(c); 298 298 if (_chart == null) 299 299 return; … … 321 321 322 322 @Override 323 public void set BorderColor(Color c) {324 super.set BorderColor(c);323 public void setSourceBorderColor(Color c) { 324 super.setSourceBorderColor(c); 325 325 if (_chart == null) 326 326 return; … … 333 333 334 334 @Override 335 public void set FillColor(Color c) {336 super.set FillColor(c);335 public void setSourceFillColor(Color c) { 336 super.setSourceFillColor(c); 337 337 if (_chart == null) 338 338 return; … … 350 350 351 351 @Override 352 public void set Thickness(float newThickness, boolean setConnected) {353 super.set Thickness(newThickness, setConnected);352 public void setSourceThickness(float newThickness, boolean setConnected) { 353 super.setSourceThickness(newThickness, setConnected); 354 354 if (_chart == null) 355 355 return; -
trunk/src/org/expeditee/items/widgets/charts/AbstractPie.java
r247 r279 75 75 76 76 @Override 77 public void set BorderColor(Color c) {78 super.set BorderColor(c);77 public void setSourceBorderColor(Color c) { 78 super.setSourceBorderColor(c); 79 79 if (getChart() == null) 80 80 return; … … 100 100 101 101 @Override 102 public void set Color(Color c) {103 super.set Color(c);102 public void setSourceColor(Color c) { 103 super.setSourceColor(c); 104 104 if (getChart() == null) 105 105 return; … … 113 113 114 114 @Override 115 public void set Thickness(float newThickness, boolean setConnected) {116 super.set Thickness(newThickness, setConnected);115 public void setSourceThickness(float newThickness, boolean setConnected) { 116 super.setSourceThickness(newThickness, setConnected); 117 117 if (getChart() == null) 118 118 return; -
trunk/src/org/expeditee/items/widgets/charts/AbstractValueAxis.java
r228 r279 38 38 39 39 @Override 40 public void set Color(Color c) {41 super.set Color(c);40 public void setSourceColor(Color c) { 41 super.setSourceColor(c); 42 42 if (getChart() == null) 43 43 return; … … 60 60 61 61 @Override 62 public void set BorderColor(Color c) {63 super.set BorderColor(c);62 public void setSourceBorderColor(Color c) { 63 super.setSourceBorderColor(c); 64 64 if (getChart() == null) 65 65 return; … … 80 80 81 81 @Override 82 public void set Thickness(float newThickness, boolean setConnected) {83 super.set Thickness(newThickness, setConnected);82 public void setSourceThickness(float newThickness, boolean setConnected) { 83 super.setSourceThickness(newThickness, setConnected); 84 84 if (getChart() == null) 85 85 return; -
trunk/src/org/expeditee/items/widgets/charts/Polar.java
r228 r279 25 25 26 26 @Override 27 public void set Color(Color c) {28 super.set Color(c);27 public void setSourceColor(Color c) { 28 super.setSourceColor(c); 29 29 if (getChart() == null) 30 30 return; … … 40 40 41 41 @Override 42 public void set Thickness(float newThickness, boolean setConnected) {43 super.set Thickness(newThickness, setConnected);42 public void setSourceThickness(float newThickness, boolean setConnected) { 43 super.setSourceThickness(newThickness, setConnected); 44 44 if (getChart() == null) 45 45 return;
Note:
See TracChangeset
for help on using the changeset viewer.