Author: estherbin Date: 2008-09-16 05:06:33 -0400 (Tue, 16 Sep 2008) New Revision: 10247 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesTableProvider.java 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/messages/VpeUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties Log: Began fixed JBIDE-2521 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesTableProvider.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesTableProvider.java 2008-09-16 06:22:14 UTC (rev 10246) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesTableProvider.java 2008-09-16 09:06:33 UTC (rev 10247) @@ -18,8 +18,8 @@ import org.jboss.tools.vpe.editor.template.VpeAnyData; public class TemplatesTableProvider implements XTableProvider, XTableImageProvider { - static String[] COLUMNS = new String[]{"URI", "Tag Name", "Display", "Children"}; - static int[] WIDTH = new int[]{200, 150, 100, 100}; + static String[] COLUMNS = new String[]{"URI","Tag for Display", "Tag Name", "Display", "Children"}; + static int[] WIDTH = new int[]{200,150, 150, 100, 100}; List dataList; public TemplatesTableProvider(List dataList){ @@ -27,7 +27,7 @@ } public int getColumnCount() { - return 4; + return 5; } public int getRowCount() { @@ -45,10 +45,12 @@ case 0: return data.getUri(); case 1: + return data.getTagForDisplay(); + case 2: return data.getName(); - case 2: + case 3: return data.getDisplay(); - case 3: + case 4: if(data.isChildren()) return "yes"; else return "no"; } 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-09-16 06:22:14 UTC (rev 10246) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-09-16 09:06:33 UTC (rev 10247) @@ -277,6 +277,7 @@ public VpeAnyData getAnyData() { return new VpeAnyData( displayStr, + "", valueStr, borderStr, valueColorStr, 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-09-16 06:22:14 UTC (rev 10246) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java 2008-09-16 09:06:33 UTC (rev 10247) @@ -12,6 +12,7 @@ public class VpeAnyData extends VpeTemplateData { private String uri; + private String tagForDisplay; private String display; private String value; private String border; @@ -26,6 +27,7 @@ } public VpeAnyData( String display, + String tagForDisplay, String value, String border, String valueColor, @@ -42,6 +44,7 @@ this.backgroundColor = backgroundColor; this.borderColor = borderColor; this.showIcon = showIcon; + this.tagForDisplay = tagForDisplay; } public String getUri() { @@ -106,4 +109,10 @@ public void setValueColor(String valueColor) { this.valueColor = valueColor; } + public String getTagForDisplay() { + return tagForDisplay; + } + public void setTagForDisplay(String tagForDisplay) { + this.tagForDisplay = tagForDisplay; + } } 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-09-16 06:22:14 UTC (rev 10246) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2008-09-16 09:06:33 UTC (rev 10247) @@ -10,6 +10,10 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.template; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -35,6 +39,7 @@ private CheckControl ctlChildren; private CheckControl ctlModify; private Combo cbDisplay; + private Combo cbTagForDisplay; private int displayIndexMem; private Text txtValue; private Text txtBorder; @@ -45,12 +50,23 @@ private CheckControl ctlShowIcon; private static String[] displayItems = new String[3]; + + private static List<String> displayTags = new ArrayList<String>(); static { displayItems[0] = VpeAnyCreator.VAL_DISPLAY_BLOCK; displayItems[1] = VpeAnyCreator.VAL_DISPLAY_INLINE; displayItems[2] = VpeAnyCreator.VAL_DISPLAY_NONE; } + static{ + displayTags.add(VpeUIMessages.TAG_DIV); + displayTags.add(VpeUIMessages.TAG_SPAN); + displayTags.add(VpeUIMessages.TAG_B); + displayTags.add(VpeUIMessages.TAG_P); + displayTags.add(VpeUIMessages.TAG_TABLE); + } + + public VpeEditAnyDialog(Shell shell, VpeAnyData data) { super(shell); @@ -76,15 +92,30 @@ composite.setBackground(parent.getBackground()); composite.setForeground(parent.getForeground()); composite.setFont(parent.getFont()); - + + //added by estherbin https://jira.jboss.org/jira/browse/JBIDE-2521 + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + Label tagFDisplayLabel = makeLabel(composite, VpeUIMessages.TAG_FOR_DISPLAY); + + tagFDisplayLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); + cbTagForDisplay = new Combo(composite,SWT.DROP_DOWN | SWT.READ_ONLY); + cbTagForDisplay.setLayoutData(gd); + cbTagForDisplay.setItems(displayTags.toArray(new String[displayTags.size()])); + cbTagForDisplay.select(0); + + // ctlCaseSensitive = new CheckControl(composite, "Case sensitive", data.isCaseSensitive()); ctlChildren = new CheckControl(composite, VpeUIMessages.CHILDREN, data.isChildren()); // ctlModify = new CheckControl(composite, "Modify", data.isModify()); - + + + + + gd = new GridData(GridData.FILL_HORIZONTAL); Label lblDisplay = makeLabel(composite, VpeUIMessages.DISPLAY); lblDisplay.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); cbDisplay = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY); - GridData gd = new GridData(GridData.FILL_HORIZONTAL); + // gd.horizontalSpan = 2; cbDisplay.setLayoutData(gd); cbDisplay.setItems(displayItems); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2008-09-16 06:22:14 UTC (rev 10246) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2008-09-16 09:06:33 UTC (rev 10247) @@ -98,5 +98,14 @@ public static String NON_VISUAL_TAGS; public static String SHOW; public static String HIDE; + public static String TAG_FOR_DISPLAY; + + public static String TAG_B; + public static String TAG_TABLE; + public static String TAG_P; + public static String TAG_A; + public static String TAG_DIV; + public static String TAG_SPAN; + } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2008-09-16 06:22:14 UTC (rev 10246) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2008-09-16 09:06:33 UTC (rev 10247) @@ -58,4 +58,12 @@ VPE_VISUAL_REFRESH_JOB=Visual Editor Refresh NON_VISUAL_TAGS=Non-visual tags SHOW=Show -HIDE=Hide \ No newline at end of file +HIDE=Hide +TAG_FOR_DISPLAY=Tag for Display +TAG_B=B +TAG_TABLE=TABLE +TAG_P=P +TAG_A=A +TAG_DIV=DIV +TAG_SPAN=SPAN +