JBoss Tools SVN: r8713 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-06-11 07:00:37 -0400 (Wed, 11 Jun 2008)
New Revision: 8713
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
Log:
JBIDE-2022
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2008-06-11 10:57:26 UTC (rev 8712)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2008-06-11 11:00:37 UTC (rev 8713)
@@ -1128,8 +1128,7 @@
<XActionItem kind="list">
<XActionItem ICON="action.empty" displayName="New" group="1"
kind="list" name="CreateActions">
- <XActionItem displayName="Add Pre-Packed Action" group="1"
- kind="list" name="PrePackedAction">
+ <XActionItem displayName="Add Pre-Packed Action" kind="list" name="PrePackedAction">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="Object Invoke..." kind="action" name="AddObjectInvoke">
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 2008-06-11 10:57:26 UTC (rev 8712)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-06-11 11:00:37 UTC (rev 8713)
@@ -127,7 +127,7 @@
<XActionItem displayName="New" group="1" kind="list" name="CreateActions">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Add Generic Action..." kind="action" name="AddAction">
+ displayName="Generic Action..." kind="action" name="AddAction">
<EntityData EntityName="ESBAction101">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="class"/>
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8712 - 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: mareshkau
Date: 2008-06-11 06:57:26 -0400 (Wed, 11 Jun 2008)
New Revision: 8712
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-675
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2008-06-11 10:10:31 UTC (rev 8711)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2008-06-11 10:57:26 UTC (rev 8712)
@@ -10,11 +10,10 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.test.jbide;
-import junit.framework.Test;
-
import org.eclipse.core.resources.IFile;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
@@ -218,6 +217,9 @@
assertNotNull(node.getNodeName());
assertEquals(textNode.getNodeValue().trim(), node.getNodeName()
.trim());
+ if(getException()!=null) {
+ throw getException();
+ }
}
public void testClosePageWhenBackgroundJobIsRun() throws Throwable {
@@ -243,7 +245,18 @@
StyledText styledText = part.getSourceEditor().getTextViewer()
.getTextWidget();
-
-
+ styledText.setCaretOffset(951);
+ styledText.insert("<a"); //$NON-NLS-1$
+ styledText.setCaretOffset(953);
+ for(int i=0;i<30;i++) {
+ styledText.insert(""+i); //$NON-NLS-1$
+ }
+ TestUtil.delay(450);
+ part.close(false);
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeEditor(part, false);
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(true);
+ if(getException()!=null) {
+ throw getException();
+ }
}
}
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8711 - trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-06-11 06:10:31 -0400 (Wed, 11 Jun 2008)
New Revision: 8711
Modified:
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
Log:
JBIDE-2022
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2008-06-11 10:05:13 UTC (rev 8710)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2008-06-11 10:10:31 UTC (rev 8711)
@@ -10,6 +10,12 @@
******************************************************************************/
package org.jboss.tools.esb.ui.editor.form;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.common.meta.XChild;
+import org.jboss.tools.common.meta.XModelEntity;
+import org.jboss.tools.common.meta.impl.XModelMetaDataImpl;
import org.jboss.tools.common.model.ui.forms.FormAttributeData;
import org.jboss.tools.common.model.ui.forms.FormData;
import org.jboss.tools.common.model.ui.forms.FormLayoutDataUtil;
@@ -48,11 +54,23 @@
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyListener") //$NON-NLS-1$
);
+ static String[] getActionEntities() {
+ XModelEntity entity = XModelMetaDataImpl.getInstance().getEntity(ENT_ESB_ACTIONS);
+ if(entity == null) {
+ return new String[]{ENT_ESB_ACTION};
+ }
+ XChild[] cs = entity.getChildren();
+ List<String> list = new ArrayList<String>();
+ for (int i = 0; i < cs.length; i++) {
+ list.add(cs[i].getName());
+ }
+ return list.toArray(new String[0]);
+ }
static IFormData ESB_ACTION_LIST_DEFINITION = new FormData(
"Actions", //$NON-NLS-1$
ModelFormLayoutData.EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)},
- new String[]{ENT_ESB_ACTION},
+ getActionEntities(),
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyAction") //$NON-NLS-1$
);
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8710 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-06-11 06:05:13 -0400 (Wed, 11 Jun 2008)
New Revision: 8710
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/employee.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/hr-layout.xhtml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-675, junit test in progress
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/employee.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/employee.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/employee.xhtml 2008-06-11 10:05:13 UTC (rev 8710)
@@ -0,0 +1,858 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:t="http://myfaces.apache.org/tomahawk"
+ xmlns:s="http://myfaces.apache.org/sandbox"
+ xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+<ui:composition template="hr-layout.xhtml">
+ <ui:param name="title" value="Edit Employee" />
+ <ui:define name="leftBar">
+ <ui:include src="../hr-actions.xhtml" />
+ </ui:define>
+ <ui:define name="content">
+ <f:loadBundle basename="resources.hr" var="bundle" />
+ <h1>Add/Edit Employee datas</h1>
+ <br />
+ <!-- <a href="javascript:showListEditor('http://localhost:8080/intranet/faces/hr/edit/lists/gradesEditor.xhtml',function(){alert('Hello');})">[?]</a><br/> -->
+ <h:form acceptcharset="UTF-8" id="employeeForm"
+ rendered="#{hrSession.employee != null}"
+ enctype="multipart/form-data">
+ <!-- <ui:include src="lists/listEditor.xhtml">
+ <ui:param name="wrapper" value="#{hrSession.employeeWrapper}" />
+ <ui:param name="parentClientId" value="employeeForm"/>
+ </ui:include> -->
+ <a4j:poll action="ajaxRefresh" id="refresh" reRender="refresh"
+ limitToList="true" interval="60000">
+ </a4j:poll>
+ <s:subForm id="mainSubForm">
+ <table>
+ <tr>
+ <td>#{bundle['Employee.firstname']}</td>
+ <td><h:inputText id="firstname"
+ value="#{hrSession.employee.firstname}" size="50" /><h:message
+ for="firstname" showDetails="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.lastname']}</td>
+ <td><h:inputText id="lastname"
+ value="#{hrSession.employee.lastname}" size="50" /><h:message
+ for="lastname" showDetails="true" showSummary="false" /></td>
+ </tr>
+ </table>
+ <t:panelTabbedPane width="100%" serverSideTabSwitch="false"
+ id="tabbedPane">
+ <t:panelTab label="#{bundle['main']}" processValidators="true"
+ id="main">
+ <table border="0" width="100%">
+ <tr>
+ <td>#{bundle['Employee.language']}</td>
+ <td><!-- <h:selectOneMenu value="#{hrSession.employee.language}" id="language">
+ <f:selectItems value="#{hrRequest.selectEntries['Language']}"/>
+ </h:selectOneMenu> --> <ui:include src="elements/selectEntry.xhtml">
+ <ui:param name="value" value="#{hrSession.employee.language}" />
+ <ui:param name="id" value="language" />
+ <ui:param name="key" value="Language" />
+ </ui:include> <h:message for="language" showDetail="true" showSummary="false" />
+ </td>
+ <td>#{bundle['Employee.gender']}</td>
+ <td><!-- <h:selectOneMenu value="#{hrSession.employee.gender}" id="gender">
+ <f:selectItems value="#{hrRequest.selectEntries['Gender']}"/>
+ </h:selectOneMenu> --> <ui:include src="elements/selectEntry.xhtml">
+ <ui:param name="value" value="#{hrSession.employee.gender}" />
+ <ui:param name="id" value="gender" />
+ <ui:param name="key" value="Gender" />
+ </ui:include> <h:message for="gender" showDetail="true" showSummary="false" />
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.formulation']}</td>
+ <td><!-- <h:selectOneMenu value="#{hrSession.employee.formulation}" id="formulation">
+ <f:selectItems value="#{hrRequest.selectEntries['Formulation']}" />
+ </h:selectOneMenu> --> <ui:include src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.formulation}" />
+ <ui:param name="id" value="formulation" />
+ <ui:param name="key" value="Formulation" />
+ </ui:include> <h:message for="formulation" showDetail="true"
+ showSummary="false" /></td>
+ <td>#{bundle['Employee.title']}</td>
+ <td><!-- <h:selectOneMenu value="#{hrSession.employee.title}" id="title">
+ <f:selectItems value="#{hrRequest.selectEntries['Title']}" />
+ </h:selectOneMenu> --> <ui:include src="elements/selectEntry.xhtml">
+ <ui:param name="value" value="#{hrSession.employee.title}" />
+ <ui:param name="id" value="title" />
+ <ui:param name="key" value="Title" />
+ </ui:include> <h:message for="title" showDetail="true" showSummary="false" />
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.section']}</td>
+ <td colspan="3"><h:selectOneMenu
+ value="#{hrSession.employee.section}" id="section">
+ <f:selectItems value="#{hrRequest.sections}" />
+ </h:selectOneMenu> <h:message for="section" showDetail="true" showSummary="false" />
+ </td>
+ </tr>
+ </table>
+ <rich:panel><f:facet name="header">#{bundle['Employee.officeAddress']}</f:facet>
+ <table border="0" width="100%">
+ <tr>
+ <td rowspan="4" style="text-align:center">#{bundle['Employee.picture']}<br />
+ <s:subForm id="pictureForm">
+ <ui:include src="elements/pictureUpload.xhtml">
+ <ui:param name="wrapper" value="#{hrSession.employeeWrapper}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:main:pictureForm" />
+ </ui:include>
+ </s:subForm></td>
+ <td valign="top" colspan="3"><ui:include
+ src="elements/address.xhtml">
+ <ui:param name="address"
+ value="#{hrSession.employee.officeAddress}" />
+ </ui:include></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.email']}</td>
+ <td><h:inputText value="#{hrSession.employee.email}"
+ id="email" required="true" /> <h:message for="email"
+ showDetail="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.login']}</td>
+ <td><h:inputText id="login"
+ value="#{hrSession.employee.login}" style="text-align:right" />@oma.be
+ <h:message for="login" showDetail="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.locationUnit']}</td>
+ <td><!-- <h:selectOneMenu value="#{hrSession.employee.locationUnit}" id="locationUnit">
+ <f:selectItems value="#{hrRequest.selectEntries['Location unit']}"/>
+ </h:selectOneMenu> --> <ui:include src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.locationUnit}" />
+ <ui:param name="id" value="locationUnit" />
+ <ui:param name="key" value="Location unit" />
+ </ui:include> <h:message for="locationUnit" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ </table>
+ </rich:panel>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['private']}" processValidators="true"
+ id="private">
+ <table width="100%" border="0">
+ <tr>
+ <td>#{bundle['Employee.birthDate']}</td>
+ <td><t:inputCalendar id="birthdate"
+ value="#{hrSession.employee.birthDate}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar>
+ <h:message for="birthdate"
+ showDetail="true" showSummary="false" /></td>
+ <td>#{bundle['Employee.age']}</td>
+ <td><h:outputText value="#{hrSession.employee.age}"
+ id="age" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.birthPlace']}</td>
+ <td><h:inputText id="birthplace"
+ value="#{hrSession.employee.birthPlace}" /> <h:message
+ for="birthplace" showDetails="true" showSummary="false" /></td>
+ <td>#{bundle['Employee.nationality']}</td>
+ <td><h:selectOneMenu
+ value="#{hrSession.employee.nationality}" id="nationality">
+ <f:selectItems value="#{hrRequest.countries}" />
+ </h:selectOneMenu> <h:message for="nationality" showDetails="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.nationalRegisterNumber']}</td>
+ <td><h:inputText
+ value="#{hrSession.employee.nationalRegisterNumber}" id="nrn" />
+ <h:message for="nrn" showDetail="true" showSummary="false" /></td>
+ <td>#{bundle['Employee.idCardNumber']}</td>
+ <td><h:inputText value="#{hrSession.employee.idCardNumber}"
+ id="idCard" /> <h:message for="idCard" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td colspan="4">
+ <rich:panel><f:facet name="header">#{bundle['Employee.home']}</f:facet>
+ <ui:include src="elements/address.xhtml">
+ <ui:param name="address" value="#{hrSession.employee.home}" />
+ </ui:include> #{bundle['Employee.lastHomeMove']} <t:inputCalendar
+ value="#{hrSession.employee.lastHomeMove}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="lastHomeMove">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar> <h:message for="lastHomeMove" showDetails="true"
+ showSummary="false" /></rich:panel>
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.bankAccountNumber']}</td>
+ <td colspan="3"><h:inputText
+ value="#{hrSession.employee.bankAccountNumber}"
+ id="bankAccount" /> <h:message for="bankAccount"
+ showDetail="true" showSummary="false" /></td>
+ </tr>
+ </table>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['administrative']}"
+ processValidators="true" id="administrative">
+ <rich:panel><f:facet name="header">Status</f:facet>
+ <table border="0">
+ <tr>
+ <td colspan="2"><!-- <h:selectOneMenu value="#{hrSession.employee.status1}" id="status1">
+ <f:selectItems value="#{hrRequest.selectEntries['Emp status 1']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value" value="#{hrSession.employee.status1}" />
+ <ui:param name="id" value="status1" />
+ <ui:param name="key" value="Emp status 1" />
+ </ui:include> <h:message for="status1" showDetail="true" showSummary="false" />
+ </td>
+ <td colspan="2"><!-- <h:selectOneMenu value="#{hrSession.employee.status2}" id="status2">
+ <f:selectItems value="#{hrRequest.selectEntries['Emp status 2']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value" value="#{hrSession.employee.status2}" />
+ <ui:param name="id" value="status2" />
+ <ui:param name="key" value="Emp status 2" />
+ </ui:include> <h:message for="status2" showDetail="true" showSummary="false" />
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['PData.status']}</td>
+ <td colspan="3"><!-- <h:selectOneMenu id="pdataStatus" value="#{hrSession.employee.PData.status}">
+ <f:selectItem itemValue="[nothing]" itemLabel=""/>
+ <f:selectItems value="#{hrRequest.selectEntries['Status']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.PData.status}" />
+ <ui:param name="id" value="pdataStatus" />
+ <ui:param name="key" value="Status" />
+ </ui:include> <h:message for="pdataStatus" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.administrativeState']}</td>
+ <td><!-- <h:selectOneMenu id="administrativeState" value="#{hrSession.employee.administrativeState}">
+ <f:selectItems value="#{hrRequest.selectEntries['Administrative state']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.administrativeState}" />
+ <ui:param name="id" value="administrativeState" />
+ <ui:param name="key" value="Administrative state" />
+ </ui:include> <h:message for="administrativeState" showDetail="true"
+ showSummary="false" /></td>
+ <td colspan="2"><h:selectBooleanCheckbox
+ value="#{hrSession.employee.scientific}" id="scientific" />
+ #{bundle['Employee.scientific']} <h:message for="scientific"
+ showDetail="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.projects']}:</td>
+ <td colspan="3">#{bundle['hint.pickList']} <s:selectManyPicklist
+ id="projects" value="#{hrSession.employee.projectsArray}">
+ <f:selectItems value="#{hrRequest.projectItems}" />
+ </s:selectManyPicklist> <h:messages for="projects" /></td>
+ </tr>
+
+ </table>
+ </rich:panel>
+ <rich:panel><f:facet name="header">#{bundle['Employee.functionGroups']}</f:facet>
+ <h:dataTable value="#{functionGroup.functionGroups}" var="fg">
+ <h:column>
+ <h:outputText value="#{fg}">
+ <f:converter converterId="NamedIdConverter" />
+ </h:outputText>
+ </h:column>
+ <h:column>
+ <h:selectOneMenu
+ value="#{hrSession.employee.functionGroups[fg]}">
+ <f:converter converterId="abstractId" />
+ <f:selectItem itemLabel="" itemValue="[nothing]"/>
+ <f:selectItems value="#{functionGroup.functionItems}" />
+ </h:selectOneMenu>
+ </h:column>
+ </h:dataTable></rich:panel>
+ <rich:panel><f:facet name="header">Rank</f:facet>
+ <table border="0">
+ <tr>
+ <td>#{bundle['Employee.workingPercent']}</td>
+ <td><h:inputText
+ value="#{hrSession.employee.workingPercent}"
+ id="workingPercent">
+ <f:validateLongRange minimum="0" maximum="100" />
+ </h:inputText> <h:message for="workingPercent" showDetail="true"
+ showSummary="false" /></td>
+ <td>#{bundle['Employee.salaryScale']}</td>
+ <td><h:inputText value="#{hrSession.employee.salaryScale}"
+ id="salaryScale" /> <h:message for="salaryScale"
+ showDetail="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.expertSalaryScale']}</td>
+ <td colspan="3"><!-- <h:selectOneMenu id="expertSalaryScale" value="#{hrSession.employee.expertSalaryScale}">
+ <f:selectItems value="#{hrRequest.selectEntries['Expert salary scale']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.expertSalaryScale}" />
+ <ui:param name="id" value="expertSalaryScale" />
+ <ui:param name="key" value="Expert salary scale" />
+ </ui:include> <h:message for="expertSalaryScale" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ </table>
+ </rich:panel>
+ <table border="0">
+ <tr>
+ <td>#{bundle['Employee.bilingualPremium']}</td>
+ <td colspan="3"><!-- <h:selectOneMenu id="bilingualPremium" value="#{hrSession.employee.bilingualPremium}">
+ <f:selectItems value="#{hrRequest.selectEntries['Bilingual premium']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.bilingualPremium}" />
+ <ui:param name="id" value="bilingualPremium" />
+ <ui:param name="key" value="Bilingual premium" />
+ </ui:include> <h:message for="bilingualPremium" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.bilingualScale']}</td>
+ <td><h:inputText size="10" id="bilingualScale"
+ value="#{hrSession.employee.bilingualScale}" /><h:message
+ for="bilingualScale" showDetails="true" showSummary="false" /></td>
+ <td>#{bundle['Employee.missionDuration']}</td>
+ <td><!-- <h:selectOneMenu id="missionDuration" value="#{hrSession.employee.missionDuration}">
+ <f:selectItems value="#{hrRequest.selectEntries['Mission duration']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.missionDuration}" />
+ <ui:param name="id" value="missionDuration" />
+ <ui:param name="key" value="Mission duration" />
+ </ui:include> <h:message for="missionDuration" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.officeLocation']}</td>
+ <td><h:inputText id="officeLocation"
+ value="#{hrSession.employee.officeLocation}" /><h:message
+ for="officeLocation" showDetails="true" showSummary="false" /></td>
+ <td>#{bundle['Employee.officeKeyNumber']}</td>
+ <td><h:inputText id="officeKey"
+ value="#{hrSession.employee.officeKeyNumber}" /><h:message
+ for="officeKey" showDetails="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.trap']}</td>
+ <td><!-- <h:selectOneMenu id="trap" value="#{hrSession.employee.trap}">
+ <f:selectItems value="#{hrRequest.selectEntries['Trap']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value" value="#{hrSession.employee.trap}" />
+ <ui:param name="id" value="trap" />
+ <ui:param name="key" value="Trap" />
+ </ui:include> <h:message for="trap" showDetail="true" showSummary="false" />
+ </td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.badgeNumber']}</td>
+ <td><h:inputText id="badgeNumber"
+ value="#{hrSession.employee.badgeNumber}" /><h:message
+ for="badgeNumber" showDetails="true" showSummary="false" /></td>
+ <td>#{bundle['Employee.timeclockCode']}</td>
+ <td><h:inputText id="badgeNumber"
+ value="#{hrSession.employee.timeclockCode}" /><h:message
+ for="badgeNumber" showDetails="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.adminNumber']}</td>
+ <td><h:inputText id="adminNumber"
+ value="#{hrSession.employee.adminNumber}" /><h:message
+ for="adminNumber" showDetails="true" showSummary="false" /></td>
+ <td>#{bundle['Employee.frame']}</td>
+ <td><!-- <h:selectOneMenu id="adminNumber" value="#{hrSession.employee.frame}">
+ <f:selectItems value="#{hrRequest.selectEntries['Frame']}"/>
+ </h:selectOneMenu> --> <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value" value="#{hrSession.employee.frame}" />
+ <ui:param name="id" value="frame" />
+ <ui:param name="key" value="Frame" />
+ </ui:include> <h:message for="frame" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.IBGBadgeNumber']}</td>
+ <td><h:inputText id="ibg"
+ value="#{hrSession.employee.IBGBadgeNumber}" /><h:message
+ for="ibg" showDetails="true" showSummary="false" /></td>
+ <td>#{bundle['Employee.dimonia']}</td>
+ <td><h:inputText id="dimonia"
+ value="#{hrSession.employee.dimonia}" /><h:message for="ibg"
+ showDetails="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.phoneActivityCode']}</td>
+ <td><h:inputText id="phoneActivity"
+ value="#{hrSession.employee.phoneActivityCode}" /><h:message
+ for="phoneActivity" showDetails="true" showSummary="false" /></td>
+ <td>#{bundle['Employee.replacement']}</td>
+ <td><ui:include src="elements/selectEntry.xhtml">
+ <ui:param name="value" value="#{hrSession.employee.replacement}" />
+ <ui:param name="id" value="replacement" />
+ <ui:param name="key" value="Replacement status" />
+ </ui:include> <h:message for="replacement" showDetail="true" showSummary="false" /></td>
+ </tr>
+ <!--
+ <tr>
+ <td>#{bundle['Employee.lifeClass']}</td>
+ <td>
+ <h:selectOneMenu value="#{hrSession.employee.lifeClass}" id="lifeClass">
+ <f:selectItems value="#{hrRequest.lifeClasses}"/>
+ <f:converter converterId="NullableLong" />
+ </h:selectOneMenu>
+ <h:message for="lifeClass" showDetails="true" showSummary="false"/></td>
+ <td>#{bundle['Employee.lifeClassDate']}</td>
+ <td><t:inputCalendar value="#{hrSession.employee.lifeClassDate}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="lifeclassDate">
+ <f:convertDateTime pattern="dd MMMM yyyy" timeZone="Europe/Paris"/>
+ </t:inputCalendar><h:message for="lifeclassDate" showDetails="true" showSummary="false"/></td>
+ </tr>-->
+ <tr>
+ <td>#{bundle['Employee.lifeClassDate18']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.lifeClassDate18}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
+ id="lifeclassDate18">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="lifeclassDate18" showDetails="true"
+ showSummary="false" /></td>
+ <td>#{bundle['Employee.lifeClassDate23']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.lifeClassDate23}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
+ id="lifeclassDate23">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="lifeclassDate23" showDetails="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.lifeClassDate20']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.lifeClassDate20}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
+ id="lifeclassDate20">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="lifeclassDate20" showDetails="true"
+ showSummary="false" /></td>
+ <td>#{bundle['Employee.lifeClassDate24']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.lifeClassDate24}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
+ id="lifeclassDate24">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="lifeclassDate24" showDetails="true"
+ showSummary="false" /></td>
+ </tr>
+
+ <tr>
+ <td>#{bundle['Employee.lifeClassDate21']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.lifeClassDate21}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
+ id="lifeclassDate21">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar><h:message for="lifeclassDate21" showDetails="true"
+ showSummary="false" /></td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td colspan="4"><ui:include src="elements/diplomas.xhtml">
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:administrative" />
+ </ui:include></td>
+ </tr>
+ <tr>
+ <td colspan="4">
+ <rich:panel><f:facet name="header">#{bundle['Employee.PData']}</f:facet>
+ <table width="100%">
+ <tr>
+ <td>#{bundle['PData.selorCode']}</td>
+ <td colspan="3">
+ <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.PData.selorCode}" />
+ <ui:param name="id" value="selorCode" />
+ <ui:param name="key" value="Selor code" />
+ </ui:include> <h:message for="selorCode" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['PData.handicap']}</td>
+ <td colspan="3">
+ <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.PData.handicap}" />
+ <ui:param name="id" value="handicap" />
+ <ui:param name="key" value="Handicap" />
+ </ui:include> <h:message for="handicap" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['PData.agdet']}</td>
+ <td colspan="3">
+ <ui:include
+ src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.PData.agdet}" />
+ <ui:param name="id" value="agdet" />
+ <ui:param name="key" value="Agdet" />
+ </ui:include> <h:message for="agdet" showDetail="true" showSummary="false" />
+ </td>
+ </tr>
+ <tr>
+ <td><h:selectBooleanCheckbox value="#{hrSession.employee.PData.managerGrant}" id="managerGrant"/>#{bundle['PData.managerGrant']}?</td>
+ <td><h:selectBooleanCheckbox value="#{hrSession.employee.PData.superiorGrant}" id="superiorGrant"/>#{bundle['PData.superiorGrant']}?</td>
+ <td><h:selectBooleanCheckbox value="#{hrSession.employee.PData.integrationGrant}" id="integrationGrant"/>#{bundle['PData.integrationGrant']}?</td>
+ <td><h:selectBooleanCheckbox value="#{hrSession.employee.PData.projectGrant}" id="projectGrant"/>#{bundle['PData.projectGrant']}?</td>
+ </tr>
+ </table>
+ </rich:panel>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">#{bundle['Employee.note']}</td>
+ <td colspan="3"><h:inputTextarea id="note"
+ value="#{hrSession.employee.note}" rows="7" cols="80" /><h:message
+ for="note" showDetails="true" showSummary="false" /></td>
+ </tr>
+ </table>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['family']}" processValidators="true"
+ id="family">
+ #{bundle['Employee.maritalStatus']}
+ <!-- <h:selectOneMenu id="maritalStatus" value="#{hrSession.employee.maritalStatus}">
+ <f:selectItems value="#{hrRequest.selectEntries['Marital status']}"/>
+ </h:selectOneMenu> -->
+ <ui:include src="elements/selectEntry.xhtml">
+ <ui:param name="value"
+ value="#{hrSession.employee.maritalStatus}" />
+ <ui:param name="id" value="maritalStatus" />
+ <ui:param name="key" value="Marital status" />
+ </ui:include>
+ <h:message for="maritalStatus" showDetail="true"
+ showSummary="false" />
+ <br />
+ <rich:panel><f:facet name="header">#{bundle['Employee.nextOfKin']}</f:facet>
+ <ui:include src="elements/nok.xhtml">
+ <ui:param name="nok" value="#{hrSession.employee.nextOfKin}" />
+ </ui:include></rich:panel>
+ <!-- derived Hoeveel kinderen? <h:inputText value="" size="2" disabled="true"/><br/> -->
+ <ui:include src="elements/childs.xhtml">
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:family" />
+ </ui:include>
+ <!-- <t:inputHtml addKupuLogo="false" value="" allowEditSource="false" allowExternalLinks="false"></t:inputHtml> -->
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.transportation']}"
+ processValidators="true" id="transportation">
+ <h:selectBooleanCheckbox id="driveAuthorization"
+ value="#{hrSession.employee.driveAuthorization}" />
+ #{bundle['Employee.driveAuthorization']}
+ <h:message for="driveAuthorization" showDetail="true"
+ showSummary="false" />
+ <ui:include src="elements/transportation.xhtml">
+ <ui:param name="transport"
+ value="#{hrSession.employee.transportation}" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['leaves']}" processValidators="true"
+ id="leaves">
+ <t:panelTabbedPane id="panel" serverSideTabSwitch="false"
+ style="width:100%">
+ <t:panelTab label="#{bundle['Employee.leaves']}"
+ processValidators="true" id="leaves">
+ <ui:include src="elements/leaves.xhtml">
+ <ui:param name="leaves"
+ value="#{hrSession.employee.leavesArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:leaves:leaves" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.illnesses']}"
+ processValidators="true" id="illnesses">
+ <table>
+ <tr>
+ <td>#{bundle['Employee.medicalNumber']}</td>
+ <td><h:inputText
+ value="#{hrSession.employee.medicalNumber}" /></td>
+ <td>#{bundle['Employee.medicalCenter']}</td>
+ <td>
+ <ui:include src="elements/selectMedicalCenter.xhtml">
+ <ui:param name="id" value="medicalCenter"/>
+ <ui:param name="value" value="#{hrSession.employee.medicalCenter}"/>
+ </ui:include>
+ <h:message for="medicalCenter" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.sickDayInBank']}</td>
+ <td><h:inputText
+ value="#{hrSession.employee.sickDayInBank}"
+ id="sickDayInBank" /> <h:message for="sickDayInBank"
+ showDetail="true" showSummary="false" /></td>
+ <td>#{bundle['Employee.sickDayForAge']}</td>
+ <td><h:inputText id="sickDayForAge"
+ value="#{hrSession.employee.sickDayForAge}" /> <h:message
+ for="sickDayForAge" showDetail="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.sickDayYearSpent']}</td>
+ <td><h:inputText id="sickDayYearSpent"
+ value="#{hrSession.employee.sickDayYearSpent}" /> <h:message
+ for="sickDayYearSpent" showDetail="true" showSummary="false" />
+ </td>
+ <td>#{bundle['Employee.sickDayYearLeft']}</td>
+ <td><h:inputText id="sickDayYearLeft"
+ value="#{hrSession.employee.sickDayYearLeft}" /> <h:message
+ for="sickDayYearLeft" showDetail="true" showSummary="false" />
+ </td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.illnessContact1']}</td>
+ <td>
+ <ui:include src="elements/selectSecretariat.xhtml">
+ <ui:param name="id" value="illness1"/>
+ <ui:param name="value" value="#{hrSession.employee.illnessContact1}"/>
+ </ui:include><h:message for="illness1" showDetail="true"
+ showSummary="false" /></td>
+ <td>#{bundle['Employee.illnessContact2']}</td>
+ <td>
+ <ui:include src="elements/selectSecretariat.xhtml">
+ <ui:param name="id" value="illness2"/>
+ <ui:param name="value" value="#{hrSession.employee.illnessContact2}"/>
+ </ui:include>
+ <h:message for="illness2" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ </table>
+ <rich:panel><f:facet name="header">#{bundle['Employee.illnesses']}</f:facet>
+ <ui:include src="elements/illnesses.xhtml">
+ <ui:param name="illnesses"
+ value="#{hrSession.employee.illnessesArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:leaves:illnesses" />
+ </ui:include></rich:panel>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.workAccidents']}"
+ processValidators="true" id="workAccidents">
+ <ui:include src="elements/workAccidents.xhtml">
+ <ui:param name="accidents"
+ value="#{hrSession.employee.workAccidentsArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:leaves:workAccidents" />
+ </ui:include>
+ </t:panelTab>
+ </t:panelTabbedPane>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.contracts']}"
+ processValidators="true" id="contracts">
+ <ui:include src="elements/contracts.xhtml">
+ <ui:param name="contracts"
+ value="#{hrSession.employee.contractsArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:contracts" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.cumuls']}"
+ processValidators="true" id="cumuls">
+ <ui:include src="elements/cumuls.xhtml">
+ <ui:param name="cumuls" value="#{hrSession.employee.cumulsArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:cumuls" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['career']}" processValidators="true"
+ id="career">
+ <table width="100%">
+ <tr>
+ <td>#{bundle['Employee.firstJobDate']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.firstJobDate}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="firstJobDate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar> <h:message for="firstJobDate" showDetail="true"
+ showSummary="false" /></td>
+ <td>#{bundle['Employee.workedOnPatrimonium']}</td>
+ <td><h:selectBooleanCheckbox id="patrimonium"
+ value="#{hrSession.employee.workedOnPatrimonium}" /> <h:message
+ for="patrimonium" showDetail="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.inDate']}</td>
+ <td><t:inputCalendar value="#{hrSession.employee.inDate}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
+ id="inDate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar> <h:message for="inDate" showDetail="true" showSummary="false" />
+ </td>
+ <td>#{bundle['Employee.outDate']}</td>
+ <td><t:inputCalendar value="#{hrSession.employee.outDate}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
+ id="outDate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar> <h:message for="outDate" showDetail="true" showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.salaryInDate']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.salaryInDate}" popupTodayString=""
+ renderAsPopup="true" renderPopupButtonAsImage="true"
+ popupDateFormat="dd MMMM yyyy" id="salaryInDate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar> <h:message for="salaryInDate" showDetail="true"
+ showSummary="false" /></td>
+ <td>#{bundle['Employee.nominationDate']}</td>
+ <td><t:inputCalendar
+ value="#{hrSession.employee.nominationDate}"
+ popupTodayString="" renderAsPopup="true"
+ renderPopupButtonAsImage="true" popupDateFormat="dd MMMM yyyy"
+ id="nominationDate">
+ <f:convertDateTime pattern="dd MMMM yyyy"
+ timeZone="Europe/Paris" />
+ </t:inputCalendar> <h:message for="nominationDate" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ <tr>
+ <td>#{bundle['Employee.rankBeforeReform']}</td>
+ <td><h:inputText
+ value="#{hrSession.employee.rankBeforeReform}" id="oldRank" />
+ <h:message for="oldRank" showDetail="true" showSummary="false" /></td>
+ <td>#{bundle['Employee.newRank']}</td>
+ <td><h:inputText value="#{hrSession.employee.newRank}"
+ id="newRank" /> <h:message for="newRank" showDetail="true"
+ showSummary="false" /></td>
+ </tr>
+ </table>
+ <t:panelTabbedPane id="ranks" serverSideTabSwitch="false"
+ style="width:100%">
+
+ <t:panelTab label="#{bundle['Employee.careerRanks']}"
+ processValidators="true" id="rank">
+ <ui:include src="elements/careerRanks.xhtml">
+ <ui:param name="ranks"
+ value="#{hrSession.employee.careerRanksArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:career:rank" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.salaryRanks']}"
+ processValidators="true" id="salary">
+ <ui:include src="elements/salaryRanks.xhtml">
+ <ui:param name="ranks"
+ value="#{hrSession.employee.salaryRanksArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:career:salary" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.developmentCircles']}"
+ processValidators="true" id="circles">
+ <ui:include src="elements/developmentCircles.xhtml">
+ <ui:param name="developmentCircles"
+ value="#{hrSession.employee.developmentCirclesArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:career:circles" />
+ </ui:include>
+ </t:panelTab>
+
+ <t:panelTab label="#{bundle['Employee.decorations']}"
+ processValidators="true" id="decoration">
+ <ui:include src="elements/decorations.xhtml">
+ <ui:param name="decorations"
+ value="#{hrSession.employee.decorationsArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:career:decoration" />
+ </ui:include>
+ </t:panelTab>
+ </t:panelTabbedPane>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['knowledge']}" id="know">
+ <t:panelTabbedPane width="100%" serverSideTabSwitch="false">
+ <t:panelTab label="#{bundle['Employee.competenceMeasures']}"
+ processValidators="true" id="compMeasure">
+ <ui:include src="elements/competenceMeasures.xhtml">
+ <ui:param name="competenceMeasures"
+ value="#{hrSession.employee.competenceMeasuresArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:know:compMeasure" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.promotionExams']}"
+ processValidators="true" id="prom">
+ <ui:include src="elements/promotionExams.xhtml">
+ <ui:param name="promotionExams"
+ value="#{hrSession.employee.promotionExamsArray}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:know:prom" />
+ </ui:include>
+ </t:panelTab>
+ <t:panelTab label="#{bundle['Employee.formations']}"
+ processValidators="true" id="formation">
+ <ui:include src="elements/formations.xhtml">
+ <ui:param name="formations"
+ value="#{hrSession.employee.formations}" />
+ <ui:param name="parentClientId"
+ value="employeeForm:mainSubForm:know:formation" />
+ </ui:include>
+ </t:panelTab>
+ </t:panelTabbedPane>
+ </t:panelTab>
+ </t:panelTabbedPane>
+ <rich:toolBar itemSeparator="disc">
+ <h:commandLink action="#{hrActions.saveEmployee}" value="#{bundle['actions.save']}"/>
+ <h:commandLink action="#{hrActions.storeEmployee}" value="#{bundle['actions.saveAndContinue']}"/>
+ <h:commandLink action="validate" value="#{bundle['actions.validate']}"/>
+ <h:commandLink action="#{hrActions.resetEmployee}" immediate="true" value="#{bundle['actions.cancel']}"/>
+ </rich:toolBar>
+ </s:subForm>
+ <h:messages showSummary="false" showDetail="true" />
+ </h:form>
+ <a4j:log level="WARN" popup="false" width="400" height="200" />
+ </ui:define>
+</ui:composition>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/hr-layout.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/hr-layout.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/hr-layout.xhtml 2008-06-11 10:05:13 UTC (rev 8710)
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="stylesheet" type="text/css" href="#{facesContext.externalContext.requestContextPath}/css/workflow.css"/>
+<link rel="stylesheet" type="text/css" href="#{facesContext.externalContext.requestContextPath}/css/RMI_intranet.css"/>
+<script src="#{facesContext.externalContext.requestContextPath}/js/scriptaculous/prototype.js" type="text/javascript"/>
+<script src="#{facesContext.externalContext.requestContextPath}/js/scriptaculous/scriptcaulous.js" type="text/javascript"/>
+<script src="#{facesContext.externalContext.requestContextPath}/js/scriptaculous/effects.js" type="text/javascript"/>
+<title>#{title}</title>
+</head>
+<body style="width:100%;margin:0pt;">
+ <f:view locale="#{strutsSession.locale}">
+ <div style="width:100%; height:50px;text-align:center;background-repeat:no-repeat;background-image:url(#{facesContext.externalContext.requestContextPath}/images/logo-irm-kmi-intranet.jpg);"><!-- Header goes here--></div>
+ <!-- <div style="width:90%;margin:0pt;padding:0pt;margin-left:auto;margin-right:auto"> -->
+ <div style="width:100%;background-color:white;overflow:auto"><ui:insert name="content"/></div>
+ <!-- </div> -->
+ </f:view>
+</body>
+</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2008-06-11 09:59:36 UTC (rev 8709)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2008-06-11 10:05:13 UTC (rev 8710)
@@ -33,10 +33,12 @@
*/
public class JBIDE675Test extends VpeTest {
- private static final String IMPORT_PROJECT_NAME = "jsfTest";
+ private static final String IMPORT_PROJECT_NAME = "jsfTest"; //$NON-NLS-1$
- private static final String TEST_PAGE_NAME = "JBIDE/675/testChangeOnUserInputTextNode.xhtml";
+ private static final String TEST_PAGE_NAME = "JBIDE/675/testChangeOnUserInputTextNode.xhtml"; //$NON-NLS-1$
+
+
public JBIDE675Test(String name) {
super(name);
}
@@ -55,11 +57,11 @@
// get test page path
IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME,
IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + TEST_PAGE_NAME, file);
+ assertNotNull("Could not open specified file " + TEST_PAGE_NAME, file); //$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
- assertNotNull("Editor input is null", input);
+ assertNotNull("Editor input is null", input); //$NON-NLS-1$
// open and get editor
JSPMultiPageEditor part = openEditor(input);
@@ -94,7 +96,7 @@
assertEquals(textNode.getNodeValue().trim(), node.getNodeValue()
.trim());
- styledText.insert("t");
+ styledText.insert("t"); //$NON-NLS-1$
TestUtil.delay(450);
TestUtil.waitForJobs();
}
@@ -114,13 +116,13 @@
setException(null);
// Tests CA
// get test page path
- IFile file = (IFile) TestUtil.getComponentPath("JBIDE/675/testUserInputOnTag.xhtml",
+ IFile file = (IFile) TestUtil.getComponentPath("JBIDE/675/testUserInputOnTag.xhtml", //$NON-NLS-1$
IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + "JBIDE/675/testUserInputOnTag.xhtml", file);
+ assertNotNull("Could not open specified file " + "JBIDE/675/testUserInputOnTag.xhtml", file); //$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
- assertNotNull("Editor input is null", input);
+ assertNotNull("Editor input is null", input); //$NON-NLS-1$
// open and get editor
JSPMultiPageEditor part = openEditor(input);
@@ -157,7 +159,7 @@
assertEquals(textNode.getNodeValue().trim(), node.getNodeName()
.trim());
- styledText.insert("t");
+ styledText.insert("t"); //$NON-NLS-1$
TestUtil.delay(450);
TestUtil.waitForJobs();
}
@@ -173,13 +175,13 @@
setException(null);
// Tests CA
// get test page path
- IFile file = (IFile) TestUtil.getComponentPath("JBIDE/675/testInsertTag.xhtml",
+ IFile file = (IFile) TestUtil.getComponentPath("JBIDE/675/testInsertTag.xhtml", //$NON-NLS-1$
IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + "JBIDE/675/testInsertTag.xhtml", file);
+ assertNotNull("Could not open specified file " + "JBIDE/675/testInsertTag.xhtml", file); //$NON-NLS-1$ //$NON-NLS-2$
IEditorInput input = new FileEditorInput(file);
- assertNotNull("Editor input is null", input);
+ assertNotNull("Editor input is null", input); //$NON-NLS-1$
// open and get editor
JSPMultiPageEditor part = openEditor(input);
@@ -188,7 +190,7 @@
.getTextWidget();
styledText.setCaretOffset(285);
- styledText.insert("<test></test>");
+ styledText.insert("<test></test>"); //$NON-NLS-1$
TestUtil.delay(450);
TestUtil.waitForJobs();
IndexedRegion treeNode = ContentAssistUtils.getNodeAt(part
@@ -217,4 +219,31 @@
assertEquals(textNode.getNodeValue().trim(), node.getNodeName()
.trim());
}
+
+ public void testClosePageWhenBackgroundJobIsRun() throws Throwable {
+
+ TestUtil.waitForJobs();
+
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+ // Tests CA
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath("JBIDE/675/employee.xhtml", //$NON-NLS-1$
+ IMPORT_PROJECT_NAME);
+ assertNotNull("Could not open specified file " + "JBIDE/675/employee.xhtml", file); //$NON-NLS-1$ //$NON-NLS-2$
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input); //$NON-NLS-1$
+
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ StyledText styledText = part.getSourceEditor().getTextViewer()
+ .getTextWidget();
+
+
+ }
}
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8709 - trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-06-11 05:59:36 -0400 (Wed, 11 Jun 2008)
New Revision: 8709
Modified:
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java
Log:
JBIDE-2022
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2008-06-11 09:59:16 UTC (rev 8708)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2008-06-11 09:59:36 UTC (rev 8709)
@@ -53,7 +53,7 @@
ModelFormLayoutData.EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)},
new String[]{ENT_ESB_ACTION},
- FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAction") //$NON-NLS-1$
+ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnyAction") //$NON-NLS-1$
);
static IFormData ESB_ACTION_SUB_LIST_DEFINITION = new FormData(
@@ -114,4 +114,13 @@
new String[]{ENT_ESB_SIMPLE_SCHEDULE, ENT_ESB_CRON_SCHEDULE},
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAnySchedule") //$NON-NLS-1$
);
+
+ static IFormData ESB_ROUTE_LIST_DEFINITION = new FormData(
+ "Route List", //$NON-NLS-1$
+ ModelFormLayoutData.EMPTY_DESCRIPTION,
+ new FormAttributeData[]{new FormAttributeData("destination name", 50), new FormAttributeData("service name", 50)},
+ new String[]{ENT_ESB_ROUTE_TO},
+ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddRouteTo") //$NON-NLS-1$
+ );
+
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2008-06-11 09:59:16 UTC (rev 8708)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2008-06-11 09:59:36 UTC (rev 8709)
@@ -69,6 +69,9 @@
IFormData g = ModelFormLayoutData.createGeneralFormData(entity);
if(g != null) list.add(g);
if(entityName.startsWith(PREACTION_PREFIX)) {
+ if(entity.getChild(ENT_ESB_ROUTE_TO) != null) {
+ list.add(ESBListsFormLayoutData.ESB_ROUTE_LIST_DEFINITION);
+ }
//do nothing; when specific children exist use specific forms
} else if(entity.getChild(ENT_ESB_PROPERTY) != null) {
list.add(ESBListsFormLayoutData.ESB_PROPERTY_LIST_DEFINITION);
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8708 - in trunk/esb/plugins/org.jboss.tools.esb.core: src/org/jboss/tools/esb/core/model and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-06-11 05:59:16 -0400 (Wed, 11 Jun 2008)
New Revision: 8708
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java
Log:
JBIDE-2022
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2008-06-11 09:47:24 UTC (rev 8707)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2008-06-11 09:59:16 UTC (rev 8708)
@@ -49,7 +49,8 @@
</ICONS>
<GlobalActions kind="list"/>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionAggregator101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionAggregator101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
</XChildrenEntities>
@@ -59,7 +60,7 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="aggregator action" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -87,7 +88,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionByteArrayToString101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionByteArrayToString101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
</XChildrenEntities>
@@ -97,7 +99,8 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="byte array to string converter action"
+ loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -126,7 +129,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionCommandInterpreter101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionCommandInterpreter101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
</XChildrenEntities>
@@ -136,7 +140,8 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="command interpreter action"
+ loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -163,7 +168,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" name="ESBPreActionContentBasedRouter101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
+ XMLSUBPATH="action" name="ESBPreActionContentBasedRouter101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
<XChildEntity name="ESBPreRouteTo"/>
@@ -174,7 +180,8 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="content based router action"
+ loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -227,7 +234,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionGroovyProcessor101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionGroovyProcessor101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
</XChildrenEntities>
@@ -237,7 +245,8 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="groovy processor action"
+ loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -265,7 +274,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionLongToDateConverter101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionLongToDateConverter101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
</XChildrenEntities>
@@ -275,7 +285,8 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="long to date converter action"
+ loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -302,7 +313,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionMessagePersister101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionMessagePersister101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
</XChildrenEntities>
@@ -312,7 +324,7 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="persist action" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -344,7 +356,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" name="ESBPreActionNotifier101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
+ XMLSUBPATH="action" name="ESBPreActionNotifier101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
<XChildEntity name="ESBPreNotificationList"/>
@@ -355,7 +368,7 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="notifier action" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -389,7 +402,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionObjectInvoke101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionObjectInvoke101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
</XChildrenEntities>
@@ -399,7 +413,7 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="object invoke action" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -432,7 +446,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionObjectToCSVString101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionObjectToCSVString101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
</XChildrenEntities>
@@ -442,7 +457,8 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="object to cvs string converter action"
+ loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -480,7 +496,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionObjectToXStream101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionObjectToXStream101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
</XChildrenEntities>
@@ -490,7 +507,8 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="object to XStream converter action"
+ loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -528,7 +546,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionSOAPClient101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionSOAPClient101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
</XChildrenEntities>
@@ -538,7 +557,7 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="SOAP client action" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -576,7 +595,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionSOAPProcessor101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionSOAPProcessor101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
</XChildrenEntities>
@@ -586,7 +606,7 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="SOAP processor action" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -614,7 +634,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionSmooksTransformer101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionSmooksTransformer101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
</XChildrenEntities>
@@ -624,7 +645,8 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="smooks transformer action"
+ loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -659,7 +681,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" name="ESBPreActionStaticRouter101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
+ XMLSUBPATH="action" name="ESBPreActionStaticRouter101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
<XChildEntity name="ESBPreRouteTo"/>
@@ -670,7 +693,7 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="static router action" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -710,7 +733,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" name="ESBPreActionStaticWiretap101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
+ XMLSUBPATH="action" name="ESBPreActionStaticWiretap101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
<XChildEntity name="ESBPreRouteTo"/>
@@ -721,7 +745,7 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="static wiretap action" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -760,7 +784,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" name="ESBPreActionSystemPrintln101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="action" name="ESBPreActionSystemPrintln101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
</XChildrenEntities>
@@ -770,7 +795,7 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="system println action" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -817,7 +842,8 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%" name="ESBPreActionXStreamToObject101">
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
+ XMLSUBPATH="action" name="ESBPreActionXStreamToObject101">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
<XChildEntity name="ESBPreAlias"/>
@@ -828,7 +854,8 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="pre-packed action" loader="ElementType" name="element type">
+ <XModelAttribute default="XStream to object converter action"
+ loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -927,7 +954,7 @@
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=notification"
XMLSUBPATH="NotificationList" name="ESBPreNotificationList">
<XChildrenEntities>
- <XChildEntity name="AnyElement"/>
+ <XChildEntity name="ESBPreTarget"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
@@ -948,9 +975,9 @@
<XActionItem kind="list" name="CreateActions">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="entity=AnyElement" WizardClassName="%Default%"
- displayName="Add Tag..." kind="action" name="CreateTag">
- <EntityData EntityName="AnyElementNew">
- <AttributeData AttributeName="tag"/>
+ displayName="Add Target..." kind="action" name="CreateTarget">
+ <EntityData EntityName="ESBPreTarget">
+ <AttributeData AttributeName="class"/>
</EntityData>
</XActionItem>
</XActionItem>
@@ -1024,6 +1051,59 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"
+ XMLSUBPATH="target" name="ESBPreTarget">
+ <XChildrenEntities>
+ <XChildEntity name="AnyElement"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="target" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="class" xmlname="class"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="entity=AnyElement" WizardClassName="%Default%"
+ displayName="Add Tag..." kind="action" name="CreateTag">
+ <EntityData EntityName="AnyElementNew">
+ <AttributeData AttributeName="tag"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions">
+ <XActionItem HIDE="always" HandlerClassName="%Move%"
+ ICON="action.move" displayName="Move" kind="action" name="Move"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
<XEntityExtension name="ESBActions101">
<XChildrenEntities>
<XChildEntity name="ESBPreActionByteArrayToString101"/>
@@ -1048,7 +1128,8 @@
<XActionItem kind="list">
<XActionItem ICON="action.empty" displayName="New" group="1"
kind="list" name="CreateActions">
- <XActionItem displayName="Pre-packed Action" group="1" kind="list" name="PrePackedAction">
+ <XActionItem displayName="Add Pre-Packed Action" group="1"
+ kind="list" name="PrePackedAction">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="Object Invoke..." kind="action" name="AddObjectInvoke">
@@ -1058,7 +1139,7 @@
<AttributeData AttributeName="class method"/>
</EntityData>
</XActionItem>
- <XActionItem displayName="Converters" group="1" kind="list" name="Converters">
+ <XActionItem displayName="Converters" kind="list" name="Converters">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="Byte Array To String..." kind="action" name="AddByteArrayToString">
@@ -1139,7 +1220,7 @@
<AttributeData AttributeName="script"/>
</EntityData>
</XActionItem>
- <XActionItem displayName="Routers" group="1" kind="list" name="Routers">
+ <XActionItem displayName="Routers" kind="list" name="Routers">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="Aggregator..." kind="action" name="AddAggregator">
@@ -1182,7 +1263,7 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem displayName="SOAP" group="1" kind="list" name="SOAP">
+ <XActionItem displayName="SOAP" kind="list" name="SOAP">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="SOAP Processor..." kind="action" name="SOAPProcessor">
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 2008-06-11 09:47:24 UTC (rev 8707)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-06-11 09:59:16 UTC (rev 8708)
@@ -127,13 +127,17 @@
<XActionItem displayName="New" group="1" kind="list" name="CreateActions">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Add Action..." kind="action" name="AddAction">
+ displayName="Add Generic Action..." kind="action" name="AddAction">
<EntityData EntityName="ESBAction101">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="class"/>
<AttributeData AttributeName="process" Mandatory="no"/>
</EntityData>
</XActionItem>
+ <XActionItem HIDE="always"
+ HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.ShowMenuHandler"
+ PROPERTIES="actionList=CreateActions" displayName="Action..."
+ kind="action" name="AddAnyAction"/>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2008-06-11 09:47:24 UTC (rev 8707)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2008-06-11 09:59:16 UTC (rev 8708)
@@ -102,8 +102,9 @@
public String ENT_ESB_SIMPLE_SCHEDULE = "ESBSimpleSchedule101"; //$NON-NLS-1$
public String ENT_ESB_CRON_SCHEDULE = "ESBCronSchedule101"; //$NON-NLS-1$
-
+ public String ENT_ESB_ROUTE_TO = "ESBPreRouteTo"; //$NON-NLS-1$
+
public String ATTR_NAME = "name"; //$NON-NLS-1$
public String ATTR_VALUE = "value"; //$NON-NLS-1$
public String ATTR_PROPERTY_VALUE_PRESENTATION = "value presentation";
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java 2008-06-11 09:47:24 UTC (rev 8707)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java 2008-06-11 09:59:16 UTC (rev 8708)
@@ -23,6 +23,17 @@
public ESBLoaderUtil() {}
+ protected String getChildEntity(XModelEntity entity, Element e) {
+ String result = super.getChildEntity(entity, e);
+ if(result != null && result.startsWith(ESBConstants.PREACTION_PREFIX)) {
+ if(entity.getChild(ESBConstants.ENT_ESB_ACTION) != null) {
+ return ESBConstants.ENT_ESB_ACTION;
+ }
+ //TODO when different versions appear, support them!
+ }
+ return result;
+ }
+
protected boolean isSaveable(XModelEntity entity, String n, String v, String dv) {
if(v == null) return false;
if(v.length() == 0 || v.equals(dv)) {
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java 2008-06-11 09:47:24 UTC (rev 8707)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java 2008-06-11 09:59:16 UTC (rev 8708)
@@ -37,35 +37,10 @@
XModelObject[] as = p.getChildren();
for (int i = 0; i < as.length; i++) {
if(as[i] instanceof AnyElementObjectImpl) {
- String tag = as[i].getAttributeValue("tag");
- Map<String, String> attr = toMap(((AnyElementObjectImpl)as[i]).getAttributes());
-
- XModelObject a = specificAction.getModel().createModelObject(getItemEntityName(), null);
- if(a == null || tag == null || !tag.equals(a.getModelEntity().getXMLSubPath())) {
- continue;
+ XModelObject a = fromAnyElement(as[i], getItemEntityName());
+ if(a != null) {
+ specificAction.addChild(a);
}
-
- XModelEntity entity = a.getModelEntity();
- XAttribute[] attrs = entity.getAttributes();
- for (int j = 0; j < attrs.length; j++) {
- String name = attrs[j].getName();
- String xml = attrs[j].getXMLName();
- if(xml == null || xml.length() == 0) continue;
- String value = attr.get(xml);
- if(value == null || value.length() == 0) {
- value = attrs[j].getDefaultValue();
- }
- if(value != null) {
- a.setAttributeValue(name, value);
- }
- }
- if(a.getModelEntity().getChild("AnyElement") != null) {
- XModelObject[] cs = as[i].getChildren();
- for (int j = 0; j < cs.length; j++) {
- a.addChild(cs[j].copy());
- }
- }
- specificAction.addChild(a);
}
}
p.removeFromParent();
@@ -77,36 +52,94 @@
XModelObject p = basicAction.getModel().createModelObject(ESBConstants.ENT_ESB_PROPERTY, null);
p.setAttributeValue(ESBConstants.ATTR_NAME, getPropertyName());
for (int i = 0; i < as.length; i++) {
- XModelObject t = basicAction.getModel().createModelObject("AnyElement", null);
- t.setAttributeValue("tag", as[i].getModelEntity().getXMLSubPath());
- StringBuffer sb = new StringBuffer();
- XModelEntity entity = as[i].getModelEntity();
- XAttribute[] attrs = entity.getAttributes();
- for (int j = 0; j < attrs.length; j++) {
- String name = attrs[j].getName();
- String xml = attrs[j].getXMLName();
- if(xml == null || xml.length() == 0) continue;
- String value = as[i].getAttributeValue(name);
- if(value == null || value.length() == 0 || value.equals(attrs[j].getDefaultValue())) {
- if(!"always".equals(attrs[j].getProperty("save"))) continue;
+ XModelObject t = toAnyElement(as[i], i);
+ p.addChild(t);
+ }
+ basicAction.addChild(p);
+ }
+
+ protected XModelObject fromAnyElement(XModelObject any, String toEntity) {
+ String tag = any.getAttributeValue("tag");
+ Map<String, String> attr = toMap(((AnyElementObjectImpl)any).getAttributes());
+
+ XModelObject a = any.getModel().createModelObject(toEntity, null);
+ if(a == null || tag == null || !tag.equals(a.getModelEntity().getXMLSubPath())) {
+ return null;
+ }
+
+ XModelEntity entity = a.getModelEntity();
+ XAttribute[] attrs = entity.getAttributes();
+ for (int j = 0; j < attrs.length; j++) {
+ String name = attrs[j].getName();
+ String xml = attrs[j].getXMLName();
+ if(xml == null || xml.length() == 0) continue;
+ String value = attr.get(xml);
+ if(value == null || value.length() == 0) {
+ value = attrs[j].getDefaultValue();
+ }
+ if(value != null) {
+ a.setAttributeValue(name, value);
+ }
+ }
+ XModelObject[] cs = any.getChildren();
+ if(cs.length > 0 && a.getModelEntity().getChildren().length > 0) {
+ //TODO consider case of several child entities, possibly including AnyElement
+ if (a.getModelEntity().getChild("AnyElement") != null) {
+ for (int j = 0; j < cs.length; j++) {
+ a.addChild(cs[j].copy());
}
- if(sb.length() > 0) {
- sb.append(';');
- }
- sb.append(xml).append('=').append(value);
+ } else {
+ String toChildEntity = a.getModelEntity().getChildren()[0].getName();
+ for (int j = 0; j < cs.length; j++) {
+ XModelObject c = fromAnyElement(cs[j], toChildEntity);
+ if(c != null) {
+ a.addChild(c);
+ }
+ }
}
- String attributes = sb.toString();
- t.setAttributeValue("attributes", attributes);
- t.setAttributeValue(XModelObjectLoaderUtil.ATTR_ID_NAME, "" + (i + 1));
- if(as[i].getModelEntity().getChild("AnyElement") != null) {
- XModelObject[] cs = as[i].getChildren();
+ }
+ return a;
+ }
+
+ protected XModelObject toAnyElement(XModelObject specific, int index) {
+ XModelObject t = specific.getModel().createModelObject("AnyElement", null);
+ t.setAttributeValue("tag", specific.getModelEntity().getXMLSubPath());
+ StringBuffer sb = new StringBuffer();
+ XModelEntity entity = specific.getModelEntity();
+ XAttribute[] attrs = entity.getAttributes();
+ for (int j = 0; j < attrs.length; j++) {
+ String name = attrs[j].getName();
+ String xml = attrs[j].getXMLName();
+ if(xml == null || xml.length() == 0) continue;
+ String value = specific.getAttributeValue(name);
+ if(value == null || value.length() == 0 || value.equals(attrs[j].getDefaultValue())) {
+ if(!"always".equals(attrs[j].getProperty("save"))) continue;
+ }
+ if(sb.length() > 0) {
+ sb.append(';');
+ }
+ sb.append(xml).append('=').append(value);
+ }
+ String attributes = sb.toString();
+ t.setAttributeValue("attributes", attributes);
+ t.setAttributeValue(XModelObjectLoaderUtil.ATTR_ID_NAME, "" + (index + 1));
+ XModelObject[] cs = specific.getChildren();
+ if (cs.length > 0) {
for (int j = 0; j < cs.length; j++) {
- t.addChild(cs[j].copy());
+ XModelObject c = null;
+ if (cs[j].getModelEntity().getName().equals("AnyElement")) {
+ c = cs[j].copy();
+ c.setAttributeValue(XModelObjectLoaderUtil.ATTR_ID_NAME, ""
+ + (j + 1));
+ } else {
+ c = toAnyElement(cs[j], j);
}
+ if (c != null) {
+ t.addChild(c);
+ }
}
- p.addChild(t);
}
- basicAction.addChild(p);
+ return t;
}
static Map<String, String> toMap(String[][] attributes) {
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8707 - in trunk/ws/tests: META-INF and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-06-11 05:47:24 -0400 (Wed, 11 Jun 2008)
New Revision: 8707
Added:
trunk/ws/tests/.classpath
trunk/ws/tests/.project
trunk/ws/tests/META-INF/
trunk/ws/tests/META-INF/MANIFEST.MF
trunk/ws/tests/build.properties
trunk/ws/tests/src/
trunk/ws/tests/src/org/
trunk/ws/tests/src/org/jboss/
trunk/ws/tests/src/org/jboss/tools/
trunk/ws/tests/src/org/jboss/tools/ws/
trunk/ws/tests/src/org/jboss/tools/ws/ui/
trunk/ws/tests/src/org/jboss/tools/ws/ui/test/
trunk/ws/tests/src/org/jboss/tools/ws/ui/test/Activator.java
Log:
JBIDE-2323: new a plugin for unit test of org.jboss.tools.ws.ui
Added: trunk/ws/tests/.classpath
===================================================================
--- trunk/ws/tests/.classpath (rev 0)
+++ trunk/ws/tests/.classpath 2008-06-11 09:47:24 UTC (rev 8707)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/ws/tests/.project
===================================================================
--- trunk/ws/tests/.project (rev 0)
+++ trunk/ws/tests/.project 2008-06-11 09:47:24 UTC (rev 8707)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.ws.ui.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/ws/tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/META-INF/MANIFEST.MF (rev 0)
+++ trunk/ws/tests/META-INF/MANIFEST.MF 2008-06-11 09:47:24 UTC (rev 8707)
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test Plug-in
+Bundle-SymbolicName: org.jboss.tools.ws.ui.test
+Bundle-Version: 1.0.0
+Bundle-Activator: org.jboss.tools.ws.ui.test.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime
+Eclipse-LazyStart: true
Added: trunk/ws/tests/build.properties
===================================================================
--- trunk/ws/tests/build.properties (rev 0)
+++ trunk/ws/tests/build.properties 2008-06-11 09:47:24 UTC (rev 8707)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Added: trunk/ws/tests/src/org/jboss/tools/ws/ui/test/Activator.java
===================================================================
--- trunk/ws/tests/src/org/jboss/tools/ws/ui/test/Activator.java (rev 0)
+++ trunk/ws/tests/src/org/jboss/tools/ws/ui/test/Activator.java 2008-06-11 09:47:24 UTC (rev 8707)
@@ -0,0 +1,50 @@
+package org.jboss.tools.ws.ui.test;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.tools.ws.ui.test";
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8706 - in trunk/ws/plugins/org.jboss.tools.ws.core: src/org/jboss/tools/ws/core/classpath and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-06-11 05:17:23 -0400 (Wed, 11 Jun 2008)
New Revision: 8706
Modified:
trunk/ws/plugins/org.jboss.tools.ws.core/plugin.xml
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCore.properties
Log:
JBIDE-2264: filter same name jars from different folder and set a logical name to container
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/plugin.xml
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/plugin.xml 2008-06-11 08:34:45 UTC (rev 8705)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/plugin.xml 2008-06-11 09:17:23 UTC (rev 8706)
@@ -66,7 +66,7 @@
point="org.eclipse.jdt.core.classpathContainerInitializer">
<classpathContainerInitializer
class="org.jboss.tools.ws.core.classpath.JbossWSRuntimeClassPathInitializer"
- id="JbossWSRuntimeLib">
+ id="JBossWS_Runtime">
</classpathContainerInitializer>
</extension>
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java 2008-06-11 08:34:45 UTC (rev 8705)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java 2008-06-11 09:17:23 UTC (rev 8706)
@@ -67,7 +67,7 @@
public IClasspathEntry[] getClasspathEntries() {
if (entries == null) {
- ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>();
+ ArrayList<IClasspathEntry> entryList = new ArrayList<IClasspathEntry>();
JbossWSRuntime jbws = JbossWSRuntimeManager.getInstance()
.findRuntimeByName(segment);
IPath wsPath = null;
@@ -76,10 +76,10 @@
}
if (wsPath != null) {
IPath libPath = wsPath.append(JbossWSCoreMessages.Dir_Lib);
- list.addAll(Arrays.asList(getEntries(libPath)));
+ entryList.addAll(Arrays.asList(getEntries(libPath,entryList)));
libPath = wsPath.append(JbossWSCoreMessages.Dir_Client);
- list.addAll(Arrays.asList(getEntries(libPath)));
- entries = list.toArray(new IClasspathEntry[list.size()]);
+ entryList.addAll(Arrays.asList(getEntries(libPath,entryList)));
+ entries = entryList.toArray(new IClasspathEntry[entryList.size()]);
}
if (entries == null)
return new IClasspathEntry[0];
@@ -92,15 +92,15 @@
.getClasspathEntry();
}
- protected IClasspathEntry[] getEntries(IPath folder) {
+ protected IClasspathEntry[] getEntries(IPath folder, ArrayList<IClasspathEntry> entryList) {
String[] files = folder.toFile().list();
ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>();
for (int i = 0; i < files.length; i++) {
- if (files[i].endsWith(".jar")) {
+ if (files[i].endsWith(".jar") && filterJars(files[i],entryList)) {
list.add(getEntry(folder.append(files[i])));
} else if (folder.append(files[i]).toFile().isDirectory()) {
list.addAll(Arrays.asList(getEntries(folder
- .append(files[i]))));
+ .append(files[i]),entryList)));
}
}
return list.toArray(new IClasspathEntry[list.size()]);
@@ -122,4 +122,13 @@
}
+ public boolean filterJars(String jarName, ArrayList<IClasspathEntry> list) {
+ for(IClasspathEntry entry : list){
+ if(entry.getPath().lastSegment().equals(jarName)){
+ return false;
+ }
+ }
+ return true;
+ }
+
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCore.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCore.properties 2008-06-11 08:34:45 UTC (rev 8705)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCore.properties 2008-06-11 09:17:23 UTC (rev 8706)
@@ -5,7 +5,7 @@
Dir_Web_Content=WebContent
Error_Copy=Exception while copy JBossWS jars
WS_Location=jbosswsruntimelocation
-JBossWS_Runtime_Lib=JbossWSRuntimeLib
+JBossWS_Runtime_Lib=JBossWS_Runtime
JBossWS_Runtime=JBoss WS Runtime
JBossAS=JBOSS
Error_WS_Location=The JBoss WS Runtime Location is NULL
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8705 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-06-11 04:34:45 -0400 (Wed, 11 Jun 2008)
New Revision: 8705
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/PositionSearcher.java
Log:
Algorithm improved
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/PositionSearcher.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/PositionSearcher.java 2008-06-11 08:34:28 UTC (rev 8704)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/PositionSearcher.java 2008-06-11 08:34:45 UTC (rev 8705)
@@ -149,8 +149,11 @@
XModelObject parent = object.getParent();
selectObject(parent);
if(startPos < 0) return;
- XModelObject[] os = parent.getChildren(object.getModelEntity().getName());
+// String entity = object.getModelEntity().getName();
+ XModelObject[] os = parent.getChildren();
for (int i = 0; i < os.length; i++) {
+ String xml_i = os[i].getModelEntity().getXMLSubPath();
+ if(!xml.equals(xml_i)) continue;
boolean ok = false;
while(!ok) {
startPos = nextStartPos(token, startPos + 1);
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8704 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-06-11 04:34:28 -0400 (Wed, 11 Jun 2008)
New Revision: 8704
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLModelObjectFinder.java
Log:
Algorithm improved
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLModelObjectFinder.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLModelObjectFinder.java 2008-06-11 07:52:58 UTC (rev 8703)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/XMLModelObjectFinder.java 2008-06-11 08:34:28 UTC (rev 8704)
@@ -59,8 +59,17 @@
}
String childEntity = getChildEntity(chain.name, o);
if(childEntity != null) {
- XModelObject[] cs = o.getChildren(childEntity);
- if(cs.length > chain.index) return findModelObject(chain.child, cs[chain.index]);
+ XModelObject[] cs = o.getChildren();
+ if(cs.length <= chain.index) return o;
+ int index = -1;
+ for (int i = 0; i < cs.length; i++) {
+ if(chain.name != null && chain.name.equals(cs[i].getModelEntity().getXMLSubPath())) {
+ index++;
+ if(index == chain.index) {
+ return findModelObject(chain.child, cs[i]);
+ }
+ }
+ }
return o;
} else {
XModelObject[] cs = o.getChildren();
17 years, 10 months
- 1
- 0