JBoss Tools SVN: r20020 - in trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat: WebContent/WEB-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-29 11:37:34 -0500 (Fri, 29 Jan 2010)
New Revision: 20020
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/faces-config-2.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/testCases.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-5471
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/faces-config-2.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/faces-config-2.xml 2010-01-29 16:01:06 UTC (rev 20019)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/WEB-INF/faces-config-2.xml 2010-01-29 16:37:34 UTC (rev 20020)
@@ -19,7 +19,7 @@
<behavior-extension/>
<behavior-extension/>
</behavior>
- <managed-bean>
+ <managed-bean eager="true">
<managed-bean-name>a</managed-bean-name>
<managed-bean-class>A</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
@@ -28,6 +28,7 @@
<from-view-id>cc</from-view-id>
<navigation-case>
<from-outcome>aaa</from-outcome>
+ <if>#{a.b}</if>
<to-view-id>/c2.jsp</to-view-id>
<redirect include-view-params="true">
<view-param>
@@ -38,11 +39,14 @@
</navigation-case>
</navigation-rule>
<absolute-ordering>
- <name>name1</name>
+ <name>n1</name>
</absolute-ordering>
<ordering>
+ <after>
+ <others/>
+ </after>
<before>
- <name>n3</name>
+ <name>n2</name>
</before>
</ordering>
<render-kit>
@@ -53,6 +57,7 @@
</client-behavior-renderer>
</render-kit>
<application>
+ <default-render-kit-id>kit</default-render-kit-id>
<resource-handler>MyResourceHandler</resource-handler>
<system-event-listener>
<system-event-listener-class>MySystemEventListener</system-event-listener-class>
@@ -63,4 +68,12 @@
<validator-id id="MyDefaultValidator">validator1</validator-id>
</default-validators>
</application>
+ <factory>
+ <exception-handler-factory>MyExceptionHandlerFactory</exception-handler-factory>
+ <external-context-factory>MyExternalContextFactory</external-context-factory>
+ <partial-view-context-factory>MyPartialViewContextFactory</partial-view-context-factory>
+ <view-declaration-language-factory>MyViewDeclarationLanguageFactory</view-declaration-language-factory>
+ <tag-handler-delegate-factory>MyTagHandlerDelegateFactory</tag-handler-delegate-factory>
+ <visit-context-factory>MyVisitContextFactory</visit-context-factory>
+ </factory>
</faces-config>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/testCases.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/testCases.xml 2010-01-29 16:01:06 UTC (rev 20019)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/testCases.xml 2010-01-29 16:37:34 UTC (rev 20020)
@@ -587,4 +587,96 @@
<property name="attributeValue" value="MyDefaultValidator"/>
</test>
+ <!-- <client-behavior-renderer> -->
+ <test name="JSFModelTest:testPaths:attribute">
+ <property name="path" value="/faces-config-2.xml/Render Kits/kit/MyClientBehaviorRendererType"/>
+ <property name="attributeName" value="renderer-class"/>
+ <property name="attributeValue" value="MyRenderer"/>
+ </test>
+
+ <!-- @include-view-params -->
+ <test name="JSFModelTest:testPaths:attribute">
+ <property name="path" value="/faces-config-2.xml/Navigation Rules/rules:cc:0/aaa::#c2.jsp/Redirect"/>
+ <property name="attributeName" value="include-view-params"/>
+ <property name="attributeValue" value="true"/>
+ </test>
+ <!-- <view-param -->
+ <test name="JSFModelTest:testPaths:attribute">
+ <property name="path" value="/faces-config-2.xml/Navigation Rules/rules:cc:0/aaa::#c2.jsp/Redirect/p1"/>
+ <property name="attributeName" value="value"/>
+ <property name="attributeValue" value="v1"/>
+ </test>
+
+ <!-- @if -->
+ <test name="JSFModelTest:testPaths:attribute">
+ <property name="path" value="/faces-config-2.xml/Navigation Rules/rules:cc:0/aaa::#c2.jsp"/>
+ <property name="attributeName" value="if"/>
+ <property name="attributeValue" value="#{a.b}"/>
+ </test>
+
+ <!-- <exception-handler-factory> -->
+ <test name="JSFModelTest:testPaths:attribute">
+ <property name="path" value="/faces-config-2.xml/factory"/>
+ <property name="attributeName" value="exception-handler-factory"/>
+ <property name="attributeValue" value="MyExceptionHandlerFactory"/>
+ </test>
+
+ <!-- <external-context-factory> -->
+ <test name="JSFModelTest:testPaths:attribute">
+ <property name="path" value="/faces-config-2.xml/factory"/>
+ <property name="attributeName" value="external-context-factory"/>
+ <property name="attributeValue" value="MyExternalContextFactory"/>
+ </test>
+
+ <!-- <partial-view-context-factory> -->
+ <test name="JSFModelTest:testPaths:attribute">
+ <property name="path" value="/faces-config-2.xml/factory"/>
+ <property name="attributeName" value="partial-view-context-factory"/>
+ <property name="attributeValue" value="MyPartialViewContextFactory"/>
+ </test>
+
+ <!-- <view-declaration-language-factory> -->
+ <test name="JSFModelTest:testPaths:attribute">
+ <property name="path" value="/faces-config-2.xml/factory"/>
+ <property name="attributeName" value="view-declaration-language-factory"/>
+ <property name="attributeValue" value="MyViewDeclarationLanguageFactory"/>
+ </test>
+
+ <!-- <tag-handler-delegate-factory> -->
+ <test name="JSFModelTest:testPaths:attribute">
+ <property name="path" value="/faces-config-2.xml/factory"/>
+ <property name="attributeName" value="tag-handler-delegate-factory"/>
+ <property name="attributeValue" value="MyTagHandlerDelegateFactory"/>
+ </test>
+
+ <!-- <visit-context-factory> -->
+ <test name="JSFModelTest:testPaths:attribute">
+ <property name="path" value="/faces-config-2.xml/factory"/>
+ <property name="attributeName" value="visit-context-factory"/>
+ <property name="attributeValue" value="MyVisitContextFactory"/>
+ </test>
+
+ <!-- @eager -->
+ <test name="JSFModelTest:testPaths:attribute">
+ <property name="path" value="/faces-config-2.xml/Managed Beans/a"/>
+ <property name="attributeName" value="eager"/>
+ <property name="attributeValue" value="true"/>
+ </test>
+
+ <!-- <absolute-ordering> -->
+ <test name="JSFModelTest:testPaths">
+ <property name="path" value="/faces-config-2.xml/Orderings/Absolute Ordering/n1"/>
+ </test>
+
+ <!-- <after> <others> -->
+ <test name="JSFModelTest:testPaths:attribute">
+ <property name="path" value="/faces-config-2.xml/Orderings/ordering/After"/>
+ <property name="attributeName" value="others"/>
+ <property name="attributeValue" value="true"/>
+ </test>
+ <!-- <before> -->
+ <test name="JSFModelTest:testPaths">
+ <property name="path" value="/faces-config-2.xml/Orderings/ordering/Before/n2"/>
+ </test>
+
</tests>
\ No newline at end of file
14 years, 3 months
JBoss Tools SVN: r20019 - trunk/esb/docs/esb_ref_guide/en/images/esb_editor.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2010-01-29 11:01:06 -0500 (Fri, 29 Jan 2010)
New Revision: 20019
Modified:
trunk/esb/docs/esb_ref_guide/en/images/esb_editor/11_esb_editor.png
trunk/esb/docs/esb_ref_guide/en/images/esb_editor/12_esb_editor.png
Log:
https://jira.jboss.org/jira/browse/JBDS-1024 Action menu and wizard is customized
Modified: trunk/esb/docs/esb_ref_guide/en/images/esb_editor/11_esb_editor.png
===================================================================
(Binary files differ)
Modified: trunk/esb/docs/esb_ref_guide/en/images/esb_editor/12_esb_editor.png
===================================================================
(Binary files differ)
14 years, 3 months
JBoss Tools SVN: r20018 - trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/model.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-01-29 10:38:00 -0500 (Fri, 29 Jan 2010)
New Revision: 20018
Modified:
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/model/EsbNode.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/model/EsbNotifier.java
Log:
jBPM Property view doesn't reflect GPD changes and can also overwrite them (JBIDE-5528)
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/model/EsbNode.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/model/EsbNode.java 2010-01-29 15:22:19 UTC (rev 20017)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/model/EsbNode.java 2010-01-29 15:38:00 UTC (rev 20018)
@@ -82,11 +82,11 @@
}
public void setReplyToOriginator(String value) {
- setConfigurationElement("reply-to-originator", value);
+ setConfigurationElement("replyToOriginator", value);
}
public String getReplyToOriginator() {
- return getConfigurationElementValue("reply-to-originator");
+ return getConfigurationElementValue("replyToOriginator");
}
private void addMapping(GenericElement mapping, String configurationElementName) {
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/model/EsbNotifier.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/model/EsbNotifier.java 2010-01-29 15:22:19 UTC (rev 20017)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/model/EsbNotifier.java 2010-01-29 15:38:00 UTC (rev 20018)
@@ -76,11 +76,11 @@
}
public void setReplyToOriginator(String value) {
- setConfigurationElement("reply-to-originator", value);
+ setConfigurationElement("replyToOriginator", value);
}
public String getReplyToOriginator() {
- return getConfigurationElementValue("reply-to-originator");
+ return getConfigurationElementValue("replyToOriginator");
}
private void addMapping(GenericElement mapping, String configurationElementName) {
14 years, 3 months
JBoss Tools SVN: r20017 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-29 10:22:19 -0500 (Fri, 29 Jan 2010)
New Revision: 20017
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/JSFFormLayoutData.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5471
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/JSFFormLayoutData.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/JSFFormLayoutData.java 2010-01-29 13:52:25 UTC (rev 20016)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/JSFFormLayoutData.java 2010-01-29 15:22:19 UTC (rev 20017)
@@ -696,7 +696,7 @@
new FormData(
"Navigation Case",
"", //$NON-NLS-1$
- new FormAttributeData[]{new FormAttributeData("from-outcome"), new FormAttributeData("from-action"), new FormAttributeData("to-view-id", null, SBFEE_CLASS_NAME), new FormAttributeData("description", InfoLayoutDataFactory.getInstance())} //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ new FormAttributeData[]{new FormAttributeData("from-outcome"), new FormAttributeData("from-action"), new FormAttributeData("if"), new FormAttributeData("to-view-id", null, SBFEE_CLASS_NAME), new FormAttributeData("description", InfoLayoutDataFactory.getInstance())} //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
),
// Advanced Navigation Case Form
new FormData(
14 years, 3 months
JBoss Tools SVN: r20016 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-29 08:52:25 -0500 (Fri, 29 Jan 2010)
New Revision: 20016
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3125
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-01-29 13:39:57 UTC (rev 20015)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-01-29 13:52:25 UTC (rev 20016)
@@ -232,7 +232,7 @@
if(injectionKeys.contains(CDIConstants.ANY_QUALIFIER_TYPE_NAME)) {
return true;
}
- if(!injectionKeys.contains(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)) {
+ if(injectionKeys.isEmpty()) {
injectionKeys.add(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME);
}
14 years, 3 months
JBoss Tools SVN: r20015 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-29 08:39:57 -0500 (Fri, 29 Jan 2010)
New Revision: 20015
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3125
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-01-29 13:31:36 UTC (rev 20014)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-01-29 13:39:57 UTC (rev 20015)
@@ -225,7 +225,7 @@
}
TreeSet<String> injectionKeys = new TreeSet<String>();
- if(injectionQualifiers != null) for (IAnnotationDeclaration d: beanQualifiers) {
+ if(injectionQualifiers != null) for (IAnnotationDeclaration d: injectionQualifiers) {
injectionKeys.add(getQualifierDeclarationKey(d));
}
14 years, 3 months
JBoss Tools SVN: r20014 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-01-29 08:31:36 -0500 (Fri, 29 Jan 2010)
New Revision: 20014
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesChecker.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesInfoDialog.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5701 , https://jira.jboss.org/jira/browse/JBIDE-5761 fixed.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java 2010-01-29 13:21:42 UTC (rev 20013)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java 2010-01-29 13:31:36 UTC (rev 20014)
@@ -15,7 +15,11 @@
private static final String FIRST_TEST_PAGE_NAME = "inputUserName.jsp"; //$NON-NLS-1$
private static final String TEST_SHELL_NAME = "Missing Natures"; //$NON-NLS-1$
- private static final String TEST_STRING = "The project \"naturesCheckTest\" doesn't contain following natures:\norg.jboss.tools.jst.web.kb.kbnature\norg.jboss.tools.jsf.jsfnature\n\nVisual Editor may not work properly."; //$NON-NLS-1$
+ private static final String TEST_STRING = "JBoss Tools Visual Editor might not fully work in project \"" //$NON-NLS-1$
+ + JsfAllTests.IMPORT_NATURES_CHECKER_PROJECT +
+ "\" because it does not have JSF and code completion enabled completely.\n\n" + //$NON-NLS-1$
+ "Please use the Configure menu on the project to enable JSF if " + //$NON-NLS-1$
+ "you want all features of the editor working."; //$NON-NLS-1$
private static final String SECOND_TEST_PAGE_NAME = "components/commandButton.jsp"; //$NON-NLS-1$
public NaturesChecker_JBIDE5701(String name) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-01-29 13:21:42 UTC (rev 20013)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-01-29 13:31:36 UTC (rev 20014)
@@ -253,14 +253,6 @@
sourceEditor = textEditor;
// this.visualMode = visualMode;
this.multiPageEditor = multiPageEditor;
- naturesChecker = VpePlugin.getDefault().getProjectNaturesChecker();
- if (naturesChecker == null) {
- naturesChecker = new ProjectNaturesChecker();
- VpePlugin.getDefault().setProjectNaturesChecker(naturesChecker);
- }
- naturesChecker.addProject(
- (((IFileEditorInput) multiPageEditor.getEditorInput())
- .getFile().getProject()));
}
public IAction getAction(String actionID) {
@@ -1019,8 +1011,15 @@
public void partOpened(IWorkbenchPart part) {
if (part == multiPageEditor) {
try {
- naturesChecker.checkNatures(((IFileEditorInput)multiPageEditor.
- getEditorInput()).getFile().getProject());
+ IEditorInput editorInput = multiPageEditor.getEditorInput();
+ if (editorInput instanceof IFileEditorInput) {
+ naturesChecker = VpePlugin.getDefault().getProjectNaturesChecker();
+ if (naturesChecker == null) {
+ naturesChecker = new ProjectNaturesChecker();
+ VpePlugin.getDefault().setProjectNaturesChecker(naturesChecker);
+ }
+ naturesChecker.checkNatures(((IFileEditorInput)editorInput).getFile().getProject());
+ }
} catch (CoreException e) {
VpePlugin.getPluginLog().logError(e);
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesChecker.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesChecker.java 2010-01-29 13:21:42 UTC (rev 20013)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesChecker.java 2010-01-29 13:31:36 UTC (rev 20014)
@@ -43,6 +43,8 @@
public static final QualifiedName IS_JSF_CHECK_NEED = new QualifiedName(
"", "Is JSF check"); //$NON-NLS-1$ //$NON-NLS-2$
private Set<IProject> projectsCollection;
+ private static final String JSF_NATURE = "JavaServer Faces Nature"; //$NON-NLS-1$
+ private static final String KB_NATURE = "Knowledge Base Nature"; //$NON-NLS-1$
public ProjectNaturesChecker() {
projectsCollection = new HashSet<IProject>(0);
@@ -62,6 +64,9 @@
}
public void checkNatures(IProject project) throws CoreException {
+ if (project == null) {
+ return;
+ }
addProject(project);
KbProject.checkKBBuilderInstalled(project);
boolean isJSFCheck = true;
@@ -86,10 +91,10 @@
private String[] getMissingNatures(IProject project) throws CoreException {
List<String> missimgNatures = new ArrayList<String>(0);
if (project.getNature(IKbProject.NATURE_ID) == null) {
- missimgNatures.add(IKbProject.NATURE_ID);
+ missimgNatures.add(JSF_NATURE);
}
if (project.getNature(WebProject.JSF_NATURE_ID) == null) {
- missimgNatures.add(WebProject.JSF_NATURE_ID);
+ missimgNatures.add(KB_NATURE);
}
if (missimgNatures.size() == 0) {
return null;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesInfoDialog.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesInfoDialog.java 2010-01-29 13:21:42 UTC (rev 20013)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesInfoDialog.java 2010-01-29 13:31:36 UTC (rev 20014)
@@ -129,6 +129,7 @@
});
}
+ @SuppressWarnings("unused")
private String arrayToString(String[] strings){
StringBuilder builder = new StringBuilder(""); //$NON-NLS-1$
for (int i = 0; i < strings.length; i++) {
@@ -138,9 +139,10 @@
}
private String getMessageInfo(String[] missingNatures, IProject project){
- String dialogMessage = "The project \"" + project.getName() + //$NON-NLS-1$
- "\" doesn't contain following natures:\n" + //$NON-NLS-1$
- arrayToString(missingNatures)+"\n"+"Visual Editor may not work properly."; //$NON-NLS-1$ //$NON-NLS-2$
+ String dialogMessage = "JBoss Tools Visual Editor might not fully work in project \"" + project.getName() + //$NON-NLS-1$
+ "\" because it does not have JSF and code completion enabled completely.\n\n" + //$NON-NLS-1$
+ "Please use the Configure menu on the project to enable JSF if " + //$NON-NLS-1$
+ "you want all features of the editor working."; //$NON-NLS-1$
return dialogMessage;
}
14 years, 3 months
JBoss Tools SVN: r20013 - in trunk/esb/plugins/org.jboss.tools.esb.core/resources: meta and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-29 08:21:42 -0500 (Fri, 29 Jan 2010)
New Revision: 20013
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu_ja.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb_ja.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5714
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2010-01-29 13:12:09 UTC (rev 20012)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2010-01-29 13:21:42 UTC (rev 20013)
@@ -17,7 +17,7 @@
ESB.AddHibernateListener.menu=Hibernate Listener...
ESB.AddJBRListener.menu=JBR Listener...
ESB.AddGroovyListener.menu=Groovy Listener...
-ESB.AddBusProvider.menu=Channel Provider...
+ESB.AddBusProvider.menu=Bus Provider...
ESB.AddJBRProvider.menu=JBR Provider...
ESB.AddScheduleProvider.menu=Schedule Provider...
ESB.AddJMSProvider.menu=JMS Provider...
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu_ja.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu_ja.properties 2010-01-29 13:12:09 UTC (rev 20012)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu_ja.properties 2010-01-29 13:21:42 UTC (rev 20013)
@@ -17,7 +17,7 @@
ESB.AddHibernateListener.menu=Hibernate Listener...
ESB.AddJBRListener.menu=JBR Listener...
ESB.AddGroovyListener.menu=Groovy Listener...
-ESB.AddBusProvider.menu=Channel Provider...
+ESB.AddBusProvider.menu=Bus Provider...
ESB.AddJBRProvider.menu=JBR Provider...
ESB.AddScheduleProvider.menu=Schedule Provider...
ESB.AddJMSProvider.menu=JMS Provider...
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-01-29 13:12:09 UTC (rev 20012)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-01-29 13:21:42 UTC (rev 20013)
@@ -19,9 +19,9 @@
#Providers List
-ESBProviders101_AddBusProvider_0.WindowTitle=Add Channel Provider
+ESBProviders101_AddBusProvider_0.WindowTitle=Add Bus Provider
ESBProviders101_AddBusProvider_0.Title=ESB Provider
-ESBProviders101_AddBusProvider_1.WindowTitle=Add Channel Provider
+ESBProviders101_AddBusProvider_1.WindowTitle=Add Bus Provider
ESBProviders101_AddBusProvider_1.Title=ESB Channel
ESBProviders101_AddJBRProvider_0.WindowTitle=Add JBR Provider
@@ -66,9 +66,9 @@
ESBProviders101_Properties.Title=Providers List
-ESBProviders110_AddBusProvider_0.WindowTitle=Add Channel Provider
+ESBProviders110_AddBusProvider_0.WindowTitle=Add Bus Provider
ESBProviders110_AddBusProvider_0.Title=ESB Provider
-ESBProviders110_AddBusProvider_1.WindowTitle=Add Channel Provider
+ESBProviders110_AddBusProvider_1.WindowTitle=Add Bus Provider
ESBProviders110_AddBusProvider_1.Title=ESB Channel
ESBProviders110_AddJBRProvider_0.WindowTitle=Add JBR Provider
@@ -118,6 +118,58 @@
ESBProviders110_Properties.Title=Providers List
+ESBProviders120_AddBusProvider_0.WindowTitle=Add Bus Provider
+ESBProviders120_AddBusProvider_0.Title=ESB Provider
+ESBProviders120_AddBusProvider_1.WindowTitle=Add Bus Provider
+ESBProviders120_AddBusProvider_1.Title=ESB Channel
+
+ESBProviders120_AddJBRProvider_0.WindowTitle=Add JBR Provider
+ESBProviders120_AddJBRProvider_0.Title=ESB JBR Provider
+ESBProviders120_AddJBRProvider_1.WindowTitle=Add JBR Provider
+ESBProviders120_AddJBRProvider_1.Title=ESB Channel
+
+ESBProviders120_AddScheduleProvider.WindowTitle=Add Schedule Provider
+ESBProviders120_AddScheduleProvider.Title=ESB Schedule Provider
+ESBProviders120_AddScheduleProvider_0.WindowTitle=Add Schedule Provider
+ESBProviders120_AddScheduleProvider_0.Title=ESB Schedule Provider
+
+ESBProviders120_AddJMSProvider_0.WindowTitle=Add JMS Provider
+ESBProviders120_AddJMSProvider_0.Title=ESB JMS Provider
+ESBProviders120_AddJMSProvider_1.WindowTitle=Add JMS Provider
+ESBProviders120_AddJMSProvider_1.Title=ESB Channel
+
+ESBProviders120_AddJCAProvider_0.WindowTitle=Add JCA Provider
+ESBProviders120_AddJCAProvider_0.Title=ESB JCA Provider
+ESBProviders120_AddJCAProvider_1.WindowTitle=Add JCA Provider
+ESBProviders120_AddJCAProvider_1.Title=ESB Channel
+
+ESBProviders120_AddFSProvider_0.WindowTitle=Add FS Provider
+ESBProviders120_AddFSProvider_0.Title=ESB FS Provider
+ESBProviders120_AddFSProvider_1.WindowTitle=Add FS Provider
+ESBProviders120_AddFSProvider_1.Title=ESB Channel
+
+ESBProviders120_AddFTPProvider_0.WindowTitle=Add FTP Provider
+ESBProviders120_AddFTPProvider_0.Title=ESB FTP Provider
+ESBProviders120_AddFTPProvider_1.WindowTitle=Add FTP Provider
+ESBProviders120_AddFTPProvider_1.Title=ESB Channel
+
+ESBProviders120_AddSQLProvider_0.WindowTitle=Add SQL Provider
+ESBProviders120_AddSQLProvider_0.Title=ESB SQL Provider
+ESBProviders120_AddSQLProvider_1.WindowTitle=Add SQL Provider
+ESBProviders120_AddSQLProvider_1.Title=ESB Channel
+
+ESBProviders120_AddHibernateProvider_0.WindowTitle=Add Hibernate Provider
+ESBProviders120_AddHibernateProvider_0.Title=ESB Hibernate Provider
+ESBProviders120_AddHibernateProvider_1.WindowTitle=Add Hibernate Provider
+ESBProviders120_AddHibernateProvider_1.Title=ESB Channel
+
+ESBProviders120_AddHTTPProvider_0.WindowTitle=Add HTTP Provider
+ESBProviders120_AddHTTPProvider_0.Title=ESB HTTP Provider
+ESBProviders120_AddHTTPProvider_1.WindowTitle=Add HTTP Provider
+ESBProviders120_AddHTTPProvider_1.Title=ESB Channel
+
+ESBProviders120_Properties.Title=Providers List
+
#Services List
ESB.AddService.WindowTitle=Add Service
@@ -135,7 +187,7 @@
ESBBusProvider101_AddBus.WindowTitle=Add Channel
ESBBusProvider101_AddBus.Title=ESB Channel
-ESBBusProvider101_Properties.Title=ESB Channel Provider
+ESBBusProvider101_Properties.Title=ESB Bus Provider
#JBR Provider
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb_ja.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb_ja.properties 2010-01-29 13:12:09 UTC (rev 20012)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb_ja.properties 2010-01-29 13:21:42 UTC (rev 20013)
@@ -6,9 +6,9 @@
FileFolder_CreateFileESB.WindowTitle=New ESB File
FileFolder_CreateFileESB.Title=ESB File
FileESB101_Properties.Title=ESB File 1.0.1
-ESBProviders101_AddBusProvider_0.WindowTitle=Add Channel Provider
+ESBProviders101_AddBusProvider_0.WindowTitle=Add Bus Provider
ESBProviders101_AddBusProvider_0.Title=ESB Provider
-ESBProviders101_AddBusProvider_1.WindowTitle=Add Channel Provider
+ESBProviders101_AddBusProvider_1.WindowTitle=Add Bus Provider
ESBProviders101_AddBusProvider_1.Title=ESB Channel
ESBProviders101_AddJBRProvider_0.WindowTitle=Add JBR Provider
ESBProviders101_AddJBRProvider_0.Title=ESB JBR Provider
@@ -52,7 +52,7 @@
ESBBusProvider101_AddProperty.Title=ESB Property
ESBBusProvider101_AddBus.WindowTitle=Add Channel
ESBBusProvider101_AddBus.Title=ESB Channel
-ESBBusProvider101_Properties.Title=ESB Channel Provider
+ESBBusProvider101_Properties.Title=ESB Bus Provider
ESBJBRProvider101_AddProperty.WindowTitle=\u30D7\u30ED\u30D1\u30C6\u30A3\u30FC\u306E\u8FFD\u52A0
ESBJBRProvider101_AddProperty.Title=ESB Property
ESBJBRProvider101_AddBus.WindowTitle=Add JBR Channel
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2010-01-29 13:12:09 UTC (rev 20012)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2010-01-29 13:21:42 UTC (rev 20013)
@@ -1918,7 +1918,7 @@
kind="list" name="CreateActions">
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBBus"
- displayName="Channel Provider..." kind="action" name="AddBusProvider">
+ displayName="Bus Provider..." kind="action" name="AddBusProvider">
<EntityData EntityName="ESBBusProvider101">
<AttributeData AttributeName="name"/>
</EntityData>
14 years, 3 months
JBoss Tools SVN: r20012 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-29 08:12:09 -0500 (Fri, 29 Jan 2010)
New Revision: 20012
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3125
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2010-01-29 13:08:55 UTC (rev 20011)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2010-01-29 13:12:09 UTC (rev 20012)
@@ -59,6 +59,7 @@
if(t == null) return;
if(processed.contains(t.getFullyQualifiedName())) return;
processed.add(t.getFullyQualifiedName());
+ allInheritedTypes = new HashSet<IParametedType>();
allInheritedTypes.add(p);
Set<IParametedType> ts = p.getInheritedTypes();
if(ts != null) for (IParametedType pp: ts) {
14 years, 3 months
JBoss Tools SVN: r20011 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-01-29 08:08:55 -0500 (Fri, 29 Jan 2010)
New Revision: 20011
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5218, junit was corrected, but it should be changed after the right locale's logic is implemented.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java 2010-01-29 06:56:35 UTC (rev 20010)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java 2010-01-29 13:08:55 UTC (rev 20011)
@@ -115,19 +115,19 @@
nsIDOMElement localeText = doc.getElementById(LOCALE_TEXT0_ID);
String localizedText = getLocalizedText(localeText);
- assertTrue("Text is '"+localizedText+"', but should be in 'de' locale", HELLO_EN_GB.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Text is '"+localizedText+"', but should be in 'en_US' locale", HELLO_EN_US.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
localeText = doc.getElementById(LOCALE_TEXT1_ID);
localizedText = getLocalizedText(localeText);
- assertTrue("Text is '"+localizedText+"', but should be in 'de' locale", HELLO_EN_GB.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Text is '"+localizedText+"', but should be in 'en_US' locale", HELLO_EN_US.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
localeText = doc.getElementById(LOCALE_TEXT2_ID);
localizedText = getLocalizedText(localeText);
- assertTrue("Text is '"+localizedText+"', but should be in default locale", HELLO_EN_GB.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Text is '"+localizedText+"', but should be in default locale", HELLO_EN_US.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
localeText = doc.getElementById(LOCALE_TEXT_ID);
localizedText = getLocalizedText(localeText);
- assertTrue("Text is '"+localizedText+"', but should be in 'en_US' locale", HELLO_EN_GB.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Text is '"+localizedText+"', but should be in 'en_US' locale", HELLO_EN_US.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
closeEditors();
}
@@ -146,7 +146,7 @@
nsIDOMDocument doc = controller.getXulRunnerEditor().getDOMDocument();
nsIDOMElement localeText = doc.getElementById(LOCALE_TEXT_ID);
String localizedText = getLocalizedText(localeText);
- assertTrue("Text is '"+localizedText+"', but should be in 'de' locale", HELLO2_DE.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Text is '"+localizedText+"', but should be in 'en_US' locale", HELLO_EN_US.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
/*
* Change the locale
*/
@@ -164,13 +164,13 @@
/*
* Check the new localized message.
*/
- assertTrue("Text is '"+localizedText+"', but should be in 'en_GB' locale", HELLO_EN_GB.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Text is '"+localizedText+"', but should be in 'en_US' locale", HELLO_EN_US.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
closeEditors();
}
/**
* Gets the text value from the container.
- * Contaner should be a simple tag like div or span.
+ * Container should be a simple tag like div or span.
* The text node in the VPE is initially wrapped in a span element,
* thus to get its value two child elements should be skipped.
*
14 years, 3 months