projects
/
mir.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
22b074b
)
problem with ghost fragments appearing after generated files has been fixed
author
zapata
<zapata>
Sun, 10 Apr 2005 10:51:59 +0000
(10:51 +0000)
committer
zapata
<zapata>
Sun, 10 Apr 2005 10:51:59 +0000
(10:51 +0000)
source/mir/util/FileFunctions.java
patch
|
blob
|
history
source/mir/util/xml/html/HTMLScanner.java
patch
|
blob
|
history
source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java
patch
|
blob
|
history
source/mircoders/servlet/ServletModuleImages.java
patch
|
blob
|
history
diff --git
a/source/mir/util/FileFunctions.java
b/source/mir/util/FileFunctions.java
index
476451c
..
08fd66b
100755
(executable)
--- a/
source/mir/util/FileFunctions.java
+++ b/
source/mir/util/FileFunctions.java
@@
-144,8
+144,10
@@
public class FileFunctions {
FileInputStream inputStream = new FileInputStream(aSource);
FileOutputStream outputStream = new FileOutputStream(aDestination);
try {
FileInputStream inputStream = new FileInputStream(aSource);
FileOutputStream outputStream = new FileOutputStream(aDestination);
try {
- while (inputStream.read(buffer)>0) {
- outputStream.write(buffer);
+ int count=inputStream.read(buffer);
+ while (count>0) {
+ outputStream.write(buffer, 0, count);
+ count=inputStream.read(buffer);
}
}
finally {
}
}
finally {
diff --git
a/source/mir/util/xml/html/HTMLScanner.java
b/source/mir/util/xml/html/HTMLScanner.java
index
816c8fa
..
319d053
100755
(executable)
--- a/
source/mir/util/xml/html/HTMLScanner.java
+++ b/
source/mir/util/xml/html/HTMLScanner.java
@@
-30,7
+30,6
@@
public class HTMLScanner {
while (!reader.isAtEnd()) {
char c = reader.peek();
while (!reader.isAtEnd()) {
char c = reader.peek();
- // TODO: << should result in the first < to be regarded as CDATA
if (c != '<')
readCData();
else {
if (c != '<')
readCData();
else {
@@
-46,6
+45,9
@@
public class HTMLScanner {
reader.get();
readEndTag();
break;
reader.get();
readEndTag();
break;
+ case '<':
+ receiver.handleCData(new String(new char[] {c }));
+ break;
default:
readTag();
}
default:
readTag();
}
@@
-238,8
+240,6
@@
public class HTMLScanner {
result.append(reader.get());
}
result.append(reader.get());
}
-
-
receiver.handleCData(HTMLRoutines.resolveHTMLEntites(result.toString()));
}
receiver.handleCData(HTMLRoutines.resolveHTMLEntites(result.toString()));
}
diff --git
a/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java
b/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java
index
e4a1629
..
286d571
100755
(executable)
--- a/
source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java
+++ b/
source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java
@@
-324,6
+324,7
@@
public class MirBasicProducerAssistantLocalizer implements MirProducerAssistantL
public Utility () {
super(new MirBasicUtilityFunctions());
}
public Utility () {
super(new MirBasicUtilityFunctions());
}
+
public Object getDatetime() {
return new GeneratorDateTimeFunctions.DateTimeFunctions(
MirPropertiesConfiguration.instance().getString("Mir.DefaultTimezone"));
public Object getDatetime() {
return new GeneratorDateTimeFunctions.DateTimeFunctions(
MirPropertiesConfiguration.instance().getString("Mir.DefaultTimezone"));
diff --git
a/source/mircoders/servlet/ServletModuleImages.java
b/source/mircoders/servlet/ServletModuleImages.java
index
0075463
..
1bfe0d8
100755
(executable)
--- a/
source/mircoders/servlet/ServletModuleImages.java
+++ b/
source/mircoders/servlet/ServletModuleImages.java
@@
-36,13
+36,12
@@
import mircoders.module.ModuleImages;
/*
* ServletModuleImages -
*
/*
* ServletModuleImages -
*
- * @version $Id: ServletModuleImages.java,v 1.26.2.
4 2004/11/21 22:07:14
zapata Exp $
+ * @version $Id: ServletModuleImages.java,v 1.26.2.
5 2005/04/10 10:52:00
zapata Exp $
* @author RK, the mir-coders group
*/
public class ServletModuleImages extends ServletModuleUploadedMedia
{
* @author RK, the mir-coders group
*/
public class ServletModuleImages extends ServletModuleUploadedMedia
{
- // Singelton / Kontruktor
private static ServletModuleImages instance = new ServletModuleImages();
public static ServletModule getInstance() { return instance; }
private static ServletModuleImages instance = new ServletModuleImages();
public static ServletModule getInstance() { return instance; }