mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-15 04:55:22 +02:00
[222162][dstore] Special characters from old server are not restored
This commit is contained in:
parent
7807f044b3
commit
7d644bce36
1 changed files with 11 additions and 3 deletions
|
@ -14,6 +14,7 @@
|
||||||
* Contributors:
|
* Contributors:
|
||||||
* David McKnight (IBM) [220123][dstore] Configurable timeout on irresponsiveness
|
* David McKnight (IBM) [220123][dstore] Configurable timeout on irresponsiveness
|
||||||
* David McKnight (IBM) [221601][dstore] xmlparser needs to be able to handle very large attributes
|
* David McKnight (IBM) [221601][dstore] xmlparser needs to be able to handle very large attributes
|
||||||
|
* David McKnight (IBM) [222163][dstore] Special characters from old server are not restored
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.dstore.internal.core.util;
|
package org.eclipse.dstore.internal.core.util;
|
||||||
|
@ -110,6 +111,9 @@ public class XMLparser
|
||||||
public static String STR_GT = ">"; //$NON-NLS-1$
|
public static String STR_GT = ">"; //$NON-NLS-1$
|
||||||
public static String STR_SEMI = ";"; //$NON-NLS-1$
|
public static String STR_SEMI = ";"; //$NON-NLS-1$
|
||||||
|
|
||||||
|
public static String STR_NL = "\n"; //$NON-NLS-1$
|
||||||
|
public static String STR_CR = "\r"; //$NON-NLS-1$
|
||||||
|
public static String STR_EOL = "\0"; //$NON-NLS-1$
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
|
@ -507,6 +511,7 @@ public class XMLparser
|
||||||
{
|
{
|
||||||
String trimmedTag = xmlTag.trim();
|
String trimmedTag = xmlTag.trim();
|
||||||
|
|
||||||
|
|
||||||
if (_dataStore.getReferenceTag() == null)
|
if (_dataStore.getReferenceTag() == null)
|
||||||
{
|
{
|
||||||
if (trimmedTag.indexOf(DE.P_ISREF + "=") > -1) _dataStore.setReferenceTag(DE.P_ISREF); //$NON-NLS-1$
|
if (trimmedTag.indexOf(DE.P_ISREF + "=") > -1) _dataStore.setReferenceTag(DE.P_ISREF); //$NON-NLS-1$
|
||||||
|
@ -979,7 +984,10 @@ public class XMLparser
|
||||||
.replaceAll(STR_QUOTE, "\"") //$NON-NLS-1$
|
.replaceAll(STR_QUOTE, "\"") //$NON-NLS-1$
|
||||||
.replaceAll(STR_APOS, "\'") //$NON-NLS-1$
|
.replaceAll(STR_APOS, "\'") //$NON-NLS-1$
|
||||||
.replaceAll(STR_LT, "<") //$NON-NLS-1$
|
.replaceAll(STR_LT, "<") //$NON-NLS-1$
|
||||||
.replaceAll(STR_GT, ">"); //$NON-NLS-1$
|
.replaceAll(STR_GT, ">") //$NON-NLS-1$
|
||||||
|
.replaceAll(STR_NL, "\n") //$NON-NLS-1$
|
||||||
|
.replaceAll(STR_CR, "\r") //$NON-NLS-1$
|
||||||
|
.replaceAll(STR_EOL, "\0"); //$NON-NLS-1$
|
||||||
return converted;
|
return converted;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Add table
Reference in a new issue