Merge pull request Unidata#1 from srcarter3/levelsMerge

Levels merge
srcarter3 · Oct 28, 2022 · d676c9a · d676c9a
2 parents 1e03c2d + 87cfa99
commit d676c9a
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 428 deletions.
diff --git a/common/com.raytheon.uf.common.localization/.classpath b/common/com.raytheon.uf.common.localization/.classpath
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="resources/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/common/com.raytheon.uf.common.localization/META-INF/MANIFEST.MF b/common/com.raytheon.uf.common.localization/META-INF/MANIFEST.MF
@@ -19,8 +19,6 @@ Export-Package: com.raytheon.uf.common.localization,
  com.raytheon.uf.common.localization.filter,
  com.raytheon.uf.common.localization.msgs,
  com.raytheon.uf.common.localization.overrides,
- com.raytheon.uf.common.localization.region,
  com.raytheon.uf.common.localization.stream
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-ClassPath: resources/,
- .
+Bundle-ClassPath: .
diff --git a/common/com.raytheon.uf.common.localization/build.properties b/common/com.raytheon.uf.common.localization/build.properties
@@ -1,5 +1,4 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               resources/
+               .
diff --git a/common/com.raytheon.uf.common.localization/resources/regions.xml b/common/com.raytheon.uf.common.localization/resources/regions.xml
diff --git a/...n.uf.common.localization/src/com/raytheon/uf/common/localization/LocalizationContext.java b/...n.uf.common.localization/src/com/raytheon/uf/common/localization/LocalizationContext.java
@@ -66,6 +66,7 @@
  * Feb 06, 2014 2761       mnash       Add region localization level
  * Aug 08, 2016 5744       mapeters    Deprecate LocalizationType.EDEX_STATIC
  * Feb 21, 2017 3440       njensen     Safely synchronize on LocalizationLevel.typeMap
+ * Oct 24, 2022          srcarter@ucar Remove REGION and WORKSTATION levels
  * 
  * </pre>
  * 
@@ -256,18 +257,12 @@ public int compare(LocalizationLevel o1, LocalizationLevel o2) {
         public static final LocalizationLevel BASE = createLevel("BASE", 0,
                 true);
 
-        public static final LocalizationLevel REGION = createLevel("REGION",
-                150);
-
         public static final LocalizationLevel CONFIGURED = createLevel(
                 "CONFIGURED",
                 250, true);
 
         public static final LocalizationLevel SITE = createLevel("SITE", 500);
 
-        public static final LocalizationLevel WORKSTATION = createLevel(
-                "WORKSTATION", 750);
-
         public static final LocalizationLevel USER = createLevel("USER", 1000);
 
         static {

diff --git a/...n.uf.common.localization/src/com/raytheon/uf/common/localization/region/RegionLookup.java b/...n.uf.common.localization/src/com/raytheon/uf/common/localization/region/RegionLookup.java