diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
index 00647923140..9d362d9e054 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
@@ -6657,34 +6657,42 @@
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index 4f043bce899..3c5a596bef8 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -3733,35 +3733,48 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml
index c26068255f2..ece93e44bc2 100644
--- a/core/org.eclipse.cdt.core.tests/plugin.xml
+++ b/core/org.eclipse.cdt.core.tests/plugin.xml
@@ -65,12 +65,14 @@
@@ -78,30 +80,49 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java
index 2318458a06b..27a73e68878 100644
--- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java
+++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java
@@ -33,6 +33,7 @@ import org.eclipse.cdt.core.parser.failedTests.ASTFailedTests;
import org.eclipse.cdt.core.parser.failedTests.FailedCompleteParseASTTest;
import org.eclipse.cdt.core.parser.failedTests.STLFailedTests;
import org.eclipse.cdt.core.parser.tests.ParserTestSuite;
+import org.eclipse.cdt.core.tests.templateengine.AllTemplateEngineTests;
import org.eclipse.cdt.internal.index.tests.IndexTests;
import org.eclipse.cdt.internal.pdom.tests.PDOMTests;
@@ -91,7 +92,7 @@ public class AutomatedIntegrationSuite extends TestSuite {
suite.addTestSuite(STLFailedTests.class);
suite.addTestSuite(FailedCompleteParseASTTest.class);
-// suite.addTest(AllTemplateEngineTests.suite());
+ suite.addTest(AllTemplateEngineTests.suite());
return suite;
}
diff --git a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TemplateEngineTestsHelper.java b/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TemplateEngineTestsHelper.java
index a087fc5a36b..ba8efe59c0a 100644
--- a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TemplateEngineTestsHelper.java
+++ b/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TemplateEngineTestsHelper.java
@@ -12,10 +12,12 @@ package org.eclipse.cdt.core.tests.templateengine;
import java.io.IOException;
import java.net.URL;
+import java.util.ArrayList;
import java.util.List;
import junit.framework.Assert;
+import org.eclipse.cdt.core.templateengine.TemplateCore;
import org.eclipse.cdt.core.templateengine.TemplateDescriptor;
import org.eclipse.cdt.core.templateengine.TemplateEngine;
import org.eclipse.cdt.core.testplugin.CTestPlugin;
@@ -61,6 +63,17 @@ public class TemplateEngineTestsHelper {
return url;
}
+ public static TemplateCore[] getTestTemplates() {
+ TemplateCore[] templates = TemplateEngine.getDefault().getTemplates();
+ List testTemplates = new ArrayList();
+ for (int i =0; i < templates.length; i++) {
+ if (templates[i].getTemplateType().equals("TestTemplate")) {
+ testTemplates.add(templates[i]);
+ }
+ }
+ return (TemplateCore[]) testTemplates.toArray(new TemplateCore[testTemplates.size()]);
+ }
+
public static int getChildCount(TemplateDescriptor templateDescriptor, String propertyGroupID){
List list = templateDescriptor.getPropertyGroupList();
for (int i = 0, l = list.size(); i < l; i++) {
diff --git a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateCore.java b/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateCore.java
index fd3c19ed834..c63e24795f8 100644
--- a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateCore.java
+++ b/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestTemplateCore.java
@@ -13,7 +13,6 @@ package org.eclipse.cdt.core.tests.templateengine;
import junit.framework.TestCase;
import org.eclipse.cdt.core.templateengine.TemplateCore;
-import org.eclipse.cdt.core.templateengine.TemplateEngine;
/**
* Test the functionality of Tempalte Class.
@@ -24,7 +23,7 @@ public class TestTemplateCore extends TestCase {
protected void setUp() throws Exception {
super.setUp();
- templates = TemplateEngine.getDefault().getTemplates();
+ templates = TemplateEngineTestsHelper.getTestTemplates();
}
/*
diff --git a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestValueStore.java b/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestValueStore.java
index 744d91f29d9..8a2b3002ec2 100644
--- a/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestValueStore.java
+++ b/core/org.eclipse.cdt.core.tests/templateengine/org/eclipse/cdt/core/tests/templateengine/TestValueStore.java
@@ -17,7 +17,6 @@ import junit.framework.TestCase;
import org.eclipse.cdt.core.templateengine.TemplateCore;
import org.eclipse.cdt.core.templateengine.TemplateDescriptor;
-import org.eclipse.cdt.core.templateengine.TemplateEngine;
/**
@@ -49,7 +48,7 @@ public class TestValueStore extends TestCase {
*
*/
public void testValueStoreNotNull(){
- TemplateCore[] templates = TemplateEngine.getDefault().getTemplates();
+ TemplateCore[] templates = TemplateEngineTestsHelper.getTestTemplates();
for (int i=0; i
+
diff --git a/core/org.eclipse.cdt.core/schema/templateAssociations.exsd b/core/org.eclipse.cdt.core/schema/templateAssociations.exsd
new file mode 100644
index 00000000000..4130eedb490
--- /dev/null
+++ b/core/org.eclipse.cdt.core/schema/templateAssociations.exsd
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+ This extension point facilitates adding new toolchains generated from a different plugin to already defined template without modifying template definition.
+
+
+
+
+
+
+ Extension point added to Template Engine plugin. Any plugin, which intends to contribute XML templates to Temaplate Engine has to extend this extension point, and add template element.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Id for the extension in the extender plugin.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This extension point was added in CDT 4.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Copyright (c) 2007 Symbian Software Limited 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:
+Symbian - Initial API and implementation
+
+
+
+
diff --git a/core/org.eclipse.cdt.core/schema/templates.exsd b/core/org.eclipse.cdt.core/schema/templates.exsd
index eee1c106792..b2a62c32360 100644
--- a/core/org.eclipse.cdt.core/schema/templates.exsd
+++ b/core/org.eclipse.cdt.core/schema/templates.exsd
@@ -108,6 +108,13 @@ This is an optional attribute.
+
+
+
+
+
+
+
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java
index 5e28f4ddc9b..9de6efd5fce 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java
@@ -43,6 +43,7 @@ public class TemplateCore {
private static final String DESCRIPTION = "description"; //$NON-NLS-1$
private static final String LABEL = "label"; //$NON-NLS-1$
private static final String ID = "id"; //$NON-NLS-1$
+ private static final String TYPE = "type"; //$NON-NLS-1$
private static Map/**/ templateCache = new HashMap/**/();
@@ -60,6 +61,7 @@ public class TemplateCore {
private String description;
private String label;
private String templateId;
+ private String templateType;
private boolean fireDirtyEvents;
/**
@@ -91,11 +93,9 @@ public class TemplateCore {
*/
public Set/**/ getAllMissingMacrosInProcesses() {
Set/**/ set = new TreeSet/**/(allMacrosInProcesses);
- if (set != null) {
- for (Iterator iter = set.iterator(); iter.hasNext();) {
- if (valueStore.get(iter.next()) != null) {
- iter.remove();
- }
+ for (Iterator iter = set.iterator(); iter.hasNext();) {
+ if (valueStore.get(iter.next()) != null) {
+ iter.remove();
}
}
return set;
@@ -154,6 +154,16 @@ public class TemplateCore {
return templateId;
}
+ /**
+ * @return String, which contains the id of the template
+ */
+ public String getTemplateType() {
+ if (templateType == null) {
+ templateType = templateDescriptor.getRootElement().getAttribute(TYPE).trim();
+ }
+ return templateType;
+ }
+
/**
* @return String, which contains the Label
*/
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
index dea101fe822..a02609646b7 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
@@ -13,6 +13,7 @@ package org.eclipse.cdt.core.templateengine;
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -40,11 +41,17 @@ import org.w3c.dom.NodeList;
public class TemplateEngine {
public static String TEMPLATES_EXTENSION_ID = CCorePlugin.PLUGIN_ID + ".templates"; //$NON-NLS-1$
+ public static String TEMPLATE_ASSOCIATIONS_EXTENSION_ID = CCorePlugin.PLUGIN_ID + ".templateAssociations"; //$NON-NLS-1$
/**
* static reference to the Singleton TemplateEngine instance.
*/
- private static TemplateEngine TEMPLATE_ENGINE = new TemplateEngine();
+ private static TemplateEngine TEMPLATE_ENGINE;
+
+ static {
+ TEMPLATE_ENGINE = new TemplateEngine();
+ TEMPLATE_ENGINE.initializeTemplateInfoMap();
+ }
/**
* This is a Map .
@@ -56,7 +63,6 @@ public class TemplateEngine {
*/
private TemplateEngine() {
templateInfoMap = new HashMap/*>*/();
- initializeTemplateInfoMap();
}
/**
@@ -190,6 +196,7 @@ public class TemplateEngine {
* extension point "templates"
*/
private void initializeTemplateInfoMap() {
+ String templateId = null;
String location = null;
String pluginId = null;
String projectType = null;
@@ -205,6 +212,7 @@ public class TemplateEngine {
pluginId = extension.getNamespaceIdentifier(); // Plugin-id of the extending plugin.
for(int j=0; j*/)templateInfoMap.get(projectType)).add(templateInfo);
}
}
+ // Check for tool Chains added to the templates outside template info definition
+ addToolChainsToTemplates();
}
+ private void addToolChainsToTemplates() {
+ String templateId = null;
+ TemplateCore[] templates = getTemplates();
+
+ IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint(TEMPLATE_ASSOCIATIONS_EXTENSION_ID).getExtensions();
+ for(int i=0; i*/ getAllMacros() {
- Set/**/ set = null;
+ Set/**/ set = new HashSet/**/();
for (Iterator i = conditionalProcessGroupList.iterator(); i.hasNext();) {
Set/**/ subSet = ((ConditionalProcessGroup)i.next()).getAllMacros();
if (subSet != null) {
- if (set == null) {
- set = new HashSet/**/();
- }
set.addAll(subSet);
}
}
diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIPage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIPage.java
index 4bdc6540f12..0082d7d87a9 100644
--- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIPage.java
+++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIPage.java
@@ -97,6 +97,7 @@ public abstract class UIPage extends DialogPage {
title = name;
uiElement = element;
+ uiElement.setValues(valueStore);
this.valueStore = valueStore;
//TODO: Check the from which plugin the PLUGIN_ID comes from i.e. from CCorePlugin or CUIPlugin
pageId = CUIPlugin.getPluginId() + "." + //$NON-NLS-1$
@@ -131,7 +132,7 @@ public abstract class UIPage extends DialogPage {
* @return HashMap. The data contained in the widgets on this page.
*/
public Map/**/ getPageData() {
- return uiComposite.getPageData();
+ return uiElement.getValues();
}
/**
diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java
index 6dd79be032e..e9254a6d9d5 100644
--- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java
+++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java
@@ -54,7 +54,7 @@ public class UIWizardPage extends UIPage implements IWizardPage, PatternEventLis
/**
* Indicates whether this page is complete.
*/
- private boolean isPageComplete = true;
+ private boolean isPageComplete;
/**
* That page that was shown right before this page became visible. null if none.
@@ -63,8 +63,6 @@ public class UIWizardPage extends UIPage implements IWizardPage, PatternEventLis
private IWizardPage nextPage = null;
- private Map valueStore;
-
/**
* Title of the page, Page Name and UIElement group are the parameters.
*
@@ -79,7 +77,7 @@ public class UIWizardPage extends UIPage implements IWizardPage, PatternEventLis
super(title, uiElement, valueStore);
name = pageName;
validInvalid = new HashMap/**/();
- this.valueStore = valueStore;
+ isPageComplete = uiElement.isValid();
}
/**
@@ -219,7 +217,7 @@ public class UIWizardPage extends UIPage implements IWizardPage, PatternEventLis
* @return boolean, true if this page is complete, otherwise false.
*/
public boolean isPageComplete() {
- return isPageComplete && getComposite() != null;
+ return isPageComplete;
}
/**
@@ -268,8 +266,6 @@ public class UIWizardPage extends UIPage implements IWizardPage, PatternEventLis
public void createControl(Composite parent) {
super.createControl(parent);
(super.getComposite()).addPatternListener(this);
- (super.getComposite()).getUIElement().setValues(valueStore);
-
// Page complete is set true of false, based on Mandatory attribute
// and Widgets contents.
diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBooleanWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBooleanWidget.java
index fdc9f5eeca4..522c66eb2eb 100644
--- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBooleanWidget.java
+++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBooleanWidget.java
@@ -14,6 +14,8 @@ import java.util.HashMap;
import java.util.Map;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -35,22 +37,24 @@ public class UIBooleanWidget extends InputUIElement {
/**
* Attributes associated with this widget.
*/
- UIAttributes/**/ uiAttribute;
+ protected UIAttributes/**/ uiAttribute;
/**
* Boolean widget.
*/
- Button button;
+ protected Button button;
/**
* Label of this widget.
*/
- Label label;
+ protected Label label;
/**
* Composite to which this widget control is added.
*/
- UIComposite uiComposite;
+ protected UIComposite uiComposite;
+
+ private boolean booleanValue;
/**
* Constructor.
@@ -61,6 +65,7 @@ public class UIBooleanWidget extends InputUIElement {
public UIBooleanWidget(UIAttributes/**/ uiAttribute) {
super(uiAttribute);
this.uiAttribute = uiAttribute;
+ this.booleanValue = false;
}
/**
@@ -69,8 +74,7 @@ public class UIBooleanWidget extends InputUIElement {
public Map/**/ getValues() {
Map/**/ retMap = new HashMap/**/();
- Boolean isCheck = new Boolean(button.getSelection());
- retMap.put(uiAttribute.get(InputUIElement.ID), isCheck.toString());
+ retMap.put(uiAttribute.get(InputUIElement.ID), new Boolean(booleanValue).toString());
return retMap;
}
@@ -81,11 +85,7 @@ public class UIBooleanWidget extends InputUIElement {
* @param valueMap
*/
public void setValues(Map/**/ valueMap) {
- String val = (String) valueMap.get(uiAttribute.get(InputUIElement.ID));
- Boolean bool = new Boolean(val);
- if (val != null) {
- button.setSelection(bool.booleanValue());
- }
+ booleanValue = new Boolean((String) valueMap.get(uiAttribute.get(InputUIElement.ID))).booleanValue();
}
/**
@@ -116,6 +116,12 @@ public class UIBooleanWidget extends InputUIElement {
booleanConatiner.setLayoutData(gridcData);
button = new Button(booleanConatiner, SWT.CHECK);
button.setData(".uid", uiAttribute.get(UIElement.ID)); //$NON-NLS-1$
+ button.setSelection(new Boolean(booleanValue).booleanValue());
+ button.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ booleanValue = button.getSelection();
+ }
+ });
}
/**
@@ -130,7 +136,7 @@ public class UIBooleanWidget extends InputUIElement {
boolean retVal = true;
String mandatory = (String) uiAttribute.get(InputUIElement.MANDATORY);
- if ((button.getSelection() == false) && (mandatory.equalsIgnoreCase(TemplateEngineHelper.BOOLTRUE))) {
+ if (!booleanValue && mandatory.equalsIgnoreCase(TemplateEngineHelper.BOOLTRUE)) {
retVal = false;
}
return retVal;
diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBrowseWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBrowseWidget.java
index f3a1920826b..de4424a97c6 100644
--- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBrowseWidget.java
+++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBrowseWidget.java
@@ -32,15 +32,11 @@ import org.eclipse.cdt.ui.templateengine.uitree.UIElement;
*/
public class UIBrowseWidget extends UITextWidget implements ModifyListener {
- /**
- * Attributes associated with this widget.
- */
- UIAttributes/**/ uiAttribute;
/**
* Browse Button of this widget.
*/
- Button button;
+ protected Button button;
/**
* Constructor.
@@ -51,6 +47,7 @@ public class UIBrowseWidget extends UITextWidget implements ModifyListener {
public UIBrowseWidget(UIAttributes/**/ uiAttribute) {
super(uiAttribute);
this.uiAttribute = uiAttribute;
+ this.textValue = (String) uiAttribute.get(InputUIElement.DEFAULT);
}
/**
@@ -83,10 +80,7 @@ public class UIBrowseWidget extends UITextWidget implements ModifyListener {
text = new Text(textConatiner, SWT.SINGLE | SWT.LEFT | SWT.BORDER);
text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
text.addModifyListener(this);
-
- // set Default values
- if (uiAttribute.get(InputUIElement.DEFAULT) != null)
- text.setText((String) uiAttribute.get(InputUIElement.DEFAULT));
+ text.setText(textValue);
button = new Button(textConatiner, SWT.PUSH | SWT.LEFT);
button.setText(InputUIElement.BROWSELABEL);
@@ -95,7 +89,8 @@ public class UIBrowseWidget extends UITextWidget implements ModifyListener {
public void widgetSelected(SelectionEvent event) {
String fileName = new FileDialog(uiComposite.getShell()).open();
if (fileName != null) {
- text.setText(fileName.toString());
+ textValue = fileName.toString();
+ text.setText(textValue);
}
}
});
diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java
index cbfec1c9679..8d3a980a66a 100644
--- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java
+++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java
@@ -16,6 +16,8 @@ import java.util.Map;
import java.util.Set;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo;
@@ -35,32 +37,32 @@ public class UISelectWidget extends InputUIElement {
/**
* Attributes associated with this widget.
*/
- UIAttributes/**/ uiAttribute;
+ protected UIAttributes/**/ uiAttribute;
/**
* Select widget.
*/
- Combo combo;
+ protected Combo combo = null;
/**
* Label of this widget.
*/
- Label label;
+ protected Label label;
/**
* Composite to which this widget control is added.
*/
- UIComposite uiComposite;
+ protected UIComposite uiComposite;
/**
* Map contains the values of Select Widget
*/
- HashMap/**/ itemMap;
+ protected HashMap/**/ itemMap;
/**
* Default value of Select Widget
*/
- String itemSelected;
+ protected String itemSelected;
/**
* Constructor for Select Widget.
@@ -70,20 +72,16 @@ public class UISelectWidget extends InputUIElement {
*/
public UISelectWidget(UIAttributes/**/ attribute, HashMap/**/ itemMap,
String itemSelected) {
-
super(attribute);
uiAttribute = attribute;
this.itemMap = itemMap;
this.itemSelected = itemSelected;
}
- /**
- * @return Boolean value contained in the Boolean Widget.
- */
public Map/**/ getValues() {
Map/**/ retMap = new HashMap/**/();
- retMap.put(uiAttribute.get(InputUIElement.ID), itemMap.get(combo.getItem(combo.getSelectionIndex())));
+ retMap.put(uiAttribute.get(InputUIElement.ID), itemSelected);
return retMap;
}
@@ -94,17 +92,17 @@ public class UISelectWidget extends InputUIElement {
* @param valueMap
*/
public void setValues(Map/**/ valueMap) {
-
- String val = (String) valueMap.get(uiAttribute.get(InputUIElement.ID));
- if (val != null)
- val = val.trim();
- String[] items = combo.getItems();
- int index = 0;
- for (int i = 0; i < items.length; i++)
- if (itemMap.get(items[i]).equals(val))
- index = i;
-
- combo.select(index);
+ itemSelected = (String) valueMap.get(uiAttribute.get(InputUIElement.ID));
+
+ if (combo != null) {
+ String[] items = combo.getItems();
+ for (int i=0; i < items.length; i++) {
+ if (items[i].equals(itemSelected)) {
+ combo.select(i);
+ break;
+ }
+ }
+ }
}
/**
@@ -149,6 +147,14 @@ public class UISelectWidget extends InputUIElement {
combo.select(index);
combo.setData(".uid", uiAttribute.get(UIElement.ID)); //$NON-NLS-1$
+ combo.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ itemSelected = combo.getItem(combo.getSelectionIndex());
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
}
/**
@@ -163,9 +169,8 @@ public class UISelectWidget extends InputUIElement {
boolean retVal = true;
String mandatory = (String) uiAttribute.get(InputUIElement.MANDATORY);
- if (((combo.getText() == null) || (combo.getText().equals("")) //$NON-NLS-1$
- || (combo.getText().trim().length() < 1)) && (mandatory.equalsIgnoreCase(TemplateEngineHelper.BOOLTRUE))) {
-
+ if ((itemSelected == null || itemSelected.equals("") //$NON-NLS-1$
+ || itemSelected.trim().length() < 1) && (mandatory.equalsIgnoreCase(TemplateEngineHelper.BOOLTRUE))) {
retVal = false;
}
return retVal;
diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISpecialListWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISpecialListWidget.java
index a0409d95317..00094cabbac 100644
--- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISpecialListWidget.java
+++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISpecialListWidget.java
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.cdt.ui.templateengine.uitree.uiwidgets;
+import java.util.Arrays;
+
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -20,6 +22,7 @@ import org.eclipse.cdt.ui.templateengine.uitree.InputUIElement;
import org.eclipse.cdt.ui.templateengine.uitree.UIAttributes;
import org.eclipse.cdt.ui.templateengine.uitree.UIElement;
import org.eclipse.cdt.utils.ui.controls.FileListControl;
+import org.eclipse.cdt.utils.ui.controls.IFileListChangeListener;
/**
@@ -69,6 +72,13 @@ public class UISpecialListWidget extends UIStringListWidget {
flcComposite.setLayoutData(gridData);
fileListControl = new FileListControl(flcComposite, (String) uiAttribute.get(InputUIElement.WIDGETLABEL), 1);
+ fileListControl.setList((String[])itemsList.toArray());
+ fileListControl.setSelection(0);
+ fileListControl.addChangeListener(new IFileListChangeListener(){
+ public void fileListChanged(FileListControl fileList, String oldValue[], String newValue[]) {
+ itemsList.addAll(Arrays.asList(newValue));
+ }
+ });
}
/**
diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java
index 4b87e1e5008..38c0f79ca04 100644
--- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java
+++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java
@@ -1,5 +1,4 @@
/*******************************************************************************
- * Copyright (c) 2007 Symbian Software Limited 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
@@ -10,7 +9,10 @@
*******************************************************************************/
package org.eclipse.cdt.ui.templateengine.uitree.uiwidgets;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
@@ -25,6 +27,7 @@ import org.eclipse.cdt.ui.templateengine.uitree.InputUIElement;
import org.eclipse.cdt.ui.templateengine.uitree.UIAttributes;
import org.eclipse.cdt.ui.templateengine.uitree.UIElement;
import org.eclipse.cdt.utils.ui.controls.FileListControl;
+import org.eclipse.cdt.utils.ui.controls.IFileListChangeListener;
/**
@@ -37,22 +40,24 @@ public class UIStringListWidget extends InputUIElement {
/**
* Attributes associated with this widget.
*/
- UIAttributes/**/ uiAttribute;
+ protected UIAttributes/**/ uiAttribute;
/**
* StringList widget.
*/
- FileListControl fileListControl;
+ protected FileListControl fileListControl;
/**
* Label of this widget.
*/
- Label label;
+ protected Label label;
/**
* Composite to which this widget control is added.
*/
- UIComposite uiComposite;
+ protected UIComposite uiComposite;
+
+ protected List itemsList;
/**
* Constructor.
@@ -63,6 +68,7 @@ public class UIStringListWidget extends InputUIElement {
public UIStringListWidget(UIAttributes/**/ attribute) {
super(attribute);
uiAttribute = attribute;
+ itemsList = new ArrayList();
}
/**
@@ -70,12 +76,10 @@ public class UIStringListWidget extends InputUIElement {
*/
public Map/**/ getValues() {
Map/**/ retMap = new HashMap/**/();
- String[] items = fileListControl.getItems();
String itemString = new String();
-
- for (int i = 0; i < items.length; i++)
- itemString = itemString + items[i] + "|"; //$NON-NLS-1$
-
+ for (int i = 0; i < itemsList.size(); i++) {
+ itemString = itemString + itemsList.get(i) + "|"; //$NON-NLS-1$
+ }
retMap.put(uiAttribute.get(InputUIElement.ID), itemString);
return retMap;
@@ -87,19 +91,14 @@ public class UIStringListWidget extends InputUIElement {
* @param valueMap
*/
public void setValues(Map/**/ valueMap) {
-
String items = (String) valueMap.get(uiAttribute.get(InputUIElement.ID));
if (items != null) {
items = items.trim();
StringTokenizer st = new StringTokenizer(items, "|"); //$NON-NLS-1$
- String[] itemList = new String[st.countTokens()];
-
- for (int i = 0; st.hasMoreTokens(); i++)
- itemList[i] = st.nextToken();
-
- fileListControl.setList(itemList);
- fileListControl.setSelection(0);
+ for (int i = 0; st.hasMoreTokens(); i++) {
+ itemsList.add(st.nextToken());
+ }
}
}
@@ -133,6 +132,14 @@ public class UIStringListWidget extends InputUIElement {
flcComposite.setLayoutData(gridData);
fileListControl = new FileListControl(flcComposite, (String) uiAttribute.get(InputUIElement.WIDGETLABEL), 0);
+ fileListControl.setList((String[])itemsList.toArray());
+ fileListControl.setSelection(0);
+ fileListControl.addChangeListener(new IFileListChangeListener(){
+ public void fileListChanged(FileListControl fileList, String oldValue[], String newValue[]) {
+ itemsList.addAll(Arrays.asList(newValue));
+ }
+ });
+
}
/**
@@ -147,8 +154,7 @@ public class UIStringListWidget extends InputUIElement {
boolean retVal = true;
String mandatory = (String) uiAttribute.get(InputUIElement.MANDATORY);
- if ((fileListControl.getItems() == null) && (mandatory.equalsIgnoreCase(TemplateEngineHelper.BOOLTRUE))) {
-
+ if ((itemsList == null || itemsList.size() == 0) && (mandatory.equalsIgnoreCase(TemplateEngineHelper.BOOLTRUE))) {
retVal = false;
}
return retVal;
diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java
index 3c55cb2e2f7..0b7af7a7d42 100644
--- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java
+++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java
@@ -50,7 +50,7 @@ public class UITextWidget extends InputUIElement implements ModifyListener {
/**
* Attributes associated with this widget.
*/
- private UIAttributes/**/ uiAttribute;
+ protected UIAttributes/**/ uiAttribute;
/**
* Text widget.
@@ -67,6 +67,8 @@ public class UITextWidget extends InputUIElement implements ModifyListener {
* Composite to which this widget control is added. Classes extending this class, should make sure that they initialize this from the respective class createWidgets method.
*/
protected UIComposite uiComposite;
+
+ protected String textValue;
/**
* Constructor.
@@ -77,6 +79,7 @@ public class UITextWidget extends InputUIElement implements ModifyListener {
public UITextWidget(UIAttributes/**/ uiAttribute) {
super(uiAttribute);
this.uiAttribute = uiAttribute;
+ this.textValue = new String();
}
/**
@@ -84,7 +87,7 @@ public class UITextWidget extends InputUIElement implements ModifyListener {
*/
public Map/**/ getValues() {
Map/**/ retMap = new HashMap/**/();
- retMap.put(uiAttribute.get(InputUIElement.ID), text.getText());
+ retMap.put(uiAttribute.get(InputUIElement.ID), textValue);
return retMap;
}
@@ -108,7 +111,7 @@ public class UITextWidget extends InputUIElement implements ModifyListener {
val = subString;
}
val = val.trim();
- text.setText(val);
+ textValue = val;
}
}
@@ -141,6 +144,7 @@ public class UITextWidget extends InputUIElement implements ModifyListener {
text = getTextWidget((String) uiAttribute.get(UIElement.TYPE));
text.addModifyListener(this);
text.setData(".uid", uiAttribute.get(UIElement.ID)); //$NON-NLS-1$
+ text.setText(textValue);
}
/**
@@ -213,17 +217,17 @@ public class UITextWidget extends InputUIElement implements ModifyListener {
// other classes, having Text widget. They can just make use of
// modifyText,
// evaluatePattern and isValid.
- String inputText = text.getText();
+ textValue = text.getText();
- if ((patternValue == null) || (inputText == null))
+ if ((patternValue == null) || (textValue == null))
return;
String mandatory = (String) attribute.get(InputUIElement.MANDATORY);
- if ((mandatory == null || !mandatory.equalsIgnoreCase("true")) && inputText.equals("")) { //$NON-NLS-1$ //$NON-NLS-2$
+ if ((mandatory == null || !mandatory.equalsIgnoreCase("true")) && textValue.equals("")) { //$NON-NLS-1$ //$NON-NLS-2$
return;
}
- evaluatePattern(label.getText(), inputText, patternValue);
+ evaluatePattern(label.getText(), textValue, patternValue);
}
/**
@@ -261,8 +265,8 @@ public class UITextWidget extends InputUIElement implements ModifyListener {
String mandatory = (String) uiAttribute.get(InputUIElement.MANDATORY);
if (((mandatory != null) && (mandatory.equalsIgnoreCase(TemplateEngineHelper.BOOLTRUE)))
- && ((text.getText() == null) || (text.getText().equals("")) || //$NON-NLS-1$
- (text.getText().trim().length() < 1))) {
+ && ((textValue == null) || (textValue.equals("")) || //$NON-NLS-1$
+ (textValue.trim().length() < 1))) {
retVal = false;
}