Author: DartPeng Date: 2009-04-14 02:32:09 -0400 (Tue, 14 Apr 2009) New Revision: 14722 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java Log: JBIDE-4171 Modify UI codes Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.properties 2009-04-14 06:27:09 UTC (rev 14721) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.properties 2009-04-14 06:32:09 UTC (rev 14722) @@ -66,6 +66,7 @@ _UI_FileConflict_label = File Conflict _WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor. Do you wish to discard this editor's changes? +# For FreeMarker _UI_FreemarkerEditor_menu = &Freemarker Editor _UI_SmooksEditor_menu = &Smooks Editor _UI_FreemarkerModelWizard_label = Freemarker Model @@ -73,11 +74,14 @@ _UI_FreemarkerEditor_label = Freemarker Model Editor _UI_FreemarkerEditorFilenameDefaultBase = My _UI_FreemarkerEditorFilenameExtensions = freemarker + _UI_SmooksModelWizard_label = Smooks Model _UI_SmooksModelWizard_description = Create a new Smooks model _UI_SmooksEditor_label = Smooks Model Editor _UI_SmooksEditorFilenameDefaultBase = My _UI_SmooksEditorFilenameExtensions = smooks + +# For Javabean _UI_JavabeanEditor_menu = &Javabean Editor _UI_JavabeanModelWizard_label = Javabean Model _UI_JavabeanModelWizard_description = Create a new Javabean model Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-04-14 06:27:09 UTC (rev 14721) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-04-14 06:32:09 UTC (rev 14722) @@ -61,15 +61,20 @@ import org.jboss.tools.smooks.configuration.SmooksConstants; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.configuration.wizards.SmooksConfigurationFileNewWizard; -import org.jboss.tools.smooks.edit.common.provider.CommonItemProviderAdapterFactory; -import org.jboss.tools.smooks.edit.edi.provider.EdiItemProviderAdapterFactory; -import org.jboss.tools.smooks.edit.fileRouting.provider.FileRoutingItemProviderAdapterFactory; -import org.jboss.tools.smooks.edit.freemarker.provider.FreemarkerItemProviderAdapterFactory; -import org.jboss.tools.smooks.edit.groovy.provider.GroovyItemProviderAdapterFactory; -import org.jboss.tools.smooks.edit.javabean.provider.JavabeanItemProviderAdapterFactory; -import org.jboss.tools.smooks.edit.smooks.provider.SmooksItemProviderAdapterFactory; -import org.jboss.tools.smooks.edit.xsl.provider.XslItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.common.provider.CommonItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.csv.provider.CsvItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.dbrouting.provider.DbroutingItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.edi.provider.EdiItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.fileRouting.provider.FileRoutingItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.freemarker.provider.FreemarkerItemProviderAdapterFactory; import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; +import org.jboss.tools.smooks.model.groovy.provider.GroovyItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.iorouting.provider.IoroutingItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.javabean.provider.JavabeanItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.jmsrouting.provider.JmsroutingItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.json.provider.JsonItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.smooks.provider.SmooksItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.xsl.provider.XslItemProviderAdapterFactory; import org.jboss.tools.smooks10.model.smooks.util.SmooksResourceFactoryImpl; /** @@ -175,6 +180,11 @@ adapterFactory.addAdapterFactory(new CommonItemProviderAdapterFactory()); adapterFactory.addAdapterFactory(new SmooksItemProviderAdapterFactory()); adapterFactory.addAdapterFactory(new EdiItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new IoroutingItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new JsonItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new JmsroutingItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new DbroutingItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new CsvItemProviderAdapterFactory()); adapterFactory.addAdapterFactory(new GroovyItemProviderAdapterFactory()); adapterFactory.addAdapterFactory(new FileRoutingItemProviderAdapterFactory()); adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java 2009-04-14 06:27:09 UTC (rev 14721) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java 2009-04-14 06:32:09 UTC (rev 14722) @@ -112,7 +112,7 @@ EAttribute feature = (EAttribute) itemPropertyDescriptor.getFeature(getModel()); boolean createDefault = true; if (creator != null) { - if(creator.ignoreProperty(feature)){ + if (creator.ignoreProperty(feature)) { continue; } Composite composite = creator.createPropertyUI(formToolkit, detailsComposite, @@ -123,21 +123,32 @@ } if (createDefault) { EClassifier typeClazz = feature.getEType(); + boolean hasCreated = false; if (typeClazz instanceof EEnum) { - createEnumFieldEditor(detailsComposite, (EEnum) typeClazz, formToolkit, + createEnumFieldEditor(detailsComposite, feature, (EEnum) typeClazz, formToolkit, itemPropertyDescriptor); + hasCreated = true; } if (typeClazz.getInstanceClass() == String.class) { - createStringFieldEditor(detailsComposite, formToolkit, itemPropertyDescriptor); + createStringFieldEditor(detailsComposite, feature, formToolkit, + itemPropertyDescriptor); } if (typeClazz.getInstanceClass() == Boolean.class || typeClazz.getInstanceClass() == boolean.class) { - createBooleanFieldEditor(detailsComposite, formToolkit, itemPropertyDescriptor); + createBooleanFieldEditor(detailsComposite, feature, formToolkit, + itemPropertyDescriptor); + hasCreated = true; } if (typeClazz.getInstanceClass() == Integer.class || typeClazz.getInstanceClass() == int.class) { - createIntegerFieldEditor(detailsComposite, formToolkit, itemPropertyDescriptor); + createIntegerFieldEditor(detailsComposite, feature, formToolkit, + itemPropertyDescriptor); + hasCreated = true; } +// if (!hasCreated) { +// createStringFieldEditor(detailsComposite, feature, formToolkit, +// itemPropertyDescriptor); +// } } } if (creator != null) { @@ -152,9 +163,13 @@ } } - protected void createEnumFieldEditor(Composite propertyComposite, final EEnum typeClass, - FormToolkit formToolKit, final IItemPropertyDescriptor itemPropertyDescriptor) { + protected void createEnumFieldEditor(Composite propertyComposite, EAttribute feature, + final EEnum typeClass, FormToolkit formToolKit, + final IItemPropertyDescriptor itemPropertyDescriptor) { String displayName = itemPropertyDescriptor.getDisplayName(getModel()); + if (feature.isRequired()) { + displayName = "*" + displayName; + } formToolKit.createLabel(propertyComposite, displayName + " :"); final CCombo combo = new CCombo(propertyComposite, SWT.NONE); List<EEnumLiteral> literalList = typeClass.getELiterals(); @@ -206,9 +221,12 @@ combo.setLayoutData(gd); } - protected void createBooleanFieldEditor(final Composite propertyComposite, FormToolkit formToolkit, - final IItemPropertyDescriptor itemPropertyDescriptor) { + protected void createBooleanFieldEditor(final Composite propertyComposite, EAttribute feature, + FormToolkit formToolkit, final IItemPropertyDescriptor itemPropertyDescriptor) { String displayName = itemPropertyDescriptor.getDisplayName(getModel()); + if (feature.isRequired()) { + displayName = "*" + displayName; + } Object value = itemPropertyDescriptor.getPropertyValue(getModel()); final Button checkButton = formToolkit.createButton(propertyComposite, displayName, SWT.CHECK); GridData gd = new GridData(GridData.FILL_HORIZONTAL); @@ -227,9 +245,12 @@ }); } - protected void createStringFieldEditor(final Composite propertyComposite, FormToolkit formToolKit, - final IItemPropertyDescriptor itemPropertyDescriptor) { + protected void createStringFieldEditor(final Composite propertyComposite, EAttribute feature, + FormToolkit formToolKit, final IItemPropertyDescriptor itemPropertyDescriptor) { String displayName = itemPropertyDescriptor.getDisplayName(getModel()); + if (feature.isRequired()) { + displayName = "*" + displayName; + } formToolKit.createLabel(propertyComposite, displayName + " :"); final Text text = formToolKit.createText(propertyComposite, "", SWT.NONE); Object value = itemPropertyDescriptor.getPropertyValue(getModel()); @@ -259,9 +280,12 @@ text.setLayoutData(gd); } - protected void createIntegerFieldEditor(final Composite propertyComposite, FormToolkit formToolKit, - final IItemPropertyDescriptor itemPropertyDescriptor) { + protected void createIntegerFieldEditor(final Composite propertyComposite, EAttribute feature, + FormToolkit formToolKit, final IItemPropertyDescriptor itemPropertyDescriptor) { String displayName = itemPropertyDescriptor.getDisplayName(getModel()); + if (feature.isRequired()) { + displayName = "*" + displayName; + } formToolKit.createLabel(propertyComposite, displayName + " :"); final Spinner spinner = new Spinner(propertyComposite, SWT.BORDER); Object value = itemPropertyDescriptor.getPropertyValue(getModel());