Google Git
Sign in
eclipse/jeetools/webtools.javaee/21a72c27eff1b8489fd2470eab2828f4480eb956^!/.
commit
21a72c27eff1b8489fd2470eab2828f4480eb956
[log]
author
rkulp <rkulp>
Fri Oct 31 20:16:34 2003 +0000
committer
rkulp <rkulp>
Fri Oct 31 20:16:34 2003 +0000
tree
7e01cf15a0cabbafe7569af215e06a9cb89fd5cc
parent
3f9a30044132b9cee53ad09e9e04e22b244d490b [diff]
Change to do explicit init call because in 1.4 java just accessing
a .class in code doesn't cause the class to be initialized.

diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java
index 2728372..ba1cdb5 100644
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java
+++ b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java

@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: BeanDescriptorEquality.java,v $
- *  $Revision: 1.1 $  $Date: 2003/10/27 17:17:59 $ 
+ *  $Revision: 1.2 $  $Date: 2003/10/31 20:16:34 $ 
  */
 
 import java.beans.*;
@@ -19,7 +19,7 @@
  * Equality tester for BeanDescriptors
  */
 public class BeanDescriptorEquality extends FeatureDescriptorEquality {
-	static {
+	static void INIT() {
 		try {
 			MAP_EQUALITY.put(BeanDescriptor.class, (BeanDescriptorEquality.class).getConstructor(new Class[] {BeanDescriptor.class}));
 		} catch (NoSuchMethodException e) {

diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java
index 27e6456..80cfa67 100644
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java
+++ b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java

@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: EventSetDescriptorEquality.java,v $
- *  $Revision: 1.1 $  $Date: 2003/10/27 17:17:59 $ 
+ *  $Revision: 1.2 $  $Date: 2003/10/31 20:16:34 $ 
  */
 
 import java.beans.*;
@@ -22,7 +22,7 @@
  */
 public class EventSetDescriptorEquality extends FeatureDescriptorEquality {
 	
-	static {
+	static void INIT() {
 		try {
 			MAP_EQUALITY.put(EventSetDescriptor.class, (EventSetDescriptorEquality.class).getConstructor(new Class[] {EventSetDescriptor.class}));
 		} catch (NoSuchMethodException e) {

diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java
index 3194027..18cc311 100644
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java
+++ b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java

@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: FeatureDescriptorEquality.java,v $
- *  $Revision: 1.1 $  $Date: 2003/10/27 17:17:59 $ 
+ *  $Revision: 1.2 $  $Date: 2003/10/31 20:16:34 $ 
  */
 
 import java.beans.*;
@@ -44,13 +44,13 @@
 			MAP_EQUALITY.put(FeatureDescriptor.class, (FeatureDescriptorEquality.class).getConstructor(new Class[] {FeatureDescriptor.class}));
 		} catch (NoSuchMethodException e) {
 		}
-		// Need to reference the others to bring them
-		MAP_EQUALITY.get(BeanDescriptorEquality.class);
-		MAP_EQUALITY.get(EventSetDescriptorEquality.class);		
-		MAP_EQUALITY.get(IndexedPropertyDescriptorEquality.class);
-		MAP_EQUALITY.get(MethodDescriptorEquality.class);		
-		MAP_EQUALITY.get(ParameterDescriptorEquality.class);
-		MAP_EQUALITY.get(PropertyDescriptorEquality.class);
+		// Need to set up the others.
+		BeanDescriptorEquality.INIT();
+		EventSetDescriptorEquality.INIT();		
+		IndexedPropertyDescriptorEquality.INIT();
+		MethodDescriptorEquality.INIT();		
+		ParameterDescriptorEquality.INIT();
+		PropertyDescriptorEquality.INIT();
 	}
 			
 	/**

diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java
index d1d9f6a..fef78e2 100644
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java
+++ b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java

@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: IndexedPropertyDescriptorEquality.java,v $
- *  $Revision: 1.1 $  $Date: 2003/10/27 17:17:59 $ 
+ *  $Revision: 1.2 $  $Date: 2003/10/31 20:16:34 $ 
  */
 
 import java.beans.*;
@@ -20,7 +20,7 @@
  */
 public class IndexedPropertyDescriptorEquality extends PropertyDescriptorEquality {
 
-	static {
+	static void INIT() {
 		try {
 			MAP_EQUALITY.put(IndexedPropertyDescriptor.class, (IndexedPropertyDescriptorEquality.class).getConstructor(new Class[] {IndexedPropertyDescriptor.class}));
 		} catch (NoSuchMethodException e) {

diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java
index 37c176d..9c92f39 100644
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java
+++ b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java

@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: MethodDescriptorEquality.java,v $
- *  $Revision: 1.1 $  $Date: 2003/10/27 17:17:59 $ 
+ *  $Revision: 1.2 $  $Date: 2003/10/31 20:16:34 $ 
  */
 
 import java.beans.*;
@@ -21,7 +21,7 @@
  */
 public class MethodDescriptorEquality extends FeatureDescriptorEquality {
 	
-	static {
+	static void INIT() {
 		try {
 			MAP_EQUALITY.put(MethodDescriptor.class, (MethodDescriptorEquality.class).getConstructor(new Class[] {MethodDescriptor.class}));
 		} catch (NoSuchMethodException e) {

diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java
index c3c0258..a5222c1 100644
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java
+++ b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java

@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: ParameterDescriptorEquality.java,v $
- *  $Revision: 1.1 $  $Date: 2003/10/27 17:17:59 $ 
+ *  $Revision: 1.2 $  $Date: 2003/10/31 20:16:34 $ 
  */
 
 import java.beans.*;
@@ -20,7 +20,7 @@
  */
 public class ParameterDescriptorEquality extends FeatureDescriptorEquality {
 	
-	static {
+	static void INIT() {
 		try {
 			MAP_EQUALITY.put(ParameterDescriptor.class, (ParameterDescriptorEquality.class).getConstructor(new Class[] {ParameterDescriptor.class}));
 		} catch (NoSuchMethodException e) {

diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java
index 61a858e..6f11d37 100644
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java
+++ b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java

@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: PropertyDescriptorEquality.java,v $
- *  $Revision: 1.1 $  $Date: 2003/10/27 17:17:59 $ 
+ *  $Revision: 1.2 $  $Date: 2003/10/31 20:16:34 $ 
  */
 
 import java.beans.*;
@@ -20,7 +20,7 @@
  */
 public class PropertyDescriptorEquality extends FeatureDescriptorEquality {
 	
-	static {
+	static void INIT() {
 		try {
 			MAP_EQUALITY.put(PropertyDescriptor.class, (PropertyDescriptorEquality.class).getConstructor(new Class[] {PropertyDescriptor.class}));
 		} catch (NoSuchMethodException e) {