Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2002-09-27 14:53:21 +0000
committerAndre Weinand2002-09-27 14:53:21 +0000
commitedb4efcfd050948496e741d49ab93fac1bf06561 (patch)
tree366389a173a95c19761932d917c219d25eb1b521
parentef7b4fdbda33d511f09f67f8e2f6d5312b980b51 (diff)
downloadeclipse.platform.team-edb4efcfd050948496e741d49ab93fac1bf06561.tar.gz
eclipse.platform.team-edb4efcfd050948496e741d49ab93fac1bf06561.tar.xz
eclipse.platform.team-edb4efcfd050948496e741d49ab93fac1bf06561.zip
fixed #24021
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java2
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java4
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java4
4 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
index c52da8b58..cd8bc44d1 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
@@ -178,7 +178,7 @@ public class TimeoutContext {
fProgressIndicator= new ProgressIndicator(c);
gd= new GridData();
gd.heightHint= 15;
- gd.horizontalAlignment= gd.FILL;
+ gd.horizontalAlignment= GridData.FILL;
gd.grabExcessHorizontalSpace= true;
gd.horizontalSpan= 2;
fProgressIndicator.setLayoutData(gd);
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
index 9fe7f3752..19d7fbd32 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
@@ -807,8 +807,8 @@ public class Patcher {
store(getRejected(failed), file, pm);
try {
IMarker marker= file.createMarker(MARKER_TYPE);
- marker.setAttribute(marker.MESSAGE, PatchMessages.getString("Patcher.Marker.message")); //$NON-NLS-1$
- marker.setAttribute(marker.PRIORITY, IMarker.PRIORITY_HIGH);
+ marker.setAttribute(IMarker.MESSAGE, PatchMessages.getString("Patcher.Marker.message")); //$NON-NLS-1$
+ marker.setAttribute(IMarker.PRIORITY, IMarker.PRIORITY_HIGH);
} catch (CoreException ex) {
}
}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
index c52da8b58..cd8bc44d1 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
@@ -178,7 +178,7 @@ public class TimeoutContext {
fProgressIndicator= new ProgressIndicator(c);
gd= new GridData();
gd.heightHint= 15;
- gd.horizontalAlignment= gd.FILL;
+ gd.horizontalAlignment= GridData.FILL;
gd.grabExcessHorizontalSpace= true;
gd.horizontalSpan= 2;
fProgressIndicator.setLayoutData(gd);
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
index 9fe7f3752..19d7fbd32 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
@@ -807,8 +807,8 @@ public class Patcher {
store(getRejected(failed), file, pm);
try {
IMarker marker= file.createMarker(MARKER_TYPE);
- marker.setAttribute(marker.MESSAGE, PatchMessages.getString("Patcher.Marker.message")); //$NON-NLS-1$
- marker.setAttribute(marker.PRIORITY, IMarker.PRIORITY_HIGH);
+ marker.setAttribute(IMarker.MESSAGE, PatchMessages.getString("Patcher.Marker.message")); //$NON-NLS-1$
+ marker.setAttribute(IMarker.PRIORITY, IMarker.PRIORITY_HIGH);
} catch (CoreException ex) {
}
}

Back to the top