Changeset 1388
- Timestamp:
- 05/28/19 12:35:48 (5 years ago)
- Location:
- trunk/src/org/expeditee/items
- Files:
-
- 1 added
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/items/Item.java
r1377 r1388 273 273 274 274 private List<String> _actions = null; 275 276 private List<String> _data = null;277 275 278 276 private String _formula = null; … … 310 308 protected boolean _filled = true; 311 309 312 // NGIKM Attributes 313 private List<String> _ngikmLabels = new ArrayList<String>(); 314 private List<String> _ngikmKeys = new ArrayList<String>(); 310 private Data _data = new Data(); 315 311 316 312 /** Just calls source.duplicateOnto(dest). */ … … 384 380 385 381 dest._visible = this._visible; 386 387 dest._ngikmKeys = new ArrayList<String>(this._ngikmKeys);388 dest._ngikmLabels = new ArrayList<String>(this._ngikmLabels);389 382 390 383 Frame parent = DisplayController.getCurrentFrame(); … … 652 645 * has been assigned. 653 646 */ 654 public List<String> getAction() 655 { 647 public List<String> getAction() { 656 648 return _actions; 657 649 } 658 650 659 public List<String> getData() 660 { 661 return _data; 662 } 663 664 public List<String> getActionCursorEnter() 665 { 651 public List<String> getData() { 652 return _data.getData(); 653 } 654 655 public List<String> getActionCursorEnter() { 666 656 return _actionCursorEnter; 667 657 } 668 658 669 public List<String> getActionCursorLeave() 670 { 659 public List<String> getActionCursorLeave() { 671 660 return _actionCursorLeave; 672 661 } 673 662 674 public List<String> getActionEnterFrame() 675 { 663 public List<String> getActionEnterFrame() { 676 664 return _actionEnterFrame; 677 665 } 678 666 679 public List<String> getActionLeaveFrame() 680 { 667 public List<String> getActionLeaveFrame() { 681 668 return _actionLeaveFrame; 682 }; 683 684 public boolean getActionMark() 685 { 669 } 670 671 public boolean getActionMark() { 686 672 return _actionMark; 687 673 } … … 1653 1639 1654 1640 public void setData(List<String> data) { 1655 if (data == null || data.size() == 0) 1656 _data = null; 1657 else 1658 _data = new LinkedList<String>(data); 1641 _data.setData(data); 1659 1642 } 1660 1643 1661 1644 public void setData(String data) { 1662 if (data == null || data.length() == 0) 1663 _data = null; 1664 else { 1665 _data = new LinkedList<String>(); 1666 _data.add(data); 1667 } 1645 _data.setData(data); 1668 1646 } 1669 1647 1670 1648 public void addToData(String dataItem) { 1671 if (dataItem != null) { 1672 if (_data == null) 1673 _data = new LinkedList<String>(); 1674 _data.add(dataItem); 1675 } 1676 } 1677 1678 public boolean hasData(final String dataItem) { 1679 if (_data != null && dataItem != null && dataItem.length() > 0) { 1680 for (final String d : _data) { 1681 if (d.compareTo(dataItem) == 0) { 1682 return true; 1683 } 1684 } 1685 } 1686 return false; 1649 _data.addToData(dataItem); 1650 } 1651 1652 public boolean hasData(String dataItem) { 1653 return _data.hasData(dataItem); 1687 1654 } 1688 1655
Note:
See TracChangeset
for help on using the changeset viewer.