Merge pull request #218 from eclipse-passage/544385/to_0_8_x_messages

Bug 544385 - [Passage] "Licensing" dialog shall show "expired" status
eclipse-passage · May 28, 2020 · 14823c0 · 14823c0
2 parents bc8239b + 77dbfc9
commit 14823c0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/...ic.equinox/src/org/eclipse/passage/lic/internal/equinox/inspector/EquinoxFeatureCase.java b/...ic.equinox/src/org/eclipse/passage/lic/internal/equinox/inspector/EquinoxFeatureCase.java
@@ -134,14 +134,14 @@ public Iterable<RestrictionVerdict> getRestrictions() {
 
 	@Override
 	public void close() {
-		query.clear();
-		requirements.clear();
-		verdicts.clear();
 		inspector.close(this);
 	}
 
 	public void reset() {
+		requirements.clear();
+		verdicts.clear();
 		failures.clear();
+		query.clear();
 		query.add(LicensingRequirement.class);
 		query.add(RestrictionVerdict.class);
 	}

diff --git a/...ipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/i18n/JFaceMessages.java b/...ipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/i18n/JFaceMessages.java
@@ -64,9 +64,9 @@ public class JFaceMessages extends NLS {
 	public static String RestrictionVerdictViewer_column_verdict;
 	public static String RestrictionVerdictViewer_column_version;
 	public static String RestrictionVerdictViewerAdapter_msg_expired;
-	public static String RestrictionVerdictViewerAdapter_msg_properly_licensed;
-	public static String RestrictionVerdictViewerAdapter_msg_no_license;
-	public static String RestrictionVerdictViewerAdapter_msg_not_yet;
+	public static String RestrictionVerdictViewerAdapter_msg_invalid_license;
+	public static String RestrictionVerdictViewerAdapter_msg_not_started;
+	public static String RestrictionVerdictViewerAdapter_msg_valid_license;
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, JFaceMessages.class);

diff --git a/...assage.lic.jface/src/org/eclipse/passage/lic/internal/jface/i18n/JFaceMessages.properties b/...assage.lic.jface/src/org/eclipse/passage/lic/internal/jface/i18n/JFaceMessages.properties
@@ -59,6 +59,6 @@ RestrictionVerdictViewer_column_status=
 RestrictionVerdictViewer_column_verdict=Verdict
 RestrictionVerdictViewer_column_version=Version
 RestrictionVerdictViewerAdapter_msg_expired=Expired
-RestrictionVerdictViewerAdapter_msg_properly_licensed=Properly licensed
-RestrictionVerdictViewerAdapter_msg_no_license=No license
-RestrictionVerdictViewerAdapter_msg_not_yet=Not yet active
+RestrictionVerdictViewerAdapter_msg_invalid_license=Invalid license
+RestrictionVerdictViewerAdapter_msg_not_started=Not started
+RestrictionVerdictViewerAdapter_msg_valid_license=Valid license
diff --git a/...e/src/org/eclipse/passage/lic/internal/jface/viewers/RestrictionVerdictViewerAdapter.java b/...e/src/org/eclipse/passage/lic/internal/jface/viewers/RestrictionVerdictViewerAdapter.java
@@ -72,13 +72,13 @@ public String getLabel(Object element, int columnIndex) {
 	private String getVerdictMessage(RestrictionVerdict verdict) {
 		int code = verdict.getRestrictionCode();
 		if (code == 0) {
-			return JFaceMessages.RestrictionVerdictViewerAdapter_msg_properly_licensed;
+			return JFaceMessages.RestrictionVerdictViewerAdapter_msg_valid_license;
 		}
 		if (code == 401) {
-			return JFaceMessages.RestrictionVerdictViewerAdapter_msg_no_license;
+			return JFaceMessages.RestrictionVerdictViewerAdapter_msg_invalid_license;
 		}
 		if (code == 416) {
-			return JFaceMessages.RestrictionVerdictViewerAdapter_msg_not_yet;
+			return JFaceMessages.RestrictionVerdictViewerAdapter_msg_not_started;
 		}
 		if (code == 417) {
 			return JFaceMessages.RestrictionVerdictViewerAdapter_msg_expired;