pnever 02/05/14 04:36:22
Modified: src/share/org/apache/slide/content NodeProperty.java
Log:
Adapted to changes in org.apache.slide.util.Configuration
Revision Changes Path
1.12 +17 -17
jakarta-slide/src/share/org/apache/slide/content/NodeProperty.java
Index: NodeProperty.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeProperty.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NodeProperty.java 8 May 2002 16:24:04 -0000 1.11
+++ NodeProperty.java 14 May 2002 11:36:22 -0000 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeProperty.java,v 1.11
2002/05/08 16:24:04 pnever Exp $
- * $Revision: 1.11 $
- * $Date: 2002/05/08 16:24:04 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeProperty.java,v 1.12
2002/05/14 11:36:22 pnever Exp $
+ * $Revision: 1.12 $
+ * $Date: 2002/05/14 11:36:22 $
*
* ====================================================================
*
@@ -63,24 +63,22 @@
package org.apache.slide.content;
-import java.io.Serializable;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.Set;
+import java.io.*;
+import java.util.*;
import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
import org.apache.slide.security.NodePermission;
import org.apache.slide.util.Configuration;
import org.apache.slide.util.Messages;
+import org.apache.slide.common.Domain;
import org.apache.slide.common.ObjectValidationFailedException;
/**
* Node property class
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public final class NodeProperty implements Serializable, Cloneable {
@@ -97,21 +95,23 @@
public static Set allComputedProperties;
static {
- Class standardLiveProperties = Configuration.standardLiveProperties();
+ Class slpc = Configuration.standardLivePropertiesClass();
+ if( slpc != null ) {
try {
- Method lp = standardLiveProperties.getMethod( "getAllLiveProperties",
new Class[]{} );
+ Method lp = slpc.getMethod( "getAllLiveProperties", new Class[]{} );
allLiveProperties = (Set)lp.invoke( null, new Object[]{} ); // obj=null
since method is static
- Method pp = standardLiveProperties.getMethod(
"getAllProtectedProperties", new Class[]{} );
+ Method pp = slpc.getMethod( "getAllProtectedProperties", new
Class[]{} );
allProtectedProperties = (Set)pp.invoke( null, new Object[]{} ); //
obj=null since method is static
- Method cp = standardLiveProperties.getMethod(
"getAllComputedProperties", new Class[]{} );
+ Method cp = slpc.getMethod( "getAllComputedProperties", new
Class[]{} );
allComputedProperties = (Set)cp.invoke( null, new Object[]{} ); //
obj=null since method is static
}
- catch( NoSuchMethodException x ) {
+ catch( Exception x ) {
+ Domain.warn( "Loading of standard live properties failed:
"+x.getMessage() );
}
- catch( InvocationTargetException x ) {
- }
- catch( IllegalAccessException x ) {
}
+ if( allLiveProperties == null ) allLiveProperties =
Collections.EMPTY_SET;
+ if( allProtectedProperties == null ) allProtectedProperties =
Collections.EMPTY_SET;
+ if( allComputedProperties == null ) allComputedProperties =
Collections.EMPTY_SET;
}
// ----------------------------------------------------------- Constructors
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
