--- a/jdk/src/java.desktop/share/classes/java/beans/BeanDescriptor.java Wed Jun 03 18:45:27 2015 +0400
+++ b/jdk/src/java.desktop/share/classes/java/beans/BeanDescriptor.java Wed Jun 03 23:17:52 2015 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -81,10 +81,7 @@
SwingContainer container = beanClass.getAnnotation(SwingContainer.class);
if (container != null) {
setValue("isContainer", container.value());
- String delegate = container.delegate();
- if (!delegate.isEmpty()) {
- setValue("containerDelegate", delegate);
- }
+ setValue("containerDelegate", container.delegate());
}
}