Project

General

Profile

commons-collections-3.2.2.diff.txt

Sergey Ivanovskiy, 12/12/2015 12:56 PM

Download (1.83 KB)

 
1
=== removed file 'lib/commons-collections-3.2.1.jar'
2
Binary files lib/commons-collections-3.2.1.jar	2014-03-26 11:32:09 +0000 and lib/commons-collections-3.2.1.jar	1970-01-01 00:00:00 +0000 differ
3
=== added file 'lib/commons-collections-3.2.2.jar'
4
Binary files lib/commons-collections-3.2.2.jar	1970-01-01 00:00:00 +0000 and lib/commons-collections-3.2.2.jar	2015-12-12 17:33:56 +0000 differ
5
=== modified file 'src/com/goldencode/p2j/ui/FieldGroup.java'
6
--- src/com/goldencode/p2j/ui/FieldGroup.java	2015-10-26 20:12:57 +0000
7
+++ src/com/goldencode/p2j/ui/FieldGroup.java	2015-12-12 16:53:22 +0000
8
@@ -49,8 +49,6 @@
9
 import java.util.*;
10
 import java.util.function.*;
11
 
12
-import org.apache.commons.collections.*;
13
-
14
 import com.goldencode.p2j.util.*;
15
  
16
 /**
17
@@ -307,10 +305,9 @@
18
     * 
19
     * @return   widgets collection.
20
     */
21
-   @SuppressWarnings("unchecked")
22
    public Collection<GenericWidget<?>> getWidgets()
23
    {
24
-      return CollectionUtils.unmodifiableCollection(widgets);
25
+      return Collections.unmodifiableList(widgets);
26
    }
27
 
28
    /**
29

    
30
=== modified file 'src/com/goldencode/p2j/ui/chui/ThinClient.java'
31
--- src/com/goldencode/p2j/ui/chui/ThinClient.java	2015-12-03 13:53:36 +0000
32
+++ src/com/goldencode/p2j/ui/chui/ThinClient.java	2015-12-12 16:45:16 +0000
33
@@ -2205,8 +2205,6 @@
34
 import java.lang.reflect.*;
35
 import java.util.*;
36
 
37
-import org.apache.commons.collections.*;
38
-
39
 import com.goldencode.p2j.cfg.*;
40
 import com.goldencode.p2j.library.*;
41
 import com.goldencode.p2j.net.*;
42
@@ -6283,7 +6281,7 @@
43
    @Override
44
    public void setFirstTabItem(int frameId, List<Integer> fgWidgetIds, int widgetId)
45
    {
46
-      if (CollectionUtils.isEmpty(fgWidgetIds))
47
+      if (fgWidgetIds == null || fgWidgetIds.isEmpty())
48
          throw new IllegalArgumentException("Invalid field-group widgets list: emtpy ");
49
       
50
       Frame frame = getFrame(frameId);
51