JBoss Tools SVN: r4742 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-11-06 10:30:18 -0500 (Tue, 06 Nov 2007)
New Revision: 4742
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java
Log:
JBIDE-1236
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java 2007-11-06 15:29:46 UTC (rev 4741)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java 2007-11-06 15:30:18 UTC (rev 4742)
@@ -41,6 +41,7 @@
import org.jboss.tools.common.meta.action.impl.XEntityDataImpl;
import org.jboss.tools.common.meta.key.WizardKeys;
import org.jboss.tools.common.model.plugin.ModelPlugin;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.XMLUtil;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.jst.web.context.ImportWebDirProjectContext;
@@ -307,6 +308,15 @@
setErrorMessage(WebUIMessages.PROJECT_EXISTS_IN_WORKSPACE + getProjectNameValue() + " exists in workspace and is closed. To use the project, please open it."); //$NON-NLS-2$
return false;
}
+ if(project == null || !project.exists()) {
+ IProject p1 = EclipseResourceUtil.findProjectIgnoreCase(projectName);
+ if(p1 != null) {
+ String message = NLS.bind(WebUIMessages.PROJECT_ALREADY_EXISTS_IN_THE_WORKSPACE, p1.getName());
+ setErrorMessage(message);
+ return false;
+ }
+ }
+
if(context.isInitialized()) return true;
boolean hasNature = false;
boolean hasJavaNature = false;
17 years, 1 month
JBoss Tools SVN: r4741 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-11-06 10:29:46 -0500 (Tue, 06 Nov 2007)
New Revision: 4741
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
Log:
JBIDE-1236
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2007-11-06 14:59:02 UTC (rev 4740)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2007-11-06 15:29:46 UTC (rev 4741)
@@ -844,14 +844,18 @@
}
public static boolean projectExistsIgnoreCase(String name) {
- if(name == null || name.length() == 0) return false;
+ return findProjectIgnoreCase(name) != null;
+ }
+
+ public static IProject findProjectIgnoreCase(String name) {
+ if(name == null || name.length() == 0) return null;
IProject[] ps = ModelPlugin.getWorkspace().getRoot().getProjects();
for (int i = 0; i < ps.length; i++) {
if(ps[i].getName().equalsIgnoreCase(name)) {
- return true;
+ return ps[i];
}
}
- return false;
+ return null;
}
}
17 years, 1 month
JBoss Tools SVN: r4740 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui: editors/dnd/composite and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-11-06 09:59:02 -0500 (Tue, 06 Nov 2007)
New Revision: 4740
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java
Log:
JBIDE-1274
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java 2007-11-06 14:17:07 UTC (rev 4739)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaHyperlinkLineFieldEditor.java 2007-11-06 14:59:02 UTC (rev 4740)
@@ -10,16 +10,27 @@
******************************************************************************/
package org.jboss.tools.common.model.ui.attribute.editor;
+import java.util.ArrayList;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.ui.IValueChangeListener;
import org.jboss.tools.common.model.ui.IValueProvider;
import org.jboss.tools.common.model.ui.attribute.adapter.DefaultValueAdapter;
import org.jboss.tools.common.model.ui.attribute.adapter.IModelPropertyEditorAdapter;
import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.search.IJavaSearchConstants;
+import org.eclipse.jdt.core.search.IJavaSearchScope;
+import org.eclipse.jdt.core.search.SearchEngine;
+import org.eclipse.jdt.internal.ui.dialogs.FilteredTypesSelectionDialog;
import org.eclipse.jdt.internal.ui.refactoring.contentassist.JavaTypeCompletionProcessor;
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.action.Action;
@@ -253,4 +264,36 @@
}
return null;
}
+
+ //Overrides to show standard dialog
+// protected String changePressed() {
+// IJavaSearchScope scope = project != null ? getScope(project.getName()) : null;
+// FilteredTypesSelectionDialog d = new FilteredTypesSelectionDialog(getChangeControl().getShell(), false, null, scope, 0/*IJavaSearchConstants.CLASS + IJavaSearchConstants.INTERFACE*/);
+// d.create();
+// int q = d.open();
+// Object result = d.getFirstResult();
+// if(result instanceof String) return result.toString();
+// return null;
+// }
+
+ private IJavaSearchScope getScope(String javaProjectName) {
+ IJavaElement[] elements = new IJavaElement[0];
+ if(javaProjectName != null) {
+ IPath path = new Path(javaProjectName);
+ IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
+ IProject proj = res.getProject();
+ IJavaProject jproject = JavaCore.create(proj);
+ IPackageFragmentRoot fCurrRoot = jproject.getPackageFragmentRoot(res);
+ elements = new IJavaElement[] { fCurrRoot.getJavaProject() };
+ } else {
+ IProject[] ps = ModelPlugin.getWorkspace().getRoot().getProjects();
+ ArrayList<IJavaElement> l = new ArrayList<IJavaElement>();
+ for (int i = 0; i < ps.length; i++) {
+ if(EclipseResourceUtil.getJavaProject(ps[i]) != null) l.add(JavaCore.create(ps[i]));
+ }
+ elements = l.toArray(new IJavaElement[0]);
+ }
+ return SearchEngine.createJavaSearchScope(elements);
+ }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java 2007-11-06 14:17:07 UTC (rev 4739)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java 2007-11-06 14:59:02 UTC (rev 4740)
@@ -243,6 +243,9 @@
TableItem item = (TableItem)element;
AttributeDescriptorValue attrDescr = (AttributeDescriptorValue)item.getData();
fWizardModel.setAttributeValue(attrDescr,value);
+ if(tableViewer != null) {
+ tableViewer.refresh();
+ }
}
}
);
17 years, 1 month
JBoss Tools SVN: r4739 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2007-11-06 09:17:07 -0500 (Tue, 06 Nov 2007)
New Revision: 4739
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1213, ui:insert was adjusted, when we use this template without name attribute, it's will copy whole client template
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java 2007-11-06 13:51:54 UTC (rev 4738)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java 2007-11-06 14:17:07 UTC (rev 4739)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.facelets.template;
+import java.util.ArrayList;
+import java.util.List;
+
import org.jboss.tools.vpe.editor.VpeIncludeInfo;
import org.jboss.tools.vpe.editor.VpeVisualDomBuilder;
import org.jboss.tools.vpe.editor.context.VpePageContext;
@@ -49,12 +52,17 @@
return creationData;
}
} else {
- Node undefineElement = findUndefinedElement(includeInfo.getElement());
- if (undefineElement != null) {
- VpeCreationData creationData = createInsert(undefineElement, visualDocument);
- creationData.setData(pageContext.getVisualBuilder().popIncludeStack());
- return creationData;
+ //if no name specified for insert Template, that expected that the all template body will be inserted
+ List<Node> elements = findUndefinedElement(includeInfo.getElement());
+
+ VpeCreationData creationData= new VpeCreationData(null);
+ for (Node node : elements) {
+ VpeChildrenInfo childInfo = new VpeChildrenInfo(null);
+ childInfo.addSourceChild(node);
+ creationData.addChildrenInfo(childInfo);
}
+ creationData.setData(pageContext.getVisualBuilder().popIncludeStack());
+ return creationData;
}
}
VpeCreationData creationData = createStub((Element)sourceNode, visualDocument);
@@ -87,8 +95,8 @@
return defineElement;
}
- private Node findUndefinedElement(Element defineContainer) {
- Node defineElement = null;
+ private List<Node> findUndefinedElement(Element defineContainer) {
+ List<Node> result= new ArrayList<Node>();
NodeList children = defineContainer.getChildNodes();
int len = children.getLength();
for (int i = 0; i < len; i++) {
@@ -96,16 +104,15 @@
if ((child.getNodeType() == Node.ELEMENT_NODE||child.getNodeType() == Node.TEXT_NODE)) {
if(child.getNodeType() == Node.ELEMENT_NODE&&!"define".equals(child.getLocalName())&&((Element)child).getAttribute("name")==null) {
- defineElement = child;
- break;
+ result.add(child);
+
} else if(child.getNodeType() == Node.TEXT_NODE&&((Text)child).getNodeValue()!=null&&
((Text)child).getNodeValue().trim().length()>0) {
- defineElement = child;
- break;
+ result.add(child);
}
}
}
- return defineElement;
+ return result;
}
private VpeCreationData createInsert(Node defineElement, nsIDOMDocument visualDocument) {
17 years, 1 month
JBoss Tools SVN: r4738 - trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: sabrashevich
Date: 2007-11-06 08:51:54 -0500 (Tue, 06 Nov 2007)
New Revision: 4738
Modified:
trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/GettingStartedStrutsValidationExamples.xml
Log:
http://jira.jboss.com/jira/browse/RHDS-136 fixed bugs found by QA
Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/GettingStartedStrutsValidationExamples.xml
===================================================================
--- trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/GettingStartedStrutsValidationExamples.xml 2007-11-06 13:50:27 UTC (rev 4737)
+++ trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/GettingStartedStrutsValidationExamples.xml 2007-11-06 13:51:54 UTC (rev 4738)
@@ -66,9 +66,9 @@
<itemizedlist continuation="continues">
<listitem><para>Double-click inputname.jsp under <emphasis><property>StrutsHello > WEB-ROOT(WebContent) > pages</property></emphasis> to open it for editing</para></listitem>
<listitem><para>Find the tag near the top and hit Return to make a new line under it</para></listitem>
- <listitem><para>In the JBoss Tools Palette view to the right, open the HTML folder and click on the javascript tag</para></listitem>
+ <listitem><para>In the JBoss Tools Palette view to the right, open the Struts HTML folder and click on the javascript tag</para></listitem>
<listitem><para>Back in the editor, just in front of the closing slash for this inserted tag, hit Ctrl+Space and select "formName" from the prompting menu</para></listitem>
-<listitem><para>Over in the Web Projects view, select GetNameForm under the <emphasis><property>StrutsHello > Configuration > default > struts-config.xml > form-beans</property></emphasis> node, drag it, and drop it between the quotes in the editor</para></listitem>
+<listitem><para>Over in the Web Projects view, select GetNameForm under the <emphasis><property>StrutsHello > Configuration > default > struts-config.xml > form-beans</property></emphasis> node, drag it, and drop it between the quotes in the editor</para></listitem>
<listitem><para>Modify the <emphasis role="bold"><property><html:form></property></emphasis> tag by inserting this attribute:</para></listitem>
</itemizedlist>
<programlisting role="XML"><![CDATA[onsubmit="return validateGetNameForm(this)"
17 years, 1 month
JBoss Tools SVN: r4737 - trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-11-06 08:50:27 -0500 (Tue, 06 Nov 2007)
New Revision: 4737
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf.meta
Log:
JBIDE-1259
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf.meta 2007-11-06 13:49:12 UTC (rev 4736)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/jsf.meta 2007-11-06 13:50:27 UTC (rev 4737)
@@ -2455,6 +2455,7 @@
<Constraint loader="Tree">
<value name="FileSystemResourceBundle"/>
<value name="extensions=properties"/>
+ <value name="javaRootsOnly=true"/>
</Constraint>
<Editor name="TreeChooser"/>
</XModelAttribute>
17 years, 1 month
JBoss Tools SVN: r4736 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-11-06 08:49:12 -0500 (Tue, 06 Nov 2007)
New Revision: 4736
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/FileSystemResourceBundleTree.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/FileSystemResourceTree.java
Log:
JBIDE-1259
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/FileSystemResourceBundleTree.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/FileSystemResourceBundleTree.java 2007-11-06 13:30:27 UTC (rev 4735)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/FileSystemResourceBundleTree.java 2007-11-06 13:49:12 UTC (rev 4736)
@@ -18,6 +18,7 @@
public void setConstraint(Object object) {
extensions = new HashSet<String>();
extensions.add("properties");
+ javaRootsOnly = true;
}
public String getValue(XModelObject object) {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/FileSystemResourceTree.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/FileSystemResourceTree.java 2007-11-06 13:30:27 UTC (rev 4735)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/trees/FileSystemResourceTree.java 2007-11-06 13:49:12 UTC (rev 4736)
@@ -22,6 +22,7 @@
protected XModel model = null;
protected Set<String> extensions = null;
protected Set<String> entities = null;
+ protected boolean javaRootsOnly = false;
public FileSystemResourceTree() {}
@@ -59,6 +60,10 @@
StringTokenizer st = new StringTokenizer(ent, ",");
while(st.hasMoreTokens()) entities.add(st.nextToken());
}
+ String jro = tc.getProperties().getProperty("java_roots_only");
+ if("true".equals(jro)) {
+ javaRootsOnly = true;
+ }
}
public XModelObject getRoot() {
@@ -122,6 +127,12 @@
XModelObject[] fs = getRoot().getChildren();
SortedMap<String,XModelObject> t = new TreeMap<String,XModelObject>();
for (int i = 0; i < fs.length; i++) {
+ if(javaRootsOnly) {
+ if("FileSystemFolder".equals(fs[i].getModelEntity().getName())
+ && !fs[i].getAttributeValue("name").startsWith("src")) {
+ continue;
+ }
+ }
XModelObject[] cs = fs[i].getChildren();
for (int j = 0; j < cs.length; j++) {
String p = cs[j].getPathPart();
17 years, 1 month
JBoss Tools SVN: r4735 - in trunk/documentation/guides/userguide/Legacy-jsf-struts/en: modules and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sabrashevich
Date: 2007-11-06 08:30:27 -0500 (Tue, 06 Nov 2007)
New Revision: 4735
Modified:
trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/ConfigEditor2.png
trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/run.png
trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/GettingStartedGuideforCreatingaStrutsApplication.xml
trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/GettingStartedStrutsValidationExamples.xml
Log:
http://jira.jboss.com/jira/browse/RHDS-136 fixed bugs found by QA
Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/ConfigEditor2.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/images/run.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/GettingStartedGuideforCreatingaStrutsApplication.xml
===================================================================
--- trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/GettingStartedGuideforCreatingaStrutsApplication.xml 2007-11-06 13:23:47 UTC (rev 4734)
+++ trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/GettingStartedGuideforCreatingaStrutsApplication.xml 2007-11-06 13:30:27 UTC (rev 4735)
@@ -52,10 +52,10 @@
<listitem><para>We will keep our presentation files in this folder</para></listitem>
-<listitem><para>Right-click the pages folder and select <emphasis><property>New > File > JSP...</property></emphasis> </para></listitem>
- <listitem><para>For Name type in inputname (the JSP extension will be automatically added to the file), for Template select <emphasis><property>StrutsForm</property></emphasis> and then click on the <emphasis><property>Finish</property></emphasis> button</para></listitem>
+<listitem><para>Right-click the pages folder and select <emphasis><property>New > JSP File...</property></emphasis> </para></listitem>
+ <listitem><para>For Name type in <emphasis><property>inputname</property></emphasis> (the JSP extension will be automatically added to the file), for Template select <emphasis><property>StrutsForm</property></emphasis> and then click on the <emphasis><property>Finish</property></emphasis> button</para></listitem>
<listitem><para>Right-click the pages folder again and select <emphasis><property>New > File > JSP...</property></emphasis></para></listitem>
- <listitem><para>For Name type in greeting, for Template leave as Blank, and then click on the <emphasis><property>Finish</property></emphasis> button</para></listitem>
+ <listitem><para>For Name type in <emphasis><property>greeting</property></emphasis>, for Template leave as Blank, and then click on the <emphasis><property>Finish</property></emphasis> button</para></listitem>
</itemizedlist>
<para>Just leave these files as is for now.</para>
</section>
@@ -109,8 +109,7 @@
<listitem><para>Click <emphasis><property>Finish</property></emphasis></para></listitem>
</itemizedlist>
-<para>The <emphasis><property>/greeting</property></emphasis> action should appear in two places, in the diagram and also under the action-mappings node under the struts-config.xml node in the Outline view. Also, note the
-asterisk to the right of the name, struts-config.xml, in the Outline view showing that the file has been changed, but not saved to disk.</para>
+<para>The <emphasis><property>/greeting</property></emphasis> action should appear in four places, in the diagram, under the action-mappings node, under the struts-config.xml node in Tree view, in Web Projects view and in the Outline view. Also, note the asterisk to the right of the name, struts-config.xml, in the Outline view showing that the file has been changed, but not saved to disk.</para>
</section>
<section id="CreatingaLink">
<title>Creating a Link</title>
@@ -319,7 +318,7 @@
<programlisting role="JAVA"><![CDATA[String name = ((GetNameForm)form).getName();
String greeting = "Hello, "+name+"!";
-((GetNameForm)form).setGreetName(greeting);
+((GetNameForm)form).setName(greeting);
return mapping.findForward(FORWARD_sayHello);
The final version of GreetingAction.java should look like this:
@@ -348,7 +347,7 @@
{
String name = ((GetNameForm)form).getName();
String greeting = "Hello, "+name+"!";
- ((GetNameForm)form).setGreetName(greeting);
+ ((GetNameForm)form).setName(greeting);
return mapping.findForward(FORWARD_sayHello);
}
}
Modified: trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/GettingStartedStrutsValidationExamples.xml
===================================================================
--- trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/GettingStartedStrutsValidationExamples.xml 2007-11-06 13:23:47 UTC (rev 4734)
+++ trunk/documentation/guides/userguide/Legacy-jsf-struts/en/modules/GettingStartedStrutsValidationExamples.xml 2007-11-06 13:30:27 UTC (rev 4735)
@@ -41,20 +41,20 @@
from the context menu</para></listitem>
<listitem><para>Drag up the sample.applResources icon until you can drop it on the resources folder under struts-config.xml</para></listitem>
-<listitem><para>Select<emphasis><property> File > Save </property></emphasis>All from the menu bar</para></listitem>
-<listitem><para>Select validation.xml under the <emphasis><property>StrutsHello > Validation</property></emphasis> node and double-click it to open it with the JBoss Tools Validation Editor</para></listitem>
-<listitem><para>Expand the form-beans node under the <emphasis><property>StrutsHello > Configuration > default > struts-config.xml node.</property></emphasis> Then, drag the form bean GetNameForm and drop it onto a formset (default) in the <property>Validation</property> Editor</para></listitem>
-<listitem><para>In the Validation Editor, expand the formset node, right-click GetNameForm, and select <emphasis><property>Add Field...</property></emphasis> from the context menu</para></listitem>
+<listitem><para>Select<emphasis><property> File > Save </property></emphasis>All from the menu bar</para></listitem>
+<listitem><para>Select validation.xml under the <emphasis><property>StrutsHello > Validation</property></emphasis> node and double-click it to open it with the JBoss Tools XML Editor</para></listitem>
+<listitem><para>Expand the form-beans node under the <emphasis><property>StrutsHello > Configuration > default > struts-config.xml node.</property></emphasis> Then, drag the form bean GetNameForm and drop it onto a formset (default) in the <property>XML</property> Editor</para></listitem>
+<listitem><para>In the Validation Editor, expand the formset node, right-click GetNameForm, and select <emphasis><property>Create Field...</property></emphasis> from the context menu</para></listitem>
<listitem><para>Enter a name for Property in the dialog box</para></listitem>
<listitem><para>In the properties for the name field to the right of the "tree" for the validation.xml file, click on the <emphasis><property>Change...</property></emphasis>button next to the Depends entry field</para></listitem>
-<listitem><para>In the displayed double list, select required from the left list and then click <emphasis><property>Add</property></emphasis></para></listitem>
+<listitem><para>In the displayed double list, select <emphasis><property>required</property></emphasis> from the left list and then click <emphasis><property>Add</property></emphasis></para></listitem>
<listitem><para>Click <emphasis><property>Ok</property></emphasis></para></listitem>
<listitem><para>Right-click name and select <emphasis><property>Add Arg...</property></emphasis> from the context menu</para></listitem>
<listitem><para>In the Add Arg dialog box, click on the <emphasis><property>Change...</property></emphasis>button next to the <emphasis><property>Key</property></emphasis> field</para></listitem>
<listitem><para>In the Key dialog box that appears now, click on the <emphasis><property>Add</property></emphasis> button</para></listitem>
<listitem><para>Enter "name.required" in the Name field, and enter a person's name in the Value field</para></listitem>
<listitem><para>Click <emphasis><property>Finish</property></emphasis>, then <emphasis><property>Ok</property></emphasis>, and then <emphasis><property>Ok</property></emphasis> again</para></listitem>
-<listitem><para>Select <emphasis><property>File > Save All</property></emphasis> from the menu bar</para></listitem>
+<listitem><para>Select <emphasis><property>File > Save All</property></emphasis> from the menu bar</para></listitem>
</itemizedlist>
</section>
17 years, 1 month
JBoss Tools SVN: r4734 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-11-06 08:23:47 -0500 (Tue, 06 Nov 2007)
New Revision: 4734
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java
Log:
JBIDE-1259
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java 2007-11-06 12:51:28 UTC (rev 4733)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java 2007-11-06 13:23:47 UTC (rev 4734)
@@ -68,7 +68,7 @@
IClasspathEntry[] es = javaProject.getRawClasspath();
for (int i = 0; i < es.length; i++) {
if(es[i].getEntryKind() != IClasspathEntry.CPE_SOURCE) continue;
- IFile file = (IFile)project.getFile(es[i].getPath().lastSegment()+"/"+name);
+ IFile file = (IFile)project.getFile(es[i].getPath().removeFirstSegments(1) + "/" + name);
if(file != null && file.exists()) return file;
}
return null;
17 years, 1 month
JBoss Tools SVN: r4733 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-11-06 07:51:28 -0500 (Tue, 06 Nov 2007)
New Revision: 4733
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ComboContribution.java
Log:
JBIDE-1254 hql toolbar broken on Mac and Linux
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ComboContribution.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ComboContribution.java 2007-11-06 12:25:14 UTC (rev 4732)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ComboContribution.java 2007-11-06 12:51:28 UTC (rev 4733)
@@ -28,7 +28,13 @@
protected Control createControl(Composite parent) {
Composite panel = new Composite( parent, SWT.NONE );
- panel.setLayout( new GridLayout(2,false) );
+ GridLayout gridLayout = new GridLayout(2,false);
+ gridLayout.horizontalSpacing = 1;
+ gridLayout.verticalSpacing = 1;
+ gridLayout.marginHeight=0;
+ gridLayout.marginWidth=0;
+ //gridLayout.
+ panel.setLayout( gridLayout );
if(getLabelText()!=null) {
Label label = new Label(panel, SWT.None);
@@ -43,7 +49,7 @@
comboControl.pack();
GridData gd = new GridData();
gd.grabExcessHorizontalSpace = true;
- gd.verticalIndent = -8;
+ //gd.verticalIndent = -8;
gd.widthHint = getComboWidth();
gd.verticalAlignment = GridData.CENTER;
gd.horizontalAlignment = GridData.END;
@@ -62,6 +68,10 @@
return 100;
}
+ protected int computeWidth(Control control) {
+ return super.computeWidth(control);
+ }
+
protected boolean isReadOnly() {
return true;
}
17 years, 1 month