Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2005-06-01 18:34:05 -0400
committerAndre Weinand2005-06-01 18:34:05 -0400
commit140c70a520d4723743ce2f55bef1d4bc14de2d4d (patch)
tree7b0b21a84c301bebfb88762566d4fb121063242f
parent20b367454914a4032466ede304710d9e1955bceb (diff)
downloadeclipse.platform.team-140c70a520d4723743ce2f55bef1d4bc14de2d4d.tar.gz
eclipse.platform.team-140c70a520d4723743ce2f55bef1d4bc14de2d4d.tar.xz
eclipse.platform.team-140c70a520d4723743ce2f55bef1d4bc14de2d4d.zip
fixed #97865]: New: Compile errors in samples.
-rw-r--r--examples/org.eclipse.compare.examples.xml/.project1
-rw-r--r--examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.pde.prefs14
-rw-r--r--examples/org.eclipse.compare.examples.xml/plugin.xml3
-rw-r--r--examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java2
-rw-r--r--examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java8
-rw-r--r--examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditOrderedDialog.java6
-rw-r--r--examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java2
-rw-r--r--examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java2
-rw-r--r--examples/org.eclipse.compare.examples/.project1
-rw-r--r--examples/org.eclipse.compare.examples/.settings/org.eclipse.pde.prefs14
-rw-r--r--examples/org.eclipse.compare.examples/plugin.xml6
11 files changed, 46 insertions, 13 deletions
diff --git a/examples/org.eclipse.compare.examples.xml/.project b/examples/org.eclipse.compare.examples.xml/.project
index 37bcfbdf7..abba1add9 100644
--- a/examples/org.eclipse.compare.examples.xml/.project
+++ b/examples/org.eclipse.compare.examples.xml/.project
@@ -21,5 +21,6 @@
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>
diff --git a/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.pde.prefs b/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.pde.prefs
new file mode 100644
index 000000000..85347def4
--- /dev/null
+++ b/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,14 @@
+#Wed Jun 01 18:31:47 CEST 2005
+compilers.p.deprecated=0
+compilers.p.illegal-att-value=0
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.p.unused-element-or-attribute=1
+compilers.use-project=true
+eclipse.preferences.version=1
diff --git a/examples/org.eclipse.compare.examples.xml/plugin.xml b/examples/org.eclipse.compare.examples.xml/plugin.xml
index 095fab4c3..de572ad13 100644
--- a/examples/org.eclipse.compare.examples.xml/plugin.xml
+++ b/examples/org.eclipse.compare.examples.xml/plugin.xml
@@ -85,7 +85,8 @@
point="org.eclipse.compare.structureMergeViewers">
<viewer
extensions="xml,classpath"
- class="org.eclipse.compare.examples.xml.XMLStructureViewerCreator">
+ class="org.eclipse.compare.examples.xml.XMLStructureViewerCreator"
+ id="org.eclipse.compare.examples.xml.XMLStructureViewerCreator">
</viewer>
</extension>
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java
index 41c8a67df..2751ce1f4 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java
@@ -125,7 +125,7 @@ public class XMLCompareAddIdMapDialog extends StatusDialog {
if (newText.indexOf(".") > -1) //$NON-NLS-1$
status.setError(XMLCompareMessages.XMLCompareAddIdMapDialog_error_extfullstop);
else if (fIdExtensionToName.containsKey(newText) && !fIdExtensionToName.get(newText).equals(fIdMap.getName()))
- status.setError(MessageFormat.format("{0} {1}",new String[] {XMLCompareMessages.XMLCompareAddIdMapDialog_error_extExists,(String)fIdExtensionToName.get(newText)}));
+ status.setError(MessageFormat.format("{0} {1}",new String[] {XMLCompareMessages.XMLCompareAddIdMapDialog_error_extExists,(String)fIdExtensionToName.get(newText)})); //$NON-NLS-1$
}
updateStatus(status);
}
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java
index 9b1351cdf..b4d009eb5 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java
@@ -140,22 +140,22 @@ public class XMLCompareEditMappingDialog extends StatusDialog {
errormsg= XMLCompareMessages.XMLCompareEditMappingDialog_error_noname;
isError= true;
} else if (XMLComparePreferencePage.containsInvalidCharacters(text)) {
- if (errormsg == "") errormsg= XMLCompareMessages.XMLCompareEditMappingDialog_error_invalidname;
+ if (errormsg == "") errormsg= XMLCompareMessages.XMLCompareEditMappingDialog_error_invalidname; //$NON-NLS-1$
isError= true;
} else if (!fEdit && fIdmapHM != null && fIdmapHM.containsKey(mappingKey)) {
- if (errormsg == "") errormsg= XMLCompareMessages.XMLCompareEditMappingDialog_error_mappingExists;
+ if (errormsg == "") errormsg= XMLCompareMessages.XMLCompareEditMappingDialog_error_mappingExists; //$NON-NLS-1$
isError= true;
}
text= fSignatureText.getText();
if (XMLComparePreferencePage.containsInvalidCharacters(text)) {
- if (errormsg == "") errormsg= XMLCompareMessages.XMLCompareEditMappingDialog_error_invalidsignature;
+ if (errormsg == "") errormsg= XMLCompareMessages.XMLCompareEditMappingDialog_error_invalidsignature; //$NON-NLS-1$
isError= true;
}
text= fIdAttributeText.getText();
if (text.length() == 0)
isError= true;
else if (XMLComparePreferencePage.containsInvalidCharacters(text)) {
- if (errormsg == "") errormsg= XMLCompareMessages.XMLCompareEditMappingDialog_error_invalididattribute;
+ if (errormsg == "") errormsg= XMLCompareMessages.XMLCompareEditMappingDialog_error_invalididattribute; //$NON-NLS-1$
isError= true;
}
if (isError) status.setError(errormsg);
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditOrderedDialog.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditOrderedDialog.java
index 66b87b99a..77d0f4e96 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditOrderedDialog.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditOrderedDialog.java
@@ -123,15 +123,15 @@ public class XMLCompareEditOrderedDialog extends StatusDialog {
errormsg= XMLCompareMessages.XMLCompareEditMappingDialog_error_noname;
isError= true;
} else if (XMLComparePreferencePage.containsInvalidCharacters(text)) {
- if (errormsg == "") errormsg= XMLCompareMessages.XMLCompareEditMappingDialog_error_invalidname;
+ if (errormsg == "") errormsg= XMLCompareMessages.XMLCompareEditMappingDialog_error_invalidname; //$NON-NLS-1$
isError= true;
} else if (!fEdit && fIdmapAL.contains(mappingKey)) {
- if (errormsg == "") errormsg= XMLCompareMessages.XMLCompareEditOrderedDialog_error_orderedExists;
+ if (errormsg == "") errormsg= XMLCompareMessages.XMLCompareEditOrderedDialog_error_orderedExists; //$NON-NLS-1$
isError= true;
}
text= fSignatureText.getText();
if (XMLComparePreferencePage.containsInvalidCharacters(text)) {
- if (errormsg == "") errormsg= XMLCompareMessages.XMLCompareEditMappingDialog_error_invalidsignature;
+ if (errormsg == "") errormsg= XMLCompareMessages.XMLCompareEditMappingDialog_error_invalidsignature; //$NON-NLS-1$
isError= true;
}
if (isError) status.setError(errormsg);
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java
index b39ef7986..31b5dd09f 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java
@@ -334,7 +334,7 @@ public class XMLStructureCreator implements IStructureCreator {
body_value= removeWhiteSpace(body_value);
}
XMLNode bodynode= new XMLNode(TYPE_TEXT, "body_(" + fcurrentParent.bodies + ")", body_value, (fsignature + SIGN_TEXT), fdoc, offset, length); //$NON-NLS-2$ //$NON-NLS-1$
- bodynode.setName(MessageFormat.format("{0} ({1})", new String[] { XMLCompareMessages.XMLStructureCreator_body, Integer.toString(fcurrentParent.bodies)}));
+ bodynode.setName(MessageFormat.format("{0} ({1})", new String[] { XMLCompareMessages.XMLStructureCreator_body, Integer.toString(fcurrentParent.bodies)})); //$NON-NLS-1$
fcurrentParent.addChild(bodynode);
bodynode.setParent(fcurrentParent);
if (XMLStructureCreator.DEBUG_MODE)
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java
index 1242a9882..9f8019e1f 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java
@@ -420,7 +420,7 @@ public class XMLStructureViewer extends StructureDiffViewer {
.ID_TYPE_BODY))
.toString()))
oldId= oldId.substring(1);
- action.setText(MessageFormat.format("{0} {1}", new String[] { XMLCompareMessages.XMLStructureViewer_action_setId_text2, oldId }));
+ action.setText(MessageFormat.format("{0} {1}", new String[] { XMLCompareMessages.XMLStructureViewer_action_setId_text2, oldId })); //$NON-NLS-1$
action.setEnabled(true);
}
} else {
diff --git a/examples/org.eclipse.compare.examples/.project b/examples/org.eclipse.compare.examples/.project
index 507ff7b71..d3a0c0af7 100644
--- a/examples/org.eclipse.compare.examples/.project
+++ b/examples/org.eclipse.compare.examples/.project
@@ -18,5 +18,6 @@
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>
diff --git a/examples/org.eclipse.compare.examples/.settings/org.eclipse.pde.prefs b/examples/org.eclipse.compare.examples/.settings/org.eclipse.pde.prefs
new file mode 100644
index 000000000..85347def4
--- /dev/null
+++ b/examples/org.eclipse.compare.examples/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,14 @@
+#Wed Jun 01 18:31:47 CEST 2005
+compilers.p.deprecated=0
+compilers.p.illegal-att-value=0
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.p.unused-element-or-attribute=1
+compilers.use-project=true
+eclipse.preferences.version=1
diff --git a/examples/org.eclipse.compare.examples/plugin.xml b/examples/org.eclipse.compare.examples/plugin.xml
index c46095143..68bb81f98 100644
--- a/examples/org.eclipse.compare.examples/plugin.xml
+++ b/examples/org.eclipse.compare.examples/plugin.xml
@@ -25,7 +25,8 @@
point="org.eclipse.compare.contentMergeViewers">
<viewer
extensions="kvtxt"
- class="org.eclipse.compare.examples.structurecreator.TextMergeViewerCreator">
+ class="org.eclipse.compare.examples.structurecreator.TextMergeViewerCreator"
+ id="org.eclipse.compare.examples.TextMergeViewerCreator">
</viewer>
</extension>
@@ -33,7 +34,8 @@
point="org.eclipse.compare.structureCreators">
<structureCreator
extensions="kv"
- class="org.eclipse.compare.examples.structurecreator.KeyValuePairStructureCreator">
+ class="org.eclipse.compare.examples.structurecreator.KeyValuePairStructureCreator"
+ id="org.eclipse.compare.examples.KeyValuePairStructureCreator">
</structureCreator>
</extension>

Back to the top