[90808] resource strings for dtd
diff --git a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentEncodingHelper.java b/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentEncodingHelper.java
index 03bcfa8..3731124 100644
--- a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentEncodingHelper.java
+++ b/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentEncodingHelper.java
@@ -24,7 +24,7 @@
try {
URL url = new URL(uri);
inputStream = url.openStream();
- String[] encodingInfo = (String[]) cmDocument.getProperty("encodingInfo");
+ String[] encodingInfo = (String[]) cmDocument.getProperty("encodingInfo"); //$NON-NLS-1$
if (encodingInfo != null) {
// if (Display.getCurrent() != null)
// {
@@ -61,8 +61,8 @@
// This code is taken from org.eclipse.wst.xml.uriresolver.util.URIHelper
// I didn't want to add this plugin as a dependency
// in order to simplify our xerces dependenies
- protected static final String FILE_PROTOCOL = "file:";
- protected static final String PROTOCOL_PATTERN = ":";
+ protected static final String FILE_PROTOCOL = "file:"; //$NON-NLS-1$
+ protected static final String PROTOCOL_PATTERN = ":"; //$NON-NLS-1$
public static String addImpliedFileProtocol(String uri) {
if (!hasProtocol(uri)) {
diff --git a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentFactoryDTD.java b/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentFactoryDTD.java
index 4df671e..ecf489c 100644
--- a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentFactoryDTD.java
+++ b/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentFactoryDTD.java
@@ -25,7 +25,7 @@
// work around a bug in our parsers
// todo... revisit this
//
- String fileProtocol = "file:";
+ String fileProtocol = "file:"; //$NON-NLS-1$
if (uri.startsWith(fileProtocol)) {
uri = uri.substring(fileProtocol.length());
}
diff --git a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMNodeImpl.java b/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMNodeImpl.java
index b94baa2..df5d218 100644
--- a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMNodeImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMNodeImpl.java
@@ -14,12 +14,12 @@
import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
public abstract class CMNodeImpl extends AdapterImpl implements CMNode {
- protected static final String PROPERTY_DOCUMENTATION = "documentation";
- protected static final String PROPERTY_DOCUMENTATION_SOURCE = "documentationSource";
- protected static final String PROPERTY_DOCUMENTATION_LANGUAGE = "documentationLanguage";
- protected static final String PROPERTY_MOF_NOTIFIER = "key";
- protected static final String PROPERTY_DEFINITION_INFO = "http://org.eclipse.wst/cm/properties/definitionInfo";
- protected static final String PROPERTY_DEFINITION = "http://org.eclipse.wst/cm/properties/definition";
+ protected static final String PROPERTY_DOCUMENTATION = "documentation"; //$NON-NLS-1$
+ protected static final String PROPERTY_DOCUMENTATION_SOURCE = "documentationSource"; //$NON-NLS-1$
+ protected static final String PROPERTY_DOCUMENTATION_LANGUAGE = "documentationLanguage"; //$NON-NLS-1$
+ protected static final String PROPERTY_MOF_NOTIFIER = "key"; //$NON-NLS-1$
+ protected static final String PROPERTY_DEFINITION_INFO = "http://org.eclipse.wst/cm/properties/definitionInfo"; //$NON-NLS-1$
+ protected static final String PROPERTY_DEFINITION = "http://org.eclipse.wst/cm/properties/definition"; //$NON-NLS-1$
public abstract Object getKey();
diff --git a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/DTDImpl.java b/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/DTDImpl.java
index df7d6e6..114b8b3 100644
--- a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/DTDImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/DTDImpl.java
@@ -145,7 +145,7 @@
*/
public static abstract class DTDBaseAdapter extends CMNodeImpl {
public String getNodeName() {
- return "";
+ return ""; //$NON-NLS-1$
}
public boolean isAdapterForType(Object type) {
@@ -154,7 +154,7 @@
public Object getProperty(String propertyName) {
Object result = null;
- if (propertyName.equals("CMDocument")) {
+ if (propertyName.equals("CMDocument")) { //$NON-NLS-1$
result = getCMDocument();
}
else if (propertyName.equals(PROPERTY_DOCUMENTATION)) {
@@ -169,7 +169,7 @@
else if (propertyName.equals(PROPERTY_MOF_NOTIFIER)) {
result = getKey();
}
- else if (propertyName.equals("spec")) {
+ else if (propertyName.equals("spec")) { //$NON-NLS-1$
result = getSpec();
}
else {
@@ -232,7 +232,7 @@
}
public String getSpec() {
- return attribute.getDTDElement().getName() + "/@" + attribute.getName();
+ return attribute.getDTDElement().getName() + "/@" + attribute.getName(); //$NON-NLS-1$
}
public int getNodeType() {
@@ -294,9 +294,9 @@
public Object getProperty(String propertyName) {
Object result = null;
- if (propertyName.equals("isValidEmptyValue")) {
+ if (propertyName.equals("isValidEmptyValue")) { //$NON-NLS-1$
String dataTypeName = getDataTypeName();
- result = (dataTypeName == null || dataTypeName.equals(CMDataType.CDATA)) ? "true" : "false";
+ result = (dataTypeName == null || dataTypeName.equals(CMDataType.CDATA)) ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$
}
return result;
}
@@ -420,10 +420,10 @@
if (documentation == null) {
String comment = getDTDElement().getComment();
if (comment != null) {
- String value = "";
- StringTokenizer st = new StringTokenizer(comment, "\n");
+ String value = ""; //$NON-NLS-1$
+ StringTokenizer st = new StringTokenizer(comment, "\n"); //$NON-NLS-1$
while (st.hasMoreTokens()) {
- value += st.nextToken().trim() + "\n";
+ value += st.nextToken().trim() + "\n"; //$NON-NLS-1$
}
documentation = new CMDocumentationImpl(value);
}
@@ -444,7 +444,7 @@
}
public String getNodeName() {
- return "";
+ return ""; //$NON-NLS-1$
}
public int getNodeType() {
@@ -481,7 +481,7 @@
public DTDElementAdapter(DTDElement element) {
this.element = element;
- dataType = new CMDataTypeImpl("#PCDATA", getDTDElement().getName());
+ dataType = new CMDataTypeImpl("#PCDATA", getDTDElement().getName()); //$NON-NLS-1$
}
public Object getKey() {
@@ -501,7 +501,7 @@
}
public String getDefinitionInfo() {
- return "global";
+ return "global"; //$NON-NLS-1$
}
public CMNode getDefinition() {
@@ -518,7 +518,7 @@
public DTDElementReferenceContentAdapter(DTDElementReferenceContent content) {
this.content = content;
- dataType = new CMDataTypeImpl("#PCDATA", getDTDElement().getName());
+ dataType = new CMDataTypeImpl("#PCDATA", getDTDElement().getName()); //$NON-NLS-1$
}
public Object getKey() {
@@ -567,7 +567,7 @@
}
public String getValue() {
- String value = "";
+ String value = ""; //$NON-NLS-1$
if (dtdEntity.getContent() instanceof DTDInternalEntity) {
DTDInternalEntity content = (DTDInternalEntity) dtdEntity.getContent();
value = content.getValue();
@@ -632,7 +632,7 @@
* DTDFileAdapter
*/
public static class DTDFileAdapter extends DTDBaseAdapter implements CMDocument {
- protected final String DEFAULT_ROOT_NAME = "http://org.eclipse.wst/cm/properties/defaultRootName";
+ protected final String DEFAULT_ROOT_NAME = "http://org.eclipse.wst/cm/properties/defaultRootName"; //$NON-NLS-1$
protected DTDFile dtdFile;
protected CMNamedNodeMapImpl namedNodeMap;
@@ -671,11 +671,11 @@
// add the built in entity declarations
//
- entityNodeMap.getHashtable().put("amp", new CMEntityDeclarationImpl("amp", "&"));
- entityNodeMap.getHashtable().put("lt", new CMEntityDeclarationImpl("lt", "<"));
- entityNodeMap.getHashtable().put("gt", new CMEntityDeclarationImpl("gt", ">"));
- entityNodeMap.getHashtable().put("quot", new CMEntityDeclarationImpl("quot", "\""));
- entityNodeMap.getHashtable().put("apos", new CMEntityDeclarationImpl("apos", "'"));
+ entityNodeMap.getHashtable().put("amp", new CMEntityDeclarationImpl("amp", "&")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ entityNodeMap.getHashtable().put("lt", new CMEntityDeclarationImpl("lt", "<")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ entityNodeMap.getHashtable().put("gt", new CMEntityDeclarationImpl("gt", ">")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ entityNodeMap.getHashtable().put("quot", new CMEntityDeclarationImpl("quot", "\"")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ entityNodeMap.getHashtable().put("apos", new CMEntityDeclarationImpl("apos", "'")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
for (Iterator i = dtdFile.listDTDEntity().iterator(); i.hasNext();) {
DTDEntity dtdEntity = (DTDEntity) i.next();
@@ -700,7 +700,7 @@
}
public String getNodeName() {
- return dtdFile.getName() + ".dtd";
+ return dtdFile.getName() + ".dtd"; //$NON-NLS-1$
}
public Object getProperty(String propertyName) {
@@ -712,13 +712,13 @@
result = dtdElement.getName();
}
}
- else if (propertyName.equals("annotationMap")) {
+ else if (propertyName.equals("annotationMap")) { //$NON-NLS-1$
result = annotationMap;
}
- else if (propertyName.equals("encodingInfo")) {
+ else if (propertyName.equals("encodingInfo")) { //$NON-NLS-1$
result = encodingInfo;
}
- else if (propertyName.equals("globalPropertyMap")) {
+ else if (propertyName.equals("globalPropertyMap")) { //$NON-NLS-1$
result = globalPropertyMap;
}
else {
@@ -736,10 +736,10 @@
public CMDataTypeInfoTable() {
// hashtable.put(DTDType.CDATA, null));
instanceValueTable = new String[DTDBasicTypeImpl.basicTypeKinds.length];
- instanceValueTable[DTDBasicTypeKind.ENTITY] = "entity";
- instanceValueTable[DTDBasicTypeKind.ENTITIES] = "entities";
- instanceValueTable[DTDBasicTypeKind.NMTOKEN] = "nmtoken";
- instanceValueTable[DTDBasicTypeKind.NMTOKENS] = "nmtokens";
+ instanceValueTable[DTDBasicTypeKind.ENTITY] = "entity"; //$NON-NLS-1$
+ instanceValueTable[DTDBasicTypeKind.ENTITIES] = "entities"; //$NON-NLS-1$
+ instanceValueTable[DTDBasicTypeKind.NMTOKEN] = "nmtoken"; //$NON-NLS-1$
+ instanceValueTable[DTDBasicTypeKind.NMTOKENS] = "nmtokens"; //$NON-NLS-1$
dataTypeNameTable = new String[DTDBasicTypeImpl.basicTypeKinds.length];
dataTypeNameTable[DTDBasicTypeKind.CDATA] = CMDataType.CDATA;
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDBasicTypeKind.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDBasicTypeKind.java
index 9752d7b..1e82140 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDBasicTypeKind.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDBasicTypeKind.java
@@ -136,7 +136,7 @@
* @generated
* @ordered
*/
- public static final DTDBasicTypeKind NONE_LITERAL = new DTDBasicTypeKind(NONE, "NONE");
+ public static final DTDBasicTypeKind NONE_LITERAL = new DTDBasicTypeKind(NONE, "NONE"); //$NON-NLS-1$
/**
* The '<em><b>CDATA</b></em>' literal object. <!-- begin-user-doc
@@ -151,7 +151,7 @@
* @generated
* @ordered
*/
- public static final DTDBasicTypeKind CDATA_LITERAL = new DTDBasicTypeKind(CDATA, "CDATA");
+ public static final DTDBasicTypeKind CDATA_LITERAL = new DTDBasicTypeKind(CDATA, "CDATA"); //$NON-NLS-1$
/**
* The '<em><b>ID</b></em>' literal object. <!-- begin-user-doc -->
@@ -165,7 +165,7 @@
* @generated
* @ordered
*/
- public static final DTDBasicTypeKind ID_LITERAL = new DTDBasicTypeKind(ID, "ID");
+ public static final DTDBasicTypeKind ID_LITERAL = new DTDBasicTypeKind(ID, "ID"); //$NON-NLS-1$
/**
* The '<em><b>IDREF</b></em>' literal object. <!-- begin-user-doc
@@ -180,7 +180,7 @@
* @generated
* @ordered
*/
- public static final DTDBasicTypeKind IDREF_LITERAL = new DTDBasicTypeKind(IDREF, "IDREF");
+ public static final DTDBasicTypeKind IDREF_LITERAL = new DTDBasicTypeKind(IDREF, "IDREF"); //$NON-NLS-1$
/**
* The '<em><b>IDREFS</b></em>' literal object. <!-- begin-user-doc
@@ -195,7 +195,7 @@
* @generated
* @ordered
*/
- public static final DTDBasicTypeKind IDREFS_LITERAL = new DTDBasicTypeKind(IDREFS, "IDREFS");
+ public static final DTDBasicTypeKind IDREFS_LITERAL = new DTDBasicTypeKind(IDREFS, "IDREFS"); //$NON-NLS-1$
/**
* The '<em><b>ENTITY</b></em>' literal object. <!-- begin-user-doc
@@ -210,7 +210,7 @@
* @generated
* @ordered
*/
- public static final DTDBasicTypeKind ENTITY_LITERAL = new DTDBasicTypeKind(ENTITY, "ENTITY");
+ public static final DTDBasicTypeKind ENTITY_LITERAL = new DTDBasicTypeKind(ENTITY, "ENTITY"); //$NON-NLS-1$
/**
* The '<em><b>ENTITIES</b></em>' literal object. <!-- begin-user-doc
@@ -225,7 +225,7 @@
* @generated
* @ordered
*/
- public static final DTDBasicTypeKind ENTITIES_LITERAL = new DTDBasicTypeKind(ENTITIES, "ENTITIES");
+ public static final DTDBasicTypeKind ENTITIES_LITERAL = new DTDBasicTypeKind(ENTITIES, "ENTITIES"); //$NON-NLS-1$
/**
* The '<em><b>NMTOKEN</b></em>' literal object. <!-- begin-user-doc
@@ -240,7 +240,7 @@
* @generated
* @ordered
*/
- public static final DTDBasicTypeKind NMTOKEN_LITERAL = new DTDBasicTypeKind(NMTOKEN, "NMTOKEN");
+ public static final DTDBasicTypeKind NMTOKEN_LITERAL = new DTDBasicTypeKind(NMTOKEN, "NMTOKEN"); //$NON-NLS-1$
/**
* The '<em><b>NMTOKENS</b></em>' literal object. <!-- begin-user-doc
@@ -255,7 +255,7 @@
* @generated
* @ordered
*/
- public static final DTDBasicTypeKind NMTOKENS_LITERAL = new DTDBasicTypeKind(NMTOKENS, "NMTOKENS");
+ public static final DTDBasicTypeKind NMTOKENS_LITERAL = new DTDBasicTypeKind(NMTOKENS, "NMTOKENS"); //$NON-NLS-1$
/**
* An array of all the '<em><b>Basic Type Kind</b></em>' enumerators.
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDConstants.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDConstants.java
index 386ac8c..5a1a9a2 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDConstants.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDConstants.java
@@ -12,10 +12,10 @@
package org.eclipse.wst.dtd.core.internal.emf;
public class DTDConstants {
- public static String DTD_ERROR_LINE_PREFIX = "<!--ERROR ";
- public static String DTD_ERROR_LINE_SUFFIX = " -->";
- public static final String DTD_EXTENSION = "dtd";
- public static final String XML_EXTENSION = "xml";
- public static final String XMI_EXTENSION = "xmi";
- public static final String DTD_XMI_EXTENSION = "dtd.xmi";
+ public static String DTD_ERROR_LINE_PREFIX = "<!--ERROR "; //$NON-NLS-1$
+ public static String DTD_ERROR_LINE_SUFFIX = " -->"; //$NON-NLS-1$
+ public static final String DTD_EXTENSION = "dtd"; //$NON-NLS-1$
+ public static final String XML_EXTENSION = "xml"; //$NON-NLS-1$
+ public static final String XMI_EXTENSION = "xmi"; //$NON-NLS-1$
+ public static final String DTD_XMI_EXTENSION = "dtd.xmi"; //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDDefaultKind.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDDefaultKind.java
index b28100b..0f6378c 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDDefaultKind.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDDefaultKind.java
@@ -82,7 +82,7 @@
* @generated
* @ordered
*/
- public static final DTDDefaultKind IMPLIED_LITERAL = new DTDDefaultKind(IMPLIED, "IMPLIED");
+ public static final DTDDefaultKind IMPLIED_LITERAL = new DTDDefaultKind(IMPLIED, "IMPLIED"); //$NON-NLS-1$
/**
* The '<em><b>REQUIRED</b></em>' literal object. <!-- begin-user-doc
@@ -97,7 +97,7 @@
* @generated
* @ordered
*/
- public static final DTDDefaultKind REQUIRED_LITERAL = new DTDDefaultKind(REQUIRED, "REQUIRED");
+ public static final DTDDefaultKind REQUIRED_LITERAL = new DTDDefaultKind(REQUIRED, "REQUIRED"); //$NON-NLS-1$
/**
* The '<em><b>FIXED</b></em>' literal object. <!-- begin-user-doc
@@ -112,7 +112,7 @@
* @generated
* @ordered
*/
- public static final DTDDefaultKind FIXED_LITERAL = new DTDDefaultKind(FIXED, "FIXED");
+ public static final DTDDefaultKind FIXED_LITERAL = new DTDDefaultKind(FIXED, "FIXED"); //$NON-NLS-1$
/**
* The '<em><b>NOFIXED</b></em>' literal object. <!-- begin-user-doc
@@ -127,7 +127,7 @@
* @generated
* @ordered
*/
- public static final DTDDefaultKind NOFIXED_LITERAL = new DTDDefaultKind(NOFIXED, "NOFIXED");
+ public static final DTDDefaultKind NOFIXED_LITERAL = new DTDDefaultKind(NOFIXED, "NOFIXED"); //$NON-NLS-1$
/**
* An array of all the '<em><b>Default Kind</b></em>' enumerators.
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEnumGroupKind.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEnumGroupKind.java
index 6035d57..7e0b8ed 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEnumGroupKind.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDEnumGroupKind.java
@@ -61,7 +61,7 @@
* @generated
* @ordered
*/
- public static final DTDEnumGroupKind NAME_TOKEN_GROUP_LITERAL = new DTDEnumGroupKind(NAME_TOKEN_GROUP, "NAME_TOKEN_GROUP");
+ public static final DTDEnumGroupKind NAME_TOKEN_GROUP_LITERAL = new DTDEnumGroupKind(NAME_TOKEN_GROUP, "NAME_TOKEN_GROUP"); //$NON-NLS-1$
/**
* The '<em><b>NOTATION GROUP</b></em>' literal object. <!--
@@ -76,7 +76,7 @@
* @generated
* @ordered
*/
- public static final DTDEnumGroupKind NOTATION_GROUP_LITERAL = new DTDEnumGroupKind(NOTATION_GROUP, "NOTATION_GROUP");
+ public static final DTDEnumGroupKind NOTATION_GROUP_LITERAL = new DTDEnumGroupKind(NOTATION_GROUP, "NOTATION_GROUP"); //$NON-NLS-1$
/**
* An array of all the '<em><b>Enum Group Kind</b></em>' enumerators.
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDErrorMessage.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDErrorMessage.java
index 8421fdb..a815056 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDErrorMessage.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDErrorMessage.java
@@ -36,7 +36,7 @@
}
public String toString() {
- return "(" + declarationType + ":" + declarationName + ") " + lineNo + ":" + charOffSet + " " + errorMessage;
+ return "(" + declarationType + ":" + declarationName + ") " + lineNo + ":" + charOffSet + " " + errorMessage; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
}
/**
@@ -44,6 +44,6 @@
*/
protected String toStringGen() {
- return "(" + declarationType + ":" + declarationName + ") " + lineNo + ":" + charOffSet + " " + errorMessage;
+ return "(" + declarationType + ":" + declarationName + ") " + lineNo + ":" + charOffSet + " " + errorMessage; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
}
}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDGroupKind.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDGroupKind.java
index f2d4bd1..fb10de0 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDGroupKind.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDGroupKind.java
@@ -61,7 +61,7 @@
* @generated
* @ordered
*/
- public static final DTDGroupKind SEQUENCE_LITERAL = new DTDGroupKind(SEQUENCE, "SEQUENCE");
+ public static final DTDGroupKind SEQUENCE_LITERAL = new DTDGroupKind(SEQUENCE, "SEQUENCE"); //$NON-NLS-1$
/**
* The '<em><b>CHOICE</b></em>' literal object. <!-- begin-user-doc
@@ -76,7 +76,7 @@
* @generated
* @ordered
*/
- public static final DTDGroupKind CHOICE_LITERAL = new DTDGroupKind(CHOICE, "CHOICE");
+ public static final DTDGroupKind CHOICE_LITERAL = new DTDGroupKind(CHOICE, "CHOICE"); //$NON-NLS-1$
/**
* An array of all the '<em><b>Group Kind</b></em>' enumerators. <!--
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDOccurrenceType.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDOccurrenceType.java
index 5a25cf8..4439aa105 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDOccurrenceType.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDOccurrenceType.java
@@ -81,7 +81,7 @@
* @generated
* @ordered
*/
- public static final DTDOccurrenceType ONE_LITERAL = new DTDOccurrenceType(ONE, "ONE");
+ public static final DTDOccurrenceType ONE_LITERAL = new DTDOccurrenceType(ONE, "ONE"); //$NON-NLS-1$
/**
* The '<em><b>OPTIONAL</b></em>' literal object. <!-- begin-user-doc
@@ -96,7 +96,7 @@
* @generated
* @ordered
*/
- public static final DTDOccurrenceType OPTIONAL_LITERAL = new DTDOccurrenceType(OPTIONAL, "OPTIONAL");
+ public static final DTDOccurrenceType OPTIONAL_LITERAL = new DTDOccurrenceType(OPTIONAL, "OPTIONAL"); //$NON-NLS-1$
/**
* The '<em><b>ONE OR MORE</b></em>' literal object. <!--
@@ -111,7 +111,7 @@
* @generated
* @ordered
*/
- public static final DTDOccurrenceType ONE_OR_MORE_LITERAL = new DTDOccurrenceType(ONE_OR_MORE, "ONE_OR_MORE");
+ public static final DTDOccurrenceType ONE_OR_MORE_LITERAL = new DTDOccurrenceType(ONE_OR_MORE, "ONE_OR_MORE"); //$NON-NLS-1$
/**
* The '<em><b>ZERO OR MORE</b></em>' literal object. <!--
@@ -126,7 +126,7 @@
* @generated
* @ordered
*/
- public static final DTDOccurrenceType ZERO_OR_MORE_LITERAL = new DTDOccurrenceType(ZERO_OR_MORE, "ZERO_OR_MORE");
+ public static final DTDOccurrenceType ZERO_OR_MORE_LITERAL = new DTDOccurrenceType(ZERO_OR_MORE, "ZERO_OR_MORE"); //$NON-NLS-1$
/**
* An array of all the '<em><b>Occurrence Type</b></em>' enumerators.
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDPackage.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDPackage.java
index 7887406..e336a58 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDPackage.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDPackage.java
@@ -38,7 +38,7 @@
*
* @generated
*/
- String eNAME = "dtd";
+ String eNAME = "dtd"; //$NON-NLS-1$
/**
* The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc
@@ -46,7 +46,7 @@
*
* @generated
*/
- String eNS_URI = "http:///com/ibm/etools/dtd.ecore";
+ String eNS_URI = "http:///com/ibm/etools/dtd.ecore"; //$NON-NLS-1$
/**
* The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc
@@ -54,7 +54,7 @@
*
* @generated
*/
- String eNS_PREFIX = "org.eclipse.wst.dtd.core.internal.emf";
+ String eNS_PREFIX = "org.eclipse.wst.dtd.core.internal.emf"; //$NON-NLS-1$
/**
* The singleton instance of the package. <!-- begin-user-doc --> <!--
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDResource.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDResource.java
index 7c7ed49..5b2799e 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDResource.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDResource.java
@@ -14,32 +14,32 @@
public interface DTDResource {
// Enumeration Constants
- public static final String ANYICON = "icons/any.gif";
- public static final String ELEMENTICON = "icons/element.gif";
- public static final String ENTITYICON = "icons/entity.gif";
- public static final String ATTRIBUTEICON = "icons/attribute.gif";
- public static final String NOTATIONICON = "icons/notation.gif";
- public static final String EMPTYICON = "icons/emptycontent.gif";
- public static final String PCDATAICON = "icons/one.gif";
- public static final String ENTITYREFERENCEICON = "icons/entity_reference.gif";
+ public static final String ANYICON = "icons/any.gif"; //$NON-NLS-1$
+ public static final String ELEMENTICON = "icons/element.gif"; //$NON-NLS-1$
+ public static final String ENTITYICON = "icons/entity.gif"; //$NON-NLS-1$
+ public static final String ATTRIBUTEICON = "icons/attribute.gif"; //$NON-NLS-1$
+ public static final String NOTATIONICON = "icons/notation.gif"; //$NON-NLS-1$
+ public static final String EMPTYICON = "icons/emptycontent.gif"; //$NON-NLS-1$
+ public static final String PCDATAICON = "icons/one.gif"; //$NON-NLS-1$
+ public static final String ENTITYREFERENCEICON = "icons/entity_reference.gif"; //$NON-NLS-1$
- public static final String ONEICON = "icons/one.gif";
- public static final String OPTIONALICON = "icons/optional.gif";
- public static final String ONEORMOREICON = "icons/oneormore.gif";
- public static final String ZEROORMOREICON = "icons/zeroormore.gif";
+ public static final String ONEICON = "icons/one.gif"; //$NON-NLS-1$
+ public static final String OPTIONALICON = "icons/optional.gif"; //$NON-NLS-1$
+ public static final String ONEORMOREICON = "icons/oneormore.gif"; //$NON-NLS-1$
+ public static final String ZEROORMOREICON = "icons/zeroormore.gif"; //$NON-NLS-1$
- public static final String ONESEQUENCEICON = "icons/onesequence.gif";
- public static final String OPTIONALSEQUENCEICON = "icons/optionalsequence.gif";
- public static final String ONEORMORESEQUENCEICON = "icons/oneormoresequence.gif";
- public static final String ZEROORMORESEQUENCEICON = "icons/zeroormoresequence.gif";
+ public static final String ONESEQUENCEICON = "icons/onesequence.gif"; //$NON-NLS-1$
+ public static final String OPTIONALSEQUENCEICON = "icons/optionalsequence.gif"; //$NON-NLS-1$
+ public static final String ONEORMORESEQUENCEICON = "icons/oneormoresequence.gif"; //$NON-NLS-1$
+ public static final String ZEROORMORESEQUENCEICON = "icons/zeroormoresequence.gif"; //$NON-NLS-1$
- public static final String ONECHOICEICON = "icons/onechoice.gif";
- public static final String OPTIONALCHOICEICON = "icons/optionalchoice.gif";
- public static final String ONEORMORECHOICEICON = "icons/oneormorechoice.gif";
- public static final String ZEROORMORECHOICEICON = "icons/zeroormorechoice.gif";
+ public static final String ONECHOICEICON = "icons/onechoice.gif"; //$NON-NLS-1$
+ public static final String OPTIONALCHOICEICON = "icons/optionalchoice.gif"; //$NON-NLS-1$
+ public static final String ONEORMORECHOICEICON = "icons/oneormorechoice.gif"; //$NON-NLS-1$
+ public static final String ZEROORMORECHOICEICON = "icons/zeroormorechoice.gif"; //$NON-NLS-1$
- public static final String DTDFILEICON = "icons/DTDFile.gif";
+ public static final String DTDFILEICON = "icons/DTDFile.gif"; //$NON-NLS-1$
- public static final String NEWDTD = "icons/newdtd_wiz.gif";
- public static final String NEWHTMLFORM = "icons/genhtmform_wiz.gif";
+ public static final String NEWDTD = "icons/newdtd_wiz.gif"; //$NON-NLS-1$
+ public static final String NEWHTMLFORM = "icons/genhtmform_wiz.gif"; //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDType.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDType.java
index f9715e9..e48fdc9 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDType.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/DTDType.java
@@ -13,18 +13,18 @@
public interface DTDType extends DTDObject {
// constant strings for dtd attribute types
- public static final String NONE = "None";
+ public static final String NONE = "None"; //$NON-NLS-1$
- public static final String CDATA = "Character Data (CDATA)";
- public static final String ID = "Identifier (ID)";
- public static final String IDREF = "ID Reference (IDREF)";
- public static final String IDREFS = "ID References (IDREFS)";
- public static final String ENTITY = "Entity Name (ENTITY)";
- public static final String ENTITIES = "Entity Names (ENTITIES)";
- public static final String NMTOKEN = "Name Token (NMTOKEN)";
- public static final String NMTOKENS = "Name Tokens (NMTOKENS)";
- public static final String ENUM_NAME_TOKEN_GROUP = "Enumerated Name Tokens";
- public static final String ENUM_NOTATION_GROUP = "Enumerated NOTATION";
+ public static final String CDATA = "Character Data (CDATA)"; //$NON-NLS-1$
+ public static final String ID = "Identifier (ID)"; //$NON-NLS-1$
+ public static final String IDREF = "ID Reference (IDREF)"; //$NON-NLS-1$
+ public static final String IDREFS = "ID References (IDREFS)"; //$NON-NLS-1$
+ public static final String ENTITY = "Entity Name (ENTITY)"; //$NON-NLS-1$
+ public static final String ENTITIES = "Entity Names (ENTITIES)"; //$NON-NLS-1$
+ public static final String NMTOKEN = "Name Token (NMTOKEN)"; //$NON-NLS-1$
+ public static final String NMTOKENS = "Name Tokens (NMTOKENS)"; //$NON-NLS-1$
+ public static final String ENUM_NAME_TOKEN_GROUP = "Enumerated Name Tokens"; //$NON-NLS-1$
+ public static final String ENUM_NOTATION_GROUP = "Enumerated NOTATION"; //$NON-NLS-1$
public String toString();
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/XMLSchemaDefinedType.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/XMLSchemaDefinedType.java
index fa4e8ae..fd138f4 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/XMLSchemaDefinedType.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/XMLSchemaDefinedType.java
@@ -191,7 +191,7 @@
* @generated
* @ordered
*/
- public static final XMLSchemaDefinedType NONE_LITERAL = new XMLSchemaDefinedType(NONE, "NONE");
+ public static final XMLSchemaDefinedType NONE_LITERAL = new XMLSchemaDefinedType(NONE, "NONE"); //$NON-NLS-1$
/**
* The '<em><b>STRING</b></em>' literal object. <!-- begin-user-doc
@@ -206,7 +206,7 @@
* @generated
* @ordered
*/
- public static final XMLSchemaDefinedType STRING_LITERAL = new XMLSchemaDefinedType(STRING, "STRING");
+ public static final XMLSchemaDefinedType STRING_LITERAL = new XMLSchemaDefinedType(STRING, "STRING"); //$NON-NLS-1$
/**
* The '<em><b>BOOLEAN</b></em>' literal object. <!-- begin-user-doc
@@ -221,7 +221,7 @@
* @generated
* @ordered
*/
- public static final XMLSchemaDefinedType BOOLEAN_LITERAL = new XMLSchemaDefinedType(BOOLEAN, "BOOLEAN");
+ public static final XMLSchemaDefinedType BOOLEAN_LITERAL = new XMLSchemaDefinedType(BOOLEAN, "BOOLEAN"); //$NON-NLS-1$
/**
* The '<em><b>FLOAT</b></em>' literal object. <!-- begin-user-doc
@@ -236,7 +236,7 @@
* @generated
* @ordered
*/
- public static final XMLSchemaDefinedType FLOAT_LITERAL = new XMLSchemaDefinedType(FLOAT, "FLOAT");
+ public static final XMLSchemaDefinedType FLOAT_LITERAL = new XMLSchemaDefinedType(FLOAT, "FLOAT"); //$NON-NLS-1$
/**
* The '<em><b>DOUBLE</b></em>' literal object. <!-- begin-user-doc
@@ -251,7 +251,7 @@
* @generated
* @ordered
*/
- public static final XMLSchemaDefinedType DOUBLE_LITERAL = new XMLSchemaDefinedType(DOUBLE, "DOUBLE");
+ public static final XMLSchemaDefinedType DOUBLE_LITERAL = new XMLSchemaDefinedType(DOUBLE, "DOUBLE"); //$NON-NLS-1$
/**
* The '<em><b>DECIMAL</b></em>' literal object. <!-- begin-user-doc
@@ -266,7 +266,7 @@
* @generated
* @ordered
*/
- public static final XMLSchemaDefinedType DECIMAL_LITERAL = new XMLSchemaDefinedType(DECIMAL, "DECIMAL");
+ public static final XMLSchemaDefinedType DECIMAL_LITERAL = new XMLSchemaDefinedType(DECIMAL, "DECIMAL"); //$NON-NLS-1$
/**
* The '<em><b>TIMEINSTANT</b></em>' literal object. <!--
@@ -281,7 +281,7 @@
* @generated
* @ordered
*/
- public static final XMLSchemaDefinedType TIMEINSTANT_LITERAL = new XMLSchemaDefinedType(TIMEINSTANT, "TIMEINSTANT");
+ public static final XMLSchemaDefinedType TIMEINSTANT_LITERAL = new XMLSchemaDefinedType(TIMEINSTANT, "TIMEINSTANT"); //$NON-NLS-1$
/**
* The '<em><b>TIMEDURATION</b></em>' literal object. <!--
@@ -296,7 +296,7 @@
* @generated
* @ordered
*/
- public static final XMLSchemaDefinedType TIMEDURATION_LITERAL = new XMLSchemaDefinedType(TIMEDURATION, "TIMEDURATION");
+ public static final XMLSchemaDefinedType TIMEDURATION_LITERAL = new XMLSchemaDefinedType(TIMEDURATION, "TIMEDURATION"); //$NON-NLS-1$
/**
* The '<em><b>RECURRINGINSTANT</b></em>' literal object. <!--
@@ -312,7 +312,7 @@
* @generated
* @ordered
*/
- public static final XMLSchemaDefinedType RECURRINGINSTANT_LITERAL = new XMLSchemaDefinedType(RECURRINGINSTANT, "RECURRINGINSTANT");
+ public static final XMLSchemaDefinedType RECURRINGINSTANT_LITERAL = new XMLSchemaDefinedType(RECURRINGINSTANT, "RECURRINGINSTANT"); //$NON-NLS-1$
/**
* The '<em><b>BINARY</b></em>' literal object. <!-- begin-user-doc
@@ -327,7 +327,7 @@
* @generated
* @ordered
*/
- public static final XMLSchemaDefinedType BINARY_LITERAL = new XMLSchemaDefinedType(BINARY, "BINARY");
+ public static final XMLSchemaDefinedType BINARY_LITERAL = new XMLSchemaDefinedType(BINARY, "BINARY"); //$NON-NLS-1$
/**
* The '<em><b>URI</b></em>' literal object. <!-- begin-user-doc -->
@@ -341,7 +341,7 @@
* @generated
* @ordered
*/
- public static final XMLSchemaDefinedType URI_LITERAL = new XMLSchemaDefinedType(URI, "URI");
+ public static final XMLSchemaDefinedType URI_LITERAL = new XMLSchemaDefinedType(URI, "URI"); //$NON-NLS-1$
/**
* The '<em><b>INTEGER</b></em>' literal object. <!-- begin-user-doc
@@ -356,7 +356,7 @@
* @generated
* @ordered
*/
- public static final XMLSchemaDefinedType INTEGER_LITERAL = new XMLSchemaDefinedType(INTEGER, "INTEGER");
+ public static final XMLSchemaDefinedType INTEGER_LITERAL = new XMLSchemaDefinedType(INTEGER, "INTEGER"); //$NON-NLS-1$
/**
* The '<em><b>DATE</b></em>' literal object. <!-- begin-user-doc -->
@@ -370,7 +370,7 @@
* @generated
* @ordered
*/
- public static final XMLSchemaDefinedType DATE_LITERAL = new XMLSchemaDefinedType(DATE, "DATE");
+ public static final XMLSchemaDefinedType DATE_LITERAL = new XMLSchemaDefinedType(DATE, "DATE"); //$NON-NLS-1$
/**
* The '<em><b>TIME</b></em>' literal object. <!-- begin-user-doc -->
@@ -384,7 +384,7 @@
* @generated
* @ordered
*/
- public static final XMLSchemaDefinedType TIME_LITERAL = new XMLSchemaDefinedType(TIME, "TIME");
+ public static final XMLSchemaDefinedType TIME_LITERAL = new XMLSchemaDefinedType(TIME, "TIME"); //$NON-NLS-1$
/**
* An array of all the '<em><b>XML Schema Defined Type</b></em>'
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDAnyContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDAnyContentImpl.java
index eb7f510..66be313 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDAnyContentImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDAnyContentImpl.java
@@ -31,7 +31,7 @@
*/
public class DTDAnyContentImpl extends DTDElementContentImpl implements DTDAnyContent {
public String getContentName() {
- return "ANY";
+ return "ANY"; //$NON-NLS-1$
}
/**
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDAttributeImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDAttributeImpl.java
index e2ab987..2e2577d 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDAttributeImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDAttributeImpl.java
@@ -119,21 +119,21 @@
StringBuffer value = new StringBuffer();
switch (getDefaultKind().getValue()) {
case DTDDefaultKind.IMPLIED :
- value.append("#IMPLIED");
+ value.append("#IMPLIED"); //$NON-NLS-1$
break;
case DTDDefaultKind.REQUIRED :
- value.append("#REQUIRED");
+ value.append("#REQUIRED"); //$NON-NLS-1$
break;
case DTDDefaultKind.FIXED :
String type = getDTDType().toString();
if (!(type.equals(DTDType.ID) || type.equals(DTDType.IDREF) || type.equals(DTDType.ENUM_NAME_TOKEN_GROUP) || type.equals(DTDType.IDREFS))) {
- value.append("#FIXED \"").append(getDefaultValueString()).append("\"");
+ value.append("#FIXED \"").append(getDefaultValueString()).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
}
break;
case DTDDefaultKind.NOFIXED :
String defaultValue = getDefaultValueString();
if (defaultValue != null)
- value.append("\"").append(defaultValue).append("\"");
+ value.append("\"").append(defaultValue).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
break;
}
@@ -141,40 +141,40 @@
// Get the attribute type
DTDEntity typeEnt = getAttributeTypeReferencedEntity();
if (typeEnt != null) {
- result.append(" %" + typeEnt.getName() + "; ").append(value);
+ result.append(" %" + typeEnt.getName() + "; ").append(value); //$NON-NLS-1$ //$NON-NLS-2$
}
else {
DTDType dtdType = getDTDType();
if (dtdType instanceof DTDBasicType) {
switch (((DTDBasicType) dtdType).getKind().getValue()) {
case DTDBasicTypeKind.CDATA :
- result.append(" CDATA ").append(value);
+ result.append(" CDATA ").append(value); //$NON-NLS-1$
break;
case DTDBasicTypeKind.ID :
- result.append(" ID ").append(value);
+ result.append(" ID ").append(value); //$NON-NLS-1$
break;
case DTDBasicTypeKind.IDREF :
- result.append(" IDREF ").append(value);
+ result.append(" IDREF ").append(value); //$NON-NLS-1$
break;
case DTDBasicTypeKind.IDREFS :
- result.append(" IDREFS ").append(value);
+ result.append(" IDREFS ").append(value); //$NON-NLS-1$
break;
case DTDBasicTypeKind.ENTITY :
- result.append(" ENTITY ").append(value);
+ result.append(" ENTITY ").append(value); //$NON-NLS-1$
break;
case DTDBasicTypeKind.ENTITIES :
- result.append(" ENTITIES ").append(value);
+ result.append(" ENTITIES ").append(value); //$NON-NLS-1$
break;
case DTDBasicTypeKind.NMTOKEN :
- result.append(" NMTOKEN ").append(value);
+ result.append(" NMTOKEN ").append(value); //$NON-NLS-1$
break;
case DTDBasicTypeKind.NMTOKENS :
- result.append(" NMTOKENS ").append(value);
+ result.append(" NMTOKENS ").append(value); //$NON-NLS-1$
break;
}
}
else if (dtdType instanceof DTDEnumerationType) {
- result.append(" ").append(buildEnumString((DTDEnumerationType) dtdType)).append(value);
+ result.append(" ").append(buildEnumString((DTDEnumerationType) dtdType)).append(value); //$NON-NLS-1$
}
}
@@ -184,20 +184,20 @@
private String buildEnumString(DTDEnumerationType enumType) {
- String result = "";
+ String result = ""; //$NON-NLS-1$
if (enumType.getKind().getValue() == DTDEnumGroupKind.NOTATION_GROUP)
- result += "NOTATION ";
+ result += "NOTATION "; //$NON-NLS-1$
Iterator i = enumType.getEnumLiterals().iterator();
if (i.hasNext()) {
- result += "(" + ((EEnumLiteral) i.next()).toString();
+ result += "(" + ((EEnumLiteral) i.next()).toString(); //$NON-NLS-1$
while (i.hasNext()) {
- result += " | " + ((EEnumLiteral) i.next()).toString();
+ result += " | " + ((EEnumLiteral) i.next()).toString(); //$NON-NLS-1$
}
- result += ") ";
+ result += ") "; //$NON-NLS-1$
}
@@ -619,7 +619,7 @@
public void setDTDElement(DTDElement newDTDElement) {
if (newDTDElement != eContainer || (eContainerFeatureID != DTDPackage.DTD_ATTRIBUTE__DTD_ELEMENT && newDTDElement != null)) {
if (EcoreUtil.isAncestor(this, newDTDElement))
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + ".");
+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + "."); //$NON-NLS-1$ //$NON-NLS-2$
NotificationChain msgs = null;
if (eContainer != null)
msgs = eBasicRemoveFromContainer(msgs);
@@ -967,11 +967,11 @@
return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (comment: ");
+ result.append(" (comment: "); //$NON-NLS-1$
result.append(comment);
- result.append(", defaultKind: ");
+ result.append(", defaultKind: "); //$NON-NLS-1$
result.append(defaultKind);
- result.append(", defaultValueString: ");
+ result.append(", defaultValueString: "); //$NON-NLS-1$
result.append(defaultValueString);
result.append(')');
return result.toString();
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDBasicTypeImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDBasicTypeImpl.java
index d9c7035..b30f3dc 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDBasicTypeImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDBasicTypeImpl.java
@@ -22,7 +22,7 @@
import org.eclipse.emf.ecore.impl.EClassImpl;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.dtd.core.internal.DTDCorePlugin;
+import org.eclipse.wst.dtd.core.internal.DTDCoreMessages;
import org.eclipse.wst.dtd.core.internal.emf.DTDBasicType;
import org.eclipse.wst.dtd.core.internal.emf.DTDBasicTypeKind;
import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
@@ -46,7 +46,7 @@
public final static String basicTypeStrings[] = {DTDType.NONE, DTDType.CDATA, DTDType.ID, DTDType.IDREF, DTDType.IDREFS, DTDType.ENTITY, DTDType.ENTITIES, DTDType.NMTOKEN, DTDType.NMTOKENS};
- public final static String basicTypeDescriptions[] = {DTDCorePlugin.getDTDString("_UI_NONE_DESC"), DTDCorePlugin.getDTDString("_UI_CHARACTER_DATA_DESC"), DTDCorePlugin.getDTDString("_UI_IDENTIFIER_DESC"), DTDCorePlugin.getDTDString("_UI_ID_REFERENCE_DESC"), DTDCorePlugin.getDTDString("_UI_ID_REFERENCES_DESC"), DTDCorePlugin.getDTDString("_UI_ENTITY_NAME_DESC"), DTDCorePlugin.getDTDString("_UI_ENTITY_NAMES_DESC"), DTDCorePlugin.getDTDString("_UI_NAME_TOKEN_DESC"), DTDCorePlugin.getDTDString("_UI_NAME_TOKENS_DESC")};
+ public final static String basicTypeDescriptions[] = {DTDCoreMessages._UI_NONE_DESC, DTDCoreMessages._UI_CHARACTER_DATA_DESC, DTDCoreMessages._UI_IDENTIFIER_DESC, DTDCoreMessages._UI_ID_REFERENCE_DESC, DTDCoreMessages._UI_ID_REFERENCES_DESC, DTDCoreMessages._UI_ENTITY_NAME_DESC, DTDCoreMessages._UI_ENTITY_NAMES_DESC, DTDCoreMessages._UI_NAME_TOKEN_DESC, DTDCoreMessages._UI_NAME_TOKENS_DESC}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
public final static int basicTypeKinds[] = {DTDBasicTypeKind.NONE, DTDBasicTypeKind.CDATA, DTDBasicTypeKind.ID, DTDBasicTypeKind.IDREF, DTDBasicTypeKind.IDREFS, DTDBasicTypeKind.ENTITY, DTDBasicTypeKind.ENTITIES, DTDBasicTypeKind.NMTOKEN, DTDBasicTypeKind.NMTOKENS};
@@ -78,7 +78,7 @@
public String getPathname() {
// TBD
- return "";
+ return ""; //$NON-NLS-1$
}
public DTDObject findObject(String relativePath) {
@@ -418,7 +418,7 @@
return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (kind: ");
+ result.append(" (kind: "); //$NON-NLS-1$
result.append(kind);
result.append(')');
return result.toString();
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDContentImpl.java
index e0974b7..7f39b9d 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDContentImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDContentImpl.java
@@ -63,7 +63,7 @@
public void setDTDFile(DTDFile newDTDFile) {
if (newDTDFile != eContainer || (eContainerFeatureID != DTDPackage.DTD_CONTENT__DTD_FILE && newDTDFile != null)) {
if (EcoreUtil.isAncestor(this, newDTDFile))
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + ".");
+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + "."); //$NON-NLS-1$ //$NON-NLS-2$
NotificationChain msgs = null;
if (eContainer != null)
msgs = eBasicRemoveFromContainer(msgs);
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementContentImpl.java
index 2ff1e0e..be81da8 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementContentImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementContentImpl.java
@@ -88,7 +88,7 @@
cnt++;
}
}
- return DTDPathnameUtil.makePath(((parent == null) ? "NULL_PARENT" : parent.getPathname()), "Content", null, cnt);
+ return DTDPathnameUtil.makePath(((parent == null) ? "NULL_PARENT" : parent.getPathname()), "Content", null, cnt); //$NON-NLS-1$ //$NON-NLS-2$
}
public DTDObject findObject(String relativePath) {
@@ -200,7 +200,7 @@
public void setGroup(DTDGroupContent newGroup) {
if (newGroup != eContainer || (eContainerFeatureID != DTDPackage.DTD_ELEMENT_CONTENT__GROUP && newGroup != null)) {
if (EcoreUtil.isAncestor(this, newGroup))
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + ".");
+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + "."); //$NON-NLS-1$ //$NON-NLS-2$
NotificationChain msgs = null;
if (eContainer != null)
msgs = eBasicRemoveFromContainer(msgs);
@@ -233,7 +233,7 @@
public void setElement(DTDElement newElement) {
if (newElement != eContainer || (eContainerFeatureID != DTDPackage.DTD_ELEMENT_CONTENT__ELEMENT && newElement != null)) {
if (EcoreUtil.isAncestor(this, newElement))
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + ".");
+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + "."); //$NON-NLS-1$ //$NON-NLS-2$
NotificationChain msgs = null;
if (eContainer != null)
msgs = eBasicRemoveFromContainer(msgs);
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementImpl.java
index ae2d93a..1095520 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementImpl.java
@@ -72,7 +72,7 @@
}
public String getPathname() {
- return DTDPathnameUtil.makePath(null, "Elem", getName(), -1);
+ return DTDPathnameUtil.makePath(null, "Elem", getName(), -1); //$NON-NLS-1$
}
public DTDObject findObject(String relativePath) {
@@ -86,11 +86,11 @@
String name = (String) result[1];
DTDObject obj = null;
- if (type.equals("Attr")) {
+ if (type.equals("Attr")) { //$NON-NLS-1$
// TODO: fix port
// obj = findAttribute(name);
}
- else if ((type.equals("Content")) || (type.equals("ElemRef")) || (type.equals("EntRef"))) {
+ else if ((type.equals("Content")) || (type.equals("ElemRef")) || (type.equals("EntRef"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
obj = getContent();
}
else {
@@ -124,13 +124,13 @@
}
public String getAttributeDetail() {
- String attributeString = "";
+ String attributeString = ""; //$NON-NLS-1$
Collection attributes = getDTDAttribute();
if (attributes != null) {
boolean seenOne = false;
for (java.util.Iterator i = attributes.iterator(); i.hasNext();) {
if (seenOne) {
- attributeString = attributeString + ", ";
+ attributeString = attributeString + ", "; //$NON-NLS-1$
}
else {
seenOne = true;
@@ -510,7 +510,7 @@
return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (comment: ");
+ result.append(" (comment: "); //$NON-NLS-1$
result.append(comment);
result.append(')');
return result.toString();
@@ -639,7 +639,7 @@
public void setDTDFile(DTDFile newDTDFile) {
if (newDTDFile != eContainer || (eContainerFeatureID != DTDPackage.DTD_ELEMENT__DTD_FILE && newDTDFile != null)) {
if (EcoreUtil.isAncestor(this, newDTDFile))
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + ".");
+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + "."); //$NON-NLS-1$ //$NON-NLS-2$
NotificationChain msgs = null;
if (eContainer != null)
msgs = eBasicRemoveFromContainer(msgs);
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementReferenceContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementReferenceContentImpl.java
index cde3467..fa2b885 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementReferenceContentImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDElementReferenceContentImpl.java
@@ -58,7 +58,7 @@
public String getContentName() {
DTDElement e = getReferencedElement();
if (e == null)
- return "";
+ return ""; //$NON-NLS-1$
return e.getName();
}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEmptyContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEmptyContentImpl.java
index 2e25e48..2077db2 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEmptyContentImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEmptyContentImpl.java
@@ -166,7 +166,7 @@
}
public String getContentName() {
- return "EMPTY";
+ return "EMPTY"; //$NON-NLS-1$
}
}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityContentImpl.java
index 66d7137..48cade3 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityContentImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityContentImpl.java
@@ -44,7 +44,7 @@
}
public String getPathname() {
- return DTDPathnameUtil.makePath(getDTDEntity().getPathname(), "Content", null, -1);
+ return DTDPathnameUtil.makePath(getDTDEntity().getPathname(), "Content", null, -1); //$NON-NLS-1$
}
public DTDObject findObject(String relativePath) {
@@ -66,7 +66,7 @@
public void setDTDEntity(DTDEntity newDTDEntity) {
if (newDTDEntity != eContainer || (eContainerFeatureID != DTDPackage.DTD_ENTITY_CONTENT__DTD_ENTITY && newDTDEntity != null)) {
if (EcoreUtil.isAncestor(this, newDTDEntity))
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + ".");
+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + "."); //$NON-NLS-1$ //$NON-NLS-2$
NotificationChain msgs = null;
if (eContainer != null)
msgs = eBasicRemoveFromContainer(msgs);
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityImpl.java
index f28ac91..eeeb09d 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityImpl.java
@@ -60,7 +60,7 @@
public class DTDEntityImpl extends DTDContentImpl implements DTDEntity, ENamedElement, DTDContent {
public String getPathname() {
- return DTDPathnameUtil.makePath(null, "Ent", getName(), -1);
+ return DTDPathnameUtil.makePath(null, "Ent", getName(), -1); //$NON-NLS-1$
}
@@ -76,7 +76,7 @@
DTDObject obj = null;
- if (type.equals("Content")) {
+ if (type.equals("Content")) { //$NON-NLS-1$
obj = getContent();
}
else {
@@ -651,9 +651,9 @@
return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (comment: ");
+ result.append(" (comment: "); //$NON-NLS-1$
result.append(comment);
- result.append(", parameterEntity: ");
+ result.append(", parameterEntity: "); //$NON-NLS-1$
result.append(parameterEntity);
result.append(')');
return result.toString();
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityReferenceContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityReferenceContentImpl.java
index d6ec762..7d26a5a 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityReferenceContentImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEntityReferenceContentImpl.java
@@ -49,17 +49,17 @@
public String getContentName() {
DTDEntity e = getElementReferencedEntity();
if (e == null)
- return "";
+ return ""; //$NON-NLS-1$
return e.getName();
}
public String unparseRepeatableContent() {
DTDEntity entityRef = getElementReferencedEntity();
if (entityRef.isParameterEntity()) {
- return "%" + getContentName() + ";";
+ return "%" + getContentName() + ";"; //$NON-NLS-1$ //$NON-NLS-2$
}
else {
- return "&" + getContentName() + ";";
+ return "&" + getContentName() + ";"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEnumerationTypeImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEnumerationTypeImpl.java
index af7b980..09fd0d2 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEnumerationTypeImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDEnumerationTypeImpl.java
@@ -25,7 +25,7 @@
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.dtd.core.internal.DTDCorePlugin;
+import org.eclipse.wst.dtd.core.internal.DTDCoreMessages;
import org.eclipse.wst.dtd.core.internal.emf.DTDEnumGroupKind;
import org.eclipse.wst.dtd.core.internal.emf.DTDEnumerationType;
import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
@@ -47,7 +47,7 @@
*/
protected static final DTDEnumGroupKind KIND_EDEFAULT = DTDEnumGroupKind.NAME_TOKEN_GROUP_LITERAL;
- public final static String enumerationTypeDescriptions[] = {DTDCorePlugin.getDTDString("_UI_ENUM_NAME_TOKENS_DESC"), DTDCorePlugin.getDTDString("_UI_ENUM_NOTATION_DESC")};
+ public final static String enumerationTypeDescriptions[] = {DTDCoreMessages._UI_ENUM_NAME_TOKENS_DESC, DTDCoreMessages._UI_ENUM_NOTATION_DESC}; //$NON-NLS-1$ //$NON-NLS-2$
public final static int enumerationTypeKinds[] = {DTDEnumGroupKind.NAME_TOKEN_GROUP, DTDEnumGroupKind.NOTATION_GROUP};
@@ -91,7 +91,7 @@
public String getPathname() {
// TBD
- return "";
+ return ""; //$NON-NLS-1$
}
public DTDObject findObject(String relativePath) {
@@ -132,7 +132,7 @@
public void setDTDFile(DTDFile newDTDFile) {
if (newDTDFile != eContainer || (eContainerFeatureID != DTDPackage.DTD_ENUMERATION_TYPE__DTD_FILE && newDTDFile != null)) {
if (EcoreUtil.isAncestor(this, newDTDFile))
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + ".");
+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString() + "."); //$NON-NLS-1$ //$NON-NLS-2$
NotificationChain msgs = null;
if (eContainer != null)
msgs = eBasicRemoveFromContainer(msgs);
@@ -353,7 +353,7 @@
return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (kind: ");
+ result.append(" (kind: "); //$NON-NLS-1$
result.append(kind);
result.append(')');
return result.toString();
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDExternalEntityImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDExternalEntityImpl.java
index 3249425..5925a39 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDExternalEntityImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDExternalEntityImpl.java
@@ -85,19 +85,19 @@
public String unparse() {
StringBuffer text = new StringBuffer(100);
- if (getPublicID() == null || getPublicID().equals("")) {
- text.append("SYSTEM ");
+ if (getPublicID() == null || getPublicID().equals("")) { //$NON-NLS-1$
+ text.append("SYSTEM "); //$NON-NLS-1$
}
else {
- text.append("PUBLIC \"").append(getPublicID()).append("\" ");
+ text.append("PUBLIC \"").append(getPublicID()).append("\" "); //$NON-NLS-1$ //$NON-NLS-2$
}
String systemId = getSystemID();
- text.append("\"").append(systemId).append("\"");
+ text.append("\"").append(systemId).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
DTDNotation notation = getNotation();
if (notation != null)
- text.append(" NDATA ").append(notation.getName());
+ text.append(" NDATA ").append(notation.getName()); //$NON-NLS-1$
return text.toString();
}
@@ -389,9 +389,9 @@
return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (systemID: ");
+ result.append(" (systemID: "); //$NON-NLS-1$
result.append(systemID);
- result.append(", publicID: ");
+ result.append(", publicID: "); //$NON-NLS-1$
result.append(publicID);
result.append(')');
return result.toString();
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDFileImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDFileImpl.java
index b68133f..7446e88 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDFileImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDFileImpl.java
@@ -147,7 +147,7 @@
public String getPathname() {
- return "";
+ return ""; //$NON-NLS-1$
}
@@ -165,16 +165,16 @@
String name = (String) result[1];
DTDObject obj = null;
- if (type.equals("Elem")) {
+ if (type.equals("Elem")) { //$NON-NLS-1$
obj = findElement(name);
}
- else if (type.equals("Ent")) {
+ else if (type.equals("Ent")) { //$NON-NLS-1$
obj = findEntity(name);
}
- else if (type.equals("PEnt")) {
+ else if (type.equals("PEnt")) { //$NON-NLS-1$
obj = findParameterEntityReference(name);
}
- else if (type.equals("Nota")) {
+ else if (type.equals("Nota")) { //$NON-NLS-1$
obj = findNotation(name);
}
else {
@@ -476,9 +476,9 @@
return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (comment: ");
+ result.append(" (comment: "); //$NON-NLS-1$
result.append(comment);
- result.append(", parseError: ");
+ result.append(", parseError: "); //$NON-NLS-1$
result.append(parseError);
result.append(')');
return result.toString();
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDGroupContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDGroupContentImpl.java
index 4ee3821..65011e6 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDGroupContentImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDGroupContentImpl.java
@@ -76,7 +76,7 @@
}
public String getContentName() {
- return "";
+ return ""; //$NON-NLS-1$
}
public String getContentDetail() {
@@ -87,7 +87,7 @@
}
public String unparseRepeatableContent() {
- return "";
+ return ""; //$NON-NLS-1$
}
/**
@@ -283,7 +283,7 @@
return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (groupKind: ");
+ result.append(" (groupKind: "); //$NON-NLS-1$
result.append(groupKind);
result.append(')');
return result.toString();
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDIdHelper.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDIdHelper.java
index 3c90ea4..0007039 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDIdHelper.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDIdHelper.java
@@ -23,21 +23,21 @@
}
public String computeContentId(DTDElementContent content) {
- String id = "";
+ String id = ""; //$NON-NLS-1$
if (content instanceof DTDEmptyContent) {
- id = "#EMPTY";
+ id = "#EMPTY"; //$NON-NLS-1$
}
else if (content instanceof DTDPCDataContent) {
- id = "#PCDATA";
+ id = "#PCDATA"; //$NON-NLS-1$
}
else if (content instanceof DTDEmptyContent) {
- id = "#EMPTY";
+ id = "#EMPTY"; //$NON-NLS-1$
}
else if (content instanceof DTDElementReferenceContent) {
- id = "#" + ((DTDElementReferenceContent) content).getReferencedElement().getName();
+ id = "#" + ((DTDElementReferenceContent) content).getReferencedElement().getName(); //$NON-NLS-1$
}
else if (content instanceof DTDEntityReferenceContent) {
- id = "#" + ((DTDEntityReferenceContent) content).getElementReferencedEntity().getName();
+ id = "#" + ((DTDEntityReferenceContent) content).getElementReferencedEntity().getName(); //$NON-NLS-1$
}
else if (content instanceof DTDGroupContent) {
id = computeGroupId((DTDGroupContent) content);
@@ -46,7 +46,7 @@
}
public String computeGroupId(DTDGroupContent grp) {
- String groupId = "_";
+ String groupId = "_"; //$NON-NLS-1$
return groupId;
}
@@ -55,21 +55,21 @@
*/
protected String computeContentIdGen(DTDElementContent content) {
- String id = "";
+ String id = ""; //$NON-NLS-1$
if (content instanceof DTDEmptyContent) {
- id = "#EMPTY";
+ id = "#EMPTY"; //$NON-NLS-1$
}
else if (content instanceof DTDPCDataContent) {
- id = "#PCDATA";
+ id = "#PCDATA"; //$NON-NLS-1$
}
else if (content instanceof DTDEmptyContent) {
- id = "#EMPTY";
+ id = "#EMPTY"; //$NON-NLS-1$
}
else if (content instanceof DTDElementReferenceContent) {
- id = "#" + ((DTDElementReferenceContent) content).getReferencedElement().getName();
+ id = "#" + ((DTDElementReferenceContent) content).getReferencedElement().getName(); //$NON-NLS-1$
}
else if (content instanceof DTDEntityReferenceContent) {
- id = "#" + ((DTDEntityReferenceContent) content).getElementReferencedEntity().getName();
+ id = "#" + ((DTDEntityReferenceContent) content).getElementReferencedEntity().getName(); //$NON-NLS-1$
}
else if (content instanceof DTDGroupContent) {
id = computeGroupId((DTDGroupContent) content);
@@ -82,7 +82,7 @@
*/
protected String computeGroupIdGen(DTDGroupContent grp) {
- String groupId = "_";
+ String groupId = "_"; //$NON-NLS-1$
return groupId;
}
}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDInternalEntityImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDInternalEntityImpl.java
index 06294bd..a825514 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDInternalEntityImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDInternalEntityImpl.java
@@ -63,9 +63,9 @@
public String unparse() {
StringBuffer sb = new StringBuffer(64);
if (getValue() == null)
- sb.append("\"\"");
+ sb.append("\"\""); //$NON-NLS-1$
else {
- sb.append("\"").append(replaceDoubleQuotes(getValue())).append("\"");
+ sb.append("\"").append(replaceDoubleQuotes(getValue())).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
}
return sb.toString();
}
@@ -81,7 +81,7 @@
char current = characters.current();
if (current == '"') {
- newValue.append(""");
+ newValue.append("""); //$NON-NLS-1$
}
else {
newValue.append(current);
@@ -230,7 +230,7 @@
return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (value: ");
+ result.append(" (value: "); //$NON-NLS-1$
result.append(value);
result.append(')');
return result.toString();
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDNotationImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDNotationImpl.java
index 1c59b24..30e3237 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDNotationImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDNotationImpl.java
@@ -50,7 +50,7 @@
public class DTDNotationImpl extends DTDContentImpl implements DTDNotation, DTDContent {
public String getPathname() {
- return DTDPathnameUtil.makePath(null, "Nota", getName(), -1);
+ return DTDPathnameUtil.makePath(null, "Nota", getName(), -1); //$NON-NLS-1$
}
@@ -429,11 +429,11 @@
return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (comment: ");
+ result.append(" (comment: "); //$NON-NLS-1$
result.append(comment);
- result.append(", systemID: ");
+ result.append(", systemID: "); //$NON-NLS-1$
result.append(systemID);
- result.append(", publicID: ");
+ result.append(", publicID: "); //$NON-NLS-1$
result.append(publicID);
result.append(')');
return result.toString();
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDPCDataContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDPCDataContentImpl.java
index 7f2c73e..7340f57 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDPCDataContentImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDPCDataContentImpl.java
@@ -166,6 +166,6 @@
}
public String getContentName() {
- return "#PCDATA";
+ return "#PCDATA"; //$NON-NLS-1$
}
}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDPackageImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDPackageImpl.java
index 3ab4269..bd01cd2 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDPackageImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDPackageImpl.java
@@ -1079,102 +1079,102 @@
dtdEntityReferenceContentEClass.getESuperTypes().add(this.getDTDRepeatableContent());
// Initialize classes and features; add operations and parameters
- initEClass(dtdElementContentEClass, DTDElementContent.class, "DTDElementContent", IS_ABSTRACT, !IS_INTERFACE);
- initEReference(getDTDElementContent_Group(), this.getDTDGroupContent(), this.getDTDGroupContent_Content(), "group", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES);
- initEReference(getDTDElementContent_Element(), this.getDTDElement(), this.getDTDElement_Content(), "element", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES);
+ initEClass(dtdElementContentEClass, DTDElementContent.class, "DTDElementContent", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEReference(getDTDElementContent_Group(), this.getDTDGroupContent(), this.getDTDGroupContent_Content(), "group", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
+ initEReference(getDTDElementContent_Element(), this.getDTDElement(), this.getDTDElement_Content(), "element", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
- initEClass(dtdGroupContentEClass, DTDGroupContent.class, "DTDGroupContent", !IS_ABSTRACT, !IS_INTERFACE);
- initEAttribute(getDTDGroupContent_GroupKind(), this.getDTDGroupKind(), "groupKind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEReference(getDTDGroupContent_Content(), this.getDTDElementContent(), this.getDTDElementContent_Group(), "content", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES);
+ initEClass(dtdGroupContentEClass, DTDGroupContent.class, "DTDGroupContent", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEAttribute(getDTDGroupContent_GroupKind(), this.getDTDGroupKind(), "groupKind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEReference(getDTDGroupContent_Content(), this.getDTDElementContent(), this.getDTDElementContent_Group(), "content", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
- initEClass(dtdAttributeEClass, DTDAttribute.class, "DTDAttribute", !IS_ABSTRACT, !IS_INTERFACE);
- initEAttribute(getDTDAttribute_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEAttribute(getDTDAttribute_DefaultKind(), this.getDTDDefaultKind(), "defaultKind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEAttribute(getDTDAttribute_DefaultValueString(), ecorePackage.getEString(), "defaultValueString", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEReference(getDTDAttribute_AttributeNameReferencedEntity(), this.getDTDEntity(), this.getDTDEntity_AttributeNameReference(), "attributeNameReferencedEntity", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES);
- initEReference(getDTDAttribute_AttributeTypeReferencedEntity(), this.getDTDEntity(), this.getDTDEntity_AttributeTypeReference(), "attributeTypeReferencedEntity", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES);
- initEReference(getDTDAttribute_DTDElement(), this.getDTDElement(), this.getDTDElement_DTDAttribute(), "DTDElement", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES);
+ initEClass(dtdAttributeEClass, DTDAttribute.class, "DTDAttribute", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEAttribute(getDTDAttribute_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEAttribute(getDTDAttribute_DefaultKind(), this.getDTDDefaultKind(), "defaultKind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEAttribute(getDTDAttribute_DefaultValueString(), ecorePackage.getEString(), "defaultValueString", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEReference(getDTDAttribute_AttributeNameReferencedEntity(), this.getDTDEntity(), this.getDTDEntity_AttributeNameReference(), "attributeNameReferencedEntity", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
+ initEReference(getDTDAttribute_AttributeTypeReferencedEntity(), this.getDTDEntity(), this.getDTDEntity_AttributeTypeReference(), "attributeTypeReferencedEntity", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
+ initEReference(getDTDAttribute_DTDElement(), this.getDTDElement(), this.getDTDElement_DTDAttribute(), "DTDElement", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
- initEClass(dtdElementEClass, DTDElement.class, "DTDElement", !IS_ABSTRACT, !IS_INTERFACE);
- initEAttribute(getDTDElement_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEReference(getDTDElement_Content(), this.getDTDElementContent(), this.getDTDElementContent_Element(), "content", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES);
- initEReference(getDTDElement_DTDAttribute(), this.getDTDAttribute(), this.getDTDAttribute_DTDElement(), "DTDAttribute", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES);
+ initEClass(dtdElementEClass, DTDElement.class, "DTDElement", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEAttribute(getDTDElement_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEReference(getDTDElement_Content(), this.getDTDElementContent(), this.getDTDElementContent_Element(), "content", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
+ initEReference(getDTDElement_DTDAttribute(), this.getDTDAttribute(), this.getDTDAttribute_DTDElement(), "DTDAttribute", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
- initEClass(dtdEmptyContentEClass, DTDEmptyContent.class, "DTDEmptyContent", !IS_ABSTRACT, !IS_INTERFACE);
+ initEClass(dtdEmptyContentEClass, DTDEmptyContent.class, "DTDEmptyContent", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
- initEClass(dtdAnyContentEClass, DTDAnyContent.class, "DTDAnyContent", !IS_ABSTRACT, !IS_INTERFACE);
+ initEClass(dtdAnyContentEClass, DTDAnyContent.class, "DTDAnyContent", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
- initEClass(dtdpcDataContentEClass, DTDPCDataContent.class, "DTDPCDataContent", !IS_ABSTRACT, !IS_INTERFACE);
+ initEClass(dtdpcDataContentEClass, DTDPCDataContent.class, "DTDPCDataContent", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
- initEClass(dtdElementReferenceContentEClass, DTDElementReferenceContent.class, "DTDElementReferenceContent", !IS_ABSTRACT, !IS_INTERFACE);
- initEReference(getDTDElementReferenceContent_ReferencedElement(), this.getDTDElement(), null, "referencedElement", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES);
+ initEClass(dtdElementReferenceContentEClass, DTDElementReferenceContent.class, "DTDElementReferenceContent", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEReference(getDTDElementReferenceContent_ReferencedElement(), this.getDTDElement(), null, "referencedElement", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
- initEClass(dtdRepeatableContentEClass, DTDRepeatableContent.class, "DTDRepeatableContent", IS_ABSTRACT, !IS_INTERFACE);
- initEAttribute(getDTDRepeatableContent_Occurrence(), this.getDTDOccurrenceType(), "occurrence", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
+ initEClass(dtdRepeatableContentEClass, DTDRepeatableContent.class, "DTDRepeatableContent", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEAttribute(getDTDRepeatableContent_Occurrence(), this.getDTDOccurrenceType(), "occurrence", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
- initEClass(dtdFileEClass, DTDFile.class, "DTDFile", !IS_ABSTRACT, !IS_INTERFACE);
- initEAttribute(getDTDFile_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEAttribute(getDTDFile_ParseError(), ecorePackage.getEBoolean(), "parseError", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEReference(getDTDFile_DTDContent(), this.getDTDContent(), this.getDTDContent_DTDFile(), "DTDContent", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES);
- initEReference(getDTDFile_DTDEnumerationType(), this.getDTDEnumerationType(), this.getDTDEnumerationType_DTDFile(), "DTDEnumerationType", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES);
+ initEClass(dtdFileEClass, DTDFile.class, "DTDFile", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEAttribute(getDTDFile_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEAttribute(getDTDFile_ParseError(), ecorePackage.getEBoolean(), "parseError", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEReference(getDTDFile_DTDContent(), this.getDTDContent(), this.getDTDContent_DTDFile(), "DTDContent", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
+ initEReference(getDTDFile_DTDEnumerationType(), this.getDTDEnumerationType(), this.getDTDEnumerationType_DTDFile(), "DTDEnumerationType", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
- initEClass(dtdBasicTypeEClass, DTDBasicType.class, "DTDBasicType", !IS_ABSTRACT, !IS_INTERFACE);
- initEAttribute(getDTDBasicType_Kind(), this.getDTDBasicTypeKind(), "kind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
+ initEClass(dtdBasicTypeEClass, DTDBasicType.class, "DTDBasicType", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEAttribute(getDTDBasicType_Kind(), this.getDTDBasicTypeKind(), "kind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
- initEClass(dtdEnumerationTypeEClass, DTDEnumerationType.class, "DTDEnumerationType", !IS_ABSTRACT, !IS_INTERFACE);
- initEAttribute(getDTDEnumerationType_Kind(), this.getDTDEnumGroupKind(), "kind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEReference(getDTDEnumerationType_DTDFile(), this.getDTDFile(), this.getDTDFile_DTDEnumerationType(), "DTDFile", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES);
+ initEClass(dtdEnumerationTypeEClass, DTDEnumerationType.class, "DTDEnumerationType", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEAttribute(getDTDEnumerationType_Kind(), this.getDTDEnumGroupKind(), "kind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEReference(getDTDEnumerationType_DTDFile(), this.getDTDFile(), this.getDTDFile_DTDEnumerationType(), "DTDFile", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
- initEClass(dtdNotationEClass, DTDNotation.class, "DTDNotation", !IS_ABSTRACT, !IS_INTERFACE);
- initEAttribute(getDTDNotation_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEAttribute(getDTDNotation_SystemID(), ecorePackage.getEString(), "systemID", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEAttribute(getDTDNotation_PublicID(), ecorePackage.getEString(), "publicID", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEReference(getDTDNotation_Entity(), this.getDTDExternalEntity(), this.getDTDExternalEntity_Notation(), "entity", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES);
+ initEClass(dtdNotationEClass, DTDNotation.class, "DTDNotation", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEAttribute(getDTDNotation_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEAttribute(getDTDNotation_SystemID(), ecorePackage.getEString(), "systemID", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEAttribute(getDTDNotation_PublicID(), ecorePackage.getEString(), "publicID", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEReference(getDTDNotation_Entity(), this.getDTDExternalEntity(), this.getDTDExternalEntity_Notation(), "entity", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
- initEClass(dtdEntityEClass, DTDEntity.class, "DTDEntity", !IS_ABSTRACT, !IS_INTERFACE);
- initEAttribute(getDTDEntity_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEAttribute(getDTDEntity_ParameterEntity(), ecorePackage.getEBoolean(), "parameterEntity", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEReference(getDTDEntity_Content(), this.getDTDEntityContent(), this.getDTDEntityContent_DTDEntity(), "content", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES);
- initEReference(getDTDEntity_ParmEntityRef(), this.getDTDParameterEntityReference(), this.getDTDParameterEntityReference_Entity(), "parmEntityRef", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES);
- initEReference(getDTDEntity_EntityReference(), this.getDTDEntityReferenceContent(), this.getDTDEntityReferenceContent_ElementReferencedEntity(), "entityReference", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES);
- initEReference(getDTDEntity_AttributeNameReference(), this.getDTDAttribute(), this.getDTDAttribute_AttributeNameReferencedEntity(), "attributeNameReference", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES);
- initEReference(getDTDEntity_AttributeTypeReference(), this.getDTDAttribute(), this.getDTDAttribute_AttributeTypeReferencedEntity(), "attributeTypeReference", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES);
+ initEClass(dtdEntityEClass, DTDEntity.class, "DTDEntity", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEAttribute(getDTDEntity_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEAttribute(getDTDEntity_ParameterEntity(), ecorePackage.getEBoolean(), "parameterEntity", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEReference(getDTDEntity_Content(), this.getDTDEntityContent(), this.getDTDEntityContent_DTDEntity(), "content", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
+ initEReference(getDTDEntity_ParmEntityRef(), this.getDTDParameterEntityReference(), this.getDTDParameterEntityReference_Entity(), "parmEntityRef", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
+ initEReference(getDTDEntity_EntityReference(), this.getDTDEntityReferenceContent(), this.getDTDEntityReferenceContent_ElementReferencedEntity(), "entityReference", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
+ initEReference(getDTDEntity_AttributeNameReference(), this.getDTDAttribute(), this.getDTDAttribute_AttributeNameReferencedEntity(), "attributeNameReference", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
+ initEReference(getDTDEntity_AttributeTypeReference(), this.getDTDAttribute(), this.getDTDAttribute_AttributeTypeReferencedEntity(), "attributeTypeReference", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
- initEClass(dtdEntityContentEClass, DTDEntityContent.class, "DTDEntityContent", IS_ABSTRACT, !IS_INTERFACE);
- initEReference(getDTDEntityContent_DTDEntity(), this.getDTDEntity(), this.getDTDEntity_Content(), "DTDEntity", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES);
+ initEClass(dtdEntityContentEClass, DTDEntityContent.class, "DTDEntityContent", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEReference(getDTDEntityContent_DTDEntity(), this.getDTDEntity(), this.getDTDEntity_Content(), "DTDEntity", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
- initEClass(dtdExternalEntityEClass, DTDExternalEntity.class, "DTDExternalEntity", !IS_ABSTRACT, !IS_INTERFACE);
- initEAttribute(getDTDExternalEntity_SystemID(), ecorePackage.getEString(), "systemID", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEAttribute(getDTDExternalEntity_PublicID(), ecorePackage.getEString(), "publicID", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
- initEReference(getDTDExternalEntity_Notation(), this.getDTDNotation(), this.getDTDNotation_Entity(), "notation", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES);
- initEReference(getDTDExternalEntity_EntityReferencedFromAnotherFile(), this.getDTDFile(), null, "entityReferencedFromAnotherFile", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES);
+ initEClass(dtdExternalEntityEClass, DTDExternalEntity.class, "DTDExternalEntity", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEAttribute(getDTDExternalEntity_SystemID(), ecorePackage.getEString(), "systemID", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEAttribute(getDTDExternalEntity_PublicID(), ecorePackage.getEString(), "publicID", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
+ initEReference(getDTDExternalEntity_Notation(), this.getDTDNotation(), this.getDTDNotation_Entity(), "notation", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
+ initEReference(getDTDExternalEntity_EntityReferencedFromAnotherFile(), this.getDTDFile(), null, "entityReferencedFromAnotherFile", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
- initEClass(dtdInternalEntityEClass, DTDInternalEntity.class, "DTDInternalEntity", !IS_ABSTRACT, !IS_INTERFACE);
- initEAttribute(getDTDInternalEntity_Value(), ecorePackage.getEString(), "value", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID);
+ initEClass(dtdInternalEntityEClass, DTDInternalEntity.class, "DTDInternalEntity", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEAttribute(getDTDInternalEntity_Value(), ecorePackage.getEString(), "value", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID); //$NON-NLS-1$
- initEClass(dtdParameterEntityReferenceEClass, DTDParameterEntityReference.class, "DTDParameterEntityReference", !IS_ABSTRACT, !IS_INTERFACE);
- initEReference(getDTDParameterEntityReference_Entity(), this.getDTDEntity(), this.getDTDEntity_ParmEntityRef(), "entity", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES);
+ initEClass(dtdParameterEntityReferenceEClass, DTDParameterEntityReference.class, "DTDParameterEntityReference", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEReference(getDTDParameterEntityReference_Entity(), this.getDTDEntity(), this.getDTDEntity_ParmEntityRef(), "entity", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
- initEClass(dtdEntityReferenceContentEClass, DTDEntityReferenceContent.class, "DTDEntityReferenceContent", !IS_ABSTRACT, !IS_INTERFACE);
- initEReference(getDTDEntityReferenceContent_ElementReferencedEntity(), this.getDTDEntity(), this.getDTDEntity_EntityReference(), "elementReferencedEntity", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES);
+ initEClass(dtdEntityReferenceContentEClass, DTDEntityReferenceContent.class, "DTDEntityReferenceContent", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEReference(getDTDEntityReferenceContent_ElementReferencedEntity(), this.getDTDEntity(), this.getDTDEntity_EntityReference(), "elementReferencedEntity", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES); //$NON-NLS-1$
- initEClass(dtdContentEClass, DTDContent.class, "DTDContent", IS_ABSTRACT, !IS_INTERFACE);
- initEReference(getDTDContent_DTDFile(), this.getDTDFile(), this.getDTDFile_DTDContent(), "DTDFile", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES);
+ initEClass(dtdContentEClass, DTDContent.class, "DTDContent", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+ initEReference(getDTDContent_DTDFile(), this.getDTDFile(), this.getDTDFile_DTDContent(), "DTDFile", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES); //$NON-NLS-1$
// Initialize enums and add enum literals
- initEEnum(dtdOccurrenceTypeEEnum, DTDOccurrenceType.class, "DTDOccurrenceType");
+ initEEnum(dtdOccurrenceTypeEEnum, DTDOccurrenceType.class, "DTDOccurrenceType"); //$NON-NLS-1$
addEEnumLiteral(dtdOccurrenceTypeEEnum, DTDOccurrenceType.ONE_LITERAL);
addEEnumLiteral(dtdOccurrenceTypeEEnum, DTDOccurrenceType.OPTIONAL_LITERAL);
addEEnumLiteral(dtdOccurrenceTypeEEnum, DTDOccurrenceType.ONE_OR_MORE_LITERAL);
addEEnumLiteral(dtdOccurrenceTypeEEnum, DTDOccurrenceType.ZERO_OR_MORE_LITERAL);
- initEEnum(dtdDefaultKindEEnum, DTDDefaultKind.class, "DTDDefaultKind");
+ initEEnum(dtdDefaultKindEEnum, DTDDefaultKind.class, "DTDDefaultKind"); //$NON-NLS-1$
addEEnumLiteral(dtdDefaultKindEEnum, DTDDefaultKind.IMPLIED_LITERAL);
addEEnumLiteral(dtdDefaultKindEEnum, DTDDefaultKind.REQUIRED_LITERAL);
addEEnumLiteral(dtdDefaultKindEEnum, DTDDefaultKind.FIXED_LITERAL);
addEEnumLiteral(dtdDefaultKindEEnum, DTDDefaultKind.NOFIXED_LITERAL);
- initEEnum(dtdBasicTypeKindEEnum, DTDBasicTypeKind.class, "DTDBasicTypeKind");
+ initEEnum(dtdBasicTypeKindEEnum, DTDBasicTypeKind.class, "DTDBasicTypeKind"); //$NON-NLS-1$
addEEnumLiteral(dtdBasicTypeKindEEnum, DTDBasicTypeKind.NONE_LITERAL);
addEEnumLiteral(dtdBasicTypeKindEEnum, DTDBasicTypeKind.CDATA_LITERAL);
addEEnumLiteral(dtdBasicTypeKindEEnum, DTDBasicTypeKind.ID_LITERAL);
@@ -1185,15 +1185,15 @@
addEEnumLiteral(dtdBasicTypeKindEEnum, DTDBasicTypeKind.NMTOKEN_LITERAL);
addEEnumLiteral(dtdBasicTypeKindEEnum, DTDBasicTypeKind.NMTOKENS_LITERAL);
- initEEnum(dtdEnumGroupKindEEnum, DTDEnumGroupKind.class, "DTDEnumGroupKind");
+ initEEnum(dtdEnumGroupKindEEnum, DTDEnumGroupKind.class, "DTDEnumGroupKind"); //$NON-NLS-1$
addEEnumLiteral(dtdEnumGroupKindEEnum, DTDEnumGroupKind.NAME_TOKEN_GROUP_LITERAL);
addEEnumLiteral(dtdEnumGroupKindEEnum, DTDEnumGroupKind.NOTATION_GROUP_LITERAL);
- initEEnum(dtdGroupKindEEnum, DTDGroupKind.class, "DTDGroupKind");
+ initEEnum(dtdGroupKindEEnum, DTDGroupKind.class, "DTDGroupKind"); //$NON-NLS-1$
addEEnumLiteral(dtdGroupKindEEnum, DTDGroupKind.SEQUENCE_LITERAL);
addEEnumLiteral(dtdGroupKindEEnum, DTDGroupKind.CHOICE_LITERAL);
- initEEnum(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.class, "XMLSchemaDefinedType");
+ initEEnum(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.class, "XMLSchemaDefinedType"); //$NON-NLS-1$
addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.NONE_LITERAL);
addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.STRING_LITERAL);
addEEnumLiteral(xmlSchemaDefinedTypeEEnum, XMLSchemaDefinedType.BOOLEAN_LITERAL);
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDParameterEntityReferenceImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDParameterEntityReferenceImpl.java
index 7140bdf..7097166 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDParameterEntityReferenceImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDParameterEntityReferenceImpl.java
@@ -50,11 +50,11 @@
if (entity != null) {
return getEntity().getName();
} // end of if ()
- return "";
+ return ""; //$NON-NLS-1$
}
public String getPathname() {
- return DTDPathnameUtil.makePath(null, "PEnt", getName(), -1);
+ return DTDPathnameUtil.makePath(null, "PEnt", getName(), -1); //$NON-NLS-1$
}
public DTDObject findObject(String relativePath) {
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDRepeatableContentImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDRepeatableContentImpl.java
index 3979060..5c470e9 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDRepeatableContentImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/impl/DTDRepeatableContentImpl.java
@@ -63,7 +63,7 @@
StringBuffer sb = new StringBuffer(128);
if (getOccurrence().getValue() != DTDOccurrenceType.ONE) {
if (this instanceof DTDEntityReferenceContent) {
- sb.append("(").append(unparseRepeatableContent()).append(")");
+ sb.append("(").append(unparseRepeatableContent()).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
}
else {
sb.append(unparseRepeatableContent());
@@ -242,7 +242,7 @@
return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (occurrence: ");
+ result.append(" (occurrence: "); //$NON-NLS-1$
result.append(occurrence);
result.append(')');
return result.toString();
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java
index 3587f93..33c47de 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDModelBuilder.java
@@ -19,7 +19,7 @@
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.wst.dtd.core.internal.DTDCorePlugin;
+import org.eclipse.wst.dtd.core.internal.DTDCoreMessages;
import org.eclipse.wst.dtd.core.internal.emf.DTDAnyContent;
import org.eclipse.wst.dtd.core.internal.emf.DTDAttribute;
import org.eclipse.wst.dtd.core.internal.emf.DTDBasicType;
@@ -163,7 +163,7 @@
// System.out.println(" ext entity toMof: " );
if (dtdEntity.isParameterEntity()) {
- dtdUtil.getPEPool().put("%" + entity.getNodeName() + ";", dtdEntity);
+ dtdUtil.getPEPool().put("%" + entity.getNodeName() + ";", dtdEntity); //$NON-NLS-1$ //$NON-NLS-2$
}
super.visitExternalEntityDecl(entity);
@@ -177,7 +177,7 @@
intEntity.setValue(entity.getValue());
// System.out.println(" int entity toMof: " );
if (dtdEntity.isParameterEntity()) {
- dtdUtil.getPEPool().put("%" + entity.getNodeName() + ";", dtdEntity);
+ dtdUtil.getPEPool().put("%" + entity.getNodeName() + ";", dtdEntity); //$NON-NLS-1$ //$NON-NLS-2$
}
super.visitInternalEntityDecl(entity);
@@ -272,7 +272,7 @@
else {
if (entityDecl.getErrorMessage() == null) {
ErrorMessage dtdError = new ErrorMessage();
- dtdError.setErrorMessage(DTDCorePlugin.getDTDString("_ERROR_INCL_FILE_LOAD_FAILURE") + " '" + systemId + "'");
+ dtdError.setErrorMessage(DTDCoreMessages._ERROR_INCL_FILE_LOAD_FAILURE + " '" + systemId + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
addErrorMessage(dtdError, extEntity.getDTDEntity());
}
@@ -280,13 +280,13 @@
extEntity.setSystemID(systemId);
}
else {
- extEntity.setSystemID("");
+ extEntity.setSystemID(""); //$NON-NLS-1$
}
}
} // end of if ()
else {
// set the system id to be ""
- extEntity.setSystemID("");
+ extEntity.setSystemID(""); //$NON-NLS-1$
}
}
@@ -512,9 +512,9 @@
return aElement;
}
- String errorMsg = DTDCorePlugin.getDTDString("_ERROR_UNDECLARED_ELEMENT_1");
- errorMsg += "\"" + name + "\"";
- errorMsg += DTDCorePlugin.getDTDString("_UI_ERRORPART_UNDECLARED_ELEMENT_2");
+ String errorMsg = DTDCoreMessages._ERROR_UNDECLARED_ELEMENT_1; //$NON-NLS-1$
+ errorMsg += "\"" + name + "\""; //$NON-NLS-1$ //$NON-NLS-2$
+ errorMsg += DTDCoreMessages._UI_ERRORPART_UNDECLARED_ELEMENT_2; //$NON-NLS-1$
ErrorMessage dtdError = new ErrorMessage();
@@ -609,7 +609,7 @@
public void finishAttribute(DTDAttribute dtdattr, AttNode attdef) {
boolean parseError = false;
- if (attdef.name.startsWith("%")) {
+ if (attdef.name.startsWith("%")) { //$NON-NLS-1$
String peName = attdef.name.trim();
DTDEntity en = (DTDEntity) dtdUtil.getPEPool().get(peName);
if (en != null) {
@@ -658,8 +658,8 @@
case AttNode.ID :
// check for duplicate ID attribute
if (hasIDAttribute(dtdattr)) {
- String errMsg = DTDCorePlugin.getDTDString("_ERROR_DUP_ID_ATTRIBUTE_1");
- errMsg += attdef.name + DTDCorePlugin.getDTDString("_UI_ERRORPART_DUP_ID_ATTRIBUTE_2");
+ String errMsg = DTDCoreMessages._ERROR_DUP_ID_ATTRIBUTE_1; //$NON-NLS-1$
+ errMsg += attdef.name + DTDCoreMessages._UI_ERRORPART_DUP_ID_ATTRIBUTE_2; //$NON-NLS-1$
// dtdattr.getDTDElement().getIElement().setDTDErrorMessage(errMsg);
// dtdattr.getDTDElement().getDTDFile().setParseError(true);
parseError = true;
@@ -732,10 +732,10 @@
if (defaultValue != null) {
if (attrType == AttNode.ENUMERATION || attrType == AttNode.NOTATION) {
if (!isDefaultEnumValueValid(attdef, defaultValue)) {
- String typeString = (attrType == AttNode.ENUMERATION ? "enumeration" : "notation");
- String errMsg = DTDCorePlugin.getDTDString("_ERROR_INVALID_DEFAULT_ATTR_VALUE_1");
- errMsg += typeString + DTDCorePlugin.getDTDString("_UI_ERRORPART_INVALID_DEFAULT_ATTR_VALUE_2");
- errMsg += attdef.name + "'";
+ String typeString = (attrType == AttNode.ENUMERATION ? "enumeration" : "notation"); //$NON-NLS-1$ //$NON-NLS-2$
+ String errMsg = DTDCoreMessages._ERROR_INVALID_DEFAULT_ATTR_VALUE_1; //$NON-NLS-1$
+ errMsg += typeString + DTDCoreMessages._UI_ERRORPART_INVALID_DEFAULT_ATTR_VALUE_2; //$NON-NLS-1$
+ errMsg += attdef.name + "'"; //$NON-NLS-1$
// dtdattr.getDTDElement().getIElement().setDTDErrorMessage(errMsg);
// dtdattr.getDTDElement().getDTDFile().setParseError(true);
@@ -1136,7 +1136,7 @@
// if (entityDecl.getErrorMessage() == null)
// {
// ErrorMessage dtdError = new ErrorMessage();
- // dtdError.setErrorMessage(DTDCorePlugin.getDTDString("_ERROR_INCL_FILE_LOAD_FAILURE")
+ // dtdError.setErrorMessage(DTDCoreMessages.getString("_ERROR_INCL_FILE_LOAD_FAILURE")
// + " '" + systemId + "'");
// addErrorMessage(dtdError, extEntity.getDTDEntity());
// }
@@ -1425,10 +1425,10 @@
//
//
// String errorMsg =
- // DTDCorePlugin.getDTDString("_ERROR_UNDECLARED_ELEMENT_1");
+ // DTDCoreMessages.getString("_ERROR_UNDECLARED_ELEMENT_1");
// errorMsg += "\"" + name + "\"";
// errorMsg +=
- // DTDCorePlugin.getDTDString("_UI_ERRORPART_UNDECLARED_ELEMENT_2");
+ // DTDCoreMessages.getString("_UI_ERRORPART_UNDECLARED_ELEMENT_2");
//
//
// ErrorMessage dtdError = new ErrorMessage();
@@ -1592,9 +1592,9 @@
// // check for duplicate ID attribute
// if (hasIDAttribute(dtdattr))
// {
- // String errMsg = DTDCorePlugin.getDTDString("_ERROR_DUP_ID_ATTRIBUTE_1");
+ // String errMsg = DTDCoreMessages.getString("_ERROR_DUP_ID_ATTRIBUTE_1");
// errMsg += attdef.name +
- // DTDCorePlugin.getDTDString("_UI_ERRORPART_DUP_ID_ATTRIBUTE_2");
+ // DTDCoreMessages.getString("_UI_ERRORPART_DUP_ID_ATTRIBUTE_2");
// // dtdattr.getDTDElement().getIElement().setDTDErrorMessage(errMsg);
// // dtdattr.getDTDElement().getDTDFile().setParseError(true);
// parseError = true;
@@ -1690,9 +1690,9 @@
// String typeString =
// (attrType==AttNode.ENUMERATION?"enumeration":"notation");
// String errMsg =
- // DTDCorePlugin.getDTDString("_ERROR_INVALID_DEFAULT_ATTR_VALUE_1");
+ // DTDCoreMessages.getString("_ERROR_INVALID_DEFAULT_ATTR_VALUE_1");
// errMsg += typeString +
- // DTDCorePlugin.getDTDString("_UI_ERRORPART_INVALID_DEFAULT_ATTR_VALUE_2");
+ // DTDCoreMessages.getString("_UI_ERRORPART_INVALID_DEFAULT_ATTR_VALUE_2");
// errMsg += attdef.name + "'";
//
//
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDObjectFinder.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDObjectFinder.java
index 6228b92..f7b36b8 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDObjectFinder.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDObjectFinder.java
@@ -21,8 +21,6 @@
import org.eclipse.wst.dtd.core.internal.emf.DTDSourceOffset;
public class DTDObjectFinder extends DTDVisitor {
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
public class SourceOffset {
// Convenience class to find containment of object
private int start, end;
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDPathnameUtil.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDPathnameUtil.java
index 6a16b76..05abd2d 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDPathnameUtil.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDPathnameUtil.java
@@ -21,14 +21,14 @@
pn = type;
}
else if (cnt <= 0) {
- pn = type + ":" + ((name == null) ? "" : name);
+ pn = type + ":" + ((name == null) ? "" : name); //$NON-NLS-1$ //$NON-NLS-2$
}
else {
- pn = type + ":" + ((name == null) ? "" : name) + ":" + cnt;
+ pn = type + ":" + ((name == null) ? "" : name) + ":" + cnt; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
if (parentPath != null) {
- return parentPath + "." + pn;
+ return parentPath + "." + pn; //$NON-NLS-1$
}
else {
return pn;
@@ -128,15 +128,15 @@
String hex = Integer.toHexString(c);
int l = hex.length();
if (l == 1) {
- o.append("_000");
+ o.append("_000"); //$NON-NLS-1$
o.append(hex);
}
else if (l == 2) {
- o.append("_00");
+ o.append("_00"); //$NON-NLS-1$
o.append(hex);
}
else if (l == 3) {
- o.append("_0");
+ o.append("_0"); //$NON-NLS-1$
o.append(hex);
}
else {
@@ -185,14 +185,14 @@
pn = type;
}
else if (cnt <= 0) {
- pn = type + ":" + ((name == null) ? "" : name);
+ pn = type + ":" + ((name == null) ? "" : name); //$NON-NLS-1$ //$NON-NLS-2$
}
else {
- pn = type + ":" + ((name == null) ? "" : name) + ":" + cnt;
+ pn = type + ":" + ((name == null) ? "" : name) + ":" + cnt; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
if (parentPath != null) {
- return parentPath + "." + pn;
+ return parentPath + "." + pn; //$NON-NLS-1$
}
else {
return pn;
@@ -300,15 +300,15 @@
String hex = Integer.toHexString(c);
int l = hex.length();
if (l == 1) {
- o.append("_000");
+ o.append("_000"); //$NON-NLS-1$
o.append(hex);
}
else if (l == 2) {
- o.append("_00");
+ o.append("_00"); //$NON-NLS-1$
o.append(hex);
}
else if (l == 3) {
- o.append("_0");
+ o.append("_0"); //$NON-NLS-1$
o.append(hex);
}
else {
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDPrinter.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDPrinter.java
index 5bcb851..16f4fa6 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDPrinter.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDPrinter.java
@@ -51,23 +51,23 @@
public void visitDTDNotation(DTDNotation notation) {
generateComment(notation);
updateStartOffset(notation, sb.length());
- sb.append("<!NOTATION ");
- sb.append(notation.getName()).append(" ");
+ sb.append("<!NOTATION "); //$NON-NLS-1$
+ sb.append(notation.getName()).append(" "); //$NON-NLS-1$
String publicID = notation.getPublicID();
String systemID = notation.getSystemID();
- if (publicID == null || publicID.equals("")) {
- sb.append("SYSTEM ");
+ if (publicID == null || publicID.equals("")) { //$NON-NLS-1$
+ sb.append("SYSTEM "); //$NON-NLS-1$
}
else {
- sb.append("PUBLIC \"").append(publicID).append("\" ");
+ sb.append("PUBLIC \"").append(publicID).append("\" "); //$NON-NLS-1$ //$NON-NLS-2$
}
if (systemID == null) {
- sb.append("\"\"");
+ sb.append("\"\""); //$NON-NLS-1$
}
else {
- sb.append("\"").append(systemID).append("\"");
+ sb.append("\"").append(systemID).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
}
endTag();
updateEndOffset(notation, sb.length() - 1); // -1 for the newline char
@@ -77,12 +77,12 @@
public void visitDTDEntity(DTDEntity entity) {
generateComment(entity);
updateStartOffset(entity, sb.length());
- sb.append("<!ENTITY ");
+ sb.append("<!ENTITY "); //$NON-NLS-1$
if (entity.isParameterEntity())
- sb.append("% ");
+ sb.append("% "); //$NON-NLS-1$
- sb.append(entity.getName()).append(" ");
+ sb.append(entity.getName()).append(" "); //$NON-NLS-1$
sb.append(entity.getContent().unparse());
endTag();
@@ -93,15 +93,15 @@
public void visitDTDElement(DTDElement element) {
generateComment(element);
updateStartOffset(element, sb.length());
- sb.append("<!ELEMENT " + element.getName());
+ sb.append("<!ELEMENT " + element.getName()); //$NON-NLS-1$
DTDElementContent content = element.getContent();
if (content instanceof DTDPCDataContent || content instanceof DTDElementReferenceContent) {
- sb.append(" (");
+ sb.append(" ("); //$NON-NLS-1$
super.visitDTDElement(element);
- sb.append(")");
+ sb.append(")"); //$NON-NLS-1$
} // end of if ()
else {
- sb.append(" ");
+ sb.append(" "); //$NON-NLS-1$
super.visitDTDElement(element);
} // end of else
endTag();
@@ -112,14 +112,14 @@
public void visitDTDParameterEntityReference(DTDParameterEntityReference parmEntity) {
generateComment(parmEntity);
updateStartOffset(parmEntity, sb.length());
- sb.append("%" + parmEntity.getName() + ";\n");
+ sb.append("%" + parmEntity.getName() + ";\n"); //$NON-NLS-1$ //$NON-NLS-2$
updateEndOffset(parmEntity, sb.length() - 1); // -1 for the newline
// char
}
public void visitDTDElementContent(DTDElementContent content) {
updateStartOffset(content, sb.length());
- String trailingChars = "";
+ String trailingChars = ""; //$NON-NLS-1$
if (content instanceof DTDRepeatableContent) {
DTDRepeatableContent repeatContent = (DTDRepeatableContent) content;
DTDOccurrenceType occurrenceType = repeatContent.getOccurrence();
@@ -128,8 +128,8 @@
int occurType = occurrenceType.getValue();
if (occurType != DTDOccurrenceType.ONE) {
if (repeatContent instanceof DTDEntityReferenceContent) {
- sb.append("(");
- trailingChars = ")";
+ sb.append("("); //$NON-NLS-1$
+ trailingChars = ")"; //$NON-NLS-1$
}
trailingChars += (char) occurType;
}
@@ -151,7 +151,7 @@
}
public void visitDTDGroupContent(DTDGroupContent group) {
- sb.append("(");
+ sb.append("("); //$NON-NLS-1$
DTDGroupKind kind = group.getGroupKind();
// MOF2EMF Port
// Integer groupKind = group.getGroupKind();
@@ -159,7 +159,7 @@
group.setGroupKind(DTDGroupKind.get(DTDGroupKind.SEQUENCE));
} // end of if ()
- String con = group.getGroupKind().getValue() == DTDGroupKind.CHOICE ? " | " : ", ";
+ String con = group.getGroupKind().getValue() == DTDGroupKind.CHOICE ? " | " : ", "; //$NON-NLS-1$ //$NON-NLS-2$
// Loop thru the children of the current group
Collection content = group.getContent();
@@ -176,7 +176,7 @@
}
}
- sb.append(")");
+ sb.append(")"); //$NON-NLS-1$
}
private void visitAttributes(DTDElement elem) {
@@ -186,34 +186,34 @@
DTDAttribute attrib = (DTDAttribute) i.next();
String comment = attrib.getComment();
if (comment != null && comment.length() > 0)
- sb.append("<!--\n ").append(comment).append("\n-->\n");
- sb.append("<!ATTLIST " + elem.getName() + "\n");
- sb.append(" ");
+ sb.append("<!--\n ").append(comment).append("\n-->\n"); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append("<!ATTLIST " + elem.getName() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append(" "); //$NON-NLS-1$
updateStartOffset(attrib, sb.length());
sb.append(attrib.unparse());
updateEndOffset(attrib, sb.length());
- sb.append("\n");
+ sb.append("\n"); //$NON-NLS-1$
for (; i.hasNext();) {
attrib = (DTDAttribute) i.next();
comment = attrib.getComment();
if (comment != null && comment.length() > 0) {
- sb.append(">\n");
+ sb.append(">\n"); //$NON-NLS-1$
if (comment != null && comment.length() > 0)
- sb.append("<!--\n ").append(comment).append("\n-->\n");
- sb.append("<!ATTLIST " + elem.getName() + "\n");
+ sb.append("<!--\n ").append(comment).append("\n-->\n"); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append("<!ATTLIST " + elem.getName() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
}
- sb.append(" ");
+ sb.append(" "); //$NON-NLS-1$
updateStartOffset(attrib, sb.length());
sb.append(attrib.unparse());
updateEndOffset(attrib, sb.length());
- sb.append("\n");
+ sb.append("\n"); //$NON-NLS-1$
}
- sb.append(">\n");
+ sb.append(">\n"); //$NON-NLS-1$
}
}
private void endTag() {
- sb.append(">\n");
+ sb.append(">\n"); //$NON-NLS-1$
}
private void updateStartOffset(DTDSourceOffset o, int offset) {
@@ -239,7 +239,7 @@
commentString = ((DTDNotation) dtdObject).getComment();
if (commentString != null && commentString.length() > 0) {
- sb.append("<!--").append(commentString).append("-->\n");
+ sb.append("<!--").append(commentString).append("-->\n"); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDResourceFactoryImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDResourceFactoryImpl.java
index bbde08a..21e2aa7 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDResourceFactoryImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDResourceFactoryImpl.java
@@ -21,8 +21,6 @@
public class DTDResourceFactoryImpl extends ResourceFactoryImpl {
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
public DTDResourceFactoryImpl() {
super();
}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDResourceImpl.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDResourceImpl.java
index 2392c62..879da44 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDResourceImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDResourceImpl.java
@@ -20,7 +20,7 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
-import org.eclipse.wst.dtd.core.internal.DTDCorePlugin;
+import org.eclipse.wst.dtd.core.internal.DTDCoreMessages;
import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
import org.eclipse.wst.dtd.core.internal.emf.DTDObject;
@@ -72,7 +72,7 @@
}
}
}
- System.out.println(">>> DTDKey Error: cannot find object " + uriFragment);
+ System.out.println(">>> DTDKey Error: cannot find object " + uriFragment); //$NON-NLS-1$
return super.getEObject(uriFragment);
}
@@ -161,6 +161,6 @@
}
public void save(ZipOutputStream zos, String entry, String metaModelName) throws Exception {
- throw new Exception(DTDCorePlugin.getDTDString("_EXC_OPERATION_NOT_SUPPORTED"));
+ throw new Exception(DTDCoreMessages._EXC_OPERATION_NOT_SUPPORTED); //$NON-NLS-1$
}
}
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDUniqueNameHelper.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDUniqueNameHelper.java
index ac20e40..e12f6b3 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDUniqueNameHelper.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDUniqueNameHelper.java
@@ -29,22 +29,22 @@
static public String getUniqueElementName(DTDFile dtdFile) {
List elements = dtdFile.listDTDElement();
- return getUniqueName(elements, "NewElement");
+ return getUniqueName(elements, "NewElement"); //$NON-NLS-1$
}
static public String getUniqueEntityName(DTDFile dtdFile) {
List entities = dtdFile.listDTDEntity();
- return getUniqueName(entities, "NewEntity");
+ return getUniqueName(entities, "NewEntity"); //$NON-NLS-1$
}
static public String getUniqueNotationName(DTDFile dtdFile) {
List notations = dtdFile.listDTDNotation();
- return getUniqueName(notations, "NewNotation");
+ return getUniqueName(notations, "NewNotation"); //$NON-NLS-1$
}
static public String getUniqueAttributeName(DTDElement element) {
List attrs = element.getDTDAttribute();
- return getUniqueName(attrs, "NewAttribute");
+ return getUniqueName(attrs, "NewAttribute"); //$NON-NLS-1$
}
static public String getUniqueName(List objs, String token) {
@@ -68,7 +68,7 @@
}
}
// we shouldn't get here
- return "No Name found";
+ return "No Name found"; //$NON-NLS-1$
}
static public String getName(Object obj) {
@@ -84,7 +84,7 @@
else if (obj instanceof DTDAttribute) {
return ((DTDAttribute) obj).getName();
}
- return "";
+ return ""; //$NON-NLS-1$
}
@@ -94,7 +94,7 @@
protected static String getUniqueElementNameGen(DTDFile dtdFile) {
List elements = dtdFile.listDTDElement();
- return getUniqueName(elements, "NewElement");
+ return getUniqueName(elements, "NewElement"); //$NON-NLS-1$
}
/**
@@ -103,7 +103,7 @@
protected static String getUniqueEntityNameGen(DTDFile dtdFile) {
List entities = dtdFile.listDTDEntity();
- return getUniqueName(entities, "NewEntity");
+ return getUniqueName(entities, "NewEntity"); //$NON-NLS-1$
}
/**
@@ -112,7 +112,7 @@
protected static String getUniqueNotationNameGen(DTDFile dtdFile) {
List notations = dtdFile.listDTDNotation();
- return getUniqueName(notations, "NewNotation");
+ return getUniqueName(notations, "NewNotation"); //$NON-NLS-1$
}
/**
@@ -121,7 +121,7 @@
protected static String getUniqueAttributeNameGen(DTDElement element) {
List attrs = element.getDTDAttribute();
- return getUniqueName(attrs, "NewAttribute");
+ return getUniqueName(attrs, "NewAttribute"); //$NON-NLS-1$
}
/**
@@ -149,7 +149,7 @@
}
}
// we shouldn't get here
- return "No Name found";
+ return "No Name found"; //$NON-NLS-1$
}
/**
@@ -169,6 +169,6 @@
else if (obj instanceof DTDAttribute) {
return ((DTDAttribute) obj).getName();
}
- return "";
+ return ""; //$NON-NLS-1$
}
}// DTDUniqueNameHelper
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDUtil.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDUtil.java
index c8c7537..cc0ab38 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDUtil.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/DTDUtil.java
@@ -175,7 +175,7 @@
return true;
}
catch (Exception ex) {
- System.out.println("Save model exception " + ex);
+ System.out.println("Save model exception " + ex); //$NON-NLS-1$
ex.printStackTrace();
return false;
}
@@ -348,18 +348,18 @@
// This gets the name with pseudo namespace prefixes if dtdFile is not
// null
public static String getName(DTDObject obj, DTDFile dtdFile) {
- String name = "";
+ String name = ""; //$NON-NLS-1$
if (obj instanceof DTDEntity) {
DTDEntity entity = (DTDEntity) obj;
if (dtdFile != null && !entity.getDTDFile().equals(dtdFile)) {
- name = new Path(entity.getDTDFile().getName()).lastSegment() + ": ";
+ name = new Path(entity.getDTDFile().getName()).lastSegment() + ": "; //$NON-NLS-1$
}
- name += "%" + ((DTDEntity) obj).getName() + ";";
+ name += "%" + ((DTDEntity) obj).getName() + ";"; //$NON-NLS-1$ //$NON-NLS-2$
}
else if (obj instanceof DTDElement) {
DTDElement element = (DTDElement) obj;
if (dtdFile != null && !element.getDTDFile().equals(dtdFile)) {
- name = new Path(element.getDTDFile().getName()).lastSegment() + ": ";
+ name = new Path(element.getDTDFile().getName()).lastSegment() + ": "; //$NON-NLS-1$
}
name += ((DTDElement) obj).getName();
}
@@ -374,10 +374,10 @@
switch (groupKind) {
case DTDGroupKind.SEQUENCE :
- type = "DTDSequence";
+ type = "DTDSequence"; //$NON-NLS-1$
break;
case DTDGroupKind.CHOICE :
- type = "DTDChoice";
+ type = "DTDChoice"; //$NON-NLS-1$
break;
}
@@ -386,24 +386,24 @@
}
public static String getReferenceType(int occurrence) {
- String type = "DTDReference";
+ String type = "DTDReference"; //$NON-NLS-1$
type += getRepeatableTypeSuffix(occurrence);
return type;
}
private static String getRepeatableTypeSuffix(int occurrence) {
- return "(" + (char) occurrence + ")";
+ return "(" + (char) occurrence + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
public static void main(String args[]) {
- System.out.println("\nStarting ...");
+ System.out.println("\nStarting ..."); //$NON-NLS-1$
if (args.length != 1)
- System.out.println("usage: DtdUtil inputfile.dtd");
+ System.out.println("usage: DtdUtil inputfile.dtd"); //$NON-NLS-1$
java.io.File inputFile = new File(args[0]);
- String dtdFileName = "";
+ String dtdFileName = ""; //$NON-NLS-1$
try {
dtdFileName = inputFile.getCanonicalPath();
}
@@ -419,12 +419,12 @@
// TODO: fix port
// d2m.parse(dtdFileName);
try {
- d2m.saveAs(dtdModelName + "." + DTDConstants.DTD_XMI_EXTENSION);
+ d2m.saveAs(dtdModelName + "." + DTDConstants.DTD_XMI_EXTENSION); //$NON-NLS-1$
}
catch (Exception e) {
- System.out.println("Exception thrown during model save: " + e);
+ System.out.println("Exception thrown during model save: " + e); //$NON-NLS-1$
}
- System.out.println("Done.");
+ System.out.println("Done."); //$NON-NLS-1$
}
public org.eclipse.core.runtime.IPath getPath() {
@@ -433,7 +433,7 @@
return currentDTDPath.removeLastSegments(1).addTrailingSeparator();
}
- return new Path("");
+ return new Path(""); //$NON-NLS-1$
}
// /**
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/ExternalDTDModel.java b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/ExternalDTDModel.java
index 1ac41ee..2476535 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/ExternalDTDModel.java
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/org/eclipse/wst/dtd/core/internal/emf/util/ExternalDTDModel.java
@@ -42,7 +42,7 @@
public boolean loadModel(ResourceSet resources, String uri) {
boolean rc = true;
- if (uri == null || uri.equals("")) {
+ if (uri == null || uri.equals("")) { //$NON-NLS-1$
return false;
}
diff --git a/bundles/org.eclipse.wst.dtd.core/plugin.properties b/bundles/org.eclipse.wst.dtd.core/plugin.properties
index 9372406..5c4fe2a 100644
--- a/bundles/org.eclipse.wst.dtd.core/plugin.properties
+++ b/bundles/org.eclipse.wst.dtd.core/plugin.properties
@@ -14,296 +14,6 @@
providerName=Eclipse.org
pluginName=Structured Source DTD Core
nlFeatureName=Structured Source DTD Core NL Support
-
-! Strings for DTDBasicTypeImpl type descriptions
-_UI_NONE_DESC=None
-
-!! NOTE TO TRANSLATOR: Do not translate following text in parentheses on following 10 lines i.e.(CDATA)
-_UI_CHARACTER_DATA_DESC=Character Data (CDATA)
-_UI_IDENTIFIER_DESC=Identifier (ID)
-_UI_ID_REFERENCE_DESC=ID Reference (IDREF)
-_UI_ID_REFERENCES_DESC=ID References (IDREFS)
-_UI_ENTITY_NAME_DESC=Entity Name (ENTITY)
-_UI_ENTITY_NAMES_DESC=Entity Names (ENTITIES)
-_UI_NAME_TOKEN_DESC=Name Token (NMTOKEN)
-_UI_NAME_TOKENS_DESC=Name Tokens (NMTOKENS)
-_UI_ENUM_NAME_TOKENS_DESC=Enumerated Name Tokens
-_UI_ENUM_NOTATION_DESC=Enumerated NOTATION
-
-!dtd/util/CreateListItems.java
-_UI_LABEL_NONE=(none)
-
-! Strings from sed/model
-
-! Attribute.java
-_UI_LABEL_ATTR_DEFAULT_VAL=Attribute Default Change Value
-_UI_LABEL_ATTR_DEFAULT_KIND=Change Attribute Default Value
-_UI_LABEL_ATTR_TYPE=Change Attribute Type
-
-! AttributeEnumList
-_UI_LABEL_ATTR_ENUM_ITEMS=Change Attribute Enumeration Value
-
-! AttributeList
-_UI_LABEL_ATTR_LIST_ADD=Add Attribute
-
-! CMGroupNode
-_UI_LABEL_CM_GRP_NODE_CONNECTOR=Change Connector
-_UI_LABEL_CM_GRP_NODE_INSERT_ELEMENT=Insert Element
-_UI_LABEL_CM_GRP_NODE_ADD_GRP=Add Group
-_UI_LABEL_CM_GRP_NODE_ADD_CHILD=Add Child Element
-
-! CMNode
-_UI_LABEL_CM_NODE_MIX_CONTENT=Mixed Content
-_UI_LABEL_CM_NODE_CHILD_CONTENT=Children Content
-_UI_LABEL_CM_NODE_SET_MIX_CONTENT=Set Mixed Content
-_UI_LABEL_CM_NODE_SET_CHILD_CONTENT=Set Children Content
-
-!! NOTE TO TRANSLATOR - USAGE: "Set <variable content> Content"
-_UI_LABEL_CM_NODE_SET=Set
-_UI_LABEL_CM_NODE_CONTENT=Content
-
-!! NOTE TO TRANSLATOR - DO NOT TRANSLATE FOLLOWING 3 LINES
-_UI_LABEL_CM_NODE_PCDATA=(#PCDATA)
-_UI_LABEL_CM_NODE_ANY=ANY
-_UI_LABEL_CM_NODE_EMPTY=EMPTY
-
-! CMRepeatableNode
-_UI_LABEL_CM_REP_NODE_CHG_OCCUR=Change Occurrence
-
-! Comment
-_UI_LABEL_COMMENT_CHG=Comment Change
-
-! DTDFile
-_UI_LABEL_DTD_FILE_ADD_ELEMENT=Add Element
-_UI_LABEL_DTD_FILE_ADD_ENTITY=Add Entity
-_UI_LABEL_DTD_FILE_ADD_COMMENT=Add Comment
-_UI_LABEL_DTD_FILE_ADD_PARM_ENTITY_REF=Add Parameter Entity Reference
-_UI_LABEL_DTD_FILE_ADD_NOTATION=Add Notation
-_UI_LABEL_DTD_FILE_ADD_ATTR_LIST=Add Attribute List
-_UI_LABEL_DTD_FILE_DELETE=Delete
-
-! DTDNode
-_UI_LABEL_DTD_NODE_NAME_CHG=Name Change
-_UI_LABEL_DTD_NODE_DELETE=Delete
-
-! Element
-_UI_LABEL_ELEMENT_ADD_ATTR=Add Attribute
-_UI_LABEL_ELEMENT_ADD_GRP=Add Group
-_UI_LABEL_ELEMENT_ADD_CHILD=Add Child Element
-
-! Entity
-_UI_LABEL_ENTITY_SET_PARM_ENTITY=Set Parameter Entity
-_UI_LABEL_ENTITY_SET_GENERAL_ENTITY=Set General Entity
-_UI_LABEL_ENTITY_SET_EXT_ENTITY=Set External Entity
-_UI_LABEL_ENTITY_SET_INT_ENTITY=Set Internal Entity
-_UI_LABEL_ENTITY_VALUE_CHG=Entity Value Change
-
-!! NOTE TO TRANSLATOR - USAGE: "NDATA Change"
-_UI_LABEL_ENTITY_NDATA_CHANGE=Change
-
-! ExternalNode
-_UI_LABEL_EXT_NODE_PUBLIC_ID_CHG=Public ID Change
-_UI_LABEL_EXT_NODE_SYSTEM_ID_CHG=System ID Change
-
-! NodeList
-_UI_LABEL_NODE_LIST_ELEMENTS=Elements
-_UI_LABEL_NODE_LIST_ENTITIES=Entities
-_UI_LABEL_NODE_LIST_NOTATIONS=Notations
-_UI_LABEL_NODE_LIST_COMMENTS=Comments
-_UI_LABEL_NODE_LIST_OTHER=Other
-_UI_LABEL_NODE_LIST_ATTRIBUTES=Attributes
-
-! ParameterEntityReference
-_UI_LABEL_PARM_ENTITY_REF_CHG_ENTITY_REF=Change Entity Reference
-_UI_LABEL_PARM_ENTITY_REF_COMMENT_CHG=Comment Change
-
-! TopLevelNode
-_UI_LABEL_TOP_LEVEL_NODE_DELETE=Delete
#
Structured_DTD_Document_Factory_Extension.name=Structured DTD Document Factory Extension
-DTD_Content_Type_Extension_Element.name=DTD Content Type
-
-_UI_PLUGIN_NAME = DTD Model
-
-_GEN_MENU_LABEL = &Generate
-_GEN_ACTION_LABEL = &XML Schema...
-
-! Strings for DTDBasicTypeImpl type descriptions
-_UI_NONE_DESC = None
-
-!! NOTE TO TRANSLATOR: Do not translate following text in parentheses on following 10 lines i.e.(CDATA)
-_UI_CHARACTER_DATA_DESC = Character Data (CDATA)
-_UI_IDENTIFIER_DESC = Identifier (ID)
-_UI_ID_REFERENCE_DESC = ID Reference (IDREF)
-_UI_ID_REFERENCES_DESC = ID References (IDREFS)
-_UI_ENTITY_NAME_DESC = Entity Name (ENTITY)
-_UI_ENTITY_NAMES_DESC = Entity Names (ENTITIES)
-_UI_NAME_TOKEN_DESC = Name Token (NMTOKEN)
-_UI_NAME_TOKENS_DESC = Name Tokens (NMTOKENS)
-_UI_ENUM_NAME_TOKENS_DESC = Enumerated Name Tokens
-_UI_ENUM_NOTATION_DESC = Enumerated NOTATION
-
-!dtd/util/CreateListItems.java
-_UI_LABEL_NONE = (none)
-
-! Strings from sed/model
-
-! Attribute.java
-_UI_LABEL_ATTR_DEFAULT_VAL = Attribute Default Change Value
-_UI_LABEL_ATTR_DEFAULT_KIND = Change Attribute Default Value
-_UI_LABEL_ATTR_TYPE = Change Attribute Type
-
-! AttributeEnumList
-_UI_LABEL_ATTR_ENUM_ITEMS = Change Attribute Enumeration Value
-
-! AttributeList
-_UI_LABEL_ATTR_LIST_ADD = Add Attribute
-
-! CMGroupNode
-_UI_LABEL_CM_GRP_NODE_CONNECTOR = Change Connector
-_UI_LABEL_CM_GRP_NODE_INSERT_ELEMENT = Insert Element
-_UI_LABEL_CM_GRP_NODE_ADD_GRP = Add Group
-_UI_LABEL_CM_GRP_NODE_ADD_CHILD = Add Child Element
-
-! CMNode
-_UI_LABEL_CM_NODE_MIX_CONTENT = Mixed Content
-_UI_LABEL_CM_NODE_CHILD_CONTENT = Children Content
-_UI_LABEL_CM_NODE_SET_MIX_CONTENT = Set Mixed Content
-_UI_LABEL_CM_NODE_SET_CHILD_CONTENT = Set Children Content
-
-!! NOTE TO TRANSLATOR - USAGE: "Set <variable content> Content"
-_UI_LABEL_CM_NODE_SET = Set
-_UI_LABEL_CM_NODE_CONTENT = Content
-
-!! NOTE TO TRANSLATOR - DO NOT TRANSLATE FOLLOWING 3 LINES
-_UI_LABEL_CM_NODE_PCDATA = (#PCDATA)
-_UI_LABEL_CM_NODE_ANY = ANY
-_UI_LABEL_CM_NODE_EMPTY = EMPTY
-
-! CMRepeatableNode
- _UI_LABEL_CM_REP_NODE_CHG_OCCUR = Change Occurrence
-
-! Comment
-_UI_LABEL_COMMENT_CHG = Comment Change
-
-! DTDFile
-_UI_LABEL_DTD_FILE_ADD_ELEMENT = Add Element
-_UI_LABEL_DTD_FILE_ADD_ENTITY = Add Entity
-_UI_LABEL_DTD_FILE_ADD_COMMENT = Add Comment
-_UI_LABEL_DTD_FILE_ADD_PARM_ENTITY_REF = Add Parameter Entity Reference
-_UI_LABEL_DTD_FILE_ADD_NOTATION = Add Notation
-_UI_LABEL_DTD_FILE_ADD_ATTR_LIST = Add Attribute List
-_UI_LABEL_DTD_FILE_DELETE = Delete
-
-! DTDNode
-_UI_LABEL_DTD_NODE_NAME_CHG = Name Change
-_UI_LABEL_DTD_NODE_DELETE = Delete
-
-! Element
-_UI_LABEL_ELEMENT_ADD_ATTR = Add Attribute
-_UI_LABEL_ELEMENT_ADD_GRP = Add Group
-_UI_LABEL_ELEMENT_ADD_CHILD = Add Child Element
-
-! Entity
-_UI_LABEL_ENTITY_SET_PARM_ENTITY = Set Parameter Entity
-_UI_LABEL_ENTITY_SET_GENERAL_ENTITY = Set General Entity
-_UI_LABEL_ENTITY_SET_EXT_ENTITY = Set External Entity
-_UI_LABEL_ENTITY_SET_INT_ENTITY = Set Internal Entity
-_UI_LABEL_ENTITY_VALUE_CHG = Entity Value Change
-
-!! NOTE TO TRANSLATOR - USAGE: "NDATA Change"
-_UI_LABEL_ENTITY_NDATA_CHANGE = Change
-
-! ExternalNode
-_UI_LABEL_EXT_NODE_PUBLIC_ID_CHG = Public ID Change
-_UI_LABEL_EXT_NODE_SYSTEM_ID_CHG = System ID Change
-
-! NodeList
-_UI_LABEL_NODE_LIST_ELEMENTS = Elements
-_UI_LABEL_NODE_LIST_ENTITIES = Entities
-_UI_LABEL_NODE_LIST_NOTATIONS = Notations
-_UI_LABEL_NODE_LIST_COMMENTS = Comments
-_UI_LABEL_NODE_LIST_OTHER = Other
-
-! ParameterEntityReference
-_UI_LABEL_PARM_ENTITY_REF_CHG_ENTITY_REF = Change Entity Reference
-_UI_LABEL_PARM_ENTITY_REF_COMMENT_CHG = Comment Change
-
-! TopLevelNode
-_UI_LABEL_TOP_LEVEL_NODE_DELETE = Delete
-
-! DTD2XSDWizard.java
-_UI_WIZARD_DTD2XSD_TITLE = Generate
-_UI_GENERATE_XSD_TITLE = Generate XML Schema
-_UI_GENERATE_XSD_DESCRIPTION = Generate an XML schema from the selected DTD file.
-_UI_PAGE_GEN_OPTIONS_TITLE = XML Schema Generation Options
-_UI_PAGE_GEN_OPTIONS_DESC = Select how you want your XML schema generated
-_UI_GENERATE_XSD_LONG_DESC = You can create one XML schema file that includes the selected DTD and any of the DTDs it references. Alternatively, you can create individual schema files that correspond to the selected DTD and any of the DTDs it references.
-_UI_GROUP_OPTIONS = Options
-_UI_BUTTON_GEN_ONE_SCHEMA = &Create one XML schema that includes all the DTD files
-_UI_BUTTON_GEN_MULTI_SCHEMAS = Create an &XML schema for each DTD file
-
-! GenerateXMLSchemaActionDelegate.java
-_UI_DIALOG_GENERATION_SUCCESS_TITLE = XML Schema Generated
-_UI_DIALOG_GENERATION_SUCCESS_MESSAGE = The XML Schema file has been successfully generated.
-_UI_DIALOG_TITLE_INVALID_GRAMMAR = Invalid Grammar
-_UI_DIALOG_MESSAGE_INVALID_GRAMMAR = The grammar file contains errors. If you proceed, an incorrect result file will be generated. Do you want to continue?
-
-_ERROR_INCL_FILE_LOAD_FAILURE = Failed to load included file
-
-! usage: _ERROR_UNDECLARED_ELEMENT_1 + <elementName> + _PARTERROR_UNDECLARED_ELEMENT_2
-_ERROR_UNDECLARED_ELEMENT_1 = Reference to undeclared element '
-_UI_ERRORPART_UNDECLARED_ELEMENT_2 =' in content model.
-
-! usage: _ERROR_UNDECLARED_PARAMETER_ENTITY_1 + <elementName> + _PARTERROR_UNDECLARED_PARAMETER_ENTITY_2
-_ERROR_UNDECLARED_PARAMETER_ENTITY_1 = Reference to undeclared parameter entity '
-_UI_ERRORPART_UNDECLARED_PARAMETER_ENTITY_2 =' in content model.
-
-! usage: _ERROR_DUP_ID_ATTRIBUTE_1 + <attributeName> + _PARTERROR_DUP_ID_ATTRIBUTE_2
-_ERROR_DUP_ID_ATTRIBUTE_1 = Duplicate ID attribute '
-_UI_ERRORPART_DUP_ID_ATTRIBUTE_2 = '. Only one ID attribute can be specified per ELEMENT type.
-
-! usage: _WARN_UNDECLARED_ATTRIBUTE_NAME1 + <attributeName> + _PARTWARN_UNDECLARED_ATTRIBUTE_NAME2
-_WARN_UNDECLARED_ATTRIBUTE_NAME1 = Reference to undeclared element '
-_PARTWARN_UNDECLARED_ATTRIBUTE_NAME2 = ' in attribute list name.
-
-! usage:_ERROR_INVALID_DEFAULT_ATTR_VALUE_1 + <typeString> + _PARTERROR_INVALID_DEFAULT_ATTR_VALUE_2 + <attributeName>
-_ERROR_INVALID_DEFAULT_ATTR_VALUE_1 = Invalid default
-_UI_ERRORPART_INVALID_DEFAULT_ATTR_VALUE_2 = value for attribute '
-
-_EXC_OPERATION_NOT_SUPPORTED = Operation not supported
-
-! usage:_ERROR_UNDECLARED_PARAMETER_ENTITY_REF_1 + <typeString> + _PARTERROR_UNDECLARED_PARAMETER_ENTITY_REF_2 + <attributeName>
-_ERROR_UNDECLARED_PARAMETER_ENTITY_REF_1 = Reference to undeclared parameter entity '
-_UI_ERRORPART_UNDECLARED_PARAMETER_ENTITY_REF_2 = '.
-
-_EXC_OPERATION_NOT_SUPPORTED = Operation not supported
-
-! Note to translator
-! Same string used in XMVAL.properties file for XML Validator component
-_UI_PROBLEMS_VALIDATING_REFERENCED_FILE = Problems validating referenced file, "{0}".
-
-!NOTE TO TRANSLATOR: (_ERROR_BAD_FILENAME_EXTENSION + string + _UI_LABEL_OR + string) or (_ERROR_BAD_FILENAME_EXTENSION)
-_ERROR_BAD_FILENAME_EXTENSION = The file name must end with
-_ERROR_FILE_ALREADY_EXISTS = The same name already exists.
-
-_UI_LABEL_OR = or
-
-_UI_MENU_VALIDATE_DTD = &Validate DTD File
-
-!
-! Validate DTD
-!
-_UI_DIALOG_DTD_INVALID_TITLE = Validation Failed
-_UI_DIALOG_DTD_VALID_TITLE = Validation Succeeded
-_UI_DIALOG_DTD_VALID_TEXT = The DTD file is valid.
-_UI_DIALOG_DTD_INVALID_TEXT = The DTD file is not valid. See the Problems view for error messages.
-_UI_DIALOG_DTD_LIMIT_EXCEEDED = The DTD file is not valid. The message limit for the Problems view has been exceeded. To see all the messages increase the limit and validate again.
-
-
-_UI_XML_DTD_VALIDATOR = DTD Validator
-
-!
-! Referenced Element Validation
-!
-_ERROR_REF_ELEMENT_UNDEFINED = The element {0} has not been declared.
+DTD_Content_Type_Extension_Element.name=DTD Content Type
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/AttNode.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/AttNode.java
index fb585a1..a86ddfb 100644
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/AttNode.java
+++ b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/AttNode.java
@@ -23,18 +23,18 @@
//
// Keep this array in-sync with the ATTTYPE definitions
//
- private static final String[] fgAttTypeString = {"CDATA", // 0
- "ID", // 1
- "IDREF", // 2
- "IDREFS", // 3
- "ENTITY", // 4
- "ENTITIES", // 5
- "NMTOKEN", // 6
- "NMTOKENS", // 7
- "NOTATION", // 8
- "ENUMERATION", // 9 (replaced with "NMTOKEN" by SAX
+ private static final String[] fgAttTypeString = {"CDATA", // 0 //$NON-NLS-1$
+ "ID", // 1 //$NON-NLS-1$
+ "IDREF", // 2 //$NON-NLS-1$
+ "IDREFS", // 3 //$NON-NLS-1$
+ "ENTITY", // 4 //$NON-NLS-1$
+ "ENTITIES", // 5 //$NON-NLS-1$
+ "NMTOKEN", // 6 //$NON-NLS-1$
+ "NMTOKENS", // 7 //$NON-NLS-1$
+ "NOTATION", // 8 //$NON-NLS-1$
+ "ENUMERATION", // 9 (replaced with "NMTOKEN" by SAX //$NON-NLS-1$
// AttributeList handler)
- "%ENTITYREFERENCE;"};
+ "%ENTITYREFERENCE;"}; //$NON-NLS-1$
//
// attDefaultType
@@ -55,7 +55,7 @@
if (type == null)
return t;
- if (type.startsWith("%") && type.endsWith(";"))
+ if (type.startsWith("%") && type.endsWith(";")) //$NON-NLS-1$ //$NON-NLS-2$
return PEREFERENCE;
for (int i = 0; i < fgAttTypeString.length; i++) {
@@ -77,19 +77,19 @@
if (defaultType == null)
return -1;
- if (defaultType.startsWith("%") && defaultType.endsWith(";"))
+ if (defaultType.startsWith("%") && defaultType.endsWith(";")) //$NON-NLS-1$ //$NON-NLS-2$
return PEREFERENCE;
- else if (defaultType.equals("#REQUIRED"))
+ else if (defaultType.equals("#REQUIRED")) //$NON-NLS-1$
return REQUIRED;
- else if (defaultType.equals("#IMPLIED"))
+ else if (defaultType.equals("#IMPLIED")) //$NON-NLS-1$
return IMPLIED;
- else if (defaultType.equals("#FIXED"))
+ else if (defaultType.equals("#FIXED")) //$NON-NLS-1$
return FIXED;
else
return NOFIXED;
}
public String toString() {
- return "Att Name: " + name + " Type: " + type + " defaultType: " + defaultType + " defaultValue: " + defaultValue;
+ return "Att Name: " + name + " Type: " + type + " defaultType: " + defaultType + " defaultValue: " + defaultValue; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMBasicNode.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMBasicNode.java
index f95dcf5..d470ffb 100644
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMBasicNode.java
+++ b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMBasicNode.java
@@ -37,6 +37,6 @@
}
public String toString() {
- return " BasicNodeName: " + getName() + " Type: " + getType() + "\n";
+ return " BasicNodeName: " + getName() + " Type: " + getType() + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMGroupNode.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMGroupNode.java
index d1781e4..823b2cf 100644
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMGroupNode.java
+++ b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMGroupNode.java
@@ -20,7 +20,7 @@
private Vector children = new Vector();
public CMGroupNode() {
- super("GROUP");
+ super("GROUP"); //$NON-NLS-1$
}
public int getType() {
@@ -49,14 +49,14 @@
}
public String toString() {
- String result = "Group ( - kind: " + getGroupKind() + " OccType: " + getOccurrence() + "\n";
+ String result = "Group ( - kind: " + getGroupKind() + " OccType: " + getOccurrence() + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
Enumeration en = children.elements();
while (en.hasMoreElements()) {
- result += " " + en.nextElement();
+ result += " " + en.nextElement(); //$NON-NLS-1$
}
- result += "Group )";
+ result += "Group )"; //$NON-NLS-1$
return result;
}
}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMReferenceNode.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMReferenceNode.java
index 657105f..ab59b4c 100644
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMReferenceNode.java
+++ b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/CMReferenceNode.java
@@ -33,6 +33,6 @@
}
public String toString() {
- return " RefName: " + getName() + " Type: " + getType() + " OccType: " + getOccurrence() + "\n";
+ return " RefName: " + getName() + " Type: " + getType() + " OccType: " + getOccurrence() + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDParser.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDParser.java
index 4f67608..7bd2fc8 100644
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDParser.java
+++ b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDParser.java
@@ -38,8 +38,8 @@
import org.xml.sax.helpers.DefaultHandler;
public class DTDParser extends DefaultHandler implements ContentHandler, DTDHandler, ErrorHandler, DeclHandler, LexicalHandler {
- private String contentString = "";
- private String declString = "";
+ private String contentString = ""; //$NON-NLS-1$
+ private String declString = ""; //$NON-NLS-1$
/* Canonical output. */
protected boolean canonical;
@@ -90,14 +90,14 @@
protected DTDParser(String encoding, boolean canonical) throws UnsupportedEncodingException {
if (encoding == null)
- encoding = "UTF-8";
+ encoding = "UTF-8"; //$NON-NLS-1$
this.canonical = canonical;
try {
SAXParser sparser = SAXParserFactory.newInstance().newSAXParser();
reader = sparser.getXMLReader();
- reader.setProperty("http://xml.org/sax/properties/declaration-handler", this);
- reader.setProperty("http://xml.org/sax/properties/lexical-handler", this);
+ reader.setProperty("http://xml.org/sax/properties/declaration-handler", this); //$NON-NLS-1$
+ reader.setProperty("http://xml.org/sax/properties/lexical-handler", this); //$NON-NLS-1$
reader.setContentHandler(this);
reader.setDTDHandler(this);
reader.setErrorHandler(this);
@@ -114,10 +114,10 @@
try {
boolean isReadable = URIHelper.isReadableURI(uri, true);
if (!isReadable) {
- throw new Exception("DTD parse error. Can not read the specified URI : " + uri);
+ throw new Exception("DTD parse error. Can not read the specified URI : " + uri); //$NON-NLS-1$
}
- String document = "<!DOCTYPE root SYSTEM \"" + uri + "\"><root/>";
+ String document = "<!DOCTYPE root SYSTEM \"" + uri + "\"><root/>"; //$NON-NLS-1$ //$NON-NLS-2$
entityDepth = 0;
currentDTD = new DTD(uri);
reader.parse(new InputSource(new StringReader(document)));
@@ -185,14 +185,14 @@
public void notationDecl(String name, String publicId, String systemId) throws SAXException {
startDeclaration(DeclNode.NOTATION);
- declString = "<!NOTATION";
+ declString = "<!NOTATION"; //$NON-NLS-1$
if (entityDepth == 1 || parsingExternalPEReference) {
- String xs = " ";
+ String xs = " "; //$NON-NLS-1$
xs += name;
if (publicId == null)
- xs += " SYSTEM " + "\"" + systemId + "\"";
+ xs += " SYSTEM " + "\"" + systemId + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
else
- xs += " PUBLIC " + "\"" + publicId + "\" " + "\"" + systemId + "\"";
+ xs += " PUBLIC " + "\"" + publicId + "\" " + "\"" + systemId + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
contentString += xs;
parseCurrentDeclaration();
}
@@ -204,7 +204,7 @@
public void elementDecl(String name, String model) throws SAXException {
startDeclaration(DeclNode.ELEMENT);
- declString = "<!ELEMENT";
+ declString = "<!ELEMENT"; //$NON-NLS-1$
// KB: With early versions of Xerces 2.x, startEntity("[dtd]") used to
// be called before this method
@@ -213,47 +213,47 @@
// Because of this, we need to handle the case where entityDepth == 0
// as well.
if (entityDepth == 0 || entityDepth == 1 || parsingExternalPEReference)
- parseCurrentDeclarationHelper(name + " " + model);
+ parseCurrentDeclarationHelper(name + " " + model); //$NON-NLS-1$
}
- protected String attributeString = "";
+ protected String attributeString = ""; //$NON-NLS-1$
public void attributeDecl(String eName, String aName, String type, String valueDefault, String value) throws SAXException {
startDeclaration(DeclNode.ATTLIST);
- declString = "<!ATTLIST";
+ declString = "<!ATTLIST"; //$NON-NLS-1$
- attributeString += " " + aName;
+ attributeString += " " + aName; //$NON-NLS-1$
if (type != null)
- attributeString += " " + type;
+ attributeString += " " + type; //$NON-NLS-1$
if (valueDefault != null)
- attributeString += " " + valueDefault;
+ attributeString += " " + valueDefault; //$NON-NLS-1$
if (value != null)
- attributeString += " '" + value + "'";
+ attributeString += " '" + value + "'"; //$NON-NLS-1$ //$NON-NLS-2$
- attributeString = eName + " " + attributeString + ">";
+ attributeString = eName + " " + attributeString + ">"; //$NON-NLS-1$ //$NON-NLS-2$
parseCurrentDeclarationHelper(attributeString);
- attributeString = "";
+ attributeString = ""; //$NON-NLS-1$
}
public void internalEntityDecl(String name, String value) throws SAXException {
startDeclaration(DeclNode.INTERNAL_ENTITY);
- declString = "<!ENTITY";
+ declString = "<!ENTITY"; //$NON-NLS-1$
boolean isPEDecl = false;
String localName = name;
if (entityDepth == 1 || parsingExternalPEReference) {
// build up a string: e.g. " % STRDOM "(#PCDATA)">"
- String xs = " ";
- if (name.startsWith("%")) {
+ String xs = " "; //$NON-NLS-1$
+ if (name.startsWith("%")) { //$NON-NLS-1$
isPEDecl = true;
localName = name.substring(1);
- xs += "% ";
+ xs += "% "; //$NON-NLS-1$
xs += name.substring(1);
}
else
xs += name;
- xs += " \"" + value + "\">";
+ xs += " \"" + value + "\">"; //$NON-NLS-1$ //$NON-NLS-2$
contentString += xs;
// save expanded entity value
@@ -265,24 +265,24 @@
public void externalEntityDecl(String name, String publicId, String systemId) throws SAXException {
startDeclaration(DeclNode.EXTERNAL_ENTITY);
- declString = "<!ENTITY";
+ declString = "<!ENTITY"; //$NON-NLS-1$
if (entityDepth == 1 || parsingExternalPEReference) {
// build up a string:
// ex1) " % FIELD SYSTEM "oagis_fields.dtd">"
// ex2) " % FIELD PUBLIC "FOO">"
- String xs = " ";
- if (name.startsWith("%")) {
- xs += "% ";
+ String xs = " "; //$NON-NLS-1$
+ if (name.startsWith("%")) { //$NON-NLS-1$
+ xs += "% "; //$NON-NLS-1$
xs += name.substring(1);
}
else
xs += name;
if (systemId != null)
- xs += " SYSTEM \"" + systemId + "\">";
+ xs += " SYSTEM \"" + systemId + "\">"; //$NON-NLS-1$ //$NON-NLS-2$
else if (publicId != null)
- xs += " PUBLIC \"" + publicId + "\">";
+ xs += " PUBLIC \"" + publicId + "\">"; //$NON-NLS-1$ //$NON-NLS-2$
contentString += xs;
parseCurrentDeclaration();
@@ -332,12 +332,12 @@
*/
public void startEntity(String name) throws SAXException {
- if (name.equals("[dtd]")) {
+ if (name.equals("[dtd]")) { //$NON-NLS-1$
startDeclaration(DeclNode.START_ENTITY_DTD);
}
else if (currentDeclNode == null) {
// PE reference in markupdecl section
- if (name.startsWith("%")) {
+ if (name.startsWith("%")) { //$NON-NLS-1$
String peName = name.substring(1);
EntityDecl en = entityPool.referPara(peName);
@@ -370,7 +370,7 @@
}
}
else if (entityDepth == 1 || parsingExternalPEReference) {
- String xs = (String) reader.getProperty("http://xml.org/sax/properties/xml-string");
+ String xs = (String) reader.getProperty("http://xml.org/sax/properties/xml-string"); //$NON-NLS-1$
contentString += xs;
}
entityDepth++;
@@ -386,15 +386,15 @@
* @see #startEntity
*/
public void endEntity(String name) throws SAXException {
- if (name.equals("[dtd]")) {
+ if (name.equals("[dtd]")) { //$NON-NLS-1$
startDeclaration(DeclNode.END_ENTITY_DTD);
}
else if (!peRefStack.empty()) {
parseExternalPEReference(name);
}
else if (entityDepth == 1 || parsingExternalPEReference) {
- if (!contentString.endsWith(name + ";")) {
- String xs = (String) reader.getProperty("http://xml.org/sax/properties/xml-string");
+ if (!contentString.endsWith(name + ";")) { //$NON-NLS-1$
+ String xs = (String) reader.getProperty("http://xml.org/sax/properties/xml-string"); //$NON-NLS-1$
contentString += xs;
}
}
@@ -438,7 +438,7 @@
if (comment == null)
comment = new String(ch);
else
- comment += "\n" + new String(ch); // append all comments.
+ comment += "\n" + new String(ch); // append all comments. //$NON-NLS-1$
// The comment will get reset after
// it has been attached to the following
// declaration.
@@ -450,27 +450,27 @@
/* Warning. */
public void warning(SAXParseException ex) {
- String error = "[Source Line] " + declString + contentString + "\n";
- error += "[Warning ] " + getLocationString(ex) + ": " + ex.getMessage();
- setErrorInformation(ex, "warning");
+ String error = "[Source Line] " + declString + contentString + "\n"; //$NON-NLS-1$//$NON-NLS-2$
+ error += "[Warning ] " + getLocationString(ex) + ": " + ex.getMessage(); //$NON-NLS-1$//$NON-NLS-2$
+ setErrorInformation(ex, "warning"); //$NON-NLS-1$
parseCurrentDeclaration();
}
/* Error. */
public void error(SAXParseException ex) {
- String error = "[Source Line] " + declString + contentString + "\n";
- error += "[Error ] " + getLocationString(ex) + ": " + ex.getMessage();
- setErrorInformation(ex, "error");
+ String error = "[Source Line] " + declString + contentString + "\n"; //$NON-NLS-1$//$NON-NLS-2$
+ error += "[Error ] " + getLocationString(ex) + ": " + ex.getMessage(); //$NON-NLS-1$//$NON-NLS-2$
+ setErrorInformation(ex, "error"); //$NON-NLS-1$
parseCurrentDeclaration();
}
/* Fatal error. */
public void fatalError(SAXParseException ex) throws SAXException {
- String error = "[Source Line] " + declString + contentString + "\n";
- error += "[Fatal Error] " + getLocationString(ex) + ": " + ex.getMessage();
- setErrorInformation(ex, "fatal");
+ String error = "[Source Line] " + declString + contentString + "\n"; //$NON-NLS-1$//$NON-NLS-2$
+ error += "[Fatal Error] " + getLocationString(ex) + ": " + ex.getMessage(); //$NON-NLS-1$//$NON-NLS-2$
+ setErrorInformation(ex, "fatal"); //$NON-NLS-1$
parseCurrentDeclaration();
}
@@ -502,15 +502,15 @@
}
else {
currentDeclNode = new DeclNode(type);
- contentString = "";
- declString = "";
+ contentString = ""; //$NON-NLS-1$
+ declString = ""; //$NON-NLS-1$
expandedEntityValue = null;
}
}
private void parseCurrentDeclaration() {
parseCurrentDeclarationHelper(contentString);
- contentString = "";
+ contentString = ""; //$NON-NLS-1$
}
private void parseCurrentDeclarationHelper(String declarationString) {
@@ -525,7 +525,7 @@
if (currentDeclNode != null) {
BaseNode baseNode = null;
// strip out the ending markup symbol ">"
- if (declarationString.endsWith(">"))
+ if (declarationString.endsWith(">")) //$NON-NLS-1$
declarationString = declarationString.substring(0, declarationString.length() - 1);
int sIndex;
@@ -543,7 +543,7 @@
scanner = new DTDScanner(currentDTD.getName(), cString);
CMNode contentModel = scanner.scanContentModel();
if (contentModel == null && errorMessage == null) {
- createErrorMessage("Expecting '(' in content model", "error");
+ createErrorMessage("Expecting '(' in content model", "error"); //$NON-NLS-1$ //$NON-NLS-2$
}
((ElementDecl) baseNode).setContentModelNode(contentModel);
@@ -588,7 +588,7 @@
((Attlist) baseNode).setAttDefs(attrs);
}
if (errorString != null) {
- createErrorMessage(errorString, "error");
+ createErrorMessage(errorString, "error"); //$NON-NLS-1$
}
break;
}
@@ -625,7 +625,7 @@
}
private void addPEReferenceNode(String name) {
- if (name.startsWith("%")) {
+ if (name.startsWith("%")) { //$NON-NLS-1$
name = name.substring(1); // strip out the % from entity name
}
EntityDecl e = new EntityDecl(name, currentDTD.getName(), null, true);
@@ -649,13 +649,13 @@
private boolean isDTDLoaded(String uri) {
boolean loaded = false;
- String list = "";
+ String list = ""; //$NON-NLS-1$
if (dtdList != null) {
Enumeration en = dtdList.elements();
while (en.hasMoreElements()) {
DTD dtd = (DTD) en.nextElement();
list += dtd.getName();
- list += ",";
+ list += ","; //$NON-NLS-1$
if (dtd.getName().equals(uri)) {
loaded = true;
break;
@@ -696,19 +696,19 @@
String arg = argv[i];
// options
- if (arg.startsWith("-")) {
+ if (arg.startsWith("-")) { //$NON-NLS-1$
- if (arg.equals("-c")) {
+ if (arg.equals("-c")) { //$NON-NLS-1$
canonical = true;
continue;
}
- if (arg.equals("-x")) {
+ if (arg.equals("-x")) { //$NON-NLS-1$
expandEntityReferences = true;
continue;
}
- if (arg.equals("-h")) {
+ if (arg.equals("-h")) { //$NON-NLS-1$
printUsage();
System.exit(1);
}
@@ -728,12 +728,12 @@
/** Prints the usage. */
private static void printUsage() {
- System.err.println("usage: java sax.DTDParser (options) uri ...");
+ System.err.println("usage: java sax.DTDParser (options) uri ..."); //$NON-NLS-1$
System.err.println();
- System.err.println("options:");
- System.err.println(" -c Canonical XML output.");
- System.err.println(" -x Expand entity references.");
- System.err.println(" -h This help screen.");
+ System.err.println("options:"); //$NON-NLS-1$
+ System.err.println(" -c Canonical XML output."); //$NON-NLS-1$
+ System.err.println(" -x Expand entity references."); //$NON-NLS-1$
+ System.err.println(" -h This help screen."); //$NON-NLS-1$
} // printUsage()
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDScanner.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDScanner.java
index 257117d..1435f51 100644
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDScanner.java
+++ b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DTDScanner.java
@@ -73,10 +73,10 @@
CMNode cmNode = null;
contentString.skipPastSpaces();
if (contentString.skippedString(empty_string)) {
- cmNode = new CMBasicNode("EMPTY", CMNodeType.EMPTY);
+ cmNode = new CMBasicNode("EMPTY", CMNodeType.EMPTY); //$NON-NLS-1$
}
else if (contentString.skippedString(any_string)) {
- cmNode = new CMBasicNode("ANY", CMNodeType.ANY);
+ cmNode = new CMBasicNode("ANY", CMNodeType.ANY); //$NON-NLS-1$
}
else if (contentString.lookingAtChar('%', true)) {
cmNode = new CMReferenceNode(contentString.getData(), CMNodeType.ENTITY_REFERENCE);
@@ -113,7 +113,7 @@
// System.out.println("ScanMixed...");
CMGroupNode cmNode = new CMGroupNode();
cmNode.setGroupKind(CMNodeType.GROUP_CHOICE);
- cmNode.addChild(new CMBasicNode("#PCDATA", CMNodeType.PCDATA));
+ cmNode.addChild(new CMBasicNode("#PCDATA", CMNodeType.PCDATA)); //$NON-NLS-1$
// int prevNodeIndex = -1;
boolean starRequired = false;
@@ -159,7 +159,7 @@
int len = nodeOffset - prevNodeOffset;
String refName = contentString.getString(prevNodeOffset, len);
prevNodeOffset = nodeOffset;
- if (refName.startsWith("%"))
+ if (refName.startsWith("%")) //$NON-NLS-1$
cmNode.addChild(new CMReferenceNode(refName, CMNodeType.ENTITY_REFERENCE));
else
cmNode.addChild(new CMReferenceNode(refName, CMNodeType.ELEMENT_REFERENCE));
@@ -236,7 +236,7 @@
nodeName = contentString.getString(prevNodeOffset, len);
CMRepeatableNode rn;
- if (nodeName.startsWith("%")) {
+ if (nodeName.startsWith("%")) { //$NON-NLS-1$
rn = new CMReferenceNode(nodeName, CMNodeType.ENTITY_REFERENCE);
}
else {
@@ -378,28 +378,28 @@
attNode.type = new String(id_string);
}
else if (!contentString.lookingAtChar('S', true)) {
- attNode.type = "IDREF";
+ attNode.type = "IDREF"; //$NON-NLS-1$
}
else {
- attNode.type = "IDREFS";
+ attNode.type = "IDREFS"; //$NON-NLS-1$
}
scannerState = Att_Scanner_State_DefaultType;
}
else if (contentString.skippedString(entit_string)) {
if (contentString.lookingAtChar('Y', true)) {
- attNode.type = "ENTITY";
+ attNode.type = "ENTITY"; //$NON-NLS-1$
}
else if (contentString.skippedString(ies_string)) {
- attNode.type = "ENTITIES";
+ attNode.type = "ENTITIES"; //$NON-NLS-1$
}
scannerState = Att_Scanner_State_DefaultType;
}
else if (contentString.skippedString(nmtoken_string)) {
if (contentString.lookingAtChar('S', true)) {
- attNode.type = "NMTOKENS";
+ attNode.type = "NMTOKENS"; //$NON-NLS-1$
}
else {
- attNode.type = "NMTOKEN";
+ attNode.type = "NMTOKEN"; //$NON-NLS-1$
}
scannerState = Att_Scanner_State_DefaultType;
}
@@ -408,21 +408,21 @@
contentString.skipPastSpaces();
}
if (!contentString.lookingAtChar('(', true)) {
- System.out.println(" missing ( in notation ");
+ System.out.println(" missing ( in notation "); //$NON-NLS-1$
}
- attNode.type = "NOTATION";
+ attNode.type = "NOTATION"; //$NON-NLS-1$
attNode.enumList = scanEnumeration(contentString, true);
scannerState = Att_Scanner_State_DefaultType;
}
else if (contentString.lookingAtChar('(', true)) {
- attNode.type = "ENUMERATION";
+ attNode.type = "ENUMERATION"; //$NON-NLS-1$
attNode.enumList = scanEnumeration(contentString, false);
scannerState = Att_Scanner_State_DefaultType;
}
else {
scannerState = checkForAttributeWithPEReference(attNode, scannerState);
if (scannerState == Att_Scanner_State_Type) {
- setErrorString("Failed to find type for attribute '" + attNode.name + "'. Please refer to the original DTD file.");
+ setErrorString("Failed to find type for attribute '" + attNode.name + "'. Please refer to the original DTD file."); //$NON-NLS-1$ //$NON-NLS-2$
// we failed to find a type for this attribute
return attList;
}
@@ -445,7 +445,7 @@
}
else
// "default"
- attNode.defaultType = "NOFIXED";
+ attNode.defaultType = "NOFIXED"; //$NON-NLS-1$
if (contentString.lookingAtSpace(true))
contentString.skipPastSpaces();
@@ -508,7 +508,7 @@
// System.out.println("State_name : " + rawText);
- if (rawText.startsWith("%") && rawText.endsWith(";")) {
+ if (rawText.startsWith("%") && rawText.endsWith(";")) { //$NON-NLS-1$ //$NON-NLS-2$
String pe = rawText.substring(1, rawText.length() - 1);
pEntity = entityPool.referPara(pe);
@@ -529,7 +529,7 @@
else if (scannerState == Att_Scanner_State_Type) {
if (contentString.lookingAtChar('%', true)) {
rawText = getPEName();
- attNode.type = "%" + rawText;
+ attNode.type = "%" + rawText; //$NON-NLS-1$
String peName = rawText.substring(0, rawText.length() - 1);
// System.out.println("State_type : pe- " + peName);
pEntity = entityPool.referPara(peName);
@@ -625,7 +625,7 @@
nextState = Att_Scanner_State_DefaultType;
}
else
- System.out.println("WhatistheNext Attr Part - is not an Attr Type");
+ System.out.println("WhatistheNext Attr Part - is not an Attr Type"); //$NON-NLS-1$
}
@@ -803,7 +803,7 @@
if (!sp.lookingAtChar('|', true)) {
if (!sp.lookingAtChar(')', true)) {
- System.out.println("scanning enum values - error missing ')'");
+ System.out.println("scanning enum values - error missing ')'"); //$NON-NLS-1$
break;
}
break;
@@ -847,7 +847,7 @@
sp.skipToChar(qchar, true);
int len = sp.getCurrentOffset() - sOffset - 1;
if (len == 0)
- value = "";
+ value = ""; //$NON-NLS-1$
else
value = sp.getString(sOffset, len);
@@ -1100,11 +1100,11 @@
}
// DTDScanner sc = new DTDScanner(argv[0]);
- DTDScanner sc = new DTDScanner("hello.dtd", " gif SYSTEM \"GIF File\" ");
+ DTDScanner sc = new DTDScanner("hello.dtd", " gif SYSTEM \"GIF File\" "); //$NON-NLS-1$ //$NON-NLS-2$
NotationDecl n = sc.scanNotationDecl();
- System.out.println("Noation Name: " + n.getNodeName());
- System.out.println("SystemId: " + n.getSystemId());
+ System.out.println("Noation Name: " + n.getNodeName()); //$NON-NLS-1$
+ System.out.println("SystemId: " + n.getSystemId()); //$NON-NLS-1$
// Attributes
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DeclNode.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DeclNode.java
index d71c49d..25720b4 100644
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DeclNode.java
+++ b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/DeclNode.java
@@ -96,7 +96,7 @@
public String toString()
{
- return "Node Name: " + declName + " Type: " + type + " ContentString: " + contentString;
+ return "Node Name: " + declName + " Type: " + type + " ContentString: " + contentString; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ErrorMessage.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ErrorMessage.java
index 618dc2f..6995e8a 100644
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ErrorMessage.java
+++ b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ErrorMessage.java
@@ -30,13 +30,13 @@
}
public void setSeverity(String severity) {
- if (severity == "warning") {
+ if (severity == "warning") { //$NON-NLS-1$
this.severity = 0;
}
- else if (severity == "error") {
+ else if (severity == "error") { //$NON-NLS-1$
this.severity = 1;
}
- else if (severity == "fatal") {
+ else if (severity == "fatal") { //$NON-NLS-1$
this.severity = 2;
}
}
@@ -109,6 +109,6 @@
public void addNewErrorMessageLine(String newLine) {
- errorString += "\n" + newLine;
+ errorString += "\n" + newLine; //$NON-NLS-1$
}
}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ExternalID.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ExternalID.java
index f33b3f0..11b0988 100644
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ExternalID.java
+++ b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/ExternalID.java
@@ -111,13 +111,13 @@
public String toString() {
String ret;
if (isSystem()) {
- ret = "SYSTEM \"" + getSystemLiteral() + "\"";
+ ret = "SYSTEM \"" + getSystemLiteral() + "\""; //$NON-NLS-1$ //$NON-NLS-2$
}
else if (null != getSystemLiteral()) {
- ret = "PUBLIC \"" + getPubIdLiteral() + "\" \"" + getSystemLiteral() + "\"";
+ ret = "PUBLIC \"" + getPubIdLiteral() + "\" \"" + getSystemLiteral() + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
else {
- ret = "PUBLIC \"" + getPubIdLiteral() + "\""; // for NOTATION
+ ret = "PUBLIC \"" + getPubIdLiteral() + "\""; // for NOTATION //$NON-NLS-1$ //$NON-NLS-2$
}
return ret;
}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/StringParser.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/StringParser.java
index e18e259..23a84ca 100644
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/StringParser.java
+++ b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/StringParser.java
@@ -32,7 +32,7 @@
public String getString(int offset, int length) {
if (length == 0)
- return "";
+ return ""; //$NON-NLS-1$
return fData.substring(offset, offset + length);
}
diff --git a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/TString.java b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/TString.java
index a547c63..7e634bf 100644
--- a/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/TString.java
+++ b/bundles/org.eclipse.wst.dtd.core/saxparser/org/eclipse/wst/dtd/core/internal/saxparser/TString.java
@@ -19,9 +19,9 @@
*/
public class TString {
- private static final String ALPHABET = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
- private static final String ALPHANUMERIC = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
- private static final String NUMERIC = "0123456789";
+ private static final String ALPHABET = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; //$NON-NLS-1$
+ private static final String ALPHANUMERIC = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; //$NON-NLS-1$
+ private static final String NUMERIC = "0123456789"; //$NON-NLS-1$
// change all occurrences of oldPat to newPat
public static String change(String in, String oldPat, String newPat) {
@@ -93,7 +93,7 @@
public static String word(String in, int i) {
StringTokenizer st = new StringTokenizer(in);
if (i <= 0 || i > st.countTokens())
- return "";
+ return ""; //$NON-NLS-1$
else {
String ret = new String();
while (st.hasMoreTokens()) {
@@ -102,13 +102,13 @@
return ret;
}
}
- return "";
+ return ""; //$NON-NLS-1$
}
public static String words(String in, int i) {
StringTokenizer st = new StringTokenizer(in);
if (i <= 0 || i > st.countTokens())
- return "";
+ return ""; //$NON-NLS-1$
else {
while (st.hasMoreTokens()) {
if (--i == 0)
@@ -116,9 +116,9 @@
st.nextToken();
}
if (st.hasMoreTokens())
- return st.nextToken("");
+ return st.nextToken(""); //$NON-NLS-1$
else
- return "";
+ return ""; //$NON-NLS-1$
}
}
@@ -128,7 +128,7 @@
StringBuffer sb = new StringBuffer(in);
for (int i = 0; i < len; i++) {
- sb.append(" ");
+ sb.append(" "); //$NON-NLS-1$
}
return sb.toString();
}
@@ -248,7 +248,7 @@
if (src != null) {
while (src.length() > 0) {
- if (src.endsWith(" "))
+ if (src.endsWith(" ")) //$NON-NLS-1$
src = src.substring(0, src.length() - 1);
else
break;
@@ -318,7 +318,7 @@
if (in.startsWith(token))
return in.substring(token.length(), in.length());
else
- throw new Exception("Expected: " + token + " but got:" + word(in, 1));
+ throw new Exception("Expected: " + token + " but got:" + word(in, 1)); //$NON-NLS-1$ //$NON-NLS-2$
}
public static long getLong(String str) {
@@ -336,7 +336,7 @@
// return = true
public static boolean containsDoubleBlanks(String srcString) {
- String bb = " ";
+ String bb = " "; //$NON-NLS-1$
char b = bb.charAt(0);
if (srcString.length() > 0) {
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Attribute.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Attribute.java
index 5afcd50..2ac9b6b 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Attribute.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Attribute.java
@@ -24,19 +24,19 @@
// base class for an Element's contentmodel
public class Attribute extends DTDNode {
- public static final String CDATA = DTDCorePlugin.getDTDString("_UI_CHARACTER_DATA_DESC"); //$NON-NLS-1$
- public static final String ENTITIES = DTDCorePlugin.getDTDString("_UI_ENTITY_NAMES_DESC"); //$NON-NLS-1$
- public static final String ENTITY = DTDCorePlugin.getDTDString("_UI_ENTITY_NAME_DESC"); //$NON-NLS-1$
- public static final String ENUMERATED_NAME = DTDCorePlugin.getDTDString("_UI_ENUM_NAME_TOKENS_DESC"); //$NON-NLS-1$
- public static final String ENUMERATED_NOTATION = DTDCorePlugin.getDTDString("_UI_ENUM_NOTATION_DESC"); //$NON-NLS-1$
+ public static final String CDATA = DTDCoreMessages._UI_CHARACTER_DATA_DESC; //$NON-NLS-1$
+ public static final String ENTITIES = DTDCoreMessages._UI_ENTITY_NAMES_DESC; //$NON-NLS-1$
+ public static final String ENTITY = DTDCoreMessages._UI_ENTITY_NAME_DESC; //$NON-NLS-1$
+ public static final String ENUMERATED_NAME = DTDCoreMessages._UI_ENUM_NAME_TOKENS_DESC; //$NON-NLS-1$
+ public static final String ENUMERATED_NOTATION = DTDCoreMessages._UI_ENUM_NOTATION_DESC; //$NON-NLS-1$
public static final String FIXED = "#FIXED"; //$NON-NLS-1$
- public static final String ID = DTDCorePlugin.getDTDString("_UI_IDENTIFIER_DESC"); //$NON-NLS-1$
- public static final String IDREF = DTDCorePlugin.getDTDString("_UI_ID_REFERENCE_DESC"); //$NON-NLS-1$
- public static final String IDREFS = DTDCorePlugin.getDTDString("_UI_ID_REFERENCES_DESC"); //$NON-NLS-1$
+ public static final String ID = DTDCoreMessages._UI_IDENTIFIER_DESC; //$NON-NLS-1$
+ public static final String IDREF = DTDCoreMessages._UI_ID_REFERENCE_DESC; //$NON-NLS-1$
+ public static final String IDREFS = DTDCoreMessages._UI_ID_REFERENCES_DESC; //$NON-NLS-1$
public static final String IMPLIED = "#IMPLIED"; //$NON-NLS-1$
- public static final String NMTOKEN = DTDCorePlugin.getDTDString("_UI_NAME_TOKEN_DESC"); //$NON-NLS-1$
- public static final String NMTOKENS = DTDCorePlugin.getDTDString("_UI_NAME_TOKENS_DESC"); //$NON-NLS-1$
+ public static final String NMTOKEN = DTDCoreMessages._UI_NAME_TOKEN_DESC; //$NON-NLS-1$
+ public static final String NMTOKENS = DTDCoreMessages._UI_NAME_TOKENS_DESC; //$NON-NLS-1$
public static final String REQUIRED = "#REQUIRED"; //$NON-NLS-1$
protected static Hashtable typeHash = new Hashtable();
@@ -249,7 +249,7 @@
}
public void setDefaultKind(String kind) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_ATTR_DEFAULT_KIND")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_ATTR_DEFAULT_KIND); //$NON-NLS-1$
setDefaultKind(this, kind);
endRecording(this);
}
@@ -307,7 +307,7 @@
}
public void setDefaultValue(String value, boolean fixed) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_ATTR_DEFAULT_VAL")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_ATTR_DEFAULT_VAL); //$NON-NLS-1$
setDefaultValue(this, value, fixed);
endRecording(this);
}
@@ -369,7 +369,7 @@
}
public void setType(String type) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_ATTR_TYPE")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_ATTR_TYPE); //$NON-NLS-1$
setType(this, type);
endRecording(this);
}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/AttributeEnumList.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/AttributeEnumList.java
index ac3b096..c6cf519 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/AttributeEnumList.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/AttributeEnumList.java
@@ -65,7 +65,7 @@
}
public void setItems(String[] items) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_ATTR_ENUM_ITEMS")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_ATTR_ENUM_ITEMS); //$NON-NLS-1$
setItems(this, items);
endRecording(this);
}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/AttributeList.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/AttributeList.java
index 6d1036e..8044165 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/AttributeList.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/AttributeList.java
@@ -27,7 +27,7 @@
}
public void addAttribute(String name) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_ATTR_LIST_ADD")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_ATTR_LIST_ADD); //$NON-NLS-1$
DTDNode lastAttribute = (DTDNode) getLastChild();
if (lastAttribute != null) {
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMGroupNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMGroupNode.java
index d39c461..e87abc8 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMGroupNode.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMGroupNode.java
@@ -36,7 +36,7 @@
}
public void addChild() {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_CM_GRP_NODE_ADD_CHILD")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_CM_GRP_NODE_ADD_CHILD); //$NON-NLS-1$
DTDNode lastNode = (DTDNode) getLastChild();
String elementName = DTDUniqueNameHelper.getUniqueName(getChildrenList(), "ChildNode"); //$NON-NLS-1$
if (lastNode != null) {
@@ -50,7 +50,7 @@
}
public void addGroup() {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_CM_GRP_NODE_ADD_GRP")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_CM_GRP_NODE_ADD_GRP); //$NON-NLS-1$
DTDNode lastNode = (DTDNode) getLastChild();
if (lastNode != null) {
replaceText(this, lastNode.getEndOffset(), 0, String.valueOf(getConnector()) + " ()"); //$NON-NLS-1$
@@ -226,7 +226,7 @@
}
public void insertChildNode(String nodeText, int position) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_CM_GRP_NODE_INSERT_ELEMENT")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_CM_GRP_NODE_INSERT_ELEMENT); //$NON-NLS-1$
insertChildNode(this, nodeText, position);
endRecording(this);
}
@@ -380,7 +380,7 @@
getDTDFile().notifyNodeChanged(this);
return;
}
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_CM_GRP_NODE_CONNECTOR")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_CM_GRP_NODE_CONNECTOR); //$NON-NLS-1$
for (int i = 0; i < children.length - 1; i++) {
DTDNode childA = (DTDNode) children[i];
DTDNode childB = (DTDNode) children[i + 1];
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMNode.java
index 9e70c4a..01d3c4f 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMNode.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMNode.java
@@ -16,12 +16,12 @@
// base class for an Element's contentmodel
public abstract class CMNode extends DTDNode {
- public static final String ANY = DTDCorePlugin.getDTDString("_UI_LABEL_CM_NODE_ANY"); //$NON-NLS-1$
- public static final String CHILDREN = DTDCorePlugin.getDTDString("_UI_LABEL_CM_NODE_CHILD_CONTENT"); //$NON-NLS-1$
+ public static final String ANY = DTDCoreMessages._UI_LABEL_CM_NODE_ANY; //$NON-NLS-1$
+ public static final String CHILDREN = DTDCoreMessages._UI_LABEL_CM_NODE_CHILD_CONTENT; //$NON-NLS-1$
- public static final String EMPTY = DTDCorePlugin.getDTDString("_UI_LABEL_CM_NODE_EMPTY"); //$NON-NLS-1$
- public static final String MIXED = DTDCorePlugin.getDTDString("_UI_LABEL_CM_NODE_MIX_CONTENT"); //$NON-NLS-1$
- public static final String PCDATA = DTDCorePlugin.getDTDString("_UI_LABEL_CM_NODE_PCDATA"); //$NON-NLS-1$
+ public static final String EMPTY = DTDCoreMessages._UI_LABEL_CM_NODE_EMPTY; //$NON-NLS-1$
+ public static final String MIXED = DTDCoreMessages._UI_LABEL_CM_NODE_MIX_CONTENT; //$NON-NLS-1$
+ public static final String PCDATA = DTDCoreMessages._UI_LABEL_CM_NODE_PCDATA; //$NON-NLS-1$
boolean rootElementContent;
@@ -48,14 +48,14 @@
public void setChildrenContent(String newChild) {
if (isRootElementContent()) {
if (!newChild.equals("")) { //$NON-NLS-1$
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_CM_NODE_SET_CHILD_CONTENT")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_CM_NODE_SET_CHILD_CONTENT); //$NON-NLS-1$
replaceText(this, getStartOffset(), getNodeLength(), "(" + newChild + ")"); //$NON-NLS-1$ //$NON-NLS-2$
endRecording(this);
return;
}
if (!getType().equals(CHILDREN)) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_CM_NODE_SET_CHILD_CONTENT")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_CM_NODE_SET_CHILD_CONTENT); //$NON-NLS-1$
if (this instanceof CMBasicNode) {
replaceText(this, getStartOffset(), getNodeLength(), "(newChild)"); //$NON-NLS-1$
}
@@ -76,7 +76,7 @@
public void setContent(String content) {
if (isRootElementContent()) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_CM_NODE_SET") + " " + content + " " + DTDCorePlugin.getDTDString("_UI_LABEL_CM_NODE_CONTENT")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_CM_NODE_SET + " " + content + " " + DTDCoreMessages._UI_LABEL_CM_NODE_CONTENT); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
replaceText(this, getStartOffset(), getNodeLength(), content);
endRecording(this);
}
@@ -87,7 +87,7 @@
public void setMixedContent() {
if (isRootElementContent()) {
if (!getType().equals(MIXED)) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_CM_NODE_SET_MIX_CONTENT")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_CM_NODE_SET_MIX_CONTENT); //$NON-NLS-1$
if (this instanceof CMBasicNode) {
replaceText(this, getStartOffset(), getNodeLength(), "(#PCDATA | newChild)*"); //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMRepeatableNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMRepeatableNode.java
index 18c117b..0b83601 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMRepeatableNode.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/CMRepeatableNode.java
@@ -48,7 +48,7 @@
abstract public ITextRegion getOccurrenceRegion();
public void setOccurrence(char occurrence) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_CM_REP_NODE_CHG_OCCUR")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_CM_REP_NODE_CHG_OCCUR); //$NON-NLS-1$
setOccurrence(this, occurrence);
endRecording(this);
}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Comment.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Comment.java
index 5205702..6c10006 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Comment.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Comment.java
@@ -65,7 +65,7 @@
}
public void setText(String newText) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_COMMENT_CHG")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_COMMENT_CHG); //$NON-NLS-1$
StartEndPair pair = new StartEndPair();
getStartAndEndOffsetForText(pair);
replaceText(this, pair.startOffset, pair.endOffset - pair.startOffset, newText);
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCoreMessages.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCoreMessages.java
new file mode 100644
index 0000000..2b06a47
--- /dev/null
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCoreMessages.java
@@ -0,0 +1,95 @@
+/**********************************************************************
+ * Copyright (c) 2005 IBM Corporation and others. All rights reserved. This
+ * program and the accompanying materials are made available under the terms of
+ * the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.wst.dtd.core.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Strings used by DTD Core
+ *
+ * @since 1.0
+ */
+public class DTDCoreMessages extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.wst.dtd.core.internal.DTDCorePluginResources";//$NON-NLS-1$
+
+ public static String _UI_NONE_DESC;
+ public static String _UI_CHARACTER_DATA_DESC;
+ public static String _UI_IDENTIFIER_DESC;
+ public static String _UI_ID_REFERENCE_DESC;
+ public static String _UI_ID_REFERENCES_DESC;
+ public static String _UI_ENTITY_NAME_DESC;
+ public static String _UI_ENTITY_NAMES_DESC;
+ public static String _UI_NAME_TOKEN_DESC;
+ public static String _UI_NAME_TOKENS_DESC;
+ public static String _UI_ENUM_NAME_TOKENS_DESC;
+ public static String _UI_ENUM_NOTATION_DESC;
+ public static String _UI_LABEL_ATTR_DEFAULT_VAL;
+ public static String _UI_LABEL_ATTR_DEFAULT_KIND;
+ public static String _UI_LABEL_ATTR_TYPE;
+ public static String _UI_LABEL_ATTR_ENUM_ITEMS;
+ public static String _UI_LABEL_ATTR_LIST_ADD;
+ public static String _UI_LABEL_CM_GRP_NODE_CONNECTOR;
+ public static String _UI_LABEL_CM_GRP_NODE_INSERT_ELEMENT;
+ public static String _UI_LABEL_CM_GRP_NODE_ADD_GRP;
+ public static String _UI_LABEL_CM_GRP_NODE_ADD_CHILD;
+ public static String _UI_LABEL_CM_NODE_MIX_CONTENT;
+ public static String _UI_LABEL_CM_NODE_CHILD_CONTENT;
+ public static String _UI_LABEL_CM_NODE_SET_MIX_CONTENT;
+ public static String _UI_LABEL_CM_NODE_SET_CHILD_CONTENT;
+ public static String _UI_LABEL_CM_NODE_SET;
+ public static String _UI_LABEL_CM_NODE_CONTENT;
+ public static String _UI_LABEL_CM_NODE_PCDATA;
+ public static String _UI_LABEL_CM_NODE_ANY;
+ public static String _UI_LABEL_CM_NODE_EMPTY;
+ public static String _UI_LABEL_CM_REP_NODE_CHG_OCCUR;
+ public static String _UI_LABEL_COMMENT_CHG;
+ public static String _UI_LABEL_DTD_FILE_ADD_ELEMENT;
+ public static String _UI_LABEL_DTD_FILE_ADD_ENTITY;
+ public static String _UI_LABEL_DTD_FILE_ADD_COMMENT;
+ public static String _UI_LABEL_DTD_FILE_ADD_PARM_ENTITY_REF;
+ public static String _UI_LABEL_DTD_FILE_ADD_NOTATION;
+ public static String _UI_LABEL_DTD_FILE_ADD_ATTR_LIST;
+ public static String _UI_LABEL_DTD_FILE_DELETE;
+ public static String _UI_LABEL_DTD_NODE_NAME_CHG;
+ public static String _UI_LABEL_DTD_NODE_DELETE;
+ public static String _UI_LABEL_ELEMENT_ADD_ATTR;
+ public static String _UI_LABEL_ELEMENT_ADD_GRP;
+ public static String _UI_LABEL_ELEMENT_ADD_CHILD;
+ public static String _UI_LABEL_ENTITY_SET_PARM_ENTITY;
+ public static String _UI_LABEL_ENTITY_SET_GENERAL_ENTITY;
+ public static String _UI_LABEL_ENTITY_SET_EXT_ENTITY;
+ public static String _UI_LABEL_ENTITY_SET_INT_ENTITY;
+ public static String _UI_LABEL_ENTITY_VALUE_CHG;
+ public static String _UI_LABEL_ENTITY_NDATA_CHANGE;
+ public static String _UI_LABEL_EXT_NODE_PUBLIC_ID_CHG;
+ public static String _UI_LABEL_EXT_NODE_SYSTEM_ID_CHG;
+ public static String _UI_LABEL_NODE_LIST_ELEMENTS;
+ public static String _UI_LABEL_NODE_LIST_ENTITIES;
+ public static String _UI_LABEL_NODE_LIST_NOTATIONS;
+ public static String _UI_LABEL_NODE_LIST_COMMENTS;
+ public static String _UI_LABEL_NODE_LIST_OTHER;
+ public static String _UI_LABEL_NODE_LIST_ATTRIBUTES;
+ public static String _UI_LABEL_PARM_ENTITY_REF_CHG_ENTITY_REF;
+ public static String _UI_LABEL_PARM_ENTITY_REF_COMMENT_CHG;
+ public static String _UI_LABEL_TOP_LEVEL_NODE_DELETE;
+ public static String _ERROR_INCL_FILE_LOAD_FAILURE;
+ public static String _ERROR_UNDECLARED_ELEMENT_1;
+ public static String _UI_ERRORPART_UNDECLARED_ELEMENT_2;
+ public static String _ERROR_DUP_ID_ATTRIBUTE_1;
+ public static String _UI_ERRORPART_DUP_ID_ATTRIBUTE_2;
+ public static String _ERROR_INVALID_DEFAULT_ATTR_VALUE_1;
+ public static String _UI_ERRORPART_INVALID_DEFAULT_ATTR_VALUE_2;
+ public static String _EXC_OPERATION_NOT_SUPPORTED;
+
+ static {
+ // load message values from bundle file
+ NLS.initializeMessages(BUNDLE_NAME, DTDCoreMessages.class);
+ }
+}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCorePlugin.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCorePlugin.java
index c7addb9..5cb55c5 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCorePlugin.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCorePlugin.java
@@ -12,10 +12,6 @@
*******************************************************************************/
package org.eclipse.wst.dtd.core.internal;
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.swt.graphics.Image;
@@ -33,15 +29,6 @@
return AbstractUIPlugin.imageDescriptorFromPlugin(thisID, iconName);
}
- public static String getDTDString(String key) {
- // In case it is invoked from a command line
- if (getInstance() == null) {
- return ""; //$NON-NLS-1$
- }
-
- return getInstance().getString(key);
- }
-
public synchronized static DTDCorePlugin getInstance() {
return instance;
}
@@ -50,8 +37,6 @@
return instance;
}
- private ResourceBundle resourceBundle;
-
public DTDCorePlugin() {
super();
instance = this;
@@ -69,36 +54,4 @@
return image;
}
-
- public ResourceBundle getResourceBundle() {
- if (resourceBundle == null) {
- try {
- resourceBundle = Platform.getResourceBundle(getBundle());
- }
- catch (java.util.MissingResourceException exception) {
- }
- }
- return resourceBundle;
- }
-
- /**
- * This gets the string resource.
- */
- public String getString(String key) {
- return getResourceBundle().getString(key);
- }
-
- /**
- * This gets the string resource and does one substitution.
- */
- public String getString(String key, Object s1) {
- return MessageFormat.format(getString(key), new Object[]{s1});
- }
-
- /**
- * This gets the string resource and does two substitutions.
- */
- public String getString(String key, Object s1, Object s2) {
- return MessageFormat.format(getString(key), new Object[]{s1, s2});
- }
}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCorePluginResources.properties b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCorePluginResources.properties
new file mode 100644
index 0000000..6b38bbb
--- /dev/null
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDCorePluginResources.properties
@@ -0,0 +1,130 @@
+###############################################################################
+# Copyright (c) 2005 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+! Strings for DTDBasicTypeImpl type descriptions
+_UI_NONE_DESC=None
+
+!! NOTE TO TRANSLATOR: Do not translate following text in parentheses on following 10 lines i.e.(CDATA)
+_UI_CHARACTER_DATA_DESC=Character Data (CDATA)
+_UI_IDENTIFIER_DESC=Identifier (ID)
+_UI_ID_REFERENCE_DESC=ID Reference (IDREF)
+_UI_ID_REFERENCES_DESC=ID References (IDREFS)
+_UI_ENTITY_NAME_DESC=Entity Name (ENTITY)
+_UI_ENTITY_NAMES_DESC=Entity Names (ENTITIES)
+_UI_NAME_TOKEN_DESC=Name Token (NMTOKEN)
+_UI_NAME_TOKENS_DESC=Name Tokens (NMTOKENS)
+_UI_ENUM_NAME_TOKENS_DESC=Enumerated Name Tokens
+_UI_ENUM_NOTATION_DESC=Enumerated NOTATION
+
+!dtd/util/CreateListItems.java
+_UI_LABEL_NONE=(none)
+
+! Strings from sed/model
+
+! Attribute.java
+_UI_LABEL_ATTR_DEFAULT_VAL=Attribute Default Change Value
+_UI_LABEL_ATTR_DEFAULT_KIND=Change Attribute Default Value
+_UI_LABEL_ATTR_TYPE=Change Attribute Type
+
+! AttributeEnumList
+_UI_LABEL_ATTR_ENUM_ITEMS=Change Attribute Enumeration Value
+
+! AttributeList
+_UI_LABEL_ATTR_LIST_ADD=Add Attribute
+
+! CMGroupNode
+_UI_LABEL_CM_GRP_NODE_CONNECTOR=Change Connector
+_UI_LABEL_CM_GRP_NODE_INSERT_ELEMENT=Insert Element
+_UI_LABEL_CM_GRP_NODE_ADD_GRP=Add Group
+_UI_LABEL_CM_GRP_NODE_ADD_CHILD=Add Child Element
+
+! CMNode
+_UI_LABEL_CM_NODE_MIX_CONTENT=Mixed Content
+_UI_LABEL_CM_NODE_CHILD_CONTENT=Children Content
+_UI_LABEL_CM_NODE_SET_MIX_CONTENT=Set Mixed Content
+_UI_LABEL_CM_NODE_SET_CHILD_CONTENT=Set Children Content
+
+!! NOTE TO TRANSLATOR - USAGE: "Set <variable content> Content"
+_UI_LABEL_CM_NODE_SET=Set
+_UI_LABEL_CM_NODE_CONTENT=Content
+
+!! NOTE TO TRANSLATOR - DO NOT TRANSLATE FOLLOWING 3 LINES
+_UI_LABEL_CM_NODE_PCDATA=(#PCDATA)
+_UI_LABEL_CM_NODE_ANY=ANY
+_UI_LABEL_CM_NODE_EMPTY=EMPTY
+
+! CMRepeatableNode
+_UI_LABEL_CM_REP_NODE_CHG_OCCUR=Change Occurrence
+
+! Comment
+_UI_LABEL_COMMENT_CHG=Comment Change
+
+! DTDFile
+_UI_LABEL_DTD_FILE_ADD_ELEMENT=Add Element
+_UI_LABEL_DTD_FILE_ADD_ENTITY=Add Entity
+_UI_LABEL_DTD_FILE_ADD_COMMENT=Add Comment
+_UI_LABEL_DTD_FILE_ADD_PARM_ENTITY_REF=Add Parameter Entity Reference
+_UI_LABEL_DTD_FILE_ADD_NOTATION=Add Notation
+_UI_LABEL_DTD_FILE_ADD_ATTR_LIST=Add Attribute List
+_UI_LABEL_DTD_FILE_DELETE=Delete
+
+! DTDNode
+_UI_LABEL_DTD_NODE_NAME_CHG=Name Change
+_UI_LABEL_DTD_NODE_DELETE=Delete
+
+! Element
+_UI_LABEL_ELEMENT_ADD_ATTR=Add Attribute
+_UI_LABEL_ELEMENT_ADD_GRP=Add Group
+_UI_LABEL_ELEMENT_ADD_CHILD=Add Child Element
+
+! Entity
+_UI_LABEL_ENTITY_SET_PARM_ENTITY=Set Parameter Entity
+_UI_LABEL_ENTITY_SET_GENERAL_ENTITY=Set General Entity
+_UI_LABEL_ENTITY_SET_EXT_ENTITY=Set External Entity
+_UI_LABEL_ENTITY_SET_INT_ENTITY=Set Internal Entity
+_UI_LABEL_ENTITY_VALUE_CHG=Entity Value Change
+
+!! NOTE TO TRANSLATOR - USAGE: "NDATA Change"
+_UI_LABEL_ENTITY_NDATA_CHANGE=Change
+
+! ExternalNode
+_UI_LABEL_EXT_NODE_PUBLIC_ID_CHG=Public ID Change
+_UI_LABEL_EXT_NODE_SYSTEM_ID_CHG=System ID Change
+
+! NodeList
+_UI_LABEL_NODE_LIST_ELEMENTS=Elements
+_UI_LABEL_NODE_LIST_ENTITIES=Entities
+_UI_LABEL_NODE_LIST_NOTATIONS=Notations
+_UI_LABEL_NODE_LIST_COMMENTS=Comments
+_UI_LABEL_NODE_LIST_OTHER=Other
+_UI_LABEL_NODE_LIST_ATTRIBUTES=Attributes
+
+! ParameterEntityReference
+_UI_LABEL_PARM_ENTITY_REF_CHG_ENTITY_REF=Change Entity Reference
+_UI_LABEL_PARM_ENTITY_REF_COMMENT_CHG=Comment Change
+
+! TopLevelNode
+_UI_LABEL_TOP_LEVEL_NODE_DELETE=Delete
+
+_ERROR_INCL_FILE_LOAD_FAILURE = Failed to load included file
+
+! usage: _ERROR_UNDECLARED_ELEMENT_1 + <elementName> + _PARTERROR_UNDECLARED_ELEMENT_2
+_ERROR_UNDECLARED_ELEMENT_1 = Reference to undeclared element '
+_UI_ERRORPART_UNDECLARED_ELEMENT_2 =' in content model.
+
+! usage: _ERROR_DUP_ID_ATTRIBUTE_1 + <attributeName> + _PARTERROR_DUP_ID_ATTRIBUTE_2
+_ERROR_DUP_ID_ATTRIBUTE_1 = Duplicate ID attribute '
+_UI_ERRORPART_DUP_ID_ATTRIBUTE_2 = '. Only one ID attribute can be specified per ELEMENT type.
+
+! usage:_ERROR_INVALID_DEFAULT_ATTR_VALUE_1 + <typeString> + _PARTERROR_INVALID_DEFAULT_ATTR_VALUE_2 + <attributeName>
+_ERROR_INVALID_DEFAULT_ATTR_VALUE_1 = Invalid default
+_UI_ERRORPART_INVALID_DEFAULT_ATTR_VALUE_2 = value for attribute '
+
+_EXC_OPERATION_NOT_SUPPORTED = Operation not supported
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDFile.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDFile.java
index 0f1c7d9..005fa9d 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDFile.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDFile.java
@@ -144,7 +144,7 @@
}
public void createAttributeList(DTDNode node, String name, boolean isAfter) {
- getDTDModel().beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_FILE_ADD_ATTR_LIST")); //$NON-NLS-1$
+ getDTDModel().beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_FILE_ADD_ATTR_LIST); //$NON-NLS-1$
String newStream = "<!ATTLIST " + name + ">\n"; //$NON-NLS-1$ //$NON-NLS-2$
int offset = getInsertOffset(node, isAfter);
getStructuredDocument().replaceText(this, offset, 0, newStream);
@@ -152,7 +152,7 @@
}
public void createComment(DTDNode node, String name, boolean isAfter) {
- getDTDModel().beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_FILE_ADD_COMMENT")); //$NON-NLS-1$
+ getDTDModel().beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_FILE_ADD_COMMENT); //$NON-NLS-1$
String newStream = "<!-- " + name + " -->\n"; //$NON-NLS-1$ //$NON-NLS-2$
int offset = getInsertOffset(node, isAfter);
getStructuredDocument().replaceText(this, offset, 0, newStream);
@@ -160,7 +160,7 @@
}
public void createElement(DTDNode node, String name, boolean isAfter) {
- getDTDModel().beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_FILE_ADD_ELEMENT")); //$NON-NLS-1$
+ getDTDModel().beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_FILE_ADD_ELEMENT); //$NON-NLS-1$
String newStream = "<!ELEMENT " + name + " EMPTY>\n"; //$NON-NLS-1$ //$NON-NLS-2$
int offset = getInsertOffset(node, isAfter);
getStructuredDocument().replaceText(this, offset, 0, newStream);
@@ -168,7 +168,7 @@
}
public void createEntity(DTDNode node, String name, boolean isAfter) {
- getDTDModel().beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_FILE_ADD_ENTITY")); //$NON-NLS-1$
+ getDTDModel().beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_FILE_ADD_ENTITY); //$NON-NLS-1$
String newStream = "<!ENTITY " + name + " \"\">\n"; //$NON-NLS-1$//$NON-NLS-2$
int offset = getInsertOffset(node, isAfter);
getStructuredDocument().replaceText(this, offset, 0, newStream);
@@ -176,7 +176,7 @@
}
public void createNotation(DTDNode node, String name, boolean isAfter) {
- getDTDModel().beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_FILE_ADD_NOTATION")); //$NON-NLS-1$
+ getDTDModel().beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_FILE_ADD_NOTATION); //$NON-NLS-1$
String newStream = "<!NOTATION " + name + " SYSTEM \"\">\n"; //$NON-NLS-1$ //$NON-NLS-2$
int offset = getInsertOffset(node, isAfter);
getStructuredDocument().replaceText(this, offset, 0, newStream);
@@ -184,7 +184,7 @@
}
public void createParameterEntityReference(DTDNode node, String name, boolean isAfter) {
- getDTDModel().beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_FILE_ADD_PARM_ENTITY_REF")); //$NON-NLS-1$
+ getDTDModel().beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_FILE_ADD_PARM_ENTITY_REF); //$NON-NLS-1$
String newStream = name + "\n"; //$NON-NLS-1$
int offset = getInsertOffset(node, isAfter);
getStructuredDocument().replaceText(this, offset, 0, newStream);
@@ -192,7 +192,7 @@
}
public void deleteNode(DTDNode node) {
- getDTDModel().beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_FILE_DELETE")); //$NON-NLS-1$
+ getDTDModel().beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_FILE_DELETE); //$NON-NLS-1$
deleteNode(this, node);
getDTDModel().endRecording(this);
}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDNode.java
index a53c519..7149189 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDNode.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/DTDNode.java
@@ -75,7 +75,7 @@
}
public void delete(DTDNode child) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_NODE_DELETE")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_NODE_DELETE); //$NON-NLS-1$
delete(this, child);
endRecording(this);
}
@@ -296,7 +296,7 @@
}
public void setName(String name) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_NODE_NAME_CHG")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_DTD_NODE_NAME_CHG); //$NON-NLS-1$
setName(this, name);
endRecording(this);
}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Element.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Element.java
index d289894..22eaca1 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Element.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Element.java
@@ -37,7 +37,7 @@
}
public void addAttribute(String name) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_ELEMENT_ADD_ATTR")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_ELEMENT_ADD_ATTR); //$NON-NLS-1$
List attLists = getAttributeLists();
if (attLists.size() == 0) {
getDTDFile().createAttributeList(this, getName(), true);
@@ -51,7 +51,7 @@
}
public void addChild() {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_ELEMENT_ADD_CHILD")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_ELEMENT_ADD_CHILD); //$NON-NLS-1$
addContent(this, " EMPTY"); //$NON-NLS-1$
endRecording(this);
}
@@ -78,7 +78,7 @@
}
public void addGroup() {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_ELEMENT_ADD_GRP")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_ELEMENT_ADD_GRP); //$NON-NLS-1$
addContent(this, " ()"); //$NON-NLS-1$
endRecording(this);
}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Entity.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Entity.java
index 4d11afa..16f1f2f 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Entity.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/Entity.java
@@ -22,11 +22,11 @@
// external node contains code to help set and get public ids
public class Entity extends ExternalNode {
- private static String setExternalEntity = DTDCorePlugin.getDTDString("_UI_LABEL_ENTITY_SET_EXT_ENTITY"); //$NON-NLS-1$
- private static String setGeneralEntity = DTDCorePlugin.getDTDString("_UI_LABEL_ENTITY_SET_GENERAL_ENTITY"); //$NON-NLS-1$
- private static String setInternalEntity = DTDCorePlugin.getDTDString("_UI_LABEL_ENTITY_SET_INT_ENTITY"); //$NON-NLS-1$
+ private static String setExternalEntity = DTDCoreMessages._UI_LABEL_ENTITY_SET_EXT_ENTITY; //$NON-NLS-1$
+ private static String setGeneralEntity = DTDCoreMessages._UI_LABEL_ENTITY_SET_GENERAL_ENTITY; //$NON-NLS-1$
+ private static String setInternalEntity = DTDCoreMessages._UI_LABEL_ENTITY_SET_INT_ENTITY; //$NON-NLS-1$
- private static String setParameterEntity = DTDCorePlugin.getDTDString("_UI_LABEL_ENTITY_SET_PARM_ENTITY"); //$NON-NLS-1$
+ private static String setParameterEntity = DTDCoreMessages._UI_LABEL_ENTITY_SET_PARM_ENTITY; //$NON-NLS-1$
public Entity(DTDFile file, IStructuredDocumentRegion flatNode) {
super(file, flatNode, DTDRegionTypes.ENTITY_TAG);
@@ -237,7 +237,7 @@
* Value to assign to notationName.
*/
public void setNotationName(String newNotation) {
- beginRecording(this, "NDATA " + DTDCorePlugin.getDTDString("_UI_LABEL_ENTITY_NDATA_CHANGE")); //$NON-NLS-1$ //$NON-NLS-2$
+ beginRecording(this, "NDATA " + DTDCoreMessages._UI_LABEL_ENTITY_NDATA_CHANGE); //$NON-NLS-1$ //$NON-NLS-2$
setNotationName(this, newNotation);
endRecording(this);
}
@@ -325,7 +325,7 @@
* Value to assign to value.
*/
public void setValue(String v) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_ENTITY_VALUE_CHG")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_ENTITY_VALUE_CHG); //$NON-NLS-1$
setValue(this, v);
endRecording(this);
}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/ExternalNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/ExternalNode.java
index 28f236f..ccc848e 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/ExternalNode.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/ExternalNode.java
@@ -188,7 +188,7 @@
* Value to assign to publicID.
*/
public void setPublicID(String v) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_EXT_NODE_PUBLIC_ID_CHG")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_EXT_NODE_PUBLIC_ID_CHG); //$NON-NLS-1$
setPublicID(this, v);
endRecording(this);
}
@@ -243,7 +243,7 @@
* Value to assign to systemID.
*/
public void setSystemID(String v) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_EXT_NODE_SYSTEM_ID_CHG")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_EXT_NODE_SYSTEM_ID_CHG); //$NON-NLS-1$
setSystemID(this, v);
endRecording(this);
}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/NodeList.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/NodeList.java
index 193ee86..ba84128 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/NodeList.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/NodeList.java
@@ -60,22 +60,22 @@
public String getName() {
if (listType == DTDRegionTypes.ELEMENT_TAG) {
- return DTDCorePlugin.getDTDString("_UI_LABEL_NODE_LIST_ELEMENTS"); //$NON-NLS-1$
+ return DTDCoreMessages._UI_LABEL_NODE_LIST_ELEMENTS; //$NON-NLS-1$
}
else if (listType == DTDRegionTypes.ENTITY_TAG) {
- return DTDCorePlugin.getDTDString("_UI_LABEL_NODE_LIST_ENTITIES"); //$NON-NLS-1$
+ return DTDCoreMessages._UI_LABEL_NODE_LIST_ENTITIES; //$NON-NLS-1$
}
else if (listType == DTDRegionTypes.NOTATION_TAG) {
- return DTDCorePlugin.getDTDString("_UI_LABEL_NODE_LIST_NOTATIONS"); //$NON-NLS-1$
+ return DTDCoreMessages._UI_LABEL_NODE_LIST_NOTATIONS; //$NON-NLS-1$
}
else if (listType == DTDRegionTypes.COMMENT_START) {
- return DTDCorePlugin.getDTDString("_UI_LABEL_NODE_LIST_COMMENTS"); //$NON-NLS-1$
+ return DTDCoreMessages._UI_LABEL_NODE_LIST_COMMENTS; //$NON-NLS-1$
}
else if (listType == DTDRegionTypes.ATTLIST_TAG) {
- return DTDCorePlugin.getDTDString("_UI_LABEL_NODE_LIST_ATTRIBUTES"); //$NON-NLS-1$
+ return DTDCoreMessages._UI_LABEL_NODE_LIST_ATTRIBUTES; //$NON-NLS-1$
}
else if (listType == DTDRegionTypes.UNKNOWN_CONTENT) {
- return DTDCorePlugin.getDTDString("_UI_LABEL_NODE_LIST_OTHER"); //$NON-NLS-1$
+ return DTDCoreMessages._UI_LABEL_NODE_LIST_OTHER; //$NON-NLS-1$
}
return ""; //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/ParameterEntityReference.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/ParameterEntityReference.java
index 288d9c6..6bbae1e 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/ParameterEntityReference.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/ParameterEntityReference.java
@@ -96,13 +96,13 @@
}
public void setReferencedEntity(String name) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_PARM_ENTITY_REF_CHG_ENTITY_REF")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_PARM_ENTITY_REF_CHG_ENTITY_REF); //$NON-NLS-1$
setReferencedEntity(this, name);
endRecording(this);
}
public void setText(String newText) {
- beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_PARM_ENTITY_REF_COMMENT_CHG")); //$NON-NLS-1$
+ beginRecording(this, DTDCoreMessages._UI_LABEL_PARM_ENTITY_REF_COMMENT_CHG); //$NON-NLS-1$
StartEndPair pair = new StartEndPair();
getStartAndEndOffsetForText(pair);
replaceText(this, pair.startOffset, pair.endOffset - pair.startOffset, newText);
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/TopLevelNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/TopLevelNode.java
index f37739f..f459164 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/TopLevelNode.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/TopLevelNode.java
@@ -39,7 +39,7 @@
// specialize this so we delete the objects flat node range
// AND any whitespace
public void delete() {
- beginRecording(getDTDFile(), DTDCorePlugin.getDTDString("_UI_LABEL_TOP_LEVEL_NODE_DELETE")); //$NON-NLS-1$
+ beginRecording(getDTDFile(), DTDCoreMessages._UI_LABEL_TOP_LEVEL_NODE_DELETE); //$NON-NLS-1$
IStructuredDocumentRegion first = (IStructuredDocumentRegion) flatNodes.get(0);
IStructuredDocumentRegion last = (IStructuredDocumentRegion) flatNodes.get(flatNodes.size() - 1);
int startOffset = first.getStartOffset();
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/DTDTokenizer.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/DTDTokenizer.java
index c7ab6f6..c2206b3 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/DTDTokenizer.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/tokenizer/DTDTokenizer.java
@@ -12,7 +12,7 @@
* Jens Lukowski/Innoopract - initial renaming/restructuring
*
*******************************************************************************/
-
+/*nlsXXX*/
package org.eclipse.wst.dtd.core.internal.tokenizer;
import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
diff --git a/bundles/org.eclipse.wst.dtd.ui/plugin.properties b/bundles/org.eclipse.wst.dtd.ui/plugin.properties
index d3c271c..2310392 100644
--- a/bundles/org.eclipse.wst.dtd.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.dtd.ui/plugin.properties
@@ -13,340 +13,12 @@
! Properties file for component: XMDTD - XML Tools DTD Editor
! Packaged for translation in: xml.zip
-!plugin.xml
providerName=Eclipse.org
pluginName=SSE DTD Source Editor
nlFeatureName=SSE DTD Source Editor NL Support
+
DTD_Source_Page_Editor.name=DTD Source Page Editor
-_UI_WIZARD_NEW_DTD=DTD File
-_UI_CREATE_NEW_DTD_FILE=Create a new DTD file
-_UI_XML_TOOLS_PREFERENCE_PAGE=XML
-_UI_DTD_EDITOR_PREFERENCE=DTD
-
-! GenerateDTDActionDelegate - XML validation check
-_UI_DIALOG_TITLE_XML_ERROR=Invalid XML
-_UI_DIALOG_INFO_XML_INVALID=The XML file contains errors. Open it in the XML editor and validate it for details.
-
-!
-! Preference Page
-!
-_UI_SEPARATE_DESIGN_AND_SOURCE_VIEW=Separate design and source view
-_UI_COMBINED_DESIGN_AND_SOURCE_VIEW=Combined design and source view
-_UI_LABEL_EDITOR_LAYOUT=Editor Layout
_UI_LABEL_DTD_FILES=DTD Files
_UI_LABEL_DTD_STYLES=DTD Styles
-
-!AddAttributeAction
-_UI_DEFAULT_NEW_ATTRIBUTE=Attribute
-_UI_ACTION_DTD_ADD_ATTRIBUTE=Add Attribute
-_UI_ACTION_DTD_ADD_ELEMENT=Add Element
-
-!actions/AddGroupToContentModelAction.java
-_UI_ACTION_ADD_GROUP=Add &Group
-
-!AddEntityAction
-_UI_ACTION_ADD_ENTITY=Add &Entity
-
-
-! Flat Page Header Text
-_UI_PAGE_HEADING_ELEMENT=Element
-_UI_PAGE_HEADING_ATTRIBUTE=Attribute
-_UI_PAGE_HEADING_NOTATION=Notation
-_UI_PAGE_HEADING_PARAM_ENTITY_REF=External Parameter Entity Reference
-_UI_PAGE_HEADING_ENTITY=Entity
-_UI_PAGE_HEADING_COMMENT=Comment
-_UI_PAGE_HEADING_ATTLIST=Attribute List
-_UI_PAGE_HEADING_CONTENT_MODEL=Content Model
-_UI_PAGE_HEADING_CONTENT_MODEL_GROUP=Content Model Group
-
-!BlankWindow
-_UI_LABEL_VIEW_NOT_AVAILABLE=View is not available for selected object.
-
-!AttributeWindow
-_UI_ACTION_NOTATION_INFO=Attribute Information
-_UI_LABEL_ATTRIBUTE_NAME=Name:
-_UI_LABEL_ATTRIBUTE_TYPE=Type:
-_UI_RADIO_DEFAULT=Default
-_UI_GROUP_ENUMERATED_DEFAULTS=Enumerated defaults
-_UI_BUTTON_ADD=Add >>
-_UI_BUTTON_REMOVE=<< Remove
-_UI_CHKBOX_DEFAULT=Default
-_UI_GROUP_ELEMENT_COMMENT=Comment
-_UI_CHKBOX_ENUMERATED_DEFAULT=Default
-_UI_CHKBOX_NOTATION_COMBO=Default
-_UI_GROUP_ATTRIBUTE=Attribute default value
-
-!ContentWindow & ElementWindow
-_UI_LABEL_DTD_NAME=Name
-_UI_GROUP_OCCURRENCE=Occurrence
-
-!the following four symbols are also used in dtdeditor/presentation/GroupContentWindow.java
-!! NOTE TO TRANSLATOR: Please keep the characters in parentheses in translated text i.e. (1)
-_UI_RADIO_JUST_ONCE=Just once (1)
-_UI_RADIO_ONE_OR_MORE=One or more (+)
-_UI_RADIO_OPTIONAL=Optional (?)
-_UI_RADIO_ZERO_OR_MORE=Zero or more (*)
-
-!context menu for .dtd files
-_UI_MENU_GENERATE=&Generate
-_UI_MENU_JAVA=&Java Beans...
-_UI_MENU_XML_SCHEMA=XML &Schema...
-_UI_MENU_HTML_FORM=&HTML Form...
-
-!presentation/DTDContextContributor.java
-_UI_MENU_GENERATE_JAVA=Generate &Java Beans...
-_UI_MENU_GENERATE_XML_SCHEMA=Generate &XML Schema...
-_UI_MENU_GENERATE_HTML_FORM=Generate &HTML Form...
-_UI_MENU_GENERATE_SAMPLE_XML=Generate XM&L...
-_UI_MENU_VALIDATE_DTD=&Validate DTD
-_UI_TOOLTIP_VALIDATE_DTD=Validate the current state of the DTD
-_UI_TOOLTIP_GENERATE_HTML=Generate an HTML form for the DTD
-_UI_TOOLTIP_GENERATE_SAMPLE_XML=Generate an XML from the DTD
-_UI_TOOLTIP_GENERATE_XML_SCHEMA=Generate an XML Schema from the DTD
-_UI_TOOLTIP_GENERATE_JAVA=Generate Java Beans for the DTD
-
-_UI_ACTION_DELETE=Delete
-_UI_ACTION_CONTEXT_ADD_NOTATION=Add &Notation
-_UI_TOOLTIP_ADD_NOTATION=Add a notation to the DTD.
-_UI_ACTION_CONTEXT_ADD_ENTITY=Add &Entity
-_UI_TOOLTIP_ADD_ENTITY=Add an entity to the DTD.
-_UI_ACTION_CONTEXT_ADD_ELEMENT=Add Ele&ment
-_UI_TOOLTIP_ADD_ELEMENT=Add an element to the DTD.
-_UI_ACTION_CONTEXT_ADD_ATTRIBUTE=Add Attribute
-_UI_TOOLTIP_ADD_ATTRIBUTE_SELECTED=Add an attribute to the selected element.
-_UI_ACTION_ADD_ATTRIBUTELIST=Add Attribute &List
-_UI_TOOLTIP_ADD_ATTRIBUTELIST_SELECTED=Add an attribute list to the selected element.
-_UI_ACTION_ADD_GROUP_CONTENT=Add Group To Con&tent Model
-_UI_TOOLTIP_ADD_GROUP=Add a group to the content model of the selected group or element.
-_UI_ACTION_ADD_ELEMENT_CONTENT=Add Element To C&ontent Model
-_UI_TOOLTIP_ADD_ELEMENT_CONTENT=Add an element to the content model.
-_UI_MENU_DTD_EDITOR=&DTD
-_UI_TOOLTIP_ADD_COMMENT=Add a comment to the DTD.
-
-!presentation/DTDEditor.java
-_UI_WORKBOOKPAGE_SOURCE=Source
-_UI_WORKBOOKPAGE_DESIGN=Design
-
-!the following is used: _UI_MENU_UNDO_1 + _UI_MENU_UNDO_2
-_UI_MENU_UNDO_1=&Undo
-!! NOTE TO TRANSLATOR: Do not translate following line - shortcut key
-_UI_MENU_UNDO_2=@Ctrl+Z
-
-!the following is used: _UI_MENU_UNDO_DESC + a description of the command to be undone
-_UI_MENU_UNDO_DESC=Undo:
-
-!the following is used: _UI_MENU_REDO_1 + _UI_MENU_REDO_2
-_UI_MENU_REDO_1=&Redo
-!! NOTE TO TRANSLATOR: Do not translate following line - shortcut key
-_UI_MENU_REDO_2=@Ctrl+Y
-
-!the following is used: _UI_MENU_REDO_DESC + a description of the command to be done again
-_UI_MENU_REDO_DESC=Redo:
-
-!presentation/ElementWindow
-_UI_ELEMENT_NAME=Name
-_UI_ELEMENT_COMMENT=Comment
-
-!DTDOutliner
-_UI_ACTION_ADD_DTD_NOTATION=Add &Notation
-_UI_ACTION_ADD_DTD_ENTITY=Add &Entity
-_UI_ACTION_ADD_DTD_ELEMENT=Add Ele&ment
-_UI_ACTION_ADD_DTD_COMMENT=Add &Comment
-_UI_ACTION_DTD_DELETE=&Delete
-_UI_ACTION_ADD_ATTRIBUTE=Add &Attribute
-_UI_ACTION_GROUP_ADD_GROUP=Add Group to Con&tent Model
-_UI_ACTION_ADD_ELEMENT=Add Element to C&ontent Model
-
-!DTDContentOutlinePage
-_UI_BUTTON_GROUP_ITEMS_LOGICALLY=Group items logically.
-_UI_BUTTON_UNGROUP_ITEMS_LOGICALLY=Do not group items logically.
-_UI_BUTTON_SORT_ITEMS=Sort items alphabetically.
-_UI_BUTTON_UNSORT_ITEMS=Do not sort items alphabetically.
-
-!provider/EntityItemProvider.java
-_UI_COLUMN_PARAMETER=Parameter
-_UI_COLUMN_GENERAL=General
-
-!provider/FolderItemProvider.java
-_UI_LABEL_ELEMENTS_FOLDER=Elements
-_UI_LABEL_NOTATIONS_FOLDER=Notations
-_UI_LABEL_ENITIES_FOLDER=Entities
-
-!Wizards/InputSelectionPage.java
-_UI_BUTTON_SELECT_ALL=&Select All
-_UI_BUTTON_UNSELECT_ALL=&Clear All
-
-!Wizards/HTMLFormWizard.java
-_UI_HTML_WIZARD_NEW_FILE_TITLE=Generate HTML Form
-_UI_HTML_WIZARD_NEW_FILE_DESC=Generate an HTML form from the selected DTD file.
-
-!Wizards/NewDTDWizard.java
-_UI_WIZARD_NEW_DTD_TITLE=Create DTD
-_UI_WIZARD_CREATE_DTD_HEADING=Create DTD File
-_UI_WIZARD_CREATE_DTD_EXPL=Select how you would like to create your DTD file.
-_UI_RADIO_CREATE_DTD=Create DTD file from scratch
-_UI_RADIO_CREATE_DTD_FROM_XML=Create DTD file from an XML file
-
-_UI_WIZARD_NEW_DTD_HEADING=New DTD
-_UI_WIZARD_NEW_DTD_EXPL=Create a new DTD file. Specify the folder and name for the file.
-_ERROR_FILENAME_MUST_END_DTD = The file name must end in .dtd
-
-_UI_WIZARD_NEW_XSD_HEADING=New XML Schema
-_UI_WIZARD_NEW_XSD_EXPL=Create a new XML Schema file from the XML file.
-
-_UI_WIZARD_XML_FILE_HEADING=XML Files
-_UI_WIZARD_XML_FILE_EXPL=Select the XML files to create the DTD file from.
-_UI_LABEL_XML_FILES=XML Files:
-
-_UI_STATUS_XML_CONTAINS_ERRORS=XML files specified contained errors.
-_UI_BUTTON_ADD_XML=Add...
-_UI_BUTTON_REMOVE_XML=Remove
-
-!wizards/ServletNamePage
-_UI_WIZARD_SERVLET_NAME_HEADING=Servlet Name
-_UI_LABEL_SERVLET_NAME=&Enter the servlet name:
-_UI_LABEL_MISSING_SERVLET_NAME=Provide a servlet name
-_UI_LABEL_DEFAULT_SERVLET_NAME=http://localhost/servlet/testServlet
-
-!wizards/GenerateXMLSchemaHelper.java & DTD2XSDWizard.java
-_UI_WIZARD_DTD2XSD_TITLE=Generate
-_UI_GENERATE_XSD_TITLE=Generate XML Schema
-_UI_GENERATE_XSD_DESCRIPTION=Generate an XML schema from the selected DTD file.
-_UI_PAGE_GEN_OPTIONS_TITLE=XML Schema Generation Options
-_UI_PAGE_GEN_OPTIONS_DESC=Select how you want your XML schema generated
-_UI_GENERATE_XSD_LONG_DESC=You can create one XML schema file that includes the selected DTD and any of the DTDs it references. Alternatively, you can create individual schema files that correspond to the selected DTD and any of the DTDs it references.
-
-
-_UI_GROUP_OPTIONS=Options
-_UI_BUTTON_GEN_ONE_SCHEMA=&Create one XML schema that includes all the DTD files
-_UI_BUTTON_GEN_MULTI_SCHEMAS=Create an &XML schema for each DTD file
-
-!EntityWindow
-_UI_GROUP_ENTITY_INFORMATION=Entity information
-_UI_LABEL_NAME=Name:
-_UI_LABLE_TYPE=Type:
-_UI_RADIO_GENERAL=General
-_UI_RADIO_PARAMETER=Parameter
-_UI_CHKBOX_EXTERNAL=External
-_UI_GROUP_INTERNAL=Internal Entity
-_UI_DIALOG_SELECT_DTD=Select System ID File
-_UI_DIALOG_SELECT_DTD_DESC=Please select a resource to be used for the System ID.
-_UI_GROUP_INTERNAL_ENTITY=Internal entity
-_UI_LABEL_VALUE_INTERNAL=Value:
-_UI_GROUP_EXTERNAL_ENTITY=External entity
-_UI_LABEL_VALUE=Value
-_UI_GROUP_COMMENT=Comment
-_UI_LABEL_SYSTEM_ID=System ID:
-_UI_BUTTON_SELECT=Select...
-_UI_LABEL_PUBLIC_ID=Public ID:
-_UI_LABEL_NOTATION_NAME=Notation name
-_UI_LABEL_UNPARSE_ENTITY=(Unparsed entity)
-_UI_TOOLTIP_GENERAL=Use entity in XML documents.
-_UI_TOOLTIP_PARAMETER=Use entity in a DTD.
-_UI_TOOLTIP_EXTERNAL=Refer to an external DTD.
-_UI_LABEL_BROWSE=Browse...
-
-!presentation/NotationsTable.java
-_UI_COLUMN_NOTATION_NAME=Notation Name
-_UI_COLUMN_DECLARATION=Declaration
-
-!GroupContentWindow
-_UI_GROUP_MODEL_GROUP=Model group
-_UI_GROUP_CONNECTOR=Connector
-_UI_GROUP_MODEL_GROUP_OCCURRENCE=Occurrence
-_UI_RADIO_SEQUENCE=Sequence (,)
-_UI_RADIO_CHOICE=Choice (|)
-_UI_LABEL_CONTENT_MODEL_TYPE=Content model type:
-
-!EntitiesTable
-_UI_COLUMN_ENTITY_NAME=Entity Name
-_UI_COLUMN_TYPE=Type
-_UI_COLUMN_DECLARATION=Declaration
-
-!AddNotationAction
-_UI_DEFAULT_NOTATION=Notation
-_UI_ACTION_ADD_NOTATION=Add &Notation
-
-!ElementsTable
-_UI_COLUMN_ELEMENT_NAME=Element Name
-_UI_COLUMN_CONTENT_MODEL=Content Model
-_UI_COLUMN_ATTRIBUTES=Attributes
-
-!ValidateDTDAction
-_UI_MSGBOX_DTD_VALID_TITLE=Validation Successful
-_UI_MSGBOX_DTD_VALID_TEXT=The DTD file is valid.
-
-!NotationWindow
-_UI_LABEL_NOTATION_INFORMATION=Notation information
-_UI_LABEL_NOTATION_NAME=Name:
-_UI_LABEL_NOTATION_SYSTEM_ID=System ID:
-_UI_LABEL_NOTATION_PUBLIC_ID=Public ID:
-_UI_LABEL_NOTATION_COMMENT=Comment
-
-!ParameterEntityReferenceWindow
-_UI_GROUP_EXTERNAL_PARM_ENTITY_REF=External parameter entity reference
-_UI_LABEL_ENTITY_NAME=Entity name:
-_UI_LABEL_REFERENCED_FILE=Referenced file:
-
-!InputSelectionPage (HTMLFormWizard)
-_UI_INPUT_SEL_PAGE_TITLE=Form Input Selection
-_UI_INPUT_SEL_PAGE_DESC=Select the form input fields to be generated
-
-!HTMLFormWizard (HTMLFormWizard)
-_UI_HTML_WIZARD_TITLE=HTML Form Creation Wizard
-
-! ParameterEntityReferenceWindow
-_UI_BUTTON_DETAILS=Details...
-
-!DTDContextContributer
-_UI_ACTION_ADD_PARAM_ENTITY_REF=Add &Parameter Entity Reference
-
-!DragAttributeCommand
-_UI_MOVE_ATTRIBUTE=Move Attribute
-
-!DragContentModelCommand
-_UI_MOVE_CONTENT=Move Content
-
-!DragTopLevelNodesCommand
-_UI_MOVE_NODE=Move Node
-_UI_MOVE_NODES=Move Nodes
-
-!DTDValidator
-_UI_DTD_VALIDATOR=DTD Validator
-
-_ERROR_MIN_ONE_XML_FILE=At least one XML File must be added
-_ERROR_MIN_ONE_XML_FILE_FOR_OP=At least one XML file is required to perform the operation.
-_ERROR_NO_FILENAME=Enter a file name
-_ERROR_FILE_DOES_NOT_EXIST=File does not exist
-_ERROR_FILENAME_INVALID=Invalid file name
-_ERROR_FILENAME_MUST_END_DTD=The file name must end in .dtd
-_ERROR_TITLE_GENERATE_DTD_FAILED=Generate DTD failed
-_ERROR_MSG_GENERATE_DTD_FAILED=Errors were encountered while generating the DTD.
-
-_ERROR_INVALID_NAME_SPACE=Name field cannot contain a space
-_ERROR_VALIDATE_FAILED=Validation failed
-_ERROR_DTD_INVALID=The DTD file is invalid. Please check the Tasks view for more details.
-_ERROR_LIMITE_EXCEEDED=The DTD file is not valid. The message limit for the Tasks view has been exceeded. Please increase the limit and try again.
-
-_ERROR_TITLE_GENERATE_JAVABEAN_FAILED=Generate Java Beans failed
-_ERROR_MSG_GENERATE_JAVABEAN_FAILED=Errors were encountered while generating the Java Beans.
-DTDColorPage.0=<!ELEMENT Main (One,Two+)>\r\n<!ELEMENT One (Three,Four)>\r\n<!ATTLIST One\r\n oneone CDATA #REQUIRED\r\n>\r\n<!-- You need this -->\r\n<!ELEMENT Two (moremore*)>\r\n<!ATTLIST Two\r\n twotwo CDATA #REQUIRED\r\n twothree (aaa | bbb) "aaa"\r\n>\r\n
-DTDColorPage.1=Comments
-DTDColorPage.2=Data
-DTDColorPage.3=Default
-DTDColorPage.4=Keywords
-DTDColorPage.5=Strings
-DTDColorPage.6=Symbols
-DTDColorPage.7=Tag Delimiters
-DTDColorPage.8=Tag Names
-DTDPropertySourceAdapter.0=Name
-DTDPropertySourceAdapter.1=Contents
-DTDPropertySourceAdapter.2=Attributes
-
-! org.eclipse.ui.newWizards extension point
-_UI_WIZARD_NEW_DTD = DTD
-_UI_CREATE_NEW_DTD_FILE = Create a new DTD file.
-_UI_WIZARD_NEW_DTD_TITLE = Create DTD
-_UI_WIZARD_NEW_DTD_HEADING = New DTD
-_UI_WIZARD_NEW_DTD_EXPL = Create a new DTD file. Specify the folder and name for the file.
-_UI_NEW_DTD_FILENAME = NewDTD.dtd
+_UI_WIZARD_NEW_DTD=DTD File
+_UI_CREATE_NEW_DTD_FILE=Create a new DTD file
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIMessages.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIMessages.java
new file mode 100644
index 0000000..657ec24
--- /dev/null
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIMessages.java
@@ -0,0 +1,60 @@
+/**********************************************************************
+ * Copyright (c) 2005 IBM Corporation and others. All rights reserved. This
+ * program and the accompanying materials are made available under the terms of
+ * the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.wst.dtd.ui.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Strings used by DTD UI
+ *
+ * @since 1.0
+ */
+public class DTDUIMessages extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.wst.dtd.ui.internal.DTDUIPluginResources";//$NON-NLS-1$
+
+ public static String _UI_ACTION_ADD_ATTRIBUTELIST;
+ public static String _UI_ACTION_ADD_DTD_NOTATION;
+ public static String _UI_ACTION_ADD_DTD_ENTITY;
+ public static String _UI_ACTION_ADD_DTD_ELEMENT;
+ public static String _UI_ACTION_ADD_DTD_COMMENT;
+ public static String _UI_ACTION_DTD_DELETE;
+ public static String _UI_ACTION_ADD_ATTRIBUTE;
+ public static String _UI_ACTION_GROUP_ADD_GROUP;
+ public static String _UI_ACTION_ADD_ELEMENT;
+ public static String _UI_BUTTON_GROUP_ITEMS_LOGICALLY;
+ public static String _UI_BUTTON_SORT_ITEMS;
+ public static String _UI_ACTION_ADD_PARAM_ENTITY_REF;
+ public static String _UI_MOVE_ATTRIBUTE;
+ public static String _UI_MOVE_CONTENT;
+ public static String _UI_MOVE_NODE;
+ public static String _UI_MOVE_NODES;
+ public static String _ERROR_FILENAME_MUST_END_DTD;
+ public static String DTDColorPage_0;
+ public static String DTDColorPage_1;
+ public static String DTDColorPage_2;
+ public static String DTDColorPage_3;
+ public static String DTDColorPage_4;
+ public static String DTDColorPage_5;
+ public static String DTDColorPage_6;
+ public static String DTDColorPage_7;
+ public static String DTDColorPage_8;
+ public static String DTDPropertySourceAdapter_0;
+ public static String DTDPropertySourceAdapter_1;
+ public static String DTDPropertySourceAdapter_2;
+ public static String _UI_CREATE_NEW_DTD_FILE;
+ public static String _UI_WIZARD_NEW_DTD_TITLE;
+ public static String _UI_WIZARD_NEW_DTD_EXPL;
+ public static String _UI_LABEL_DTD_FILE_DELETE;
+
+ static {
+ // load message values from bundle file
+ NLS.initializeMessages(BUNDLE_NAME, DTDUIMessages.class);
+ }
+}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPlugin.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPlugin.java
index 711ee85..b93a751 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPlugin.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPlugin.java
@@ -12,12 +12,8 @@
*******************************************************************************/
package org.eclipse.wst.dtd.ui.internal;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -35,37 +31,12 @@
}
/**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = DTDUIPlugin.getDefault().getResourceBundle();
- String bundleKey = null;
- if (key.startsWith("%")) {
- bundleKey = key.substring(1);
- }
- else {
- bundleKey = key;
- }
- try {
- if (bundle != null)
- return bundle.getString(bundleKey);
- }
- catch (MissingResourceException e) {
- }
- return key;
- }
-
- /**
* Returns the workspace instance.
*/
public static IWorkspace getWorkspace() {
return ResourcesPlugin.getWorkspace();
}
- // Resource bundle.
- private ResourceBundle resourceBundle;
-
/**
* The constructor.
*/
@@ -73,19 +44,4 @@
super();
plugin = this;
}
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- if (resourceBundle == null) {
- try {
- resourceBundle = Platform.getResourceBundle(getBundle());
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
- return resourceBundle;
- }
}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPluginResources.properties b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPluginResources.properties
new file mode 100644
index 0000000..5e7ec1a
--- /dev/null
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPluginResources.properties
@@ -0,0 +1,63 @@
+###############################################################################
+# Copyright (c) 2005 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+
+_UI_ACTION_ADD_ATTRIBUTELIST=Add Attribute &List
+
+!DTDOutliner
+_UI_ACTION_ADD_DTD_NOTATION=Add &Notation
+_UI_ACTION_ADD_DTD_ENTITY=Add &Entity
+_UI_ACTION_ADD_DTD_ELEMENT=Add Ele&ment
+_UI_ACTION_ADD_DTD_COMMENT=Add &Comment
+_UI_ACTION_DTD_DELETE=&Delete
+_UI_ACTION_ADD_ATTRIBUTE=Add &Attribute
+_UI_ACTION_GROUP_ADD_GROUP=Add Group to Con&tent Model
+_UI_ACTION_ADD_ELEMENT=Add Element to C&ontent Model
+
+!DTDContentOutlinePage
+_UI_BUTTON_GROUP_ITEMS_LOGICALLY=Group items logically.
+_UI_BUTTON_SORT_ITEMS=Sort items alphabetically.
+
+!DTDContextContributer
+_UI_ACTION_ADD_PARAM_ENTITY_REF=Add &Parameter Entity Reference
+
+!DragAttributeCommand
+_UI_MOVE_ATTRIBUTE=Move Attribute
+
+!DragContentModelCommand
+_UI_MOVE_CONTENT=Move Content
+
+!DragTopLevelNodesCommand
+_UI_MOVE_NODE=Move Node
+_UI_MOVE_NODES=Move Nodes
+
+_ERROR_FILENAME_MUST_END_DTD=The file name must end in .dtd
+
+#DTD Style page
+DTDColorPage_0=<!ELEMENT Main (One,Two+)>\r\n<!ELEMENT One (Three,Four)>\r\n<!ATTLIST One\r\n oneone CDATA #REQUIRED\r\n>\r\n<!-- You need this -->\r\n<!ELEMENT Two (moremore*)>\r\n<!ATTLIST Two\r\n twotwo CDATA #REQUIRED\r\n twothree (aaa | bbb) "aaa"\r\n>\r\n
+DTDColorPage_1=Comments
+DTDColorPage_2=Data
+DTDColorPage_3=Default
+DTDColorPage_4=Keywords
+DTDColorPage_5=Strings
+DTDColorPage_6=Symbols
+DTDColorPage_7=Tag Delimiters
+DTDColorPage_8=Tag Names
+DTDPropertySourceAdapter_0=Name
+DTDPropertySourceAdapter_1=Contents
+DTDPropertySourceAdapter_2=Attributes
+
+! NewDTDWizard.java
+_UI_CREATE_NEW_DTD_FILE = Create a new DTD file.
+_UI_WIZARD_NEW_DTD_TITLE = Create DTD
+_UI_WIZARD_NEW_DTD_EXPL = Create a new DTD file. Specify the folder and name for the file.
+
+# copied from dtd core
+_UI_LABEL_DTD_FILE_DELETE=Delete
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragAttributeCommand.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragAttributeCommand.java
index 06e250f..798716f 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragAttributeCommand.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragAttributeCommand.java
@@ -20,7 +20,7 @@
import org.eclipse.wst.dtd.core.internal.AttributeList;
import org.eclipse.wst.dtd.core.internal.DTDFile;
import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
+import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
@@ -45,7 +45,7 @@
DTDNode referenceNode = (DTDNode) target;
DTDFile dtdFile = referenceNode.getDTDFile();
if (referenceNode instanceof Attribute) {
- dtdFile.getDTDModel().beginRecording(this, DTDUIPlugin.getResourceString("_UI_MOVE_ATTRIBUTE")); //$NON-NLS-1$
+ dtdFile.getDTDModel().beginRecording(this, DTDUIMessages._UI_MOVE_ATTRIBUTE); //$NON-NLS-1$
AttributeList attList = (AttributeList) referenceNode.getParentNode();
Iterator iter = sources.iterator();
while (iter.hasNext()) {
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragContentModelCommand.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragContentModelCommand.java
index 35fab76..9f24c27 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragContentModelCommand.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragContentModelCommand.java
@@ -25,7 +25,7 @@
import org.eclipse.wst.dtd.core.internal.DTDFile;
import org.eclipse.wst.dtd.core.internal.DTDNode;
import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
+import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
public class DragContentModelCommand extends DefaultDragAndDropCommand {
@@ -56,7 +56,7 @@
DTDFile dtdFile = referenceNode.getDTDFile();
DTDNode parent = (DTDNode) referenceNode.getParentNode();
- dtdFile.getDTDModel().beginRecording(this, DTDUIPlugin.getResourceString("_UI_MOVE_CONTENT")); //$NON-NLS-1$
+ dtdFile.getDTDModel().beginRecording(this, DTDUIMessages._UI_MOVE_CONTENT); //$NON-NLS-1$
boolean parentIsElement = false;
Element element = null;
CMGroupNode group = null;
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragTopLevelNodesCommand.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragTopLevelNodesCommand.java
index 0aa8082..127224d 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragTopLevelNodesCommand.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragTopLevelNodesCommand.java
@@ -21,12 +21,12 @@
import org.eclipse.wst.dtd.core.internal.DTDFile;
import org.eclipse.wst.dtd.core.internal.DTDNode;
import org.eclipse.wst.dtd.core.internal.TopLevelNode;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
+import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
public class DragTopLevelNodesCommand extends DefaultDragAndDropCommand {
- static private final String moveNode = DTDUIPlugin.getResourceString("_UI_MOVE_NODE"); //$NON-NLS-1$
- static private final String moveNodes = DTDUIPlugin.getResourceString("_UI_MOVE_NODES"); //$NON-NLS-1$
+ static private final String moveNode = DTDUIMessages._UI_MOVE_NODE; //$NON-NLS-1$
+ static private final String moveNodes = DTDUIMessages._UI_MOVE_NODES; //$NON-NLS-1$
public DragTopLevelNodesCommand(Object target, float location, int operations, int operation, Collection sources) {
super(target, location, operations, operation, sources);
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDColorPage.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDColorPage.java
index 836be12..c1abc3b 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDColorPage.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDColorPage.java
@@ -24,6 +24,7 @@
import org.eclipse.ui.help.WorkbenchHelp;
import org.eclipse.wst.dtd.core.contenttype.ContentTypeIdForDTD;
import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
+import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
import org.eclipse.wst.dtd.ui.internal.editor.IHelpContextIds;
import org.eclipse.wst.dtd.ui.internal.style.IStyleConstantsDTD;
@@ -69,7 +70,7 @@
}
public String getSampleText() {
- return DTDUIPlugin.getResourceString("DTDColorPage.0"); //$NON-NLS-1$
+ return DTDUIMessages.DTDColorPage_0; //$NON-NLS-1$
}
protected void initContextStyleMap(Dictionary contextStyleMap) {
@@ -117,14 +118,14 @@
}
protected void initDescriptions(Dictionary descriptions) {
- descriptions.put(IStyleConstantsDTD.DTD_COMMENT, DTDUIPlugin.getResourceString("DTDColorPage.1")); //$NON-NLS-1$
- descriptions.put(IStyleConstantsDTD.DTD_DATA, DTDUIPlugin.getResourceString("DTDColorPage.2")); //$NON-NLS-1$
- descriptions.put(IStyleConstantsDTD.DTD_DEFAULT, DTDUIPlugin.getResourceString("DTDColorPage.3")); //$NON-NLS-1$
- descriptions.put(IStyleConstantsDTD.DTD_KEYWORD, DTDUIPlugin.getResourceString("DTDColorPage.4")); //$NON-NLS-1$
- descriptions.put(IStyleConstantsDTD.DTD_STRING, DTDUIPlugin.getResourceString("DTDColorPage.5")); //$NON-NLS-1$
- descriptions.put(IStyleConstantsDTD.DTD_SYMBOL, DTDUIPlugin.getResourceString("DTDColorPage.6")); //$NON-NLS-1$
- descriptions.put(IStyleConstantsDTD.DTD_TAG, DTDUIPlugin.getResourceString("DTDColorPage.7")); //$NON-NLS-1$
- descriptions.put(IStyleConstantsDTD.DTD_TAGNAME, DTDUIPlugin.getResourceString("DTDColorPage.8")); //$NON-NLS-1$
+ descriptions.put(IStyleConstantsDTD.DTD_COMMENT, DTDUIMessages.DTDColorPage_1); //$NON-NLS-1$
+ descriptions.put(IStyleConstantsDTD.DTD_DATA, DTDUIMessages.DTDColorPage_2); //$NON-NLS-1$
+ descriptions.put(IStyleConstantsDTD.DTD_DEFAULT, DTDUIMessages.DTDColorPage_3); //$NON-NLS-1$
+ descriptions.put(IStyleConstantsDTD.DTD_KEYWORD, DTDUIMessages.DTDColorPage_4); //$NON-NLS-1$
+ descriptions.put(IStyleConstantsDTD.DTD_STRING, DTDUIMessages.DTDColorPage_5); //$NON-NLS-1$
+ descriptions.put(IStyleConstantsDTD.DTD_SYMBOL, DTDUIMessages.DTDColorPage_6); //$NON-NLS-1$
+ descriptions.put(IStyleConstantsDTD.DTD_TAG, DTDUIMessages.DTDColorPage_7); //$NON-NLS-1$
+ descriptions.put(IStyleConstantsDTD.DTD_TAGNAME, DTDUIMessages.DTDColorPage_8); //$NON-NLS-1$
}
protected void initStyleList(ArrayList list) {
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/projection/StructuredTextFoldingProviderDTD.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/projection/StructuredTextFoldingProviderDTD.java
index 6318ea8..49ec5d9 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/projection/StructuredTextFoldingProviderDTD.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/projection/StructuredTextFoldingProviderDTD.java
@@ -72,7 +72,7 @@
long end = System.currentTimeMillis();
if (debugProjectionPerf)
- System.out.println("StructuredTextFoldingProviderDTD.addAllAnnotations: " + (end - start));
+ System.out.println("StructuredTextFoldingProviderDTD.addAllAnnotations: " + (end - start)); //$NON-NLS-1$
}
/**
@@ -241,8 +241,8 @@
long end = System.currentTimeMillis();
if (debugProjectionPerf) {
- String nodeName = node != null ? node.getNodeName() : "null";
- System.out.println("StructuredTextFoldingProviderDTD.nodeChanged (" + nodeName + "):" + (end - start));
+ String nodeName = node != null ? node.getNodeName() : "null"; //$NON-NLS-1$
+ System.out.println("StructuredTextFoldingProviderDTD.nodeChanged (" + nodeName + "):" + (end - start)); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -267,7 +267,7 @@
long end = System.currentTimeMillis();
if (debugProjectionPerf)
- System.out.println("StructuredTextFoldingProviderDTD.nodesAdded: " + (end - start));
+ System.out.println("StructuredTextFoldingProviderDTD.nodesAdded: " + (end - start)); //$NON-NLS-1$
}
public void nodesRemoved(NodesEvent event) {
@@ -289,7 +289,7 @@
long end = System.currentTimeMillis();
if (debugProjectionPerf)
- System.out.println("StructuredTextFoldingProviderDTD.nodesRemoved: " + (end - start));
+ System.out.println("StructuredTextFoldingProviderDTD.nodesRemoved: " + (end - start)); //$NON-NLS-1$
}
public void projectionDisabled() {
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/DTDContextMenuHelper.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/DTDContextMenuHelper.java
index de903dc..359125f 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/DTDContextMenuHelper.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/DTDContextMenuHelper.java
@@ -34,7 +34,7 @@
import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
import org.eclipse.wst.dtd.core.internal.util.LabelValuePair;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
+import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImageHelper;
import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImages;
import org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions.AddAttributeAction;
@@ -94,18 +94,18 @@
public DTDContextMenuHelper(StructuredTextEditor editor) {
this.fEditor = editor;
fMenuListener = new DTDMenuListener();
- addNotationAction = new AddNotationAction(editor, DTDUIPlugin.getResourceString("_UI_ACTION_ADD_DTD_NOTATION")); //$NON-NLS-1$
- addEntityAction = new AddEntityAction(editor, DTDUIPlugin.getResourceString("_UI_ACTION_ADD_DTD_ENTITY")); //$NON-NLS-1$
- addElementAction = new AddElementAction(editor, DTDUIPlugin.getResourceString("_UI_ACTION_ADD_DTD_ELEMENT")); //$NON-NLS-1$
- addCommentAction = new AddCommentAction(editor, DTDUIPlugin.getResourceString("_UI_ACTION_ADD_DTD_COMMENT")); //$NON-NLS-1$
+ addNotationAction = new AddNotationAction(editor, DTDUIMessages._UI_ACTION_ADD_DTD_NOTATION); //$NON-NLS-1$
+ addEntityAction = new AddEntityAction(editor, DTDUIMessages._UI_ACTION_ADD_DTD_ENTITY); //$NON-NLS-1$
+ addElementAction = new AddElementAction(editor, DTDUIMessages._UI_ACTION_ADD_DTD_ELEMENT); //$NON-NLS-1$
+ addCommentAction = new AddCommentAction(editor, DTDUIMessages._UI_ACTION_ADD_DTD_COMMENT); //$NON-NLS-1$
- addParameterEntityReferenceAction = new AddParameterEntityReferenceAction(editor, DTDUIPlugin.getResourceString("_UI_ACTION_ADD_PARAM_ENTITY_REF")); //$NON-NLS-1$
- deleteAction = new DeleteAction(DTDUIPlugin.getResourceString("_UI_ACTION_DTD_DELETE")); //$NON-NLS-1$
- addAttributeAction = new AddAttributeAction(editor, DTDUIPlugin.getResourceString("_UI_ACTION_ADD_ATTRIBUTE")); //$NON-NLS-1$
- addAttributeListAction = new AddAttributeListAction(editor, DTDUIPlugin.getResourceString("_UI_ACTION_ADD_ATTRIBUTELIST")); //$NON-NLS-1$
+ addParameterEntityReferenceAction = new AddParameterEntityReferenceAction(editor, DTDUIMessages._UI_ACTION_ADD_PARAM_ENTITY_REF); //$NON-NLS-1$
+ deleteAction = new DeleteAction(DTDUIMessages._UI_ACTION_DTD_DELETE); //$NON-NLS-1$
+ addAttributeAction = new AddAttributeAction(editor, DTDUIMessages._UI_ACTION_ADD_ATTRIBUTE); //$NON-NLS-1$
+ addAttributeListAction = new AddAttributeListAction(editor, DTDUIMessages._UI_ACTION_ADD_ATTRIBUTELIST); //$NON-NLS-1$
- addGroupToContentModelAction = new AddGroupToContentModelAction(editor, DTDUIPlugin.getResourceString("_UI_ACTION_GROUP_ADD_GROUP")); //$NON-NLS-1$
- addElementToContentModelAction = new AddElementToContentModelAction(editor, DTDUIPlugin.getResourceString("_UI_ACTION_ADD_ELEMENT")); //$NON-NLS-1$
+ addGroupToContentModelAction = new AddGroupToContentModelAction(editor, DTDUIMessages._UI_ACTION_GROUP_ADD_GROUP); //$NON-NLS-1$
+ addElementToContentModelAction = new AddElementToContentModelAction(editor, DTDUIMessages._UI_ACTION_ADD_ELEMENT); //$NON-NLS-1$
addNotationAction.setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_OBJ_ADD_NOTATION));
addEntityAction.setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_OBJ_ADD_ENTITY));
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/OrderAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/OrderAction.java
index ef73645..ff8e107 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/OrderAction.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/OrderAction.java
@@ -21,7 +21,7 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
+import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImageHelper;
import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImages;
import org.eclipse.wst.sse.ui.internal.contentoutline.PropertyChangeUpdateAction;
@@ -35,7 +35,7 @@
private TreeViewer treeViewer;
public OrderAction(TreeViewer viewer, DTDTreeContentProvider provider, IPreferenceStore store, String preferenceKey) {
- super(DTDUIPlugin.getResourceString("_UI_BUTTON_GROUP_ITEMS_LOGICALLY"), store, preferenceKey, false); //$NON-NLS-1$
+ super(DTDUIMessages._UI_BUTTON_GROUP_ITEMS_LOGICALLY, store, preferenceKey, false); //$NON-NLS-1$
setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_OBJ_ORGANIZE_DTD_LOGICALLY));
treeViewer = viewer;
contentProvider = provider;
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/SortAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/SortAction.java
index ddc707d..a496ce3 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/SortAction.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/SortAction.java
@@ -17,7 +17,7 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
+import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImageHelper;
import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImages;
import org.eclipse.wst.sse.ui.internal.contentoutline.PropertyChangeUpdateAction;
@@ -27,7 +27,7 @@
private TreeViewer treeViewer;
public SortAction(TreeViewer viewer, IPreferenceStore store, String preferenceKey) {
- super(DTDUIPlugin.getResourceString("_UI_BUTTON_SORT_ITEMS"), store, preferenceKey, false); //$NON-NLS-1$
+ super(DTDUIMessages._UI_BUTTON_SORT_ITEMS, store, preferenceKey, false); //$NON-NLS-1$
setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_OBJ_SORT));
setToolTipText(getText());
treeViewer = viewer;
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/DeleteAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/DeleteAction.java
index c31e431..af094b2 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/DeleteAction.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/DeleteAction.java
@@ -19,10 +19,10 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.actions.SelectionListenerAction;
import org.eclipse.wst.dtd.core.internal.CMNode;
-import org.eclipse.wst.dtd.core.internal.DTDCorePlugin;
import org.eclipse.wst.dtd.core.internal.DTDFile;
import org.eclipse.wst.dtd.core.internal.DTDNode;
import org.eclipse.wst.dtd.core.internal.util.DTDBatchNodeDelete;
+import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
public class DeleteAction extends SelectionListenerAction {
@@ -48,7 +48,7 @@
batchDelete.addNode((DTDNode) element);
}
}
- dtdFile.getDTDModel().beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_FILE_DELETE")); //$NON-NLS-1$
+ dtdFile.getDTDModel().beginRecording(this, DTDUIMessages._UI_LABEL_DTD_FILE_DELETE); //$NON-NLS-1$
batchDelete.deleteNodes(this);
dtdFile.getDTDModel().endRecording(this);
}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/properties/DTDPropertySourceAdapter.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/properties/DTDPropertySourceAdapter.java
index ba82d7e..44da03d 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/properties/DTDPropertySourceAdapter.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/properties/DTDPropertySourceAdapter.java
@@ -17,7 +17,7 @@
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
+import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
import org.eclipse.wst.sse.core.INodeAdapter;
import org.eclipse.wst.sse.core.INodeNotifier;
import org.eclipse.wst.sse.ui.internal.properties.CustomPropertyDescriptor;
@@ -31,8 +31,8 @@
public class DTDPropertySourceAdapter implements INodeAdapter, IPropertySource {
protected final static String CATEGORY_ATTRIBUTES = "Attributes"; //$NON-NLS-1$
- private static final String ID_NAME = DTDUIPlugin.getResourceString("DTDPropertySourceAdapter.0"); //$NON-NLS-1$
- private static final String ID_TEXT = DTDUIPlugin.getResourceString("DTDPropertySourceAdapter.1"); //$NON-NLS-1$
+ private static final String ID_NAME = DTDUIMessages.DTDPropertySourceAdapter_0; //$NON-NLS-1$
+ private static final String ID_TEXT = DTDUIMessages.DTDPropertySourceAdapter_1; //$NON-NLS-1$
protected IPropertyDescriptor[] fDescriptors = null;
protected INodeNotifier fNode = null;
@@ -49,7 +49,7 @@
*/
private IPropertyDescriptor[] createPropertyDescriptors() {
CustomPropertyDescriptor nameDescriptor = new CustomPropertyDescriptor(ID_NAME, ID_NAME, null);
- nameDescriptor.setCategory(DTDUIPlugin.getResourceString("DTDPropertySourceAdapter.2")); //$NON-NLS-1$
+ nameDescriptor.setCategory(DTDUIMessages.DTDPropertySourceAdapter_2); //$NON-NLS-1$
// CustomPropertyDescriptor contentDescriptor = new
// CustomPropertyDescriptor(ID_TEXT, ID_TEXT, null);
// contentDescriptor.setCategory("Attributes");
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/wizard/NewDTDWizard.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/wizard/NewDTDWizard.java
index c7d126a..35dd349 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/wizard/NewDTDWizard.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/wizard/NewDTDWizard.java
@@ -15,6 +15,7 @@
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
import org.eclipse.ui.ide.IDE;
import org.eclipse.wst.dtd.core.internal.DTDResource;
+import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
import org.eclipse.wst.dtd.ui.internal.Logger;
@@ -23,27 +24,27 @@
private IStructuredSelection fSelection;
public void addPages() {
- fNewFilePage = new WizardNewFileCreationPage("DTDWizardNewFileCreationPage", new StructuredSelection(IDE.computeSelectedResources(fSelection))) {
+ fNewFilePage = new WizardNewFileCreationPage("DTDWizardNewFileCreationPage", new StructuredSelection(IDE.computeSelectedResources(fSelection))) { //$NON-NLS-1$
protected boolean validatePage() {
IPath handlePath = new Path(getFileName());
String extension = handlePath.getFileExtension();
- if (extension == null || !extension.equalsIgnoreCase("dtd")) {
- setErrorMessage(DTDUIPlugin.getResourceString("%_ERROR_FILENAME_MUST_END_DTD"));
+ if (extension == null || !extension.equalsIgnoreCase("dtd")) { //$NON-NLS-1$
+ setErrorMessage(DTDUIMessages._ERROR_FILENAME_MUST_END_DTD); //$NON-NLS-1$
return false;
}
setErrorMessage(null);
return super.validatePage();
}
};
- fNewFilePage.setTitle(DTDUIPlugin.getResourceString("%_UI_CREATE_NEW_DTD_FILE"));
- fNewFilePage.setDescription(DTDUIPlugin.getResourceString("%_UI_WIZARD_NEW_DTD_EXPL"));
+ fNewFilePage.setTitle(DTDUIMessages._UI_CREATE_NEW_DTD_FILE);
+ fNewFilePage.setDescription(DTDUIMessages._UI_WIZARD_NEW_DTD_EXPL);
addPage(fNewFilePage);
}
public void init(IWorkbench aWorkbench, IStructuredSelection aSelection) {
fSelection = aSelection;
- setWindowTitle(DTDUIPlugin.getResourceString("_UI_WIZARD_NEW_DTD_TITLE"));
+ setWindowTitle(DTDUIMessages._UI_WIZARD_NEW_DTD_TITLE); //$NON-NLS-1$
ImageDescriptor descriptor = DTDUIPlugin.getDefault().getImageRegistry().getDescriptor(DTDResource.NEWDTD);
if (descriptor == null) {
descriptor = ImageDescriptor.createFromURL(DTDUIPlugin.getDefault().getBundle().getEntry(DTDResource.NEWDTD));