Bug 512965 - Support launcher arguments tags in Generic TP editorI20170723-2000I20170722-2000I20170722-0045I20170721-2000

Change-Id: I23dbc3751d663f66c218f5e378b3cf7b2a1da2d9
Signed-off-by: Sopot Cela <scela@redhat.com>

5 files changed, 12 insertions, 7 deletions

diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/TagCompletionProcessor.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/TagCompletionProcessor.java
index 5feb20f9e2..d522381636 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/TagCompletionProcessor.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/autocomplete/processors/TagCompletionProcessor.java
@@ -25,11 +25,11 @@ public class TagCompletionProcessor extends DelegateProcessor {
 
 	private String[] tags = new String[] { ITargetConstants.LOCATIONS_TAG, ITargetConstants.LOCATION_TAG,
 			ITargetConstants.TARGET_TAG, ITargetConstants.UNIT_TAG, ITargetConstants.REPOSITORY_TAG,
-			ITargetConstants.TARGET_JRE_TAG };
+			ITargetConstants.TARGET_JRE_TAG, ITargetConstants.LAUNCHER_ARGS_TAG, ITargetConstants.VM_ARGS_TAG,
+			ITargetConstants.PROGRAM_ARGS_TAG };
 
 	private String prefix;
 	private int offset;
-
 	public TagCompletionProcessor(String prefix, String acKey, int offset) {
 		this.prefix = prefix;
 		this.offset = offset;
@@ -37,7 +37,7 @@ public class TagCompletionProcessor extends DelegateProcessor {
 
 	@Override
 	public ICompletionProposal[] getCompletionProposals() {
-		List<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
+		List<ICompletionProposal> proposals = new ArrayList<>();
 
 		String handyAddition;
 		for (int i = 0; i < tags.length; i++) {
@@ -55,7 +55,7 @@ public class TagCompletionProcessor extends DelegateProcessor {
 			proposals.add(new CompletionProposal(proposal, offset - prefix.length(), prefix.length(),
 					proposal.length() - handyAddition.length(), null, tags[i], null, null));
 		}
-		return (ICompletionProposal[]) proposals.toArray(new ICompletionProposal[proposals.size()]);
+		return proposals.toArray(new ICompletionProposal[proposals.size()]);
 	}
 
 }
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/ITargetConstants.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/ITargetConstants.java
index 18bed51069..cc81ec01c6 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/ITargetConstants.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/ITargetConstants.java
@@ -25,6 +25,9 @@ public interface ITargetConstants {
 	public static final String LOCATIONS_TAG = "locations"; //$NON-NLS-1$
 	public static final String REPOSITORY_TAG = "repository"; //$NON-NLS-1$
 	public static final String UNIT_TAG = "unit"; //$NON-NLS-1$
+	public static final String LAUNCHER_ARGS_TAG = "launcherArgs"; //$NON-NLS-1$
+	public static final String VM_ARGS_TAG = "vmArgs";
+	public static final String PROGRAM_ARGS_TAG = "programArgs";
 	public static final String UNIT_ID_ATTR = "id"; //$NON-NLS-1$
 	public static final String UNIT_VERSION_ATTR = "version"; //$NON-NLS-1$
 	public static final String TARGET_NAME_ATTR = "name"; //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/Node.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/Node.java
index e8675aba96..75bf079391 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/Node.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/Node.java
@@ -11,7 +11,7 @@
 package org.eclipse.pde.internal.genericeditor.target.extension.model;
 
 /**
- * Base class for model nodes in a target definiton.
+ * Base class for model nodes in a target definition.
  */
 public class Node {
 
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformAttributeRule.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformAttributeRule.java
index ea919d4000..4bbaeb1c63 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformAttributeRule.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformAttributeRule.java
@@ -27,7 +27,8 @@ public class TargetPlatformAttributeRule extends WordRule {
 			ITargetConstants.UNIT_VERSION_ATTR, ITargetConstants.UNIT_ID_ATTR,
 			ITargetConstants.LOCATION_INCLUDE_PLATFORMS_ATTR, ITargetConstants.LOCATION_INCLUDE_MODE_ATTR,
 			ITargetConstants.LOCATION_TYPE_ATTR, ITargetConstants.REPOSITORY_LOCATION_ATTR,
-			ITargetConstants.TARGET_JRE_PATH_ATTR, ITargetConstants.TARGET_SEQ_NO_ATTR };
+			ITargetConstants.TARGET_JRE_PATH_ATTR, ITargetConstants.TARGET_SEQ_NO_ATTR,
+			ITargetConstants.LOCATION_INCLUDE_CONFIG_PHASE_ATTR, ITargetConstants.LOCATION_INCLUDE_SOURCE_ATTR };
 	private IToken attributeToken = new Token(
 			new TextAttribute(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_RED)));
 
diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformTagRule.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformTagRule.java
index 9d8449968f..b71e61aa78 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformTagRule.java
+++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/reconciler/presentation/TargetPlatformTagRule.java
@@ -26,7 +26,8 @@ public class TargetPlatformTagRule extends WordRule {
 
 	private String[] tags = new String[] { ITargetConstants.LOCATIONS_TAG, ITargetConstants.LOCATION_TAG,
 			ITargetConstants.TARGET_TAG, ITargetConstants.UNIT_TAG, ITargetConstants.REPOSITORY_TAG,
-			ITargetConstants.TARGET_JRE_TAG };
+			ITargetConstants.TARGET_JRE_TAG, ITargetConstants.LAUNCHER_ARGS_TAG, ITargetConstants.VM_ARGS_TAG,
+			ITargetConstants.PROGRAM_ARGS_TAG };
 
 	private IToken tagToken = new Token(new TextAttribute(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_CYAN)));