From ff9b49ad76234e3b60512fc479343030a6b367ad Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Wed, 18 Aug 2010 09:47:15 +0000
Subject: [PATCH] Cleanup. Remove references to Java 5 since we no longer support it. Cleanup messages, removing unnecessary casts (due to bugs in early versions of Java 5), removing dead code. The minimal version has been set to Java 1.6.0_10. Also cleanup the Java Stubs for MacOS, removed the StatusPanel (replaced by ControlPanel since 1.2), and update Info.plist to require 1.6 or higher, show 2.3 as version.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java
index b7939d1..3d41520 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.server.admin;
@@ -30,9 +30,6 @@
/**
* A mock LDAP profile wrapper for testing purposes.
- *
- * NOTE: The seemingly unnecessary casts throughout this class are
- * required to work around a bug in JDK versions prior to 1.5.0_08.
*/
public final class MockLDAPProfile extends LDAPProfile.Wrapper {
@@ -50,8 +47,7 @@
public String getAttributeName(AbstractManagedObjectDefinition<?, ?> d,
PropertyDefinition<?> pd) {
- // These casts throughout are required to work around a bug in JDK versions prior to 1.5.0_08.
- if (d == (AbstractManagedObjectDefinition<?, ?>)TestParentCfgDefn.getInstance()) {
+ if (d == TestParentCfgDefn.getInstance()) {
TestParentCfgDefn td = TestParentCfgDefn.getInstance();
if (pd == (PropertyDefinition<?>)td.getMandatoryBooleanPropertyPropertyDefinition()) {
@@ -67,7 +63,7 @@
throw new RuntimeException("Unexpected test-parent property"
+ pd.getName());
}
- } else if (d == (AbstractManagedObjectDefinition<?, ?>)TestChildCfgDefn.getInstance()) {
+ } else if (d == TestChildCfgDefn.getInstance()) {
TestChildCfgDefn td = TestChildCfgDefn.getInstance();
if (pd == (PropertyDefinition<?>)td.getMandatoryBooleanPropertyPropertyDefinition()) {
@@ -117,10 +113,9 @@
*/
@Override
public String getObjectClass(AbstractManagedObjectDefinition<?, ?> d) {
- // These casts throughout are required to work around a bug in JDK versions prior to 1.5.0_08.
- if (d == (AbstractManagedObjectDefinition<?, ?>)TestParentCfgDefn.getInstance()) {
+ if (d == TestParentCfgDefn.getInstance()) {
return "ds-cfg-test-parent-dummy";
- } else if (d == (AbstractManagedObjectDefinition<?, ?>)TestChildCfgDefn.getInstance()) {
+ } else if (d == TestChildCfgDefn.getInstance()) {
return "ds-cfg-test-child-dummy";
} else {
// Not known.
--
Gitblit v1.10.0