diff options
author | kmoore | 2008-05-06 15:37:46 +0000 |
---|---|---|
committer | kmoore | 2008-05-06 15:37:46 +0000 |
commit | a6ca799c7e7c3c02df3fe4345c499ff306fcfd7f (patch) | |
tree | d1e2fb85b3278839373c93f58d045e7e8357aefb /jpa | |
parent | 9d04d952a77e6543f1648d185d095948562cf029 (diff) | |
download | webtools.dali-a6ca799c7e7c3c02df3fe4345c499ff306fcfd7f.tar.gz webtools.dali-a6ca799c7e7c3c02df3fe4345c499ff306fcfd7f.tar.xz webtools.dali-a6ca799c7e7c3c02df3fe4345c499ff306fcfd7f.zip |
cleaned up semi-colon use on the jpa entity wizard
Diffstat (limited to 'jpa')
5 files changed, 25 insertions, 13 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_entity_wizard.properties b/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_entity_wizard.properties index ee50016493..732af19267 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_entity_wizard.properties +++ b/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_entity_wizard.properties @@ -19,28 +19,32 @@ ENTITY_PROPERTIES_DESCRIPTION=Set entity name, table name, fields, and access ty ENTITY=Entity MAPPED_AS_SUPERCLASS=Mapped Superclass INHERITANCE_GROUP=Inheritance +INHERITANCE_CHECK_BOX=Inheritance: XML_STORAGE_GROUP=XML Entity Mappings XML_SUPPORT=Add to entity mappings in XML -CHOOSE_XML=Choose XML : +CHOOSE_XML=Choose XML: MAPPING_XML_TITLE=Mapping XML XML_NAME_TITLE=XML name: CHOOSE_MAPPING_XML_MESSAGE=Choose mapping XML or create new one INCORRECT_XML_NAME=Incorrect XML name TYPE_DIALOG_TITLE=Choose Type TYPE_DIALOG_DESCRIPTION=Choose the type of the entity field. -ENTITY_NAME=Entity Name : -TABLE_NAME=Table Name : +ENTITY_NAME=Entity Name: +TABLE_NAME_GROUP=Table Name +TABLE_NAME=Table Name: USE_DEFAULT=Use default ENTITY_FIELDS=Entity Fields KEY=Key -NAME=Name -TYPE=Type +NAME_COLUMN=Name +TYPE_COLUMN=Type +NAME_TEXT_FIELD=Name: +TYPE_TEXT_FIELD=Type: BROWSE_BUTTON_LABEL=Browse... ADD_BUTTON_LABEL=Add... EDIT_BUTTON_LABEL=Edit... REMOVE_BUTTON_LABEL=Remove DUPLICATED_ENTITY_NAMES_MESSAGE=There are duplicate names on created entity fields. Please resolve the duplication. -ACCESS_TYPE=Access Type : +ACCESS_TYPE=Access Type FIELD_BASED=Field-based PROPERTY_BASED=Property-based NO_JPA_PROJECTS=No JPA projects in the workspace diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityClassWizardPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityClassWizardPage.java index e7a688c376..06a7ea6f6f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityClassWizardPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityClassWizardPage.java @@ -141,7 +141,7 @@ public class EntityClassWizardPage extends NewJavaClassWizardPage{ Group group = createGroup(parent, EntityWizardMsg.INHERITANCE_GROUP); entityButton = createRadioButton(group, EntityWizardMsg.ENTITY, IEntityDataModelProperties.ENTITY); mapedAsSuperclassButton = createRadioButton(group, EntityWizardMsg.MAPPED_AS_SUPERCLASS, IEntityDataModelProperties.MAPPED_AS_SUPERCLASS); - inheritanceButton = createCheckButton(group, GridData.HORIZONTAL_ALIGN_FILL, 1/*horizontal span*/, EntityWizardMsg.INHERITANCE_GROUP, IEntityDataModelProperties.INHERITANCE); + inheritanceButton = createCheckButton(group, GridData.HORIZONTAL_ALIGN_FILL, 1/*horizontal span*/, EntityWizardMsg.INHERITANCE_CHECK_BOX, IEntityDataModelProperties.INHERITANCE); createComboBox(group, IEntityDataModelProperties.INHERITANCE_STRATEGY); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityFieldsWizardPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityFieldsWizardPage.java index 2f6798397d..3cf301e9d0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityFieldsWizardPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityFieldsWizardPage.java @@ -51,6 +51,7 @@ public class EntityFieldsWizardPage extends DataModelWizardPage { * * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#getValidationPropertyNames() */ + @Override protected String[] getValidationPropertyNames() { return new String[]{IEntityDataModelProperties.ENTITY_FIELDS}; } @@ -58,6 +59,7 @@ public class EntityFieldsWizardPage extends DataModelWizardPage { /* Create the main composite and add to it the entity properties * @see org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite) */ + @Override protected Composite createTopLevelComposite(Composite parent) { Composite composite = new Composite(parent, SWT.NULL); composite.setLayout(new GridLayout()); @@ -68,7 +70,7 @@ public class EntityFieldsWizardPage extends DataModelWizardPage { composite.pack(); entityNameText = createNameGroup(composite, EntityWizardMsg.ENTITY_NAME, IEntityDataModelProperties.ENTITY_NAME); - Group group = createGroup(composite, EntityWizardMsg.TABLE_NAME); + Group group = createGroup(composite, EntityWizardMsg.TABLE_NAME_GROUP); tableNameCheckButton= createCheckButton(group, EntityWizardMsg.USE_DEFAULT, IEntityDataModelProperties.TABLE_NAME_DEFAULT); tableNameText = createNameGroup(group, EntityWizardMsg.TABLE_NAME, IEntityDataModelProperties.TABLE_NAME); tableNameText.setEnabled(!tableNameCheckButton.getSelection()); @@ -151,6 +153,7 @@ public class EntityFieldsWizardPage extends DataModelWizardPage { button.setLayoutData(groupGridData); button.setText(text); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { boolean isChecked = button.getSelection(); if (tableNameText != null) { @@ -185,6 +188,7 @@ public class EntityFieldsWizardPage extends DataModelWizardPage { * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModelListener#propertyChanged(java.lang.String, * java.lang.Object, java.lang.Object) */ + @Override public void propertyChanged(DataModelEvent event) { String propertyName = event.getPropertyName(); if (IEntityDataModelProperties.MAPPED_AS_SUPERCLASS.equals(propertyName)) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityRowTableWizardSection.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityRowTableWizardSection.java index f8fbb6d254..9d0a7a0ca7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityRowTableWizardSection.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityRowTableWizardSection.java @@ -93,7 +93,7 @@ public class EntityRowTableWizardSection extends Composite { private Button removeButton; private String title = EntityWizardMsg.ENTITY_FIELDS; private String[] labelsForCombo = VALID_TYPES; - private String[] labelsForText = new String[]{EntityWizardMsg.TYPE, EntityWizardMsg.NAME}; + private String[] labelsForText = new String[]{EntityWizardMsg.TYPE_TEXT_FIELD, EntityWizardMsg.NAME_TEXT_FIELD}; private IDataModel model; private String propertyName; private Image labelProviderImage = null; @@ -200,10 +200,10 @@ public class EntityRowTableWizardSection extends Composite { pkColumn.setResizable(false); TableColumn nameColumn = new TableColumn(mTableWidget, SWT.NONE); - nameColumn.setText(EntityWizardMsg.NAME); + nameColumn.setText(EntityWizardMsg.NAME_COLUMN); TableColumn typeColumn = new TableColumn(mTableWidget, SWT.NONE); - typeColumn.setText(EntityWizardMsg.TYPE); + typeColumn.setText(EntityWizardMsg.TYPE_COLUMN); this.addControlListener(new ControlAdapter() { @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityWizardMsg.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityWizardMsg.java index be6c460d86..7fe698b5b5 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityWizardMsg.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityWizardMsg.java @@ -31,6 +31,7 @@ public class EntityWizardMsg extends NLS { public static String ENTITY; public static String MAPPED_AS_SUPERCLASS; public static String INHERITANCE_GROUP; + public static String INHERITANCE_CHECK_BOX; public static String XML_STORAGE_GROUP; public static String XML_SUPPORT; public static String CHOOSE_XML; @@ -42,11 +43,14 @@ public class EntityWizardMsg extends NLS { public static String TYPE_DIALOG_DESCRIPTION; public static String ENTITY_NAME; public static String TABLE_NAME; + public static String TABLE_NAME_GROUP; public static String USE_DEFAULT; public static String ENTITY_FIELDS; public static String KEY; - public static String NAME; - public static String TYPE; + public static String NAME_COLUMN; + public static String TYPE_COLUMN; + public static String NAME_TEXT_FIELD; + public static String TYPE_TEXT_FIELD; public static String BROWSE_BUTTON_LABEL; public static String ADD_BUTTON_LABEL; public static String EDIT_BUTTON_LABEL; |