| commit | 05abb865678ead39da37fe70c9cb0fea2e89226b | [log] [tgz] |
|---|---|---|
| author | tle <tran.le@oracle.com> | Sat Aug 18 18:13:13 2012 -0400 |
| committer | tle <tran.le@oracle.com> | Sat Aug 18 18:13:13 2012 -0400 |
| tree | dde269e4db8c99c26aead6ad23fea415e872c970 | |
| parent | 99f77488734320109b1f4331aec224d1cc851488 [diff] | |
| parent | d4557ae3b638a2f4ec3f13bff4025de87fadee89 [diff] |
Merge branch 'master' of ssh://tle@git.eclipse.org:22/gitroot/dali/webtools.dali.git
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/validation/JaxbValidator.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/validation/JaxbValidator.java index 1bd5690..7edbd8e 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/validation/JaxbValidator.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/validation/JaxbValidator.java
@@ -34,11 +34,13 @@ extends AbstractValidator implements IValidator { - public static final String RELATIVE_MARKER_ID = "problemMarker"; //$NON-NLS-1$ + public static final String RELATIVE_MARKER_ID = "jaxbProblemMarker"; //$NON-NLS-1$ /** * The identifier for the JAXB validation marker - * (value <code>"org.eclipse.jpt.jaxb.core.problemMarker"</code>). + * (value <code>"org.eclipse.jpt.jaxb.core.jaxbProblemMarker"</code>). + * <p> + * See <code>org.eclipse.jpt.jaxb.core/plugin.xml:org.eclipse.core.resources.markers</code>. */ public static final String MARKER_ID = JptJaxbCorePlugin.instance().getPluginID() + '.' + RELATIVE_MARKER_ID;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/JpaValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/JpaValidator.java index eb01ed0..9990a75 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/JpaValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/JpaValidator.java
@@ -36,11 +36,13 @@ implements IValidator { - public static final String RELATIVE_MARKER_ID = "problemMarker"; //$NON-NLS-1$ + public static final String RELATIVE_MARKER_ID = "jpaProblemMarker"; //$NON-NLS-1$ /** * The identifier for the JPA validation marker - * (value <code>"org.eclipse.jpt.jpa.core.problemMarker"</code>). + * (value <code>"org.eclipse.jpt.jpa.core.jpaProblemMarker"</code>). + * <p> + * See <code>org.eclipse.jpt.jpa.core/plugin.xml:org.eclipse.core.resources.markers</code>. */ public static final String MARKER_ID = JptJpaCorePlugin.instance().getPluginID() + '.' + RELATIVE_MARKER_ID;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java index f5f12ae..b25c28b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java
@@ -728,6 +728,9 @@ } private void updateConnectLinkText(String text) { + if (this.connectLink.isDisposed()) { + return; + } this.connectLink.setText(text); SWTUtil.reflow(this.connectLink.getParent()); }