This commit was manufactured by cvs2svn to create tag 'R1_0_1'.
diff --git a/org.eclipse.wst.common.snippets.tests/META-INF/MANIFEST.MF b/org.eclipse.wst.common.snippets.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 2fe9674..0000000
--- a/org.eclipse.wst.common.snippets.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Snippets View Tests Plug-in
-Bundle-SymbolicName: org.eclipse.wst.common.snippets.tests; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.wst.common.snippets.tests.TestsPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit,
- org.eclipse.wst.common.snippets,
- org.eclipse.core.resources,
- org.eclipse.ui.ide,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.text
-Eclipse-AutoStart: true
diff --git a/org.eclipse.wst.common.snippets.tests/build.properties b/org.eclipse.wst.common.snippets.tests/build.properties
index d0656ea..67081da 100644
--- a/org.eclipse.wst.common.snippets.tests/build.properties
+++ b/org.eclipse.wst.common.snippets.tests/build.properties
@@ -1,9 +1,14 @@
-source.. = src/
-output.. = bin/
+snippetstests.source.. = src/
+snippetstests.output.. = bin/
bin.includes = META-INF/,\
- .,\
test.xml,\
- plugin.xml
+ plugin.xml,\
+ snippetstests.jar,\
+ testfiles/,\
+ plugin.properties,\
+ about.html
src.includes = src/,\
- build.properties,\
- test.xml
+ build.properties
+jars.compile.order = snippetstests.jar
+source.snippetstests.jar = src/
+output.snippetstests.jar = bin/
diff --git a/org.eclipse.wst.common.snippets.tests/plugin.xml b/org.eclipse.wst.common.snippets.tests/plugin.xml
index c899451..438f703 100644
--- a/org.eclipse.wst.common.snippets.tests/plugin.xml
+++ b/org.eclipse.wst.common.snippets.tests/plugin.xml
@@ -1,6 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
-<plugin>
+<plugin
+ id="org.eclipse.wst.common.snippets.tests"
+ name="org.eclipse.wst.common.snippets.tests"
+ version="1.0.0"
+ provider-name="Eclipse.org"
+ class="org.eclipse.wst.common.snippets.tests.TestsPlugin">
+ <runtime>
+ <library name="snippetstests.jar">
+ <export name="*"/>
+ </library>
+ </runtime>
+
+
+ <requires>
+ <import plugin="org.junit"/>
+ <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.text"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.wst.common.snippets"/>
+ <import plugin="org.eclipse.ui.ide"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor"/>
+ </requires>
+
<!--======================================================================================-->
<!-- Snippet View contributions -->
<!--======================================================================================-->
diff --git a/org.eclipse.wst.common.snippets.tests/test.xml b/org.eclipse.wst.common.snippets.tests/test.xml
index d9e0b92..9ec892a 100644
--- a/org.eclipse.wst.common.snippets.tests/test.xml
+++ b/org.eclipse.wst.common.snippets.tests/test.xml
@@ -40,7 +40,7 @@
dir="${wst-folder}"
quiet="true" />
<ant
- target="core-test"
+ target="ui-test"
antfile="${library-file}"
dir="${eclipse-home}">
<property
diff --git a/org.eclipse.wst.common.snippets.tests/testfiles/testInsertIntoActiveEditor.txt b/org.eclipse.wst.common.snippets.tests/testfiles/testInsertIntoActiveEditor.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/org.eclipse.wst.common.snippets.tests/testfiles/testInsertIntoActiveEditor.txt
diff --git a/org.eclipse.wst.common.snippets/META-INF/MANIFEST.MF b/org.eclipse.wst.common.snippets/META-INF/MANIFEST.MF
index 24a7bda..28324cd 100644
--- a/org.eclipse.wst.common.snippets/META-INF/MANIFEST.MF
+++ b/org.eclipse.wst.common.snippets/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Snippets_View.name
Bundle-SymbolicName: org.eclipse.wst.common.snippets; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.wst.common.snippets.internal.SnippetsPlugin
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
diff --git a/org.eclipse.wst.common.snippets/schema/SnippetContributions.exsd b/org.eclipse.wst.common.snippets/schema/SnippetContributions.exsd
index f623252..a34229a 100644
--- a/org.eclipse.wst.common.snippets/schema/SnippetContributions.exsd
+++ b/org.eclipse.wst.common.snippets/schema/SnippetContributions.exsd
@@ -214,7 +214,7 @@
<meta.section type="since"/>
</appInfo>
<documentation>
- V1.0
+ 1.0
</documentation>
</annotation>
@@ -277,7 +277,7 @@
<meta.section type="apiInfo"/>
</appInfo>
<documentation>
- This API and extension point are still being developed. As such, extenders should expect incompatible changes in the near future. The baseline for API and extension point stability will be WTP 1.0.
+
</documentation>
</annotation>
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetCategory.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetCategory.java
index 668d7a9..aae417c 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetCategory.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetCategory.java
@@ -10,6 +10,11 @@
*******************************************************************************/
package org.eclipse.wst.common.snippets.core;
+/**
+ * Represents a category containing individual snippets.
+ *
+ * @since 1.0
+ */
public interface ISnippetCategory extends ISnippetsEntry {
/**
* @return an array of the items within this category
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetItem.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetItem.java
index a0d3b49..beb20e0 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetItem.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetItem.java
@@ -13,6 +13,8 @@
/**
* A snippet item is the actual object draggable from the Snippets view.
+ *
+ * @since 1.0
*/
public interface ISnippetItem extends ISnippetsEntry {
/**
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetVariable.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetVariable.java
index 6522fe0..45461db 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetVariable.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetVariable.java
@@ -10,6 +10,12 @@
*******************************************************************************/
package org.eclipse.wst.common.snippets.core;
+/**
+ * A variable is a user-prompted value meant to be filled-in by the user
+ * during insertion.
+ *
+ * @since 1.0
+ */
public interface ISnippetVariable {
/**
* @return Returns the default value for this variable
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetsEntry.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetsEntry.java
index 7e7448f..dce3724 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetsEntry.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetsEntry.java
@@ -16,6 +16,8 @@
* A Snippets Entry is an abstract notion encapsulating the values used to
* represent Snippet Items and Containers. No object implements only this
* interface.
+ *
+ * @since 1.0
*/
public interface ISnippetsEntry {
@@ -42,8 +44,8 @@
String getDescription();
/**
- * @return the filters for which this entry will be shown (when filtering
- * is enabled)
+ * @return the filters for which this entry will be shown when filtering
+ * is enabled
*/
String[] getFilters();
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/SnippetDefinitions.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/SnippetDefinitions.java
index aebf16e..c7f7318 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/SnippetDefinitions.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/SnippetDefinitions.java
@@ -75,6 +75,15 @@
if (item.getId().equals(id))
return item;
}
+ for (int i = 0; i < fCategories.size(); i++) {
+ ISnippetItem[] items = ((ISnippetCategory) fCategories.get(i)).getItems();
+ for (int j = 0; j < items.length; j++) {
+ SnippetPaletteItem item = (SnippetPaletteItem) items[j];
+ if (item.getId().equals(id)) {
+ return item;
+ }
+ }
+ }
return null;
}
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/SnippetsPlugin.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/SnippetsPlugin.java
index 4ddd3a2..41aaf5f 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/SnippetsPlugin.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/SnippetsPlugin.java
@@ -27,7 +27,7 @@
String EDITORCLASSNAME = "editorclass"; //$NON-NLS-1$
String EXTENSION_POINT_ID = "SnippetContributions"; //$NON-NLS-1$
String HIDE = "hide"; //$NON-NLS-1$
- String ICON = "icon"; //$NON-NLS-1$
+ String SMALLICON = "smallicon"; //$NON-NLS-1$
String ID = "id"; //$NON-NLS-1$
String INITIAL_STATE = "initial_state"; //$NON-NLS-1$
String ITEM = "item"; //$NON-NLS-1$
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/AbstractModelFactory.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/AbstractModelFactory.java
index dc3c2c5..4c84886 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/AbstractModelFactory.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/AbstractModelFactory.java
@@ -119,7 +119,7 @@
if (entry instanceof SnippetPaletteItem) {
if (property.equals(SnippetsPlugin.NAMES.DESCRIPTION))
((SnippetPaletteItem) entry).setDescription(value.toString());
- else if (property.equals(SnippetsPlugin.NAMES.ICON))
+ else if (property.equals(SnippetsPlugin.NAMES.SMALLICON))
((SnippetPaletteItem) entry).setIconName(value.toString());
else if (property.equals(SnippetsPlugin.NAMES.ID))
((SnippetPaletteItem) entry).setId(value.toString());
@@ -133,7 +133,7 @@
if (entry instanceof SnippetPaletteDrawer) {
if (property.equals(SnippetsPlugin.NAMES.DESCRIPTION))
((SnippetPaletteDrawer) entry).setDescription(value.toString());
- else if (property.equals(SnippetsPlugin.NAMES.ICON))
+ else if (property.equals(SnippetsPlugin.NAMES.SMALLICON))
((SnippetPaletteDrawer) entry).setIconName(value.toString());
else if (property.equals(SnippetsPlugin.NAMES.ID))
((SnippetPaletteDrawer) entry).setId(value.toString());
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/ModelFactoryForPlugins.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/ModelFactoryForPlugins.java
index 1919c18..15659f0 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/ModelFactoryForPlugins.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/ModelFactoryForPlugins.java
@@ -142,7 +142,7 @@
IConfigurationElement element = ((IConfigurationElement) source);
setProperty(category, SnippetsPlugin.NAMES.DESCRIPTION, element.getAttribute(SnippetsPlugin.NAMES.DESCRIPTION));
- setProperty(category, SnippetsPlugin.NAMES.ICON, element.getAttribute(SnippetsPlugin.NAMES.ICON));
+ setProperty(category, SnippetsPlugin.NAMES.SMALLICON, element.getAttribute(SnippetsPlugin.NAMES.SMALLICON));
setProperty(category, SnippetsPlugin.NAMES.ID, element.getAttribute(SnippetsPlugin.NAMES.ID));
setProperty(category, SnippetsPlugin.NAMES.LABEL, element.getAttribute(SnippetsPlugin.NAMES.LABEL));
setProperty(category, SnippetsPlugin.NAMES.LARGEICON, element.getAttribute(SnippetsPlugin.NAMES.LARGEICON));
@@ -165,7 +165,7 @@
setProperty(item, SnippetsPlugin.NAMES.CLASSNAME, element.getAttribute(SnippetsPlugin.NAMES.CLASSNAME));
setProperty(item, SnippetsPlugin.NAMES.DESCRIPTION, element.getAttribute(SnippetsPlugin.NAMES.DESCRIPTION));
setProperty(item, SnippetsPlugin.NAMES.EDITORCLASSNAME, element.getAttribute(SnippetsPlugin.NAMES.EDITORCLASSNAME));
- setProperty(item, SnippetsPlugin.NAMES.ICON, element.getAttribute(SnippetsPlugin.NAMES.ICON));
+ setProperty(item, SnippetsPlugin.NAMES.SMALLICON, element.getAttribute(SnippetsPlugin.NAMES.SMALLICON));
setProperty(item, SnippetsPlugin.NAMES.ID, element.getAttribute(SnippetsPlugin.NAMES.ID));
setProperty(item, SnippetsPlugin.NAMES.LABEL, element.getAttribute(SnippetsPlugin.NAMES.LABEL));
setProperty(item, SnippetsPlugin.NAMES.LARGEICON, element.getAttribute(SnippetsPlugin.NAMES.LARGEICON));
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/ModelFactoryForUser.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/ModelFactoryForUser.java
index c460b44..c395173 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/ModelFactoryForUser.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/ModelFactoryForUser.java
@@ -280,7 +280,7 @@
return;
Element element = ((Element) source);
- setProperty(category, SnippetsPlugin.NAMES.ICON, element.getAttribute(SnippetsPlugin.NAMES.ICON));
+ setProperty(category, SnippetsPlugin.NAMES.SMALLICON, element.getAttribute(SnippetsPlugin.NAMES.SMALLICON));
setProperty(category, SnippetsPlugin.NAMES.ID, element.getAttribute(SnippetsPlugin.NAMES.ID));
setProperty(category, SnippetsPlugin.NAMES.LABEL, element.getAttribute(SnippetsPlugin.NAMES.LABEL));
setProperty(category, SnippetsPlugin.NAMES.LARGEICON, element.getAttribute(SnippetsPlugin.NAMES.LARGEICON));
@@ -307,7 +307,7 @@
setProperty(item, SnippetsPlugin.NAMES.CATEGORY, element.getAttribute(SnippetsPlugin.NAMES.CATEGORY));
setProperty(item, SnippetsPlugin.NAMES.CLASSNAME, element.getAttribute(SnippetsPlugin.NAMES.CLASSNAME));
setProperty(item, SnippetsPlugin.NAMES.EDITORCLASSNAME, element.getAttribute(SnippetsPlugin.NAMES.EDITORCLASSNAME));
- setProperty(item, SnippetsPlugin.NAMES.ICON, element.getAttribute(SnippetsPlugin.NAMES.ICON));
+ setProperty(item, SnippetsPlugin.NAMES.SMALLICON, element.getAttribute(SnippetsPlugin.NAMES.SMALLICON));
setProperty(item, SnippetsPlugin.NAMES.ID, element.getAttribute(SnippetsPlugin.NAMES.ID));
setProperty(item, SnippetsPlugin.NAMES.LABEL, element.getAttribute(SnippetsPlugin.NAMES.LABEL));
setProperty(item, SnippetsPlugin.NAMES.LARGEICON, element.getAttribute(SnippetsPlugin.NAMES.LARGEICON));
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/SnippetPaletteDrawer.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/SnippetPaletteDrawer.java
index e906976..cb30366 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/SnippetPaletteDrawer.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/SnippetPaletteDrawer.java
@@ -13,7 +13,6 @@
package org.eclipse.wst.common.snippets.internal.palette;
import org.eclipse.gef.palette.PaletteDrawer;
-import org.eclipse.gef.palette.PaletteEntry;
import org.eclipse.gef.palette.PaletteTemplateEntry;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.wst.common.snippets.core.ISnippetCategory;
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/UserModelDumper.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/UserModelDumper.java
index d7a6b57..d01b06f 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/UserModelDumper.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/UserModelDumper.java
@@ -54,7 +54,7 @@
if (entry instanceof SnippetPaletteDrawer) {
owningElement.setAttribute(SnippetsPlugin.NAMES.ID, ((SnippetPaletteDrawer) entry).getId());
if (((SnippetPaletteDrawer) entry).getSmallIconName() != null)
- owningElement.setAttribute(SnippetsPlugin.NAMES.ICON, ((SnippetPaletteDrawer) entry).getSmallIconName());
+ owningElement.setAttribute(SnippetsPlugin.NAMES.SMALLICON, ((SnippetPaletteDrawer) entry).getSmallIconName());
if (entry.getLabel() != null)
owningElement.setAttribute(SnippetsPlugin.NAMES.LABEL, entry.getLabel());
if (((SnippetPaletteDrawer) entry).getLargeIconName() != null)
@@ -63,7 +63,7 @@
if (entry instanceof SnippetPaletteItem) {
owningElement.setAttribute(SnippetsPlugin.NAMES.ID, ((SnippetPaletteItem) entry).getId());
if (((SnippetPaletteItem) entry).getSmallIconName() != null)
- owningElement.setAttribute(SnippetsPlugin.NAMES.ICON, ((SnippetPaletteItem) entry).getSmallIconName());
+ owningElement.setAttribute(SnippetsPlugin.NAMES.SMALLICON, ((SnippetPaletteItem) entry).getSmallIconName());
if (entry.getLabel() != null)
owningElement.setAttribute(SnippetsPlugin.NAMES.LABEL, entry.getLabel());
if (((SnippetPaletteItem) entry).getLargeIconName() != null)
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/WorkspaceModelDumper.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/WorkspaceModelDumper.java
index d22b99c..7202858 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/WorkspaceModelDumper.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/WorkspaceModelDumper.java
@@ -54,14 +54,14 @@
if (entry instanceof SnippetPaletteDrawer) {
SnippetPaletteDrawer drawer = (SnippetPaletteDrawer) entry;
owningElement.setAttribute(SnippetsPlugin.NAMES.ID, drawer.getId());
- owningElement.setAttribute(SnippetsPlugin.NAMES.ICON, drawer.getSmallIconName());
+ owningElement.setAttribute(SnippetsPlugin.NAMES.SMALLICON, drawer.getSmallIconName());
owningElement.setAttribute(SnippetsPlugin.NAMES.LABEL, drawer.getLabel());
owningElement.setAttribute(SnippetsPlugin.NAMES.LARGEICON, drawer.getLargeIconName());
}
if (entry instanceof SnippetPaletteItem) {
SnippetPaletteItem item = (SnippetPaletteItem) entry;
owningElement.setAttribute(SnippetsPlugin.NAMES.ID, item.getId());
- owningElement.setAttribute(SnippetsPlugin.NAMES.ICON, item.getSmallIconName());
+ owningElement.setAttribute(SnippetsPlugin.NAMES.SMALLICON, item.getSmallIconName());
owningElement.setAttribute(SnippetsPlugin.NAMES.LABEL, item.getLabel());
owningElement.setAttribute(SnippetsPlugin.NAMES.LARGEICON, item.getLargeIconName());
}
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/EntryDeserializer.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/EntryDeserializer.java
index 5ef1da1..ba55c8c 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/EntryDeserializer.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/EntryDeserializer.java
@@ -46,7 +46,7 @@
private void assignEntryProperties(Element element, SnippetPaletteItem entry) {
entry.setId(element.getAttribute(SnippetsPlugin.NAMES.ID));
- entry.setIconName(element.getAttribute(SnippetsPlugin.NAMES.ICON));
+ entry.setIconName(element.getAttribute(SnippetsPlugin.NAMES.SMALLICON));
String description = createDescription(element);
String label = element.getAttribute(SnippetsPlugin.NAMES.LABEL);
if ((label == null || label.length() == 0) && description != null) {
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/EntrySerializer.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/EntrySerializer.java
index 215045d..d8a2c27 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/EntrySerializer.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/EntrySerializer.java
@@ -50,13 +50,13 @@
SnippetPaletteItem item = (SnippetPaletteItem) entry;
owningElement.setAttribute(SnippetsPlugin.NAMES.ID, item.getId());
if (item.getSmallIconName() != null)
- owningElement.setAttribute(SnippetsPlugin.NAMES.ICON, item.getSmallIconName());
+ owningElement.setAttribute(SnippetsPlugin.NAMES.SMALLICON, item.getSmallIconName());
}
if (entry instanceof SnippetPaletteDrawer) {
SnippetPaletteDrawer drawer = (SnippetPaletteDrawer) entry;
owningElement.setAttribute(SnippetsPlugin.NAMES.ID, drawer.getId());
if (drawer.getSmallIconName() != null)
- owningElement.setAttribute(SnippetsPlugin.NAMES.ICON, drawer.getSmallIconName());
+ owningElement.setAttribute(SnippetsPlugin.NAMES.SMALLICON, drawer.getSmallIconName());
}
if (entry.getDescription() != null)
owningElement.appendChild(createDescription(owningElement.getOwnerDocument(), entry.getDescription()));
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/ui/DefaultSnippetInsertion.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/ui/DefaultSnippetInsertion.java
index 6fdc34a..e30b31f 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/ui/DefaultSnippetInsertion.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/ui/DefaultSnippetInsertion.java
@@ -40,11 +40,17 @@
* An insertion implementation that supports ISnippetVariables. The content
* string of the item can contain markers, in the form ${+variable+}, that
* will be replaced with user-supplied values at insertion time.
+ *
+ * @since 1.0
*/
public class DefaultSnippetInsertion implements ISnippetInsertion {
private ISnippetItem fItem = null;
private Transfer[] fSupportedTransfers = null;
+ /**
+ * Default constructor. Subclasses may call, but only the Snippets view
+ * should ever instantiate an insertion.
+ */
public DefaultSnippetInsertion() {
super();
}
@@ -57,10 +63,18 @@
}
/**
+ * Insert the current snippet item.
+ *
* @param editorPart
+ * the editor part that is active
* @param textEditor
+ * the text editor (or adapter) with which to interact (may be
+ * the same as editorPart)
* @param document
+ * the text document to update
* @param textSelection
+ * the selection of text within the document to be replaced by
+ * the inserted snippet
* @throws BadLocationException
*/
protected void doInsert(IEditorPart editorPart, ITextEditor textEditor, IDocument document, ITextSelection textSelection) throws BadLocationException {
@@ -135,6 +149,14 @@
}
}
+ /**
+ * Gets the string to be inserted by interacting further with the user if
+ * needed.
+ *
+ * @param host
+ * Shell to use for creating dialogs
+ * @return the string to be inserted
+ */
protected String getInsertString(Shell host) {
if (fItem == null)
return ""; //$NON-NLS-1$
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/ui/ISnippetInsertion.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/ui/ISnippetInsertion.java
index 9bec111..18fbaa5 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/ui/ISnippetInsertion.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/ui/ISnippetInsertion.java
@@ -20,6 +20,8 @@
* An insertion class is responsible for inserting a snippet item's contents
* into editors. Implementors are responsible for supporting the drag-and-drop
* mechanism and inserting the snippet's text into a given editor part.
+ *
+ * @since 1.0
*/
public interface ISnippetInsertion {
@@ -71,7 +73,7 @@
* for determining which Transfer types to allow and what transfer data to
* set during Drag and Drop operations.
*
- * @param targetPart
+ * @param targetPart the target editor part
*/
void setEditorPart(IEditorPart targetPart);
