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/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java b/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
index 14d5b1a..246f532 100644
--- a/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
+++ b/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2007-2009 Sun Microsystems, Inc.
+ * Copyright 2007-2010 Sun Microsystems, Inc.
*/
package org.opends.server.admin;
@@ -867,8 +867,6 @@
* definition is the {@link TopCfgDefn}.
*/
public final boolean isTop() {
- // Casting to Object and instanceof check are required
- // to workaround a bug in JDK versions prior to 1.5.0_08.
return (this instanceof TopCfgDefn);
}
@@ -998,7 +996,7 @@
propertyDefinitions.put(propName, d);
allPropertyDefinitions.put(propName, d);
- if (d instanceof AggregationPropertyDefinition) {
+ if (d instanceof AggregationPropertyDefinition<?,?>) {
AggregationPropertyDefinition<?, ?> apd =
(AggregationPropertyDefinition<?, ?>) d;
aggregationPropertyDefinitions.put(propName, apd);
--
Gitblit v1.10.0