Author: dgeraskov Date: 2011-08-18 08:10:35 -0400 (Thu, 18 Aug 2011) New Revision: 34042 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsComposite.java Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateGeneratorContainer.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/details/java/HibernateJavaEntityComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/jpa2/details/java/HibernateJavaEntity2_0Composite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateIdMappingComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMessages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties Log: https://issues.jboss.org/browse/JBIDE-9560 create ui for @GenericGenerators Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateGeneratorContainer.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateGeneratorContainer.java 2011-08-18 12:04:57 UTC (rev 34041) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateGeneratorContainer.java 2011-08-18 12:10:35 UTC (rev 34042) @@ -1,3 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2010-2011 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + package org.jboss.tools.hibernate.jpt.core.internal.context; import java.util.ListIterator; @@ -4,6 +15,13 @@ import org.eclipse.jpt.jpa.core.context.GeneratorContainer; +/** + * @author Dmitry Geraskov + * + * Extends GeneratorContainer with possibility to hold + * org.hibernate.annotations.GenericGenerator(s) + * Used by entities, package-infos and ID mappings. + */ public interface HibernateGeneratorContainer extends GeneratorContainer { //******************** generic generator ***************** @@ -27,6 +45,11 @@ GenericGenerator addGenericGenerator(int index); /** + * Add a generic generator to the entity return the object representing it. + */ + GenericGenerator addGenericGenerator(); + + /** * Remove the generic generator at the index from the entity. */ void removeGenericGenerator(int index); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/details/java/HibernateJavaEntityComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/details/java/HibernateJavaEntityComposite.java 2011-08-18 12:04:57 UTC (rev 34041) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/details/java/HibernateJavaEntityComposite.java 2011-08-18 12:10:35 UTC (rev 34042) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. + * Copyright (c) 2009-2011 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, @@ -92,7 +92,7 @@ @SuppressWarnings("unchecked") @Override protected void initializeGeneratorsSection(Composite container, PropertyValueModel<GeneratorContainer> generatorContainerHolder) { - new HibernateGenerationComposite(this, (PropertyValueModel<? extends HibernateGeneratorContainer>) generatorContainerHolder, addSubPane(container, 10), true); + new HibernateGenerationComposite(this, (PropertyValueModel<? extends HibernateGeneratorContainer>) generatorContainerHolder, addSubPane(container, 10)); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/jpa2/details/java/HibernateJavaEntity2_0Composite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/jpa2/details/java/HibernateJavaEntity2_0Composite.java 2011-08-18 12:04:57 UTC (rev 34041) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/jpa2/details/java/HibernateJavaEntity2_0Composite.java 2011-08-18 12:10:35 UTC (rev 34042) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. + * Copyright (c) 2009-2011 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, @@ -99,7 +99,7 @@ @SuppressWarnings("unchecked") @Override protected void initializeGeneratorsSection(Composite container, PropertyValueModel<GeneratorContainer> generatorContainerHolder) { - new HibernateGenerationComposite(this, (PropertyValueModel<? extends HibernateGeneratorContainer>) generatorContainerHolder, addSubPane(container, 10), true); + new HibernateGenerationComposite(this, (PropertyValueModel<? extends HibernateGeneratorContainer>) generatorContainerHolder, addSubPane(container, 10)); } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsComposite.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsComposite.java 2011-08-18 12:10:35 UTC (rev 34042) @@ -0,0 +1,236 @@ +/******************************************************************************* + * Copyright (c) 2011 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.jpt.ui.internal.mapping.details; + +import java.util.ListIterator; + +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.window.Window; +import org.eclipse.jpt.common.ui.internal.util.ControlSwitcher; +import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane; +import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter; +import org.eclipse.jpt.common.ui.internal.widgets.NewNameDialog; +import org.eclipse.jpt.common.ui.internal.widgets.NewNameDialogBuilder; +import org.eclipse.jpt.common.ui.internal.widgets.Pane; +import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.Transformer; +import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValueModelAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; +import org.eclipse.jpt.common.utility.internal.model.value.swing.ObjectListSelectionModel; +import org.eclipse.jpt.common.utility.model.value.ListValueModel; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel; +import org.eclipse.jpt.jpa.ui.internal.details.GeneratorComposite.GeneratorBuilder; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.part.PageBook; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerator; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateGeneratorContainer; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersistenceUnit; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaGeneratorContainer; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaGenericGenerator; + +/** + * @author Dmitry Geraskov + * + */ +public class GenericGeneratorsComposite extends Pane<HibernateGeneratorContainer> { + + private AddRemoveListPane<HibernateGeneratorContainer> listPane; + Pane<? extends GenericGenerator> genericGeneratorPane; + private WritablePropertyValueModel<GenericGenerator> generatorHolder; + private NewNameDialogBuilder dialogBuilder = null; + + public GenericGeneratorsComposite( + Pane<?> parentPane, + PropertyValueModel<? extends HibernateGeneratorContainer> subjectHolder, + Composite parent) { + super(parentPane, subjectHolder, parent, false); + dialogBuilder = new NewNameDialogBuilder(getShell()); + dialogBuilder.setDialogTitle(HibernateUIMappingMessages.GenericGeneratorsComposite_dialogTitle); + dialogBuilder.setDescriptionTitle(HibernateUIMappingMessages.GenericGeneratorsComposite_DescriptionTitle); + dialogBuilder.setDescription(HibernateUIMappingMessages.GenericGeneratorsComposite_Description); + dialogBuilder.setLabelText(HibernateUIMappingMessages.GenericGeneratorsComposite_Name); + } + + void addGenericGenerator() { + addGenericGeneratorFromDialog(buildAddGenericGeneratorDialog()); + } + + protected HibernatePersistenceUnit getPersistenceUnit(){ + return (HibernatePersistenceUnit)this.getSubject().getPersistenceUnit(); + } + + protected NewNameDialog buildAddGenericGeneratorDialog() { + dialogBuilder.setExistingNames(getPersistenceUnit().getUniqueGeneratorNames().iterator()); + return dialogBuilder.buildDialog(); + } + + protected void addGenericGeneratorFromDialog(NewNameDialog dialog) { + if (dialog.open() != Window.OK) { + return; + } + GenericGenerator generator = this.getSubject().addGenericGenerator(); + generator.setName(dialog.getName()); + this.getGenericGeneratorHolder().setValue(generator);//so that it gets selected in the List for the user to edit + } + + private ListValueModel<GenericGenerator> buildDisplayableGenericGeneratorsListHolder() { + return new ItemPropertyListValueModelAdapter<GenericGenerator>( + buildGenericGeneratorsListHolder(), + GenericGenerator.NAME_PROPERTY + ); + } + + private AddRemoveListPane<HibernateGeneratorContainer> addListPane(Composite container) { + + return new AddRemoveListPane<HibernateGeneratorContainer>( + this, + container, + buildGenericGeneratorsAdapter(), + buildDisplayableGenericGeneratorsListHolder(), + this.getGenericGeneratorHolder(), + buildGenericGeneratorsListLabelProvider() + ); + } + + private ListValueModel<GenericGenerator> buildGenericGeneratorsListHolder() { + return new ListAspectAdapter<HibernateGeneratorContainer, GenericGenerator>( + getSubjectHolder(), + HibernateGeneratorContainer.GENERIC_GENERATORS_LIST) + { + @Override + protected ListIterator<GenericGenerator> listIterator_() { + return (ListIterator<GenericGenerator>) this.subject.genericGenerators(); + } + + @Override + protected int size_() { + return this.subject.genericGeneratorsSize(); + } + }; + } + + private Transformer<GenericGenerator, Control> buildPaneTransformer() { + return new Transformer<GenericGenerator, Control>() { + public Control transform(GenericGenerator generator) { + + if (generator == null) { + return null; + } + + return GenericGeneratorsComposite.this.genericGeneratorPane.getControl(); + } + }; + } + + private Adapter buildGenericGeneratorsAdapter() { + + return new AddRemoveListPane.AbstractAdapter() { + + public void addNewItem(ObjectListSelectionModel listSelectionModel) { + addGenericGenerator(); + } + + public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) { + for (Object item : listSelectionModel.selectedValues()) { + if (item instanceof GenericGenerator) { + getSubject().removeGenericGenerator((GenericGenerator) item); + } + } + } + }; + } + + + private ILabelProvider buildGenericGeneratorsListLabelProvider() { + return new LabelProvider() { + @Override + public String getText(Object element) { + GenericGenerator generator = (GenericGenerator) element; + String name = generator.getName(); + + if (name == null) { + int index = CollectionTools.indexOf(getSubject().genericGenerators(), generator); + name = NLS.bind(HibernateUIMappingMessages.GenericGeneratorsComposite_displayString, Integer.valueOf(index)); + } + + return name; + } + }; + } + + private WritablePropertyValueModel<GenericGenerator> buildGenericGeneratorHolder() { + return new SimplePropertyValueModel<GenericGenerator>(); + } + + @Override + public void enableWidgets(boolean enabled) { + super.enableWidgets(enabled); + this.listPane.enableWidgets(enabled); + } + + @Override + protected void initialize() { + super.initialize(); + this.generatorHolder = buildGenericGeneratorHolder(); + } + + @Override + protected void initializeLayout(Composite container) { + + // List pane + this.listPane = this.addListPane(container); + + // Property pane + PageBook pageBook = new PageBook(container, SWT.NULL); + pageBook.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + // Named GenericGenerator property pane + this.genericGeneratorPane = this.buildGenericGeneratorComposite(pageBook); + + installPaneSwitcher(pageBook); + } + + protected Pane<? extends GenericGenerator> buildGenericGeneratorComposite(PageBook pageBook) { + return new GenericGeneratorComposite( + this, + this.getGenericGeneratorHolder(), + pageBook, + buildGenericGeneratorBuilder() + ); + } + + protected GeneratorBuilder<GenericGenerator> buildGenericGeneratorBuilder() { + return new GeneratorBuilder<GenericGenerator>() { + public GenericGenerator addGenerator() { + HibernateJavaGeneratorContainer container = (HibernateJavaGeneratorContainer)getSubject(); + JavaGenericGenerator generator = container.addGenericGenerator(container.genericGeneratorsSize()); + generatorHolder.setValue(generator); + return generator; + } + }; + } + + private void installPaneSwitcher(PageBook pageBook) { + new ControlSwitcher(this.getGenericGeneratorHolder(), this.buildPaneTransformer(), pageBook); + } + + protected WritablePropertyValueModel<GenericGenerator> getGenericGeneratorHolder() { + return generatorHolder; + } + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java 2011-08-18 12:04:57 UTC (rev 34041) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java 2011-08-18 12:10:35 UTC (rev 34042) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. + * Copyright (c) 2010-2011 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, @@ -15,6 +15,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel; +import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.GeneratorContainer; import org.eclipse.jpt.jpa.ui.internal.details.GenerationComposite; import org.eclipse.jpt.jpa.ui.internal.details.GeneratorComposite.GeneratorBuilder; @@ -33,13 +34,11 @@ private WritablePropertyValueModel<Boolean> genericGeneratorExpansionStateHolder; private WritablePropertyValueModel<GenericGenerator> generatorHolder; - private boolean allowMany; public HibernateGenerationComposite(Pane<?> parentPane, PropertyValueModel<? extends HibernateGeneratorContainer> subjectHolder, - Composite parent, boolean allowMany) { + Composite parent) { super(parentPane, subjectHolder, parent); - this.allowMany = allowMany; } @Override @@ -89,20 +88,26 @@ null ); - if (allowMany){ - //FIXME add table with generators + + if (getSubjectHolder().getValue().getParent() instanceof AttributeMapping){ + if (getSubject().genericGeneratorsSize() > 0){ + generatorHolder.setValue(getSubject().genericGenerators().next()); + } + // Generic Generator pane + this.addGenericGeneratorComposite( + container, 0, + genericGeneratorCheckBox.getBorderWidth() + 16); + } else { + addGenericGeneratorsComposite(container, 0, + genericGeneratorCheckBox.getBorderWidth() + 16); } - //FIXME for many generators - if (getSubject().genericGeneratorsSize() > 0){ - generatorHolder.setValue(getSubject().genericGenerators().next()); - } - - // Generic Generator pane - this.addGenericGeneratorComposite( - container, 0, - genericGeneratorCheckBox.getBorderWidth() + 16); } + protected void addGenericGeneratorsComposite(Composite container, int topMargin, int leftMargin) { + new GenericGeneratorsComposite(this, (PropertyValueModel<? extends HibernateGeneratorContainer>) getSubjectHolder(), + this.addSubPane(container, topMargin, leftMargin)); + } + protected void addGenericGeneratorComposite(Composite container, int topMargin, int leftMargin) { new GenericGeneratorComposite( this, Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateIdMappingComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateIdMappingComposite.java 2011-08-18 12:04:57 UTC (rev 34041) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateIdMappingComposite.java 2011-08-18 12:10:35 UTC (rev 34042) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009-2011 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, @@ -69,7 +69,7 @@ protected void initializeGenerationCollapsibleSection(Composite container) { if (getSubject() instanceof HibernateJavaIdMapping) { // Generic Generator required only for Java. - new HibernateGenerationComposite(this, buildGeneratorContainer(), addSubPane(container, 10), false); + new HibernateGenerationComposite(this, buildGeneratorContainer(), addSubPane(container, 10)); } else { super.initializeGenerationCollapsibleSection(container); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMessages.java 2011-08-18 12:04:57 UTC (rev 34041) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMessages.java 2011-08-18 12:10:35 UTC (rev 34042) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008-2010 Red Hat, Inc. + * Copyright (c) 2008-2011 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, @@ -54,24 +54,18 @@ public static String TypeDefPropertyComposite_Name; - - public static String TypeDefPropertyComposite_TypeClass; - - public static String TypeDefsComposite_Description; - - public static String TypeDefsComposite_DescriptionTitle; - - public static String TypeDefsComposite_dialogTitle; - - public static String TypeDefsComposite_displayString; - - public static String TypeDefsComposite_Name; + + public static String GenericGeneratorsComposite_Description; + public static String GenericGeneratorsComposite_DescriptionTitle; + public static String GenericGeneratorsComposite_dialogTitle; + public static String GenericGeneratorsComposite_displayString; + public static String GenericGeneratorsComposite_Name; private HibernateUIMappingMessages() {} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties 2011-08-18 12:04:57 UTC (rev 34041) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties 2011-08-18 12:10:35 UTC (rev 34042) @@ -32,7 +32,12 @@ TypeDefPropertyComposite_Name=Name: TypeDefPropertyComposite_TypeClass=Type Class: TypeDefsComposite_Description=Create a new Type Definition setting 'name' -TypeDefsComposite_DescriptionTitle=Cerate New Type Definition +TypeDefsComposite_DescriptionTitle=Create New Type Definition TypeDefsComposite_dialogTitle=Add Type Definition TypeDefsComposite_displayString=<Name not set> {0} TypeDefsComposite_Name=Name: +GenericGeneratorsComposite_Description=Create a new Generic Generator 'name' +GenericGeneratorsComposite_DescriptionTitle=Cerate New Generic Generator +GenericGeneratorsComposite_dialogTitle=Add Generic Generator +GenericGeneratorsComposite_displayString=<Name not set> {0} +GenericGeneratorsComposite_Name=Name: