Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortle2012-08-18 18:13:13 -0400
committertle2012-08-18 18:13:13 -0400
commit05abb865678ead39da37fe70c9cb0fea2e89226b (patch)
treedde269e4db8c99c26aead6ad23fea415e872c970
parent99f77488734320109b1f4331aec224d1cc851488 (diff)
parentd4557ae3b638a2f4ec3f13bff4025de87fadee89 (diff)
downloadwebtools.dali-201208182202.tar.gz
webtools.dali-201208182202.tar.xz
webtools.dali-201208182202.zip
Merge branch 'master' of ssh://tle@git.eclipse.org:22/gitroot/dali/webtools.dali.gitv201208182202
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/validation/JaxbValidator.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/JpaValidator.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java3
3 files changed, 11 insertions, 4 deletions
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 1bd5690139..7edbd8e6a9 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 @@ public class JaxbValidator
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 eb01ed082f..9990a753a8 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 @@ public class JpaValidator
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 f5f12aeac9..b25c28b502 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 @@ public class JpaProjectPropertiesPage
}
private void updateConnectLinkText(String text) {
+ if (this.connectLink.isDisposed()) {
+ return;
+ }
this.connectLink.setText(text);
SWTUtil.reflow(this.connectLink.getParent());
}

Back to the top