[jbosstools-commits] JBoss Tools SVN: r13060 - in trunk/hibernatetools: plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect and 5 other directories.

Author: vyemialyanchyk Date: 2009-01-15 09:37:24 -0500 (Thu, 15 Jan 2009) New Revision: 13060 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/EntityInfo.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/Utils.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizard.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/ResolveAmbiguous.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Person.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Foto.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java Log: JBIDE-3426 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java 2009-01-15 13:29:01 UTC (rev 13059) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java 2009-01-15 14:37:24 UTC (rev 13060) @@ -29,7 +29,7 @@ public static String JPAMapToolActor_message_title; public static String JPAMapToolActor_message; public static String ResolveAmbiguous_column_Class; - public static String ResolveAmbiguous_column_Association; + public static String ResolveAmbiguous_column_Property; public static String ResolveAmbiguous_column_Type; public static String ResolveAmbiguous_column_Related; public static String ResolveAmbiguous_column_Owner; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2009-01-15 13:29:01 UTC (rev 13059) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2009-01-15 14:37:24 UTC (rev 13060) @@ -33,7 +33,7 @@ JPAMapToolActor_message_title=Hibernate/JPA JPAMapToolActor_message=Cannot generate annotations for an interface or enumeration ResolveAmbiguous_column_Class=Class -ResolveAmbiguous_column_Association=Association +ResolveAmbiguous_column_Property=Property ResolveAmbiguous_column_Type=Type ResolveAmbiguous_column_Related=Related ResolveAmbiguous_column_Owner=Owner Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2009-01-15 13:29:01 UTC (rev 13059) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2009-01-15 14:37:24 UTC (rev 13060) @@ -152,8 +152,43 @@ public void updateOwner(ProcessItem pi) { if (pi.refEntityInfo.refType == RefType.ONE2ONE) { - pi.refEntityInfo.owner = OwnerType.UNDEF; - pi.refEntityInfo2.owner = OwnerType.UNDEF; + //pi.refEntityInfo.owner = OwnerType.UNDEF; + //pi.refEntityInfo2.owner = OwnerType.UNDEF; + if ((pi.refEntityInfo.owner == OwnerType.UNDEF && + pi.refEntityInfo2.owner == OwnerType.UNDEF) || + (pi.refEntityInfo.owner == OwnerType.YES && + pi.refEntityInfo2.owner == OwnerType.YES) || + (pi.refEntityInfo.owner == OwnerType.NO && + pi.refEntityInfo2.owner == OwnerType.NO)) + { + // this is the ambiguous case + // TODO: this is temporary solution for GA + // select owner in lexicographical order + if (pi.refEntityInfo.fullyQualifiedName.compareTo( + pi.refEntityInfo2.fullyQualifiedName) > 0) { + pi.refEntityInfo.owner = OwnerType.YES; + pi.refEntityInfo2.owner = OwnerType.NO; + } + else { + pi.refEntityInfo.owner = OwnerType.NO; + pi.refEntityInfo2.owner = OwnerType.YES; + } + } + else if (pi.refEntityInfo.owner == OwnerType.UNDEF || + pi.refEntityInfo2.owner == OwnerType.UNDEF) { + if (pi.refEntityInfo.owner == OwnerType.YES) { + pi.refEntityInfo2.owner = OwnerType.NO; + } + else if (pi.refEntityInfo.owner == OwnerType.NO) { + pi.refEntityInfo2.owner = OwnerType.YES; + } + else if (pi.refEntityInfo2.owner == OwnerType.YES) { + pi.refEntityInfo.owner = OwnerType.NO; + } + else if (pi.refEntityInfo2.owner == OwnerType.NO) { + pi.refEntityInfo.owner = OwnerType.YES; + } + } } else if (pi.refEntityInfo.refType == RefType.ONE2MANY) { pi.refEntityInfo.owner = OwnerType.YES; @@ -164,8 +199,43 @@ pi.refEntityInfo2.owner = OwnerType.YES; } else if (pi.refEntityInfo.refType == RefType.MANY2MANY) { - pi.refEntityInfo.owner = OwnerType.UNDEF; - pi.refEntityInfo2.owner = OwnerType.UNDEF; + //pi.refEntityInfo.owner = OwnerType.UNDEF; + //pi.refEntityInfo2.owner = OwnerType.UNDEF; + if ((pi.refEntityInfo.owner == OwnerType.UNDEF && + pi.refEntityInfo2.owner == OwnerType.UNDEF) || + (pi.refEntityInfo.owner == OwnerType.YES && + pi.refEntityInfo2.owner == OwnerType.YES) || + (pi.refEntityInfo.owner == OwnerType.NO && + pi.refEntityInfo2.owner == OwnerType.NO)) + { + // this is the ambiguous case + // TODO: this is temporary solution for GA + // select owner in lexicographical order + if (pi.refEntityInfo.fullyQualifiedName.compareTo( + pi.refEntityInfo2.fullyQualifiedName) > 0) { + pi.refEntityInfo.owner = OwnerType.YES; + pi.refEntityInfo2.owner = OwnerType.NO; + } + else { + pi.refEntityInfo.owner = OwnerType.NO; + pi.refEntityInfo2.owner = OwnerType.YES; + } + } + else if (pi.refEntityInfo.owner == OwnerType.UNDEF || + pi.refEntityInfo2.owner == OwnerType.UNDEF) { + if (pi.refEntityInfo.owner == OwnerType.YES) { + pi.refEntityInfo2.owner = OwnerType.NO; + } + else if (pi.refEntityInfo.owner == OwnerType.NO) { + pi.refEntityInfo2.owner = OwnerType.YES; + } + else if (pi.refEntityInfo2.owner == OwnerType.YES) { + pi.refEntityInfo.owner = OwnerType.NO; + } + else if (pi.refEntityInfo2.owner == OwnerType.NO) { + pi.refEntityInfo.owner = OwnerType.YES; + } + } } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/EntityInfo.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/EntityInfo.java 2009-01-15 13:29:01 UTC (rev 13059) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/EntityInfo.java 2009-01-15 14:37:24 UTC (rev 13060) @@ -354,6 +354,9 @@ rei.annotated = annotated; rei.refType = refType; rei.mappedBy = mappedBy; + if (rei.mappedBy != null) { + rei.owner = OwnerType.YES; + } rei.resolvedAnnotationName = resolvedAnnotationName; } else { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/Utils.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/Utils.java 2009-01-15 13:29:01 UTC (rev 13059) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/Utils.java 2009-01-15 14:37:24 UTC (rev 13060) @@ -24,7 +24,6 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.dom.AST; import org.eclipse.jdt.core.dom.ASTParser; -import org.hibernate.eclipse.console.HibernateConsolePlugin; /** * Compilation unit common functions @@ -103,4 +102,56 @@ return res; } + static public String refTypeToStr(RefType rt) { + if (rt == RefType.ONE2ONE) { + return "1-to-1"; //$NON-NLS-1$ + } + else if (rt == RefType.ONE2MANY) { + return "1-to-n"; //$NON-NLS-1$ + } + else if (rt == RefType.MANY2ONE) { + return "n-to-1"; //$NON-NLS-1$ + } + else if (rt == RefType.MANY2MANY) { + return "n-to-n"; //$NON-NLS-1$ + } + return "undef"; //$NON-NLS-1$ + } + + static public RefType strToRefType(String str) { + if ("1-to-1".equals(str)) { //$NON-NLS-1$ + return RefType.ONE2ONE; + } + else if ("1-to-n".equals(str)) { //$NON-NLS-1$ + return RefType.ONE2MANY; + } + else if ("n-to-1".equals(str)) { //$NON-NLS-1$ + return RefType.MANY2ONE; + } + else if ("n-to-n".equals(str)) { //$NON-NLS-1$ + return RefType.MANY2MANY; + } + return RefType.UNDEF; + } + + static public String ownerTypeToStr(OwnerType ot) { + if (ot == OwnerType.YES) { + return "yes"; //$NON-NLS-1$ + } + else if (ot == OwnerType.NO) { + return "no"; //$NON-NLS-1$ + } + return "undef"; //$NON-NLS-1$ + } + + static public OwnerType strToOwnerType(String str) { + str = str.toLowerCase(); + if ("yes".equals(str)) { //$NON-NLS-1$ + return OwnerType.YES; + } + else if ("no".equals(str)) { //$NON-NLS-1$ + return OwnerType.NO; + } + return OwnerType.UNDEF; + } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizard.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizard.java 2009-01-15 13:29:01 UTC (rev 13059) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/HibernateJPAWizard.java 2009-01-15 14:37:24 UTC (rev 13060) @@ -44,8 +44,10 @@ protected void addUserInputPages() { UserInputWizardPage page = new EntitiesList(wizard_title, data, params); addPage(page); + /** / UserInputWizardPage page2 = new ResolveAmbiguous(wizard_title, data, params); addPage(page2); + /**/ } public HibernateJPARefactoring getHibernateJPARefactoring() { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/ResolveAmbiguous.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/ResolveAmbiguous.java 2009-01-15 13:29:01 UTC (rev 13059) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/ResolveAmbiguous.java 2009-01-15 14:37:24 UTC (rev 13060) @@ -32,6 +32,7 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.hibernate.eclipse.jdt.ui.internal.JdtUiMessages; +import org.hibernate.eclipse.jdt.ui.internal.jpa.common.Utils; import org.hibernate.eclipse.jdt.ui.internal.jpa.common.EntityInfo; import org.hibernate.eclipse.jdt.ui.internal.jpa.common.OwnerType; import org.hibernate.eclipse.jdt.ui.internal.jpa.common.RefEntityInfo; @@ -50,7 +51,7 @@ protected IHibernateJPAWizardParams params; protected final int COLUMN_CLASS = 0; - protected final int COLUMN_ASSOCIATION = 1; + protected final int COLUMN_PROPERTY = 1; protected final int COLUMN_TYPE = 2; protected final int COLUMN_RELATED = 3; protected final int COLUMN_OWNER = 4; @@ -98,15 +99,15 @@ ti.setData(rei); ti.setText(COLUMN_CLASS, entry.getKey()); String shortName = getShortName(rei.fullyQualifiedName); - ti.setText(COLUMN_ASSOCIATION, shortName + " " + entryRef.getKey()); //$NON-NLS-1$ - ti.setText(COLUMN_TYPE, rei.refType.toString()); + ti.setText(COLUMN_PROPERTY, shortName + " " + entryRef.getKey()); //$NON-NLS-1$ + ti.setText(COLUMN_TYPE, Utils.refTypeToStr(rei.refType)); if (null != rei.mappedBy) { ti.setText(COLUMN_RELATED, rei.mappedBy); } else { ti.setText(COLUMN_RELATED, JdtUiMessages.ResolveAmbiguous_empty); } - ti.setText(COLUMN_OWNER, rei.owner.toString()); + ti.setText(COLUMN_OWNER, Utils.ownerTypeToStr(rei.owner)); } } // @@ -148,23 +149,13 @@ RefEntityInfo rei = (RefEntityInfo)ti.getData(); RefType oldVal = rei.refType; OwnerType oldVal2 = rei.owner; - if (str.equalsIgnoreCase(RefType.ONE2ONE.toString())) { - rei.refType = RefType.ONE2ONE; - } - else if (str.equalsIgnoreCase(RefType.ONE2MANY.toString())) { - rei.refType = RefType.ONE2MANY; + rei.refType = Utils.strToRefType(str); + if (rei.refType == RefType.ONE2MANY) { rei.owner = OwnerType.YES; } - else if (str.equalsIgnoreCase(RefType.MANY2ONE.toString())) { - rei.refType = RefType.MANY2ONE; + else if (rei.refType == RefType.MANY2ONE) { rei.owner = OwnerType.NO; } - else if (str.equalsIgnoreCase(RefType.MANY2MANY.toString())) { - rei.refType = RefType.MANY2MANY; - } - else if (str.equalsIgnoreCase(RefType.UNDEF.toString())) { - rei.refType = RefType.UNDEF; - } if (oldVal != rei.refType || oldVal2 != rei.owner) { RefEntityInfo rei2 = findMappedRefEntityInfo(rei); // firstly search @@ -211,12 +202,12 @@ Color bkgnd = table.getBackground(); comboType.setBackground(bkgnd); RefEntityInfo rei = (RefEntityInfo)item.getData(); - comboType.add(RefType.ONE2ONE.toString()); - comboType.add(RefType.ONE2MANY.toString()); - comboType.add(RefType.MANY2ONE.toString()); - comboType.add(RefType.MANY2MANY.toString()); - comboType.add(RefType.UNDEF.toString()); - comboType.setText(rei.refType.toString()); + comboType.add(Utils.refTypeToStr(RefType.ONE2ONE)); + comboType.add(Utils.refTypeToStr(RefType.ONE2MANY)); + comboType.add(Utils.refTypeToStr(RefType.MANY2ONE)); + comboType.add(Utils.refTypeToStr(RefType.MANY2MANY)); + comboType.add(Utils.refTypeToStr(RefType.UNDEF)); + comboType.setText(Utils.refTypeToStr(rei.refType)); comboType.addModifyListener(editorTypeModifyListener); //comboType.selectAll(); comboType.setFocus(); @@ -291,15 +282,7 @@ TableItem ti = editorOwner.getItem(); RefEntityInfo rei = (RefEntityInfo)ti.getData(); OwnerType oldVal = rei.owner; - if (str.equalsIgnoreCase(OwnerType.YES.toString())) { - rei.owner = OwnerType.YES; - } - else if (str.equalsIgnoreCase(OwnerType.NO.toString())) { - rei.owner = OwnerType.NO; - } - else if (str.equalsIgnoreCase(OwnerType.UNDEF.toString())) { - rei.owner = OwnerType.UNDEF; - } + rei.owner = Utils.strToOwnerType(str); if (oldVal != rei.owner) { RefEntityInfo rei2 = findMappedRefEntityInfo(rei); // firstly search @@ -364,9 +347,9 @@ comboOwner.setEditable(false); Color bkgnd = table.getBackground(); comboOwner.setBackground(bkgnd); - comboOwner.add(OwnerType.YES.toString()); - comboOwner.add(OwnerType.NO.toString()); - comboOwner.setText(rei.owner.toString()); + comboOwner.add(Utils.ownerTypeToStr(OwnerType.YES)); + comboOwner.add(Utils.ownerTypeToStr(OwnerType.NO)); + comboOwner.setText(Utils.ownerTypeToStr(rei.owner)); comboOwner.addModifyListener(editorOwnerModifyListener); editorOwner.setEditor(comboOwner, item, COLUMN_OWNER); } @@ -389,14 +372,14 @@ return; } RefEntityInfo rei = (RefEntityInfo)ti.getData(); - ti.setText(COLUMN_TYPE, rei.refType.toString()); + ti.setText(COLUMN_TYPE, Utils.refTypeToStr(rei.refType)); if (null != rei.mappedBy) { ti.setText(COLUMN_RELATED, rei.mappedBy); } else { ti.setText(COLUMN_RELATED, JdtUiMessages.ResolveAmbiguous_empty); } - ti.setText(COLUMN_OWNER, rei.owner.toString()); + ti.setText(COLUMN_OWNER, Utils.ownerTypeToStr(rei.owner)); } protected void createTableColumns(Table table) { @@ -406,17 +389,17 @@ column.setText(JdtUiMessages.ResolveAmbiguous_column_Class); column.setWidth(200); - column = new TableColumn(table, SWT.LEFT, COLUMN_ASSOCIATION); - column.setText(JdtUiMessages.ResolveAmbiguous_column_Association); - column.setWidth(100); + column = new TableColumn(table, SWT.LEFT, COLUMN_PROPERTY); + column.setText(JdtUiMessages.ResolveAmbiguous_column_Property); + column.setWidth(140); column = new TableColumn(table, SWT.LEFT, COLUMN_TYPE); column.setText(JdtUiMessages.ResolveAmbiguous_column_Type); - column.setWidth(80); + column.setWidth(60); column = new TableColumn(table, SWT.LEFT, COLUMN_RELATED); column.setText(JdtUiMessages.ResolveAmbiguous_column_Related); - column.setWidth(70); + column.setWidth(80); column = new TableColumn(table, SWT.LEFT, COLUMN_OWNER); column.setText(JdtUiMessages.ResolveAmbiguous_column_Owner); @@ -468,7 +451,7 @@ if (!ti.getText(COLUMN_CLASS).equals(rei2.fullyQualifiedName)) { continue; } - String fieldId1 = getFieldId(ti.getText(COLUMN_ASSOCIATION)); + String fieldId1 = getFieldId(ti.getText(COLUMN_PROPERTY)); String fieldId2 = ti.getText(COLUMN_RELATED); if (fieldId2.equals(rei1.mappedBy) && fieldId1.equals(rei2.mappedBy)) { tiRes = ti; Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Person.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Person.java 2009-01-15 13:29:01 UTC (rev 13059) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Person.java 2009-01-15 14:37:24 UTC (rev 13060) @@ -27,7 +27,7 @@ @OneToMany(mappedBy="documentOwner") protected Set<Document> documents; - @OneToOne(mappedBy="person") + @OneToOne() protected Foto foto; protected Set someTestSet; Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Foto.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Foto.java 2009-01-15 13:29:01 UTC (rev 13059) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Foto.java 2009-01-15 14:37:24 UTC (rev 13060) @@ -48,7 +48,7 @@ this.id = id; } - @OneToOne(mappedBy="foto") + @OneToOne() public Person getPerson() { return person; } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2009-01-15 13:29:01 UTC (rev 13059) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2009-01-15 14:37:24 UTC (rev 13060) @@ -14,7 +14,6 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.io.StringReader; import java.net.URL; import java.util.List;