Package: pcalendar / 3.2.0-2

fixes.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
--- pcalendar-src-3.2.0.orig/PeriodicCalendar/net/sf/linuxorg/pcal/engine/EngineXMLCrypter.java
+++ pcalendar-src-3.2.0/PeriodicCalendar/net/sf/linuxorg/pcal/engine/EngineXMLCrypter.java
@@ -47,8 +47,8 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.XMLSerializer;
 
 public class EngineXMLCrypter {
 
--- pcalendar-src-3.2.0.orig/PeriodicCalendar/net/sf/linuxorg/pcal/engine/EngineTest.java
+++ pcalendar-src-3.2.0/PeriodicCalendar/net/sf/linuxorg/pcal/engine/EngineTest.java
@@ -1025,7 +1025,7 @@
 	public void testGetSetRemoveDateIntegers() {
 		calendar.set(2007, 9, 1);
 		engine.setDateInteger(calendar.getTime(), 0, 5);
-		assertEquals(engine.getDateIntegers(calendar.getTime()).getIntValue(0), 5);
+		assertEquals((Object)(engine.getDateIntegers(calendar.getTime()).getIntValue(0)), (Object)5);
 		engine.removeDateIntegers(calendar.getTime());
 		assertNull(engine.getDateIntegers(calendar.getTime()));
 	}
--- pcalendar-src-3.2.0.orig/PeriodicCalendar/net/sf/linuxorg/pcal/engine/DateIntsContainerTest.java
+++ pcalendar-src-3.2.0/PeriodicCalendar/net/sf/linuxorg/pcal/engine/DateIntsContainerTest.java
@@ -48,7 +48,7 @@
 			DateIntsContainer intsContainer = new DateIntsContainer(i, i+5);
 			for(int j = 0; j<DateIntsContainer.getIntsCount(); j++) {
 				if(i==j) {
-					assertEquals(intsContainer.getIntValue(j), i+5);
+					assertEquals((Object)intsContainer.getIntValue(j), (Object)(i+5));
 				} else {
 					assertNull(intsContainer.getIntValue(j));
 				}
@@ -64,14 +64,14 @@
 		DateIntsContainer intsContainer = new DateIntsContainer();
 		
 		intsContainer.setIntValue(0, 3);
-		assertEquals(intsContainer.getIntValue(0), 3);
+		assertEquals((Object)intsContainer.getIntValue(0), (Object)3);
 		
 		intsContainer.setIntValue(100, 1);
-		assertEquals(intsContainer.getIntValue(3), null);
-		assertEquals(intsContainer.getIntValue(100), null);
+		assertEquals((Object)intsContainer.getIntValue(3), (Object)null);
+		assertEquals((Object)intsContainer.getIntValue(100), (Object)null);
 		
 		intsContainer.setIntValue(0, null);
-		assertEquals(intsContainer.getIntValue(0), null);
+		assertEquals((Object)intsContainer.getIntValue(0), (Object)null);
 	}
 
 	/**