Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2011-07-31 03:58:16 -0400
committerIgor Fedorenko2011-07-31 03:58:16 -0400
commitc47e215285d7c562d2e8c98c52a80349abe070b6 (patch)
tree7960aca2bfe35fdf5b1745332a7bb24c1b407dfd /org.eclipse.m2e.editor.xml
parente288b8a47e935b50a091b259cb96beebbe5c3ee7 (diff)
parent74e41f5cadf4d515ccb47e38a8656a7b111ef457 (diff)
downloadm2e-core-c47e215285d7c562d2e8c98c52a80349abe070b6.tar.gz
m2e-core-c47e215285d7c562d2e8c98c52a80349abe070b6.tar.xz
m2e-core-c47e215285d7c562d2e8c98c52a80349abe070b6.zip
Merge remote-tracking branch 'origin/master' into m2e-self-hosting
Diffstat (limited to 'org.eclipse.m2e.editor.xml')
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/InsertArtifactProposal.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/InsertArtifactProposal.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/InsertArtifactProposal.java
index e9e6b570..3587ff0d 100644
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/InsertArtifactProposal.java
+++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/InsertArtifactProposal.java
@@ -209,6 +209,13 @@ public class InsertArtifactProposal implements ICompletionProposal, ICompletionP
if (fDialog.getSelectedScope() != null && !"compile".equals(fDialog.getSelectedScope())) {
setText(getChild(dependency, SCOPE), fDialog.getSelectedScope());
}
+ if (af.type != null && !"jar".equals(af.type)
+ && !"null".equals(af.type)) { // guard against MNGECLIPSE-622 //$NON-NLS-1$)
+ setText(getChild(dependency, TYPE), af.type);
+ }
+ if (af.classifier != null) {
+ setText(getChild(dependency, CLASSIFIER), af.classifier);
+ }
format(toFormat);
generatedOffset = ((IndexedRegion)toFormat).getStartOffset();
generatedLength = ((IndexedRegion)toFormat).getEndOffset() - generatedOffset;

Back to the top