/[pkgs]/devel/eclipse-mylyn/eclipse-mylyn-largebzconfigs.patch
ViewVC logotype

Contents of /devel/eclipse-mylyn/eclipse-mylyn-largebzconfigs.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.2 - (show annotations) (download) (as text)
Wed Nov 12 19:52:17 2008 UTC (12 months, 1 week ago) by overholt
Branch: MAIN
CVS Tags: F-11-split, eclipse-mylyn-3_3_0-1_fc13, F-12-split, eclipse-mylyn-3_3_0-4_fc13, eclipse-mylyn-3_3_0-2_fc13, eclipse-mylyn-3_1_1-1_fc12, eclipse-mylyn-3_2_1-1_fc12, eclipse-mylyn-3_1_0-1_fc11, eclipse-mylyn-3_2_1-2_fc12, eclipse-mylyn-3_3_0-3_fc13, eclipse-mylyn-3_1_0-3_fc11, eclipse-mylyn-3_0_3-4_fc11, eclipse-mylyn-3_0_3-5_fc11, eclipse-mylyn-3_1_1-2_fc12, eclipse-mylyn-3_1_0-2_fc11, HEAD
Changes since 1.1: +1 -1 lines
File MIME type: text/x-patch 
Add newline to patch.
1 ### Eclipse Workspace Patch 1.0
2 #P org.eclipse.mylyn.bugzilla.core
3 Index: src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java
4 ===================================================================
5 RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java,v
6 retrieving revision 1.40
7 diff -u -r1.40 AbstractReportFactory.java
8 --- src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java 20 May 2008 23:13:39 -0000 1.40
9 +++ src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java 10 Aug 2008 19:21:32 -0000
10 @@ -9,7 +9,7 @@
11 package org.eclipse.mylyn.internal.bugzilla.core;
12
13 import java.io.BufferedInputStream;
14 -import java.io.BufferedReader;
15 +import java.io.File;
16 import java.io.IOException;
17 import java.io.InputStream;
18 import java.io.InputStreamReader;
19 @@ -48,6 +48,7 @@
20 * @throws GeneralSecurityException
21 */
22 protected void collectResults(DefaultHandler contentHandler, boolean clean) throws IOException {
23 + File tempFile = null;
24
25 if (inStream == null) {
26 return;
27 @@ -77,9 +78,9 @@
28 }
29
30 if (clean) {
31 - StringBuffer result = XmlCleaner.clean(in);
32 - StringReader strReader = new StringReader(result.toString());
33 - in = new BufferedReader(strReader);
34 + tempFile = File.createTempFile("XmlCleaner-", "tmp");
35 + tempFile.deleteOnExit();
36 + in = XmlCleaner.clean(in, tempFile);
37 }
38
39 try {
40 @@ -125,6 +126,12 @@
41 throw new IOException(e.getMessage());
42 // }
43 }
44 +
45 + finally {
46 + if (tempFile != null) {
47 + tempFile.delete();
48 + }
49 + }
50 }
51
52 }
53 Index: src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java
54 ===================================================================
55 RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java,v
56 retrieving revision 1.11
57 diff -u -r1.11 XmlCleaner.java
58 --- src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java 30 Apr 2008 15:34:35 -0000 1.11
59 +++ src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java 10 Aug 2008 19:21:33 -0000
60 @@ -8,6 +8,11 @@
61
62 package org.eclipse.mylyn.internal.bugzilla.core;
63
64 +import java.io.BufferedReader;
65 +import java.io.BufferedWriter;
66 +import java.io.File;
67 +import java.io.FileReader;
68 +import java.io.FileWriter;
69 import java.io.IOException;
70 import java.io.Reader;
71 import java.text.ParseException;
72 @@ -25,14 +30,13 @@
73 */
74 public class XmlCleaner {
75
76 - public static StringBuffer clean(Reader in) {
77 + public static BufferedReader clean(Reader in, File tempFile) {
78
79 HtmlStreamTokenizer tokenizer = new HtmlStreamTokenizer(in, null);
80 - StringBuffer content = new StringBuffer();
81 -
82 - // Hack since HtmlStreamTokenizer not familiar with xml tag.
83 - content.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
84 try {
85 + BufferedWriter content = new BufferedWriter(new FileWriter(tempFile));
86 + // Hack since HtmlStreamTokenizer not familiar with xml tag.
87 + content.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
88 for (Token token = tokenizer.nextToken(); token.getType() != Token.EOF; token = tokenizer.nextToken()) {
89
90 if (token.getType() == Token.TAG) {
91 @@ -50,12 +54,15 @@
92 content.append(token.toString());
93 }
94 }
95 + content.flush();
96 + content.close();
97 + return new BufferedReader(new FileReader(tempFile));
98 } catch (IOException e) {
99
100 } catch (ParseException e) {
101
102 }
103 - return content;
104 + return null;
105 }
106
107 }
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2