Bug 535883 - Remove duplicated messages in markermessages.properties
Change-Id: Ie282f70d56d138744c5f13558551206daab3e924
Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/MarkerMessages.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/MarkerMessages.java
index 0be9242..748b042 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/MarkerMessages.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/MarkerMessages.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2017 IBM Corporation and others.
+ * Copyright (c) 2008, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -62,17 +62,10 @@
public static String RemoveUnsupportedAnnotationOperation_remove_unsupported_annotations;
public static String RemoveUnsupportedTagOperation_removeing_unsupported_tag;
- public static String SinceTagResolution_missing0;
- public static String SinceTagResolution_missing1;
- public static String SinceTagResolution_missing2;
+ public static String SinceTagResolution_add_since_tag;
- public static String SinceTagResolution_malformed0;
- public static String SinceTagResolution_malformed1;
- public static String SinceTagResolution_malformed2;
- public static String SinceTagResolution_invalid0;
- public static String SinceTagResolution_invalid1;
- public static String SinceTagResolution_invalid2;
+ public static String SinceTagResolution_change_since_tag;
public static String UnknownAnnotationResolution_0;
public static String UnknownAnnotationResolution_1;
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/SinceTagResolution.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/SinceTagResolution.java
index 5f366f3..5280b84 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/SinceTagResolution.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/SinceTagResolution.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 IBM Corporation and others.
+ * Copyright (c) 2008, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -42,11 +42,11 @@
@Override
public String getDescription() {
if (IApiProblem.SINCE_TAG_INVALID == this.kind) {
- return NLS.bind(MarkerMessages.SinceTagResolution_invalid0, this.newVersionValue);
+ return NLS.bind(MarkerMessages.SinceTagResolution_change_since_tag, this.newVersionValue);
} else if (IApiProblem.SINCE_TAG_MALFORMED == this.kind) {
- return NLS.bind(MarkerMessages.SinceTagResolution_malformed0, this.newVersionValue);
+ return NLS.bind(MarkerMessages.SinceTagResolution_change_since_tag, this.newVersionValue);
} else {
- return NLS.bind(MarkerMessages.SinceTagResolution_missing0, this.newVersionValue);
+ return NLS.bind(MarkerMessages.SinceTagResolution_add_since_tag, this.newVersionValue);
}
}
@@ -58,11 +58,11 @@
@Override
public String getLabel() {
if (IApiProblem.SINCE_TAG_INVALID == this.kind) {
- return NLS.bind(MarkerMessages.SinceTagResolution_invalid1, this.newVersionValue);
+ return NLS.bind(MarkerMessages.SinceTagResolution_change_since_tag, this.newVersionValue);
} else if (IApiProblem.SINCE_TAG_MALFORMED == this.kind) {
- return NLS.bind(MarkerMessages.SinceTagResolution_malformed1, this.newVersionValue);
+ return NLS.bind(MarkerMessages.SinceTagResolution_change_since_tag, this.newVersionValue);
} else {
- return NLS.bind(MarkerMessages.SinceTagResolution_missing1, this.newVersionValue);
+ return NLS.bind(MarkerMessages.SinceTagResolution_add_since_tag, this.newVersionValue);
}
}
@@ -70,11 +70,11 @@
public void run(final IMarker marker) {
String title = null;
if (IApiProblem.SINCE_TAG_INVALID == this.kind) {
- title = NLS.bind(MarkerMessages.SinceTagResolution_invalid2, this.newVersionValue);
+ title = NLS.bind(MarkerMessages.SinceTagResolution_change_since_tag, this.newVersionValue);
} else if (IApiProblem.SINCE_TAG_MALFORMED == this.kind) {
- title = NLS.bind(MarkerMessages.SinceTagResolution_malformed2, this.newVersionValue);
+ title = NLS.bind(MarkerMessages.SinceTagResolution_change_since_tag, this.newVersionValue);
} else {
- title = NLS.bind(MarkerMessages.SinceTagResolution_missing2, this.newVersionValue);
+ title = NLS.bind(MarkerMessages.SinceTagResolution_add_since_tag, this.newVersionValue);
}
UIJob job = new UIJob(title) {
@Override
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/markermessages.properties b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/markermessages.properties
index 9b60599..9b6f235 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/markermessages.properties
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/markermessages.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2008, 2017 IBM Corporation and others.
+# Copyright (c) 2008, 2018 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -53,15 +53,8 @@
RemoveFilterProblemResolution_removes_selected_problem_filter=Removes the unused API problem filter for: {0}
RemoveUnsupportedAnnotationOperation_remove_unsupported_annotations=Remove unsupported annotations
RemoveUnsupportedTagOperation_removeing_unsupported_tag=Removing Unsupported API Javadoc tag
-SinceTagResolution_missing0=Add the missing @since tag with version {0}
-SinceTagResolution_missing1=Add the missing @since tag with version {0}
-SinceTagResolution_missing2=Add the missing @since tag with version {0}
-SinceTagResolution_malformed0=Change @since tag value to be {0}
-SinceTagResolution_malformed1=Change @since tag value to be {0}
-SinceTagResolution_malformed2=Change @since tag value to be {0}
-SinceTagResolution_invalid0=Change @since tag value to be {0}
-SinceTagResolution_invalid1=Change @since tag value to be {0}
-SinceTagResolution_invalid2=Change @since tag value to be {0}
+SinceTagResolution_add_since_tag=Add the missing @since tag with version {0}
+SinceTagResolution_change_since_tag=Change @since tag value to be {0}
UnknownAnnotationResolution_0=Corrects missing imports and adds a build-time reference to API Tools annotations on the build path so that they are visible at compile time, but avoids a bundle dependency on 'org.eclipse.pde.api.tools.annotations' at run time.<br><br>Adds this entry to 'build.properties':<br><code>additional.bundles = org.eclipse.pde.api.tools.annotations</code>
UnknownAnnotationResolution_1=Fix project setup and import {0} ({1})
UnknownAnnotationResolution_2=Update the build.properties file
