[jbosstools-commits] JBoss Tools SVN: r12935 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages and 2 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Thu Jan 8 11:59:00 EST 2009


Author: mareshkau
Date: 2009-01-08 11:59:00 -0500 (Thu, 08 Jan 2009)
New Revision: 12935

Modified:
   trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/AbstractResourceReferencesComposite.java
   trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.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
   trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3484, groups were removed, help messages for each tab were added

Modified: trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/AbstractResourceReferencesComposite.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/AbstractResourceReferencesComposite.java	2009-01-08 16:19:09 UTC (rev 12934)
+++ trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/AbstractResourceReferencesComposite.java	2009-01-08 16:59:00 UTC (rev 12935)
@@ -82,17 +82,16 @@
 
 	public Control createControl(Composite parent) {
 		
-		final Group group = new Group(parent,SWT.NONE);
+		final Composite composite = new Composite(parent,SWT.NONE);
 		
-		group.setText(createGroupLabel());
-		group.setLayoutData(new GridData(GridData.FILL_BOTH));
+		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
 		GridLayout g = new GridLayout(2, false);
-		group.setLayout(g);
+		composite.setLayout(g);
 
 	    
-		Control slc = table.createControl(group);
+		Control slc = table.createControl(composite);
 		slc.setLayoutData(new GridData(GridData.FILL_BOTH));
-		Control bc = bar.createControl(group);
+		Control bc = bar.createControl(composite);
 		
 	
 		GridData gd = new GridData(GridData.FILL_VERTICAL);
@@ -106,7 +105,7 @@
 			}
 		});
 		update();
-		return group;
+		return composite;
 	}
 	
 	protected ResourceReference[] getReferenceArray() {

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	2009-01-08 16:19:09 UTC (rev 12934)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java	2009-01-08 16:59:00 UTC (rev 12935)
@@ -92,5 +92,9 @@
 	public static String INSERT_AFTER;
 	public static String REPLACE_WITH;
 	public static String FROM_PALETTE;
-	
+	public static String PAGE_DESIGN_OPTIONS_ABOUT;
+	public static String ACTUAL_RUN_TIME_FOLDERS_ABOUT;
+	public static String INCLUDED_CSS_FILES_ABOUT;
+	public static String INCLUDED_TAG_LIBS_ABOUT;
+	public static String SUBSTITUTED_EL_EXPRESSIONS_ABOUT;	
 }

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	2009-01-08 16:19:09 UTC (rev 12934)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties	2009-01-08 16:59:00 UTC (rev 12935)
@@ -69,4 +69,9 @@
 INSERT_BEFORE=Insert Before
 INSERT_AFTER=Insert After
 REPLACE_WITH=Replace With
-FROM_PALETTE=From Palette
\ No newline at end of file
+FROM_PALETTE=From Palette
+PAGE_DESIGN_OPTIONS_ABOUT=Here you can configure Visual Page Editor arguments, which will be used for generating a preview
+ACTUAL_RUN_TIME_FOLDERS_ABOUT=This parameters will be used by Visual Page Editor for replacing absolute and relative path values when generating a preview
+INCLUDED_CSS_FILES_ABOUT=This CSS files will be linked by Visual Page Editor when generating a preview
+INCLUDED_TAG_LIBS_ABOUT=This Taglibs will be used by Visual Page Editor for getting appropriate template for generating a preview, if this Taglibs doesn't included on page
+SUBSTITUTED_EL_EXPRESSIONS_ABOUT=This EL expressions will be substituted by Visual Page Editor when generating a  preview 

Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java	2009-01-08 16:19:09 UTC (rev 12934)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java	2009-01-08 16:59:00 UTC (rev 12935)
@@ -15,16 +15,16 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
 import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryWizardView;
+import org.jboss.tools.vpe.messages.VpeUIMessages;
 import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceComposite;
 import org.jboss.tools.vpe.resref.core.CssReferencesComposite;
 import org.jboss.tools.vpe.resref.core.ElVariablesComposite;
@@ -59,26 +59,26 @@
     }
 
     public Control createControl(Composite parent) {
+    
+	final TabFolder tabFolder = new TabFolder(parent, SWT.NONE);
 
-	TabFolder tabFolder = new TabFolder(parent, SWT.NONE);
-	tabFolder.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
 	TabItem foldersTab = new TabItem(tabFolder, SWT.NONE);
 	TabItem cssTab = new TabItem(tabFolder, SWT.NONE);
 	TabItem tldTab = new TabItem(tabFolder, SWT.NONE);
 	TabItem elTab = new TabItem(tabFolder, SWT.NONE);
 	
-	Group groupControl = new Group(tabFolder, SWT.NONE);
-	groupControl.setLayout(new GridLayout(1, false));
-	groupControl.setText(Messages.ACTUAL_RUN_TIME_FOLDERS);
-	Control absControl = absFolder.createControl(groupControl);
-	Control relControl = relFolder.createControl(groupControl);
+	Composite compositeControl = new Composite(tabFolder, SWT.NONE);
+	compositeControl.setLayout(new GridLayout(1, false));
+	Control absControl = absFolder.createControl(compositeControl);
+	Control relControl = relFolder.createControl(compositeControl);
+	
 	Control cssControl = css.createControl(tabFolder);
 	Control tldControl = tld.createControl(tabFolder);
 	Control elControl = el.createControl(tabFolder);
 
 	foldersTab.setText(Messages.ACTUAL_RUN_TIME_FOLDERS);
 	foldersTab.setToolTipText(Messages.ACTUAL_RUN_TIME_FOLDERS);
-	foldersTab.setControl(groupControl);
+	foldersTab.setControl(compositeControl);
 
 	cssTab.setText(Messages.INCLUDED_CSS_FILES);
 	cssTab.setToolTipText(Messages.INCLUDED_CSS_FILES);
@@ -91,7 +91,23 @@
 	elTab.setText(Messages.SUBSTITUTED_EL_EXPRESSIONS);
 	elTab.setToolTipText(Messages.SUBSTITUTED_EL_EXPRESSIONS);
 	elTab.setControl(elControl);
+	
+	tabFolder.addSelectionListener(new SelectionListener(){
+		public void widgetDefaultSelected(SelectionEvent e) {}
 
+		public void widgetSelected(SelectionEvent e) {
+			String selectedTabText = tabFolder.getSelection()[0].getText();
+			if(Messages.ACTUAL_RUN_TIME_FOLDERS.equals(selectedTabText)) {
+				setMessage(VpeUIMessages.ACTUAL_RUN_TIME_FOLDERS_ABOUT);
+			}else if(Messages.INCLUDED_CSS_FILES.equals(selectedTabText)){
+				setMessage(VpeUIMessages.INCLUDED_CSS_FILES_ABOUT);
+			}else if(Messages.INCLUDED_TAG_LIBS.equals(selectedTabText)){
+				setMessage(VpeUIMessages.INCLUDED_TAG_LIBS_ABOUT);
+			}else if(Messages.SUBSTITUTED_EL_EXPRESSIONS.equals(selectedTabText)){
+				setMessage(VpeUIMessages.SUBSTITUTED_EL_EXPRESSIONS_ABOUT);
+			}
+		}});
+	setMessage(VpeUIMessages.PAGE_DESIGN_OPTIONS_ABOUT);
 	return tabFolder;
     }
 

Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java	2009-01-08 16:19:09 UTC (rev 12934)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java	2009-01-08 16:59:00 UTC (rev 12935)
@@ -11,8 +11,6 @@
 
 package org.jboss.tools.vpe.resref.core;
 
-import java.util.ResourceBundle;
-
 import org.eclipse.osgi.util.NLS;
 
 /**
@@ -25,8 +23,6 @@
     /** The Constant BUNDLE_NAME. */
     private static final String BUNDLE_NAME = "org.jboss.tools.vpe.resref.core.messages";//$NON-NLS-1$
     
-    /** The f resource bundle. */
-    private static ResourceBundle fResourceBundle;
     static {
         // load message values from bundle file
         NLS.initializeMessages(BUNDLE_NAME, Messages.class);       




More information about the jbosstools-commits mailing list