Changeset 1388 for trunk

Timestamp:

05/28/19 12:35:48 (5 years ago)

Author:

bln4

Message:

Data is now contained in its own object. Functionally nothing has changed, but perhaps it will be easier to make changes in the future!

Location:

trunk/src/org/expeditee/items

Files:

• Data.java (added)
• Item.java (modified) (5 diffs)

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

@@ -273 +273 @@
 
         private List<String> _actions = null;
-
-        private List<String> _data = null;
          
         private String _formula = null;
@@ -310 +308 @@
         protected boolean _filled = true;
         
-        // NGIKM Attributes
-        private List<String> _ngikmLabels = new ArrayList<String>();
-        private List<String> _ngikmKeys = new ArrayList<String>();
+        private Data _data = new Data();
 
         /** Just calls source.duplicateOnto(dest). */
@@ -384 +380 @@
 
                 dest._visible = this._visible;
-                
-                dest._ngikmKeys = new ArrayList<String>(this._ngikmKeys);
-                dest._ngikmLabels = new ArrayList<String>(this._ngikmLabels);
 
                 Frame parent = DisplayController.getCurrentFrame();
@@ -652 +645 @@
          *         has been assigned.
          */
-        public List<String> getAction()
-        {
+        public List<String> getAction() {
                 return _actions;
         }
 
-        public List<String> getData()
-        {
-                return _data;
-        }
-
-        public List<String> getActionCursorEnter()
-        {
+        public List<String> getData() {
+                return _data.getData();
+        }
+
+        public List<String> getActionCursorEnter() {
                 return _actionCursorEnter;
         }
 
-        public List<String> getActionCursorLeave()
-        {
+        public List<String> getActionCursorLeave() {
                 return _actionCursorLeave;
         }
 
-        public List<String> getActionEnterFrame()
-        {
+        public List<String> getActionEnterFrame() {
                 return _actionEnterFrame;
         }
 
-        public List<String> getActionLeaveFrame()
-        {
+        public List<String> getActionLeaveFrame() {
                 return _actionLeaveFrame;
-        };
-
-        public boolean getActionMark()
-        {
+        }
+
+        public boolean getActionMark() {
                 return _actionMark;
         }
@@ -1653 +1639 @@
 
         public void setData(List<String> data) {
-                if (data == null || data.size() == 0)
-                        _data = null;
-                else
-                        _data = new LinkedList<String>(data);
+                _data.setData(data);
         }
 
         public void setData(String data) {
-                if (data == null || data.length() == 0)
-                        _data = null;
-                else {
-                        _data = new LinkedList<String>();
-                        _data.add(data);
-                }
+                _data.setData(data);
         }
 
         public void addToData(String dataItem) {
-                if (dataItem != null) {
-                        if (_data == null)
-                                _data = new LinkedList<String>();
-                        _data.add(dataItem);
-                }
-        }
-        
-        public boolean hasData(final String dataItem) {
-                if (_data != null && dataItem != null && dataItem.length() > 0) {
-                        for (final String d : _data) {
-                                if (d.compareTo(dataItem) == 0) {
-                                        return true;
-                                }
-                        }
-                }
-                return false;
+                _data.addToData(dataItem);
+        }
+        
+        public boolean hasData(String dataItem) {
+                return _data.hasData(dataItem);
         }