Author: scabanovich Date: 2010-09-01 11:22:51 -0400 (Wed, 01 Sep 2010) New Revision: 24614 Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddHibernateBusSupport.java Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 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/handlers/AddProviderSupport.java Log: https://jira.jboss.org/browse/JBIDE-6941 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-09-01 15:16:05 UTC (rev 24613) +++ trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-09-01 15:22:51 UTC (rev 24614) @@ -49,6 +49,8 @@ class="org.jboss.tools.esb.core.model.handlers.AddProviderSupport"/> <xclass id="org.jboss.tools.esb.core.model.handlers.AddScheduleProviderSupport" class="org.jboss.tools.esb.core.model.handlers.AddScheduleProviderSupport"/> + <xclass id="org.jboss.tools.esb.core.model.handlers.AddHibernateBusSupport" + class="org.jboss.tools.esb.core.model.handlers.AddHibernateBusSupport"/> <xclass id="org.jboss.tools.esb.core.model.handlers.AddGenericActionSupport" class="org.jboss.tools.esb.core.model.handlers.AddGenericActionSupport"/> <xclass id="org.jboss.tools.esb.core.model.handlers.AddContentBasedRouterSupport" Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-09-01 15:16:05 UTC (rev 24613) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2010-09-01 15:22:51 UTC (rev 24614) @@ -67,6 +67,8 @@ ESBProviders101_AddHibernateProvider_0.Title=ESB Hibernate Provider ESBProviders101_AddHibernateProvider_1.WindowTitle=Add Hibernate Provider ESBProviders101_AddHibernateProvider_1.Title=ESB Channel +ESBProviders101_AddHibernateProvider_2.WindowTitle=Add Hibernate Provider +ESBProviders101_AddHibernateProvider_2.Title=ESB Message Filter ESBProviders101_Properties.Title=Providers List @@ -116,6 +118,8 @@ ESBProviders110_AddHibernateProvider_0.Title=ESB Hibernate Provider ESBProviders110_AddHibernateProvider_1.WindowTitle=Add Hibernate Provider ESBProviders110_AddHibernateProvider_1.Title=ESB Channel +ESBProviders110_AddHibernateProvider_2.WindowTitle=Add Hibernate Provider +ESBProviders110_AddHibernateProvider_2.Title=ESB Message Filter ESBProviders110_AddHTTPProvider_0.WindowTitle=Add HTTP Provider ESBProviders110_AddHTTPProvider_0.Title=ESB HTTP Provider @@ -170,6 +174,8 @@ ESBProviders120_AddHibernateProvider_0.Title=ESB Hibernate Provider ESBProviders120_AddHibernateProvider_1.WindowTitle=Add Hibernate Provider ESBProviders120_AddHibernateProvider_1.Title=ESB Channel +ESBProviders120_AddHibernateProvider_2.WindowTitle=Add Hibernate Provider +ESBProviders120_AddHibernateProvider_2.Title=ESB Message Filter ESBProviders120_AddHTTPProvider_0.WindowTitle=Add HTTP Provider ESBProviders120_AddHTTPProvider_0.Title=ESB HTTP Provider @@ -229,6 +235,8 @@ ESBProviders130_AddHibernateProvider_0.Title=ESB Hibernate Provider ESBProviders130_AddHibernateProvider_1.WindowTitle=Add Hibernate Provider ESBProviders130_AddHibernateProvider_1.Title=ESB Channel +ESBProviders130_AddHibernateProvider_2.WindowTitle=Add Hibernate Provider +ESBProviders130_AddHibernateProvider_2.Title=ESB Message Filter ESBProviders130_AddHTTPProvider_0.WindowTitle=Add HTTP Provider ESBProviders130_AddHTTPProvider_0.Title=ESB HTTP Provider @@ -294,6 +302,10 @@ ESBHibernateProvider101_AddBus.WindowTitle=Add Hibernate Channel ESBHibernateProvider101_AddBus.Title=ESB Hibernate Channel +ESBHibernateProvider101_AddBus_0.WindowTitle=Add Hibernate Channel +ESBHibernateProvider101_AddBus_0.Title=ESB Hibernate Channel +ESBHibernateProvider101_AddBus_1.WindowTitle=Add Hibernate Channel +ESBHibernateProvider101_AddBus_1.Title=ESB Message Filter ESBHibernateProvider101_Properties.Title=ESB Hibernate Provider Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2010-09-01 15:16:05 UTC (rev 24613) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2010-09-01 15:22:51 UTC (rev 24614) @@ -1096,7 +1096,7 @@ </ICONS> </XEntityRenderer> <XModelAttributes> - <XModelAttribute default="ftp provider" loader="ElementType" name="element type"> + <XModelAttribute default="hibernate provider" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=general;id=true;save=always" @@ -1111,12 +1111,16 @@ <XActionItem ICON="action.empty" displayName="New" group="1" kind="list" name="CreateActions"> <XActionItemReference entity="ESBAction101" name="AddProperty" path="CreateActions/AddProperty"/> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" + <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" + PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddHibernateBusSupport" displayName="Hibernate Bus..." kind="action" name="AddBus"> <EntityData EntityName="ESBHibernateBus101"> <AttributeData AttributeName="id"/> </EntityData> + <EntityData EntityName="ESBHibernateMessageFilter101"> + <AttributeData AttributeName="class name"/> + <AttributeData AttributeName="event" Mandatory="no"/> + </EntityData> </XActionItem> </XActionItem> <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> @@ -1960,6 +1964,10 @@ <EntityData EntityName="ESBBusCreator"> <AttributeData AttributeName="id"/> </EntityData> + <EntityData EntityName="ESBHibernateMessageFilter101"> + <AttributeData AttributeName="class name"/> + <AttributeData AttributeName="event" Mandatory="no"/> + </EntityData> </XActionItem> <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty" PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBJBRBus101" Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddHibernateBusSupport.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddHibernateBusSupport.java (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddHibernateBusSupport.java 2010-09-01 15:22:51 UTC (rev 24614) @@ -0,0 +1,93 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.esb.core.model.handlers; + +import java.util.Properties; + +import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport; +import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; +import org.jboss.tools.common.model.XModelException; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.FindObjectHelper; +import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class AddHibernateBusSupport extends SpecialWizardSupport { + String busEntity; + String filterEntity; + + public AddHibernateBusSupport() {} + + protected void reset() { + busEntity = getEntityData()[0].getModelEntity().getName(); + filterEntity = getEntityData()[1].getModelEntity().getName(); + } + + public String[] getActionNames(int stepId) { + if(getStepId() < getEntityData().length - 1) { + if(getStepId() == 0) { + return new String[]{NEXT, CANCEL}; + } else { + return new String[]{BACK, NEXT, CANCEL}; + } + } else if(getEntityData().length > 0) { + return new String[]{BACK, FINISH, CANCEL}; + } + return new String[]{FINISH, CANCEL, HELP}; + } + + public boolean isActionEnabled(String name) { + if(FINISH.equals(name) && getStepId() < getEntityData().length - 1) { + return false; + } + return true; + } + + @Override + public void action(String name) throws XModelException { + if(FINISH.equals(name)) { + execute(); + setFinished(true); + } else if(CANCEL.equals(name)) { + setFinished(true); + } else if(BACK.equals(name)) { + if(getStepId() == 0) return; + setStepId(getStepId() - 1); + } else if(NEXT.equals(name)) { + if(getStepId() >= getEntityData().length - 1) return; + setStepId(getStepId() + 1); + } else if(HELP.equals(name)) { + help(); + } + } + + protected void execute() throws XModelException { + Properties p0 = extractStepData(0); + XModelObject bus = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), busEntity, p0); + + Properties p1 = extractStepData(1); + if(filterEntity != null) { + XModelObject filter = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), filterEntity, p1); + bus.addChild(filter); + } + + DefaultCreateHandler.addCreatedObject(getTarget(), bus, FindObjectHelper.EVERY_WHERE); + } + + public boolean canBeProcessedByStandardWizard() { + return true; + } + +} Property changes on: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddHibernateBusSupport.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java 2010-09-01 15:16:05 UTC (rev 24613) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java 2010-09-01 15:22:51 UTC (rev 24614) @@ -84,6 +84,13 @@ provider.addChild(bus); + if(getStepId() == 2) { + Properties p2 = extractStepData(2); + String childEntity = getEntityData()[2].getModelEntity().getName(); + XModelObject child = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), childEntity, p2); + bus.addChild(child); + } + DefaultCreateHandler.addCreatedObject(getTarget(), provider, FindObjectHelper.EVERY_WHERE); }