Fix most warnings in e4-tools

eclipse-pde · Aug 1, 2024 · 6a14115 · 6a14115
1 parent 0c5461a
commit 6a14115
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 53 deletions.
diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -28,18 +28,4 @@
     <skipAPIAnalysis>true</skipAPIAnalysis> <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=548572 -->
   </properties>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-compiler-plugin</artifactId>
-        <configuration>
-          <compilerArgs>
-            <arg>-warn:-raw,unchecked</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
-    </plugins>
- </build>
-
 </project>
diff --git a/...rg/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java b/...rg/eclipse/e4/tools/emf/ui/internal/common/properties/ProjectOSGiTranslationProvider.java
@@ -4,9 +4,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.List;
 import java.util.Locale;
 import java.util.PropertyResourceBundle;
@@ -248,7 +245,6 @@ class ProjectResourceBundleControl extends ResourceBundle.Control {
 			this.useFallback = useFallback;
 		}
 
-		@SuppressWarnings("resource")
 		@Override
 		public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader,
 				boolean reload) throws IllegalAccessException, InstantiationException, IOException {
@@ -257,18 +253,8 @@ public ResourceBundle newBundle(String baseName, Locale locale, String format, C
 			ResourceBundle bundle = null;
 			if (format.equals("java.properties")) { //$NON-NLS-1$
 				final String resourceName = toResourceName(bundleName, "properties"); //$NON-NLS-1$
-				InputStream stream = null;
-				try {
-					stream = AccessController.doPrivileged((PrivilegedExceptionAction<InputStream>) () -> getResourceAsStream(resourceName));
-				} catch (final PrivilegedActionException e) {
-					throw (IOException) e.getException();
-				}
-				if (stream != null) {
-					try {
-						bundle = new PropertyResourceBundle(stream);
-					} finally {
-						stream.close();
-					}
+				try (InputStream stream = getResourceAsStream(resourceName);) {
+					bundle = new PropertyResourceBundle(stream);
 				}
 			} else {
 				throw new IllegalArgumentException("unknown format: " + format); //$NON-NLS-1$

diff --git a/...src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/...src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
@@ -28,8 +28,8 @@
 import org.eclipse.jdt.internal.ui.text.java.AbstractTemplateCompletionProposalComputer;
 import org.eclipse.jdt.internal.ui.text.template.contentassist.TemplateEngine;
 import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
 import org.eclipse.jface.text.templates.TemplateContextType;
+import org.eclipse.text.templates.ContextTypeRegistry;
 
 /**
  * Computer that computes the template proposals for the E4 context type.

diff --git a/...clipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java b/...clipse.e4.tools.services/src/org/eclipse/e4/tools/services/impl/ResourceBundleHelper.java
@@ -17,9 +17,6 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.List;
 import java.util.Locale;
 import java.util.MissingResourceException;
@@ -396,28 +393,21 @@ public ResourceBundle newBundle(String baseName, Locale locale,
 			ResourceBundle bundle = null;
 			if (format.equals("java.properties")) { //$NON-NLS-1$
 				final String resourceName = toResourceName(bundleName, "properties"); //$NON-NLS-1$
-				PrivilegedExceptionAction<InputStream> action = (PrivilegedExceptionAction<InputStream>) () -> {
-					URL url = osgiBundle.getEntry(resourceName);
-					if (url != null) {
-						URLConnection connection = url.openConnection();
-						if (connection != null) {
-							// Disable caches to get fresh data for
-							// reloading.
-							connection.setUseCaches(false);
-							return connection.getInputStream();
+				URL url = osgiBundle.getEntry(resourceName);
+				if (url != null) {
+					URLConnection connection = url.openConnection();
+					if (connection != null) {
+						// Disable caches to get fresh data for
+						// reloading.
+						connection.setUseCaches(false);
+						try (InputStream stream = connection.getInputStream()) {
+							if (stream != null) {
+								bundle = new PropertyResourceBundle(stream);
+							}
 						}
 					}
-					return null;
-				};
-				try (InputStream stream = AccessController.doPrivileged(action)) {
-					if (stream != null) {
-						bundle = new PropertyResourceBundle(stream);
-					}
-				} catch (final PrivilegedActionException e) {
-					throw (IOException) e.getException();
 				}
-			}
-			else {
+			} else {
 				throw new IllegalArgumentException("unknown format: " + format); //$NON-NLS-1$
 			}
 			return bundle;