JBoss Tools SVN: r31403 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-05-20 14:14:37 -0400 (Fri, 20 May 2011)
New Revision: 31403
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
Log:
https://issues.jboss.org/browse/JBIDE-8977
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-05-20 16:28:05 UTC (rev 31402)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-05-20 18:14:37 UTC (rev 31403)
@@ -67,6 +67,7 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.SearchPattern;
+import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICoreMessages;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IBean;
@@ -108,6 +109,10 @@
protected boolean isComplete = true;
+ private boolean hasDefaultQualifier = false;
+
+ private IQualifier defaultQualifier, namedQualifier;
+
private ILabelProvider labelProvider = new QualifiersListLabelProvider();
public AddQualifiersToBeanComposite(Composite parent, WizardPage wizard) {
@@ -125,6 +130,17 @@
public void init(IBean bean){
this.bean = bean;
originalQualifiers = new ArrayList<IQualifier>(bean.getQualifiers());
+
+ defaultQualifier = bean.getCDIProject().getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME);
+ namedQualifier = bean.getCDIProject().getQualifier(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
+
+ for(IQualifier q : originalQualifiers){
+ if(q.equals(defaultQualifier)){
+ hasDefaultQualifier = true;
+ break;
+ }
+ }
+
deployedListViewer.setInput(originalQualifiers);
qualifiers.clear();
@@ -418,7 +434,6 @@
label = new Label(this, SWT.NONE);
label.setText("");
-
final Button createQualifier = new Button(this, SWT.PUSH);
createQualifier.setText(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_CREATE_NEW_QUALIFIER);
@@ -589,6 +604,20 @@
deployedListViewer.remove(qualifier);
}
}
+
+ if(hasDefaultQualifier){
+ if(deployed.isEmpty() || (namedQualifier != null && deployed.size() == 1 && deployed.contains(namedQualifier))) {
+ if(!originalQualifiers.contains(defaultQualifier)){
+ originalQualifiers.add(defaultQualifier);
+ deployedListViewer.add(defaultQualifier);
+ }
+ }else{
+ if(originalQualifiers.contains(defaultQualifier)){
+ originalQualifiers.remove(defaultQualifier);
+ deployedListViewer.remove(defaultQualifier);
+ }
+ }
+ }
setEnablement();
}
14 years, 10 months
JBoss Tools SVN: r31402 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-05-20 12:28:05 -0400 (Fri, 20 May 2011)
New Revision: 31402
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-8958
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2011-05-20 13:41:22 UTC (rev 31401)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2011-05-20 16:28:05 UTC (rev 31402)
@@ -33,7 +33,7 @@
org.eclipse.debug.ui;bundle-version="3.7.0",
org.eclipse.ui.navigator;bundle-version="3.5.0",
org.eclipse.ui.navigator.resources;bundle-version="3.4.300",
- org.eclipse.draw2d
+ org.eclipse.draw2d;bundle-version="3.7.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %Bundle-Vendor.0
14 years, 10 months
JBoss Tools SVN: r31401 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-05-20 09:41:22 -0400 (Fri, 20 May 2011)
New Revision: 31401
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.classpath
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.project
Log:
JBIDE-8949
org.jboss.tools.jst.jsp.test.JstJspAllTests failure
The issue is fixed.
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.classpath 2011-05-20 13:40:37 UTC (rev 31400)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.classpath 2011-05-20 13:41:22 UTC (rev 31401)
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="JavaSource"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
\ No newline at end of file
+</classpath>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.project 2011-05-20 13:40:37 UTC (rev 31400)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.project 2011-05-20 13:41:22 UTC (rev 31401)
@@ -6,11 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
14 years, 10 months
JBoss Tools SVN: r31400 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent: WEB-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-05-20 09:40:37 -0400 (Fri, 20 May 2011)
New Revision: 31400
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/WEB-INF/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/WEB-INF/lib/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/WEB-INF/lib/jsf-tlds.jar
Log:
JBIDE-8949
org.jboss.tools.jst.jsp.test.JstJspAllTests failure
The issue is fixed.
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/WEB-INF/lib/jsf-tlds.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/WEB-INF/lib/jsf-tlds.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 10 months
JBoss Tools SVN: r31399 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-05-20 09:40:02 -0400 (Fri, 20 May 2011)
New Revision: 31399
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/html_page.html
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/jsp_page.jsp
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/xhtml_page.xhtml
Log:
JBIDE-8949
org.jboss.tools.jst.jsp.test.JstJspAllTests failure
The issue is fixed.
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/html_page.html
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/html_page.html (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/html_page.html 2011-05-20 13:40:02 UTC (rev 31399)
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+ <link rel="stylesheet" href="theme1.css" type="text/css" />
+</head>
+
+<body class="">
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/html_page.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/jsp_page.jsp
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/jsp_page.jsp 2011-05-20 13:38:00 UTC (rev 31398)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/jsp_page.jsp 2011-05-20 13:40:02 UTC (rev 31399)
@@ -16,7 +16,7 @@
<title>Insert title here</title>
<link rel="stylesheet" href="theme1.css" type="text/css" />
</head>
-<body>
+<body class="">
<f:view>
<h:inputText value="" styleClass="" />
</f:view>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/xhtml_page.xhtml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/xhtml_page.xhtml 2011-05-20 13:38:00 UTC (rev 31398)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/xhtml_page.xhtml 2011-05-20 13:40:02 UTC (rev 31399)
@@ -8,5 +8,9 @@
</head>
<body class="">
+<f:view>
+ <h:inputText value="" styleClass="" />
+</f:view>
+
</body>
</html>
\ No newline at end of file
14 years, 10 months
JBoss Tools SVN: r31398 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test: .settings and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-05-20 09:38:00 -0400 (Fri, 20 May 2011)
New Revision: 31398
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/.jsdtscope
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.jdt.core.prefs
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.common.component
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.jsdt.ui.superType.name
Log:
JBIDE-8949
org.jboss.tools.jst.jsp.test.JstJspAllTests failure
The issue is fixed.
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/.jsdtscope
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/.jsdtscope (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/.jsdtscope 2011-05-20 13:38:00 UTC (rev 31398)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.jdt.core.prefs 2011-05-20 13:38:00 UTC (rev 31398)
@@ -0,0 +1,8 @@
+#Thu May 19 17:44:30 MSD 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.common.component 2011-05-20 13:38:00 UTC (rev 31398)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="Jbide6061Test">
+ <wb-resource deploy-path="/" source-path="/WebContent"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/>
+ <property name="context-root" value="Jbide6061Test"/>
+ <property name="java-output-path" value="/Jbide6061Test/WebContent/WEB-INF/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 2011-05-20 13:38:00 UTC (rev 31398)
@@ -0,0 +1,7 @@
+<root>
+ <facet id="jst.jsf">
+ <node name="libprov">
+ <attribute name="provider-id" value="jsf-user-library-provider"/>
+ </node>
+ </facet>
+</root>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-05-20 13:38:00 UTC (rev 31398)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 5.1 Runtime"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="jst.jsf"/>
+ <fixed facet="java"/>
+ <fixed facet="jst.web"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="jst.jsf" version="1.2"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-05-20 13:38:00 UTC (rev 31398)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-05-20 13:38:00 UTC (rev 31398)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
14 years, 10 months
JBoss Tools SVN: r31395 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-20 05:37:47 -0400 (Fri, 20 May 2011)
New Revision: 31395
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
Log:
[JBIDE-8968] fixed background of the "server behavior" section so that it is white
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-05-20 09:23:46 UTC (rev 31394)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-05-20 09:37:47 UTC (rev 31395)
@@ -47,7 +47,7 @@
this.callback = callback;
loadDeployTypeData();
FormToolkit toolkit = new FormToolkit(getDisplay());
-// FormUtils.adaptFormCompositeRecursively(this, toolkit);
+ FormUtils.adaptFormCompositeRecursively(this, toolkit);
setLayout(new FormLayout());
deployTypeCombo = new Combo(this, SWT.READ_ONLY);
FormData fd = UIUtil.createFormData2(0, 5, null, 0, 0, 5, 50, -5);
14 years, 11 months
JBoss Tools SVN: r31394 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui: editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-20 05:23:46 -0400 (Fri, 20 May 2011)
New Revision: 31394
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/FormUtils.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
Log:
[JBIDE-8968] fixed background of the "server behavior" section so that it is white
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/FormUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/FormUtils.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/FormUtils.java 2011-05-20 09:23:46 UTC (rev 31394)
@@ -0,0 +1,39 @@
+package org.jboss.ide.eclipse.as.ui;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+
+/**
+ * Utility methods that help in dealing with eclipse forms.
+ *
+ * @author André Dietisheim
+ *
+ */
+public class FormUtils {
+
+ public static void adaptFormCompositeRecursively(Composite composite, FormToolkit toolkit) {
+ if (FormUtils.isInSection(composite)) {
+ FormUtils.adaptRecursively(composite, toolkit);
+ }
+ }
+
+ public static boolean isInSection(Composite composite) {
+ return composite.getParent() instanceof Section;
+ }
+
+ public static void adaptRecursively(Composite composite, FormToolkit toolkit) {
+ toolkit.adapt(composite);
+ Control[] children = composite.getChildren();
+ for (int i = 0; i < children.length; i++) {
+ Control control = children[i];
+ if (control instanceof Composite) {
+ adaptRecursively((Composite) control, toolkit);
+ } else {
+ toolkit.adapt(control, true, false);
+ }
+ }
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/FormUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-05-20 08:25:55 UTC (rev 31393)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-05-20 09:23:46 UTC (rev 31394)
@@ -32,6 +32,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.ui.FormUtils;
import org.jboss.ide.eclipse.as.ui.UIUtil;
import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback;
@@ -45,14 +46,15 @@
super(parent, style);
this.callback = callback;
loadDeployTypeData();
- FormToolkit toolkit2 = new FormToolkit(parent.getDisplay());
+ FormToolkit toolkit = new FormToolkit(getDisplay());
+// FormUtils.adaptFormCompositeRecursively(this, toolkit);
setLayout(new FormLayout());
deployTypeCombo = new Combo(this, SWT.READ_ONLY);
FormData fd = UIUtil.createFormData2(0, 5, null, 0, 0, 5, 50, -5);
deployTypeCombo.setLayoutData(fd);
- preferencePageBook = toolkit2.createPageBook(this, SWT.FLAT|SWT.TOP);
+ preferencePageBook = toolkit.createPageBook(this, SWT.FLAT|SWT.TOP);
preferencePageBook.setLayoutData(UIUtil.createFormData2(
deployTypeCombo, 5, 0, 150, 0, 5, 100, -5));
14 years, 11 months