diff options
| author | sdimov | 2011-03-02 14:59:05 +0000 |
|---|---|---|
| committer | sdimov | 2011-03-02 14:59:05 +0000 |
| commit | caac75061e06f2a0582b79bc1ff45ef64a3ae903 (patch) | |
| tree | 40b32c96b3e36e3f9c87f2c38e8593829ea71b01 /jpa_diagram_editor | |
| parent | 47fd225a4c4e78e632da0d0697adde8322ee8078 (diff) | |
| download | webtools.dali-caac75061e06f2a0582b79bc1ff45ef64a3ae903.tar.gz webtools.dali-caac75061e06f2a0582b79bc1ff45ef64a3ae903.tar.xz webtools.dali-caac75061e06f2a0582b79bc1ff45ef64a3ae903.zip | |
Fixing some non-working tests
Diffstat (limited to 'jpa_diagram_editor')
2 files changed, 8 insertions, 2 deletions
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPACheckSum.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPACheckSum.java index 88d7ca57e3..556c213970 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPACheckSum.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPACheckSum.java @@ -92,6 +92,8 @@ public class JPACheckSum { } public boolean isEntityModelChanged(Shape sh, JpaProject jpaProject) { + if (sh == null) + return true; PersistenceUnit pu = JpaArtifactFactory.instance().getPersistenceUnit(jpaProject); String name = Graphiti.getPeService().getPropertyValue(sh, JPAEditorConstants.PROP_ENTITY_CLASS_NAME); JavaPersistentType jpt = JpaArtifactFactory.instance().getJPT(name, pu); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java index 27a702421d..bfe189200f 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java @@ -2061,7 +2061,11 @@ public class JpaArtifactFactory { private JavaPersistentAttribute getAttributeFromEntity( JavaPersistentType jpt, String attributeName) { this.refreshEntityModel(null, jpt); - PersistentAttribute at = jpt.getAttributeNamed(attributeName);; + PersistentAttribute at = jpt.getAttributeNamed(attributeName); + if (at == null) { + jpt.getResourcePersistentType().synchronizeWith(jpt.getResourcePersistentType().getJavaResourceCompilationUnit().buildASTRoot()); + jpt.update(); + } int c = 0; while ((at == null) && (c < MAX_NUM_OF_ITERATIONS)) { try { @@ -2070,7 +2074,7 @@ public class JpaArtifactFactory { System.err.println("Cannot get the attribute " + //$NON-NLS-1$ attributeName + " from " + jpt.getName()); //$NON-NLS-1$ e.printStackTrace(); - } + } at = jpt.getAttributeNamed(attributeName); c++; } |