Author: dmaliarevich
Date: 2008-12-22 12:00:31 -0500 (Mon, 22 Dec 2008)
New Revision: 12805
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/RelativeFolderReferenceComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/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-3443,
https://jira.jboss.org/jira/browse/JBIDE-3053, there were made tabs on the resources
dialog, size of the dialog was changed to fit the screen resolution.
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 2008-12-22
16:13:40 UTC (rev 12804)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2008-12-22
17:00:31 UTC (rev 12805)
@@ -7,7 +7,7 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.vpe.resref;
import java.util.Properties;
@@ -21,73 +21,101 @@
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.resref.core.AbsoluteFolderReferenceComposite;
import org.jboss.tools.vpe.resref.core.CssReferencesComposite;
import org.jboss.tools.vpe.resref.core.ElVariablesComposite;
+import org.jboss.tools.vpe.resref.core.Messages;
import org.jboss.tools.vpe.resref.core.RelativeFolderReferenceComposite;
import org.jboss.tools.vpe.resref.core.TaglibReferencesComposite;
public class VpeResourcesDialogView extends AbstractQueryWizardView {
- IFile file;
- IPath path;
- CssReferencesComposite css = new CssReferencesComposite();
- //changed by estherbin
- //http://jira.jboss.com/jira/browse/JBIDE-2010
- ElVariablesComposite el = new ElVariablesComposite();
- TaglibReferencesComposite tld = new TaglibReferencesComposite();
- AbsoluteFolderReferenceComposite absFolder = new AbsoluteFolderReferenceComposite();
- RelativeFolderReferenceComposite relFolder = new RelativeFolderReferenceComposite();
+ IFile file;
+ IPath path;
+ CssReferencesComposite css = new CssReferencesComposite();
+ // changed by estherbin
+ //
http://jira.jboss.com/jira/browse/JBIDE-2010
+ ElVariablesComposite el = new ElVariablesComposite();
+ TaglibReferencesComposite tld = new TaglibReferencesComposite();
+ AbsoluteFolderReferenceComposite absFolder = new AbsoluteFolderReferenceComposite();
+ RelativeFolderReferenceComposite relFolder = new RelativeFolderReferenceComposite();
- public void setObject(Object object) {
- super.setObject(object);
- Properties p = findProperties(object);
- file = (IFile)p.get("file");
- path = (IPath)p.get("path");
+ public void setObject(Object object) {
+ super.setObject(object);
+ Properties p = findProperties(object);
+ file = (IFile) p.get("file"); //$NON-NLS-1$
+ path = (IPath) p.get("path"); //$NON-NLS-1$
- css.setObject(object);
- //changed by estherbin
- //http://jira.jboss.com/jira/browse/JBIDE-2010
- el.setObject(object);
- tld.setObject(object);
- absFolder.setObject(p);
- relFolder.setObject(p);
- }
+ css.setObject(object);
+ // changed by estherbin
+ //
http://jira.jboss.com/jira/browse/JBIDE-2010
+ el.setObject(object);
+ tld.setObject(object);
+ absFolder.setObject(p);
+ relFolder.setObject(p);
+ }
- public Control createControl(Composite parent) {
- GridData data;
- Composite c = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout(1, false);
- layout.marginWidth = 5;
- layout.marginHeight = 0;
- c.setLayout(layout);
- Control absControl = absFolder.createControl(c);
- Control relControl = relFolder.createControl(c);
- Control cssControl = css.createControl(c);
- Control tldControl = tld.createControl(c);
- Control elControl = el.createControl(c);
- return c;
- }
+ public Control createControl(Composite parent) {
- public void action(String command) {
- if(OK.equals(command)) {
- absFolder.commit();
- relFolder.commit();
- el.commit();
- css.commit();
- tld.commit();
- }
- super.action(command);
+ 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);
+ 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);
+
+ cssTab.setText(Messages.INCLUDED_CSS_FILES);
+ cssTab.setToolTipText(Messages.INCLUDED_CSS_FILES);
+ cssTab.setControl(cssControl);
+
+ tldTab.setText(Messages.INCLUDED_TAG_LIBS);
+ tldTab.setToolTipText(Messages.INCLUDED_TAG_LIBS);
+ tldTab.setControl(tldControl);
+
+ elTab.setText(Messages.SUBSTITUTED_EL_EXPRESSIONS);
+ elTab.setToolTipText(Messages.SUBSTITUTED_EL_EXPRESSIONS);
+ elTab.setControl(elControl);
+
+ return tabFolder;
+ }
+
+ public void action(String command) {
+ if (OK.equals(command)) {
+ absFolder.commit();
+ relFolder.commit();
+ el.commit();
+ css.commit();
+ tld.commit();
}
+ super.action(command);
+ }
- public Point getPreferredSize() {
- //changed by estherbin
- //http://jira.jboss.com/jira/browse/JBIDE-2010
- String os_name = System.getProperty("os.name");
- if(os_name != null && os_name.indexOf("Windows") >= 0) return new
Point(800, 600);
- //changed by estherbin
- //http://jira.jboss.com/jira/browse/JBIDE-2010
- return new Point(600, 700);
+ public Point getPreferredSize() {
+ // changed by estherbin
+ //
http://jira.jboss.com/jira/browse/JBIDE-2010
+ String os_name = System.getProperty("os.name"); //$NON-NLS-1$
+ if (os_name != null && os_name.indexOf("Windows") >= 0) {
//$NON-NLS-1$
+ return new Point(800, 300);
}
+ // changed by estherbin
+ //
http://jira.jboss.com/jira/browse/JBIDE-2010
+ return new Point(600, 350);
+ }
}
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 2008-12-22
16:13:40 UTC (rev 12804)
+++
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java 2008-12-22
17:00:31 UTC (rev 12805)
@@ -41,6 +41,8 @@
public static String INCLUDED_CSS_FILES;
public static String INCLUDED_TAG_LIBS;
public static String SUBSTITUTED_EL_EXPRESSIONS;
+ public static String ACTUAL_RUN_TIME_FOLDERS;
public static String ACTUAL_RUN_TIME_ABSOLUTE_FOLDER;
+ public static String ACTUAL_RUN_TIME_RELATIVE_FOLDER;
public static String INVALID_EL_EXPRESSION;
}
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceComposite.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceComposite.java 2008-12-22
16:13:40 UTC (rev 12804)
+++
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceComposite.java 2008-12-22
17:00:31 UTC (rev 12805)
@@ -20,7 +20,7 @@
}
protected String getTitle() {
- return "Actual Run-Time Relative Folder";
+ return Messages.ACTUAL_RUN_TIME_RELATIVE_FOLDER;
}
}
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties 2008-12-22
16:13:40 UTC (rev 12804)
+++
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties 2008-12-22
17:00:31 UTC (rev 12805)
@@ -1,5 +1,7 @@
INCLUDED_CSS_FILES=Included css files
INCLUDED_TAG_LIBS=Included tag libs
SUBSTITUTED_EL_EXPRESSIONS=Substituted El expressions
-ACTUAL_RUN_TIME_ABSOLUTE_FOLDER=Actual Run-Time Absolute Folder
+ACTUAL_RUN_TIME_ABSOLUTE_FOLDER=Absolute Folder
+ACTUAL_RUN_TIME_RELATIVE_FOLDER=Relative Folder
+ACTUAL_RUN_TIME_FOLDERS=Actual Run-Time Folders
INVALID_EL_EXPRESSION=Invalid El Expression