Author: estherbin Date: 2008-07-22 07:30:57 -0400 (Tue, 22 Jul 2008) New Revision: 9200 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/CssReferencesComposite.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ElVariablesComposite.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferencesComposite.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/TaglibReferencesComposite.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: Add labels https://jira.jboss.com:8443/jira/browse/JBIDE-2010 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/CssReferencesComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/CssReferencesComposite.java 2008-07-21 17:32:17 UTC (rev 9199) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/CssReferencesComposite.java 2008-07-22 11:30:57 UTC (rev 9200) @@ -12,6 +12,8 @@ import java.util.List; +import org.jboss.tools.vpe.messages.VpeUIMessages; + public class CssReferencesComposite extends ResourceReferencesComposite { protected String getEntity() { @@ -25,5 +27,15 @@ protected ResourceReferenceList getReferenceList() { return CSSReferenceList.getInstance(); } + + + /** + * @see ResourceReferencesComposite#createGroupLabel() + */ + @Override + protected String createGroupLabel() { + return VpeUIMessages.INCLUDED_CSS_FILES; + } + } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ElVariablesComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ElVariablesComposite.java 2008-07-21 17:32:17 UTC (rev 9199) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ElVariablesComposite.java 2008-07-22 11:30:57 UTC (rev 9200) @@ -2,6 +2,8 @@ import java.util.List; +import org.jboss.tools.vpe.messages.VpeUIMessages; + /** * The Class ElVariablesComposite. */ @@ -40,4 +42,14 @@ return ELReferenceList.getInstance(); } + /** + * @see ResourceReferencesComposite#createGroupLabel() + */ + @Override + protected String createGroupLabel() { + return VpeUIMessages.SUBSTITUTED_EL_EXPRESSIONS; + } + + + } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferencesComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferencesComposite.java 2008-07-21 17:32:17 UTC (rev 9199) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferencesComposite.java 2008-07-22 11:30:57 UTC (rev 9200) @@ -28,8 +28,11 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; public abstract class ResourceReferencesComposite { static String ADD = "Add"; @@ -57,6 +60,15 @@ protected abstract ResourceReferencesTableProvider createTableProvider(List dataList); protected abstract ResourceReferenceList getReferenceList(); + + /** + * Returned the label that will display in group. + * + * @return label displayed in group + * @see #createControl(Composite) + */ + protected abstract String createGroupLabel(); + public void setObject(Object object) { Properties p = (Properties)object; @@ -69,13 +81,24 @@ } public Control createControl(Composite parent) { - Composite c = new Composite(parent, SWT.NONE); - c.setLayoutData(new GridData(GridData.FILL_BOTH)); + Composite c1 = new Composite(parent, SWT.NONE); + + c1.setLayoutData(new GridData(GridData.FILL_BOTH)); + c1.setLayout(new GridLayout(2,false)); + + final Group group = new Group(c1,SWT.NONE); + + group.setText(createGroupLabel()); + group.setLayoutData(new GridData(GridData.FILL_BOTH)); GridLayout g = new GridLayout(2, false); - c.setLayout(g); - Control slc = table.createControl(c); + group.setLayout(g); + + + Control slc = table.createControl(group); slc.setLayoutData(new GridData(GridData.FILL_BOTH)); - Control bc = bar.createControl(c); + Control bc = bar.createControl(group); + + GridData gd = new GridData(GridData.FILL_VERTICAL); bc.setLayoutData(gd); table.getTable().addSelectionListener(new SelectionListener() { @@ -87,7 +110,7 @@ } }); update(); - return c; + return c1; } ResourceReference[] getReferenceArray() { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/TaglibReferencesComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/TaglibReferencesComposite.java 2008-07-21 17:32:17 UTC (rev 9199) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/TaglibReferencesComposite.java 2008-07-22 11:30:57 UTC (rev 9200) @@ -12,6 +12,8 @@ import java.util.List; +import org.jboss.tools.vpe.messages.VpeUIMessages; + public class TaglibReferencesComposite extends ResourceReferencesComposite { protected String getEntity() { @@ -26,4 +28,14 @@ return TaglibReferenceList.getInstance(); } + /** + * @see ResourceReferencesComposite#createGroupLabel() + */ + @Override + protected String createGroupLabel() { + return VpeUIMessages.INCLUDED_TAG_LIBS; + } + + + } 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-07-21 17:32:17 UTC (rev 9199) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2008-07-22 11:30:57 UTC (rev 9200) @@ -95,5 +95,8 @@ public static String CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE; public static String VPE_UPDATE_JOB_TITLE; public static String VPE_VISUAL_REFRESH_JOB; + public static String INCLUDED_CSS_FILES; + public static String INCLUDED_TAG_LIBS; + public static String SUBSTITUTED_EL_EXPRESSIONS; } 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-07-21 17:32:17 UTC (rev 9199) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2008-07-22 11:30:57 UTC (rev 9200) @@ -55,3 +55,8 @@ CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE=Always hide selection bar without prompt VPE_UPDATE_JOB_TITLE=Visual Editor View Update VPE_VISUAL_REFRESH_JOB=Visual Editor Refresh +INCLUDED_CSS_FILES=Included css files +INCLUDED_TAG_LIBS=Included tag libs +SUBSTITUTED_EL_EXPRESSIONS=Substituted El expressions + +