diff --git a/enterprise/performance.scripting/test/qa-functional/src/org/netbeans/performance/languages/actions/CountingSecurityManager.java b/enterprise/performance.scripting/test/qa-functional/src/org/netbeans/performance/languages/actions/CountingSecurityManager.java index 652cc2fdb83c..b9f6b674f2c6 100644 --- a/enterprise/performance.scripting/test/qa-functional/src/org/netbeans/performance/languages/actions/CountingSecurityManager.java +++ b/enterprise/performance.scripting/test/qa-functional/src/org/netbeans/performance/languages/actions/CountingSecurityManager.java @@ -51,11 +51,10 @@ public static void register() { public static void initialize(String prefix) { Assert.assertNotNull(prefix); - if (! (System.getSecurityManager() instanceof CountingSecurityManager)) { - setAllowedReplace(true); - System.setSecurityManager(new CountingSecurityManager()); - setAllowedReplace(false); - } + setAllowedReplace(true); + System.setSecurityManager(new CountingSecurityManager()); + setAllowedReplace(false); + if (!System.getSecurityManager().getClass().getName().equals(CountingSecurityManager.class.getName())) { throw new IllegalStateException("Wrong security manager: " + System.getSecurityManager()); } diff --git a/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java b/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java index 45b65e53bbb3..361eb697babd 100755 --- a/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java +++ b/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java @@ -90,11 +90,7 @@ public enum Mode { public static void initialize(String prefix, Mode mode, Set allowedFiles) { System.setProperty("counting.security.disabled", "true"); - if (System.getSecurityManager() instanceof CountingSecurityManager) { - // ok - } else { - System.setSecurityManager(new CountingSecurityManager()); - } + System.setSecurityManager(new CountingSecurityManager()); setCnt(0); msgs = new StringWriter(); pw = new PrintWriter(msgs); @@ -113,7 +109,6 @@ public static void initialize(String prefix, Mode mode, Set allowedFiles static void assertReflection(int maxCount, String whitelist) { System.setProperty("counting.reflection.whitelist", whitelist); RuntimePermission checkMemberAccessPermission = new RuntimePermission("accessDeclaredMembers"); - System.getSecurityManager().checkPermission(checkMemberAccessPermission); System.getProperties().remove("counting.reflection.whitelist"); } @@ -127,7 +122,7 @@ public Integer call() throws Exception { } public static boolean isEnabled() { - return System.getSecurityManager() instanceof Callable; + return false; } public static void assertCounts(String msg, int expectedCnt) throws Exception { diff --git a/ide/projectui/src/org/netbeans/modules/project/ui/groups/CheckBoxRenderrer.java b/ide/projectui/src/org/netbeans/modules/project/ui/groups/CheckBoxRenderrer.java index d0628fd4d406..6a1750ab5233 100644 --- a/ide/projectui/src/org/netbeans/modules/project/ui/groups/CheckBoxRenderrer.java +++ b/ide/projectui/src/org/netbeans/modules/project/ui/groups/CheckBoxRenderrer.java @@ -49,19 +49,11 @@ public CheckBoxRenderrer () { private Border getNoFocusBorder () { Border border = UIManager.getBorder("List.cellNoFocusBorder"); - if (System.getSecurityManager () != null) { - if (border != null) { - return border; - } - return SAFE_NO_FOCUS_BORDER; - } else { - if (border != null && - (noFocusBorder == null || - noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) { - return border; - } - return noFocusBorder; + if (border != null && + (noFocusBorder == null || noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) { + return border; } + return noFocusBorder; } public Component getListCellRendererComponent ( diff --git a/ide/spellchecker/src/org/netbeans/modules/spellchecker/options/CheckBoxRenderrer.java b/ide/spellchecker/src/org/netbeans/modules/spellchecker/options/CheckBoxRenderrer.java index 02f7706a8c34..5a434e2987b4 100644 --- a/ide/spellchecker/src/org/netbeans/modules/spellchecker/options/CheckBoxRenderrer.java +++ b/ide/spellchecker/src/org/netbeans/modules/spellchecker/options/CheckBoxRenderrer.java @@ -49,19 +49,11 @@ public CheckBoxRenderrer () { private Border getNoFocusBorder () { Border border = UIManager.getBorder("List.cellNoFocusBorder"); - if (System.getSecurityManager () != null) { - if (border != null) { - return border; - } - return SAFE_NO_FOCUS_BORDER; - } else { - if (border != null && - (noFocusBorder == null || - noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) { - return border; - } - return noFocusBorder; + if (border != null && + (noFocusBorder == null || noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) { + return border; } + return noFocusBorder; } public Component getListCellRendererComponent ( diff --git a/ide/versioning/test/unit/src/org/netbeans/modules/versioning/GetOwnerTest.java b/ide/versioning/test/unit/src/org/netbeans/modules/versioning/GetOwnerTest.java index 7b4642306228..ba531213ac0e 100644 --- a/ide/versioning/test/unit/src/org/netbeans/modules/versioning/GetOwnerTest.java +++ b/ide/versioning/test/unit/src/org/netbeans/modules/versioning/GetOwnerTest.java @@ -37,7 +37,6 @@ public class GetOwnerTest extends NbTestCase { protected File dataRootDir; private StatFiles accessMonitor; - private SecurityManager defaultSecurityManager; protected File versionedFolder; protected File unversionedFolder; @@ -69,9 +68,6 @@ protected void setUp() throws Exception { userdir.mkdirs(); System.setProperty("netbeans.user", userdir.getAbsolutePath()); if(accessMonitor != null) { - if(defaultSecurityManager == null) { - defaultSecurityManager = System.getSecurityManager(); - } System.setSecurityManager(accessMonitor); } } @@ -80,7 +76,8 @@ protected void setUp() throws Exception { protected void tearDown() throws Exception { super.tearDown(); if(accessMonitor != null) { - System.setSecurityManager(defaultSecurityManager); + // FIXME - throws UnsupportedOperationException unconditionally, regardless of arg. + System.setSecurityManager(null); } } diff --git a/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyserCellRenderer.java b/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyserCellRenderer.java index 44d0641fafc6..4b0eb5a52afa 100644 --- a/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyserCellRenderer.java +++ b/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyserCellRenderer.java @@ -42,17 +42,11 @@ public AnalyserCellRenderer () { private Border getNoFocusBorder() { Border border = UIManager.getBorder("List.cellNoFocusBorder"); - if (System.getSecurityManager() != null) { - if (border != null) return border; - return SAFE_NO_FOCUS_BORDER; - } else { - if (border != null && - (noFocusBorder == null || - noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) { - return border; - } - return noFocusBorder; + if (border != null && + (noFocusBorder == null || noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) { + return border; } + return noFocusBorder; } diff --git a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TreePathHandleTest.java b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TreePathHandleTest.java index 950c9fa6afcf..987de39fd3c3 100644 --- a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TreePathHandleTest.java +++ b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TreePathHandleTest.java @@ -184,13 +184,12 @@ public void run(CompilationController parameter) throws Exception { TypeElement string = parameter.getElements().getTypeElement("test.test2"); - SecurityManager old = System.getSecurityManager(); - System.setSecurityManager(new SecMan()); TreePathHandle.create(string, parameter); - - System.setSecurityManager(old); + + // FIXME - throws UnsupportedOperationException unconditionally, regardless of arg. + System.setSecurityManager(null); } }, true); } diff --git a/java/performance.java/test/qa-functional/src/org/netbeans/performance/j2se/actions/CountingSecurityManager.java b/java/performance.java/test/qa-functional/src/org/netbeans/performance/j2se/actions/CountingSecurityManager.java index 64a04837c34d..2bd2017d2ae4 100644 --- a/java/performance.java/test/qa-functional/src/org/netbeans/performance/j2se/actions/CountingSecurityManager.java +++ b/java/performance.java/test/qa-functional/src/org/netbeans/performance/j2se/actions/CountingSecurityManager.java @@ -50,14 +50,10 @@ public static void register() { public static void initialize(String prefix) { Assert.assertNotNull(prefix); - if (! (System.getSecurityManager() instanceof CountingSecurityManager)) { - setAllowedReplace(true); - System.setSecurityManager(new CountingSecurityManager()); - setAllowedReplace(false); - } - if (!System.getSecurityManager().getClass().getName().equals(CountingSecurityManager.class.getName())) { - throw new IllegalStateException("Wrong security manager: " + System.getSecurityManager()); - } + setAllowedReplace(true); + System.setSecurityManager(new CountingSecurityManager()); + setAllowedReplace(false); + cnt = 0; msgs = new StringWriter(); pw = new PrintWriter(msgs); diff --git a/java/performance/test/qa-functional/src/org/netbeans/test/ide/PerfCountingSecurityManager.java b/java/performance/test/qa-functional/src/org/netbeans/test/ide/PerfCountingSecurityManager.java index dcd3b28cead8..17dd919c1a7e 100644 --- a/java/performance/test/qa-functional/src/org/netbeans/test/ide/PerfCountingSecurityManager.java +++ b/java/performance/test/qa-functional/src/org/netbeans/test/ide/PerfCountingSecurityManager.java @@ -91,11 +91,7 @@ public enum Mode { public static void initialize(String prefix, PerfCountingSecurityManager.Mode mode, Set allowedFiles) { System.setProperty("counting.security.disabled", "true"); - if (System.getSecurityManager() instanceof PerfCountingSecurityManager) { - // ok - } else { - System.setSecurityManager(new PerfCountingSecurityManager()); - } + System.setSecurityManager(new PerfCountingSecurityManager()); setCnt(0); msgs = new StringWriter(); pw = new PrintWriter(msgs); @@ -113,7 +109,6 @@ public static void initialize(String prefix, PerfCountingSecurityManager.Mode mo static void assertReflection(int maxCount, String whitelist) { System.setProperty("counting.reflection.whitelist", whitelist); - System.getSecurityManager().checkPermission( SecurityConstants.CHECK_MEMBER_ACCESS_PERMISSION); System.getProperties().remove("counting.reflection.whitelist"); } @@ -127,7 +122,7 @@ public Integer call() throws Exception { } public static boolean isEnabled() { - return System.getSecurityManager() instanceof Callable; + return false; } public static void assertCounts(String msg, int expectedCnt) throws Exception { diff --git a/java/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java b/java/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java index 0a42eb5166e5..32660829db76 100644 --- a/java/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java +++ b/java/performance/test/unit/src/org/netbeans/performance/scalability/CountingSecurityManager.java @@ -51,14 +51,10 @@ public static void register() { public static void initialize(String prefix) { Assert.assertNotNull(prefix); - if (! (System.getSecurityManager() instanceof CountingSecurityManager)) { - setAllowedReplace(true); - System.setSecurityManager(new CountingSecurityManager()); - setAllowedReplace(false); - } - if (!System.getSecurityManager().getClass().getName().equals(CountingSecurityManager.class.getName())) { - throw new IllegalStateException("Wrong security manager: " + System.getSecurityManager()); - } + setAllowedReplace(true); + System.setSecurityManager(new CountingSecurityManager()); + setAllowedReplace(false); + cnt = 0; msgs = new StringWriter(); pw = new PrintWriter(msgs); diff --git a/platform/core.startup/test/unit/src/org/netbeans/core/startup/CountingSecurityManager.java b/platform/core.startup/test/unit/src/org/netbeans/core/startup/CountingSecurityManager.java index fd6ac88fb244..7b3ef66e437e 100644 --- a/platform/core.startup/test/unit/src/org/netbeans/core/startup/CountingSecurityManager.java +++ b/platform/core.startup/test/unit/src/org/netbeans/core/startup/CountingSecurityManager.java @@ -36,11 +36,7 @@ final class CountingSecurityManager extends SecurityManager { private static String prefix; public static void initialize(String prefix) { - if (System.getSecurityManager() instanceof CountingSecurityManager) { - // ok - } else { - System.setSecurityManager(new CountingSecurityManager()); - } + System.setSecurityManager(new CountingSecurityManager()); cnt = 0; msgs = new StringWriter(); pw = new PrintWriter(msgs); diff --git a/platform/core.startup/test/unit/src/org/netbeans/core/startup/IsDirCntSecurityManager.java b/platform/core.startup/test/unit/src/org/netbeans/core/startup/IsDirCntSecurityManager.java index 12a02eb2aeeb..528704c97d9c 100644 --- a/platform/core.startup/test/unit/src/org/netbeans/core/startup/IsDirCntSecurityManager.java +++ b/platform/core.startup/test/unit/src/org/netbeans/core/startup/IsDirCntSecurityManager.java @@ -32,9 +32,7 @@ public class IsDirCntSecurityManager extends SecurityManager { private static StringBuffer sb; public static void initialize() { - if (!(System.getSecurityManager() instanceof IsDirCntSecurityManager)) { - System.setSecurityManager(new IsDirCntSecurityManager()); - } + System.setSecurityManager(new IsDirCntSecurityManager()); cnt = 0; sb = new StringBuffer(); } diff --git a/platform/core.startup/test/unit/src/org/netbeans/core/startup/layers/CountingSecurityManager.java b/platform/core.startup/test/unit/src/org/netbeans/core/startup/layers/CountingSecurityManager.java index ed12ee2376c2..1c15dc922996 100644 --- a/platform/core.startup/test/unit/src/org/netbeans/core/startup/layers/CountingSecurityManager.java +++ b/platform/core.startup/test/unit/src/org/netbeans/core/startup/layers/CountingSecurityManager.java @@ -67,11 +67,7 @@ public static void initialize(String prefix, Mode mode, Set allowedFiles System.setProperty("counting.security.disabled", "true"); inSubtree("", ""); - if (System.getSecurityManager() instanceof CountingSecurityManager) { - // ok - } else { - System.setSecurityManager(new CountingSecurityManager()); - } + System.setSecurityManager(new CountingSecurityManager()); setCnt(0); msgs = new StringWriter(); pw = new PrintWriter(msgs); @@ -86,7 +82,6 @@ public static void initialize(String prefix, Mode mode, Set allowedFiles static void assertReflection(int maxCount, String whitelist) { System.setProperty("counting.reflection.whitelist", whitelist); - System.getSecurityManager().checkPermission(new MaxCountCheck(maxCount, "MaxCountCheck")); System.getProperties().remove("counting.reflection.whitelist"); } @@ -129,7 +124,7 @@ public Integer call() throws Exception { } public static boolean isEnabled() { - return System.getSecurityManager() instanceof Callable; + return false; } public static void assertCounts(String msg, int expectedCnt) throws Exception { diff --git a/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/CountingSecurityManager.java b/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/CountingSecurityManager.java index 608d1d936dbe..b461497b96b9 100644 --- a/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/CountingSecurityManager.java +++ b/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/CountingSecurityManager.java @@ -60,11 +60,7 @@ public enum Mode { public static void initialize(String prefix, Mode mode, Set allowedFiles) { System.setProperty("counting.security.disabled", "true"); - if (System.getSecurityManager() instanceof CountingSecurityManager) { - // ok - } else { - System.setSecurityManager(new CountingSecurityManager()); - } + System.setSecurityManager(new CountingSecurityManager()); setCnt(0); msgs = new StringWriter(); pw = new PrintWriter(msgs); @@ -79,7 +75,6 @@ public static void initialize(String prefix, Mode mode, Set allowedFiles static void assertReflection(int maxCount, String whitelist) { System.setProperty("counting.reflection.whitelist", whitelist); - System.getSecurityManager().checkPermission(new MaxCountPerm(maxCount)); System.getProperties().remove("counting.reflection.whitelist"); } @@ -124,7 +119,7 @@ public Integer call() throws Exception { } public static boolean isEnabled() { - return System.getSecurityManager() instanceof Callable; + return false; } public static void assertCounts(String msg, int expectedCnt) throws Exception { diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CountingSecurityManager.java b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CountingSecurityManager.java index d29eb163aede..7a54ce8b9a73 100644 --- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CountingSecurityManager.java +++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CountingSecurityManager.java @@ -36,11 +36,7 @@ final class CountingSecurityManager extends SecurityManager { private static String prefix; public static void initialize(String prefix) { - if (System.getSecurityManager() instanceof CountingSecurityManager) { - // ok - } else { - System.setSecurityManager(new CountingSecurityManager()); - } + System.setSecurityManager(new CountingSecurityManager()); cnt = 0; msgs = new StringWriter(); pw = new PrintWriter(msgs); diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/JarClassLoaderTest.java b/platform/o.n.bootstrap/test/unit/src/org/netbeans/JarClassLoaderTest.java index 0a603593bba1..73e2ea9e3b4a 100644 --- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/JarClassLoaderTest.java +++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/JarClassLoaderTest.java @@ -407,11 +407,7 @@ private static class BlockingSecurityManager extends SecurityManager { public static void initialize(String path, Semaphore sync) { BlockingSecurityManager.path = path; BlockingSecurityManager.sync = sync; - if (System.getSecurityManager() instanceof BlockingSecurityManager) { - // ok - } else { - System.setSecurityManager(new BlockingSecurityManager()); - } + System.setSecurityManager(new BlockingSecurityManager()); } public @Override void checkRead(String file) { diff --git a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestBaseHid.java b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestBaseHid.java index 029b9db853db..b14d886fa763 100644 --- a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestBaseHid.java +++ b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestBaseHid.java @@ -76,9 +76,6 @@ protected void setUp() throws Exception { if (allTestedFS != null) testedFS = allTestedFS[0]; // If not null, file accesses are counted through custom SecurityManager. if(accessMonitor != null) { - if(defaultSecurityManager == null) { - defaultSecurityManager = System.getSecurityManager(); - } System.setSecurityManager(accessMonitor); } } diff --git a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/test/StatFiles.java b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/test/StatFiles.java index 6fab0f33a51a..4e7b3e5e1b0d 100644 --- a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/test/StatFiles.java +++ b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/test/StatFiles.java @@ -40,23 +40,17 @@ public class StatFiles extends SecurityManager { public static final int DELETE = 3; private Results results; private Monitor monitor; - private SecurityManager defaultSecurityManager; public StatFiles() { reset(); } public void register() { - if (defaultSecurityManager == null) { - defaultSecurityManager = System.getSecurityManager(); - } System.setSecurityManager(this); } public void unregister() { - if (defaultSecurityManager == null) { - System.setSecurityManager(defaultSecurityManager); - } + System.setSecurityManager(null); } public void reset() { diff --git a/platform/openide.util.ui/test/unit/src/org/openide/xml/XMLUtilReflectionTest.java b/platform/openide.util.ui/test/unit/src/org/openide/xml/XMLUtilReflectionTest.java index 7caedcf8d87c..56b5964ab582 100644 --- a/platform/openide.util.ui/test/unit/src/org/openide/xml/XMLUtilReflectionTest.java +++ b/platform/openide.util.ui/test/unit/src/org/openide/xml/XMLUtilReflectionTest.java @@ -97,11 +97,7 @@ private static void assertSAX(boolean validate, boolean namespace) throws Except static final class CountingSecurityManager extends SecurityManager { public static void initialize() { - if (System.getSecurityManager() instanceof CountingSecurityManager) { - // ok - } else { - System.setSecurityManager(new CountingSecurityManager()); - } + System.setSecurityManager(new CountingSecurityManager()); members.clear(); }