Author: mareshkau Date: 2008-10-01 10:41:58 -0400 (Wed, 01 Oct 2008) New Revision: 10593 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/template/VpeTemplateManagerTest.java trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/TemplatesExpressionParsingTest.java trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeTestPlugin.java Log: =Show Icon attribute was removed from vpe template dialog, some code adjustment was made Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-10-01 14:27:48 UTC (rev 10592) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-10-01 14:41:58 UTC (rev 10593) @@ -138,20 +138,6 @@ } } - Attr showIconAttr = element.getAttributeNode(VpeTemplateManager.ATTR_ANY_ICON); - if (showIconAttr != null) { - try { - if("yes".equals(showIconAttr.getValue())) showIconBool = true; - else showIconBool = false; - VpeExpressionInfo info = VpeExpressionBuilder.buildCompletedExpression(showIconAttr.getValue(), true); - dependencyMap.setCreator(this, info.getDependencySet()); - } catch(VpeExpressionBuilderException e) { - VpePlugin.reportProblem(e); - } - } - - - if (VpeTemplateManager.ATTR_ANY_PROPERTIES != null) { for (int i = 0; i < VpeTemplateManager.ATTR_ANY_PROPERTIES.length; i++) { String attrName = VpeTemplateManager.ATTR_ANY_PROPERTIES[i]; @@ -270,8 +256,7 @@ return new VpeAnyData( tagForDisplayStr, valueStr, - styleStr, - showIconBool + styleStr ); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java 2008-10-01 14:27:48 UTC (rev 10592) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java 2008-10-01 14:41:58 UTC (rev 10593) @@ -18,7 +18,6 @@ public class VpeAnyData extends VpeTemplateData { private String uri; private String tagForDisplay; - private boolean showIcon; private String value; private String style; @@ -36,11 +35,8 @@ public VpeAnyData( String tagForDisplay, String value, - String style, - boolean showIcon - ) { + String style) { this.value = value; - this.showIcon = showIcon; this.tagForDisplay = tagForDisplay; this.style=style; } @@ -55,14 +51,6 @@ this.uri = uri; } - public boolean isShowIcon(){ - return showIcon; - } - - public void setShowIcon(boolean flag){ - showIcon = flag; - } - public String getValue() { return value; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2008-10-01 14:27:48 UTC (rev 10592) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2008-10-01 14:41:58 UTC (rev 10593) @@ -44,7 +44,6 @@ private Text txtTagForDisplay; private Text txtValue; private Text txtStyle; - private CheckControl ctlShowIcon; public VpeEditAnyDialog(Shell shell, VpeAnyData data) { super(shell); @@ -87,9 +86,7 @@ // ctlCaseSensitive = new CheckControl(composite, "Case sensitive", data.isCaseSensitive()); ctlChildren = new CheckControl(composite, VpeUIMessages.CHILDREN, data.isChildren()); // ctlModify = new CheckControl(composite, "Modify", data.isModify()); - - ctlShowIcon = new CheckControl(composite, VpeUIMessages.ICON, data.isShowIcon()); - + //value control Label lblValue = makeLabel(composite, VpeUIMessages.VALUE); lblValue.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); @@ -155,9 +152,6 @@ data.setChanged(isChanged(data, data.getValue(), txtValue.getText())); data.setValue(txtValue.getText().trim()); - data.setChanged(isChanged(data, data.isShowIcon(), ctlShowIcon.getSelection())); - data.setShowIcon(ctlShowIcon.getSelection()); - data.setChanged(isChanged(data, data.getStyle(), txtStyle.getText())); data.setStyle(txtStyle.getText()); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-10-01 14:27:48 UTC (rev 10592) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-10-01 14:41:58 UTC (rev 10593) @@ -189,7 +189,6 @@ private static final String ATTR_ANY_DISPLAY = "display"; //$NON-NLS-1$ static final String ATTR_ANY_TAG_FOR_DISPLAY="tag-for-display"; //$NON-NLS-1$ - static final String ATTR_ANY_ICON = "icon"; //$NON-NLS-1$ static final String ATTR_ANY_VALUE = "value"; //$NON-NLS-1$ static final String ATTR_ANY_STYLE = "style"; //$NON-NLS-1$ @Deprecated @@ -646,10 +645,6 @@ .append(attrDisplay.getNodeValue()).append(";"); //$NON-NLS-1$ } //-----------END - attr = anyNode.getAttributeNode(ATTR_ANY_ICON); - if (attr != null){ - anyData.setShowIcon(ATTR_VALUE_YES.equalsIgnoreCase(attr.getNodeValue())); - } attr = anyNode.getAttributeNode(ATTR_ANY_VALUE); if (attr != null) { @@ -801,8 +796,6 @@ // if (data.getBorderColor() != null && data.getBorderColor().length() > 0) // newAnyElement.setAttribute(ATTR_ANY_BORDER_COLOR, data.getBorderColor()); - newAnyElement.setAttribute(ATTR_ANY_ICON, data.isShowIcon() ? ATTR_VALUE_YES : ATTR_VALUE_NO); - newTemplateElement.appendChild(newAnyElement); return newTagElement; Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/template/VpeTemplateManagerTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/template/VpeTemplateManagerTest.java 2008-10-01 14:27:48 UTC (rev 10592) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/template/VpeTemplateManagerTest.java 2008-10-01 14:41:58 UTC (rev 10593) @@ -2,27 +2,23 @@ import java.util.List; -import org.jboss.tools.vpe.editor.util.TemplateManagingUtil; - import junit.framework.TestCase; public class VpeTemplateManagerTest extends TestCase { public void testSetAnyTemplates() { VpeAnyData data = new VpeAnyData( - "tag-name1", - "tag-value", - "color:red", - true + "tag-name1", //$NON-NLS-1$ + "tag-value", //$NON-NLS-1$ + "color:red" //$NON-NLS-1$ ); VpeTemplateManager.getInstance().setAnyTemplate(data); data = new VpeAnyData( - "tag-name2", - "tag-value", - "color:white", - true + "tag-name2", //$NON-NLS-1$ + "tag-value", //$NON-NLS-1$ + "color:white" //$NON-NLS-1$ ); VpeTemplateManager.getInstance().setAnyTemplate(data); @@ -40,7 +36,7 @@ public void testGetDefTemplate() { VpeTemplateManager.getInstance().setDefTemplate(null); VpeTemplate template = VpeTemplateManager.getInstance().getDefTemplate(); - assertNotNull("TemplateManager.getDefTemplate() cannot return null",template); + assertNotNull("TemplateManager.getDefTemplate() cannot return null",template); //$NON-NLS-1$ } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/TemplatesExpressionParsingTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/TemplatesExpressionParsingTest.java 2008-10-01 14:27:48 UTC (rev 10592) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/TemplatesExpressionParsingTest.java 2008-10-01 14:41:58 UTC (rev 10593) @@ -14,24 +14,23 @@ import java.io.FileInputStream; import java.io.IOException; import java.net.URL; +import junit.framework.TestCase; import org.eclipse.core.internal.registry.ExtensionRegistry; import org.eclipse.core.runtime.ContributorFactoryOSGi; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IContributor; import org.eclipse.core.runtime.IExtension; -import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.RegistryFactory; -import org.osgi.framework.Bundle; -import org.jboss.tools.vpe.editor.template.VpeTemplateManager; import org.jboss.tools.common.reporting.IProblemReporter; import org.jboss.tools.common.reporting.ProblemReporterFactory; -import junit.framework.TestCase; +import org.jboss.tools.vpe.editor.template.VpeTemplateManager; +import org.osgi.framework.Bundle; /** * This class created for testing templates expression. @@ -40,15 +39,15 @@ */ public class TemplatesExpressionParsingTest extends TestCase { - private static final String PLUGIN_FAILURE_NAME = "testFailure-plugin.xml"; + private static final String PLUGIN_FAILURE_NAME = "testFailure-plugin.xml"; //$NON-NLS-1$ - private static final String PLUGIN_OK_NAME = "testOk-plugin.xml"; + private static final String PLUGIN_OK_NAME = "testOk-plugin.xml"; //$NON-NLS-1$ - private static final String EXTENSION_POINT_ID = "org.jboss.tools.vpe.templates"; + private static final String EXTENSION_POINT_ID = "org.jboss.tools.vpe.templates"; //$NON-NLS-1$ - private static final String EXTENSION_ERROR_EXTENSION_ID_1 = "org.jboss.tools.vpe.tests.failureExtensions"; + private static final String EXTENSION_ERROR_EXTENSION_ID_1 = "org.jboss.tools.vpe.tests.failureExtensions"; //$NON-NLS-1$ - private static final String EXTENSION_ERROR_EXTENSION_ID_2 = "org.jboss.tools.vpe.tests.okExtensions"; + private static final String EXTENSION_ERROR_EXTENSION_ID_2 = "org.jboss.tools.vpe.tests.okExtensions"; //$NON-NLS-1$ private IStatus iStatus = null; @@ -87,8 +86,8 @@ vpeTemplateManager = VpeTemplateManager.getInstance(); vpeTemplateManager.reload(); - assertNull("Can not parse template from ReDHat DevStudio" + iStatus, iStatus); - assertEquals("There exist some errors", 0, errorNumber); + assertNull("Can not parse template from ReDHat DevStudio" + iStatus, iStatus); //$NON-NLS-1$ + assertEquals("There exist some errors", 0, errorNumber); //$NON-NLS-1$ assertNotNull(vpeTemplateManager); } @@ -101,8 +100,8 @@ createTemplatesForTesting(PLUGIN_OK_NAME); vpeTemplateManager = VpeTemplateManager.getInstance(); vpeTemplateManager.reload(); - assertNull("Can not parse template from ReDHat DevStudio" + iStatus, iStatus); - assertEquals("There exist some errors", 0, errorNumber); + assertNull("Can not parse template from ReDHat DevStudio" + iStatus, iStatus); //$NON-NLS-1$ + assertEquals("There exist some errors", 0, errorNumber); //$NON-NLS-1$ return; } @@ -117,8 +116,8 @@ vpeTemplateManager = VpeTemplateManager.getInstance(); errorNumber = 0; vpeTemplateManager.reload(); - assertEquals("Number founds error is Incorrect ", 5, errorNumber); - assertNotNull("Can not parse template from ReDHat DevStudio" + iStatus, + assertEquals("Number founds error is Incorrect ", 5, errorNumber); //$NON-NLS-1$ + assertNotNull("Can not parse template from ReDHat DevStudio" + iStatus, //$NON-NLS-1$ iStatus); return; } @@ -166,7 +165,7 @@ bundle = Platform.getBundle(confElement.getNamespaceIdentifier()); } - URL url = bundle.getEntry("/"); + URL url = bundle.getEntry("/"); //$NON-NLS-1$ IPath path = new Path(FileLocator.toFileURL(url).getFile()); path = path.append(name); Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2008-10-01 14:27:48 UTC (rev 10592) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2008-10-01 14:41:58 UTC (rev 10593) @@ -34,7 +34,7 @@ public class VpeAllTests extends TestCase{ public static Test suite(){ - TestSuite suite = new TestSuite("Tests for vpe"); + TestSuite suite = new TestSuite("Tests for vpe"); //$NON-NLS-1$ // $JUnit-BEGIN$ suite.addTestSuite(TemplateLoadingTest.class); suite.addTestSuite(TemplateSchemeValidateTest.class); Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeTestPlugin.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeTestPlugin.java 2008-10-01 14:27:48 UTC (rev 10592) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeTestPlugin.java 2008-10-01 14:41:58 UTC (rev 10593) @@ -19,7 +19,7 @@ public class VpeTestPlugin extends Plugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.ide.vpe.tests"; + public static final String PLUGIN_ID = "org.jboss.ide.vpe.tests"; //$NON-NLS-1$ // The shared instance private static VpeTestPlugin plugin;