From: cvs@openprivacy.orgCVS update: talon/src/java/talon/references
Date: Wednesday March 14, 19101 @ 17:33
Author: burton
CVSWEB Options: -------------------
Main CVSWeb: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi
View this module: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/talon/src/java/talon/references
-----------------------------------
Update of /usr/local/cvs/public/talon/src/java/talon/references
In directory giga:/tmp/cvs-serv4084/src/java/talon/references
Modified Files:
ComponentReferenceFactory.java ReferenceFactory.java
TypeReferenceFactory.java
Log Message:
refactoring component package from interfaces to components
*****************************************************************
File: talon/src/java/talon/references/ComponentReferenceFactory.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/talon/src/java/talon/references/ComponentReferenceFactory.java?annotate=1.2
CVSWeb: View this file: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/talon/src/java/talon/references/ComponentReferenceFactory.java?rev=1.2&content-type=text/x-cvsweb-markup
CVSWeb: Diff to previous version: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/talon/src/java/talon/references/ComponentReferenceFactory.java.diff?r1=1.2&r2=1.1
-----------------------------------
Index: talon/src/java/talon/references/ComponentReferenceFactory.java
diff -u talon/src/java/talon/references/ComponentReferenceFactory.java:1.1 talon/src/java/talon/references/ComponentReferenceFactory.java:1.2
--- talon/src/java/talon/references/ComponentReferenceFactory.java:1.1 Tue Mar 13 23:26:21 2001
+++ talon/src/java/talon/references/ComponentReferenceFactory.java Wed Mar 14 17:33:39 2001
@@ -14,7 +14,7 @@
import java.util.*;
import talon.*;
import talon.implementations.*;
-import talon.interfaces.*;
+import talon.components.*;
import talon.util.net.*;
/**
@@ -26,7 +26,7 @@
* @see #Component.getTypeReference
* @see #ComponentHandle.getTypeReference
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: ComponentReferenceFactory.java,v 1.1 2001/03/14 07:26:21 burton Exp $
+ * @version $Id: ComponentReferenceFactory.java,v 1.2 2001/03/15 01:33:39 burton Exp $
*/
public class ComponentReferenceFactory extends ReferenceFactory {
@@ -34,7 +34,7 @@
*
*
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: ComponentReferenceFactory.java,v 1.1 2001/03/14 07:26:21 burton Exp $
+ * @version $Id: ComponentReferenceFactory.java,v 1.2 2001/03/15 01:33:39 burton Exp $
*/
public static URI getComponentReference( Component component ) {
*****************************************************************
File: talon/src/java/talon/references/ReferenceFactory.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/talon/src/java/talon/references/ReferenceFactory.java?annotate=1.2
CVSWeb: View this file: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/talon/src/java/talon/references/ReferenceFactory.java?rev=1.2&content-type=text/x-cvsweb-markup
CVSWeb: Diff to previous version: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/talon/src/java/talon/references/ReferenceFactory.java.diff?r1=1.2&r2=1.1
-----------------------------------
Index: talon/src/java/talon/references/ReferenceFactory.java
diff -u talon/src/java/talon/references/ReferenceFactory.java:1.1 talon/src/java/talon/references/ReferenceFactory.java:1.2
--- talon/src/java/talon/references/ReferenceFactory.java:1.1 Tue Mar 13 23:26:21 2001
+++ talon/src/java/talon/references/ReferenceFactory.java Wed Mar 14 17:33:39 2001
@@ -14,7 +14,7 @@
import java.util.*;
import talon.*;
import talon.implementations.*;
-import talon.interfaces.*;
+import talon.components.*;
import talon.util.net.*;
/**
@@ -26,7 +26,7 @@
* @see #Component.getTypeReference
* @see #ComponentHandle.getTypeReference
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: ReferenceFactory.java,v 1.1 2001/03/14 07:26:21 burton Exp $
+ * @version $Id: ReferenceFactory.java,v 1.2 2001/03/15 01:33:39 burton Exp $
*/
public class ReferenceFactory {
@@ -34,7 +34,7 @@
*
*
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: ReferenceFactory.java,v 1.1 2001/03/14 07:26:21 burton Exp $
+ * @version $Id: ReferenceFactory.java,v 1.2 2001/03/15 01:33:39 burton Exp $
*/
protected static String buildInterfaceURIPart( Class[] interfaces ) {
@@ -53,7 +53,7 @@
*
*
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: ReferenceFactory.java,v 1.1 2001/03/14 07:26:21 burton Exp $
+ * @version $Id: ReferenceFactory.java,v 1.2 2001/03/15 01:33:39 burton Exp $
*/
public static Class[] getInterfaces( Class current ) {
*****************************************************************
File: talon/src/java/talon/references/TypeReferenceFactory.java
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/talon/src/java/talon/references/TypeReferenceFactory.java?annotate=1.2
CVSWeb: View this file: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/talon/src/java/talon/references/TypeReferenceFactory.java?rev=1.2&content-type=text/x-cvsweb-markup
CVSWeb: Diff to previous version: http://openprivacy.org/cgi-bin/cvsweb/cvsweb.cgi/talon/src/java/talon/references/TypeReferenceFactory.java.diff?r1=1.2&r2=1.1
-----------------------------------
Index: talon/src/java/talon/references/TypeReferenceFactory.java
diff -u talon/src/java/talon/references/TypeReferenceFactory.java:1.1 talon/src/java/talon/references/TypeReferenceFactory.java:1.2
--- talon/src/java/talon/references/TypeReferenceFactory.java:1.1 Tue Mar 13 23:26:21 2001
+++ talon/src/java/talon/references/TypeReferenceFactory.java Wed Mar 14 17:33:39 2001
@@ -14,7 +14,7 @@
import java.util.*;
import talon.*;
import talon.implementations.*;
-import talon.interfaces.*;
+import talon.components.*;
import talon.util.net.*;
/**
@@ -26,7 +26,7 @@
* @see #Component.getTypeReference
* @see #ComponentHandle.getTypeReference
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: TypeReferenceFactory.java,v 1.1 2001/03/14 07:26:21 burton Exp $
+ * @version $Id: TypeReferenceFactory.java,v 1.2 2001/03/15 01:33:39 burton Exp $
*/
public class TypeReferenceFactory extends ReferenceFactory {
@@ -34,7 +34,7 @@
*
*
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: TypeReferenceFactory.java,v 1.1 2001/03/14 07:26:21 burton Exp $
+ * @version $Id: TypeReferenceFactory.java,v 1.2 2001/03/15 01:33:39 burton Exp $
*/
public static URI getTypeReference( Component component ) {
@@ -44,7 +44,7 @@
String interfaceURIPart = buildInterfaceURIPart( getInterfaces( component.getClass() ) );
- return getTypeReference( handle, interfaceURIPart );
+ return getTypeReference( component.getClass().getName(), interfaceURIPart );
}
@@ -52,7 +52,7 @@
*
*
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: TypeReferenceFactory.java,v 1.1 2001/03/14 07:26:21 burton Exp $
+ * @version $Id: TypeReferenceFactory.java,v 1.2 2001/03/15 01:33:39 burton Exp $
*/
public static URI getTypeReference( ComponentHandle handle ) {
@@ -62,26 +62,40 @@
Class[] interfaces = getInterfaces( clazz );
- return getTypeReference( handle, buildInterfaceURIPart( interfaces ));
+ return getTypeReference( handle.getImplementation(), buildInterfaceURIPart( interfaces ) );
} catch ( Throwable t ) {
//if for some reason we can't instantiate this... just use the
//default (which may be null.
- return getTypeReference( handle, "/interface/" + handle.getInterface() );
+ return getTypeReference( handle.getImplementation(), "/interface/" + handle.getInterface() );
}
}
+
+ /**
+ *
+ *
+ * @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
+ * @version $Id: TypeReferenceFactory.java,v 1.2 2001/03/15 01:33:39 burton Exp $
+ */
+ public static URI getTypeReference( Class clazz ) {
+
+ Class[] interfaces = getInterfaces( clazz );
+
+ return getTypeReference( clazz.getName(), buildInterfaceURIPart( interfaces ) );
+
+ }
/**
*
*
* @author <a href="mailto:burton@relativity.yi.org">Kevin A. Burton</a>
- * @version $Id: TypeReferenceFactory.java,v 1.1 2001/03/14 07:26:21 burton Exp $
+ * @version $Id: TypeReferenceFactory.java,v 1.2 2001/03/15 01:33:39 burton Exp $
*/
- protected static URI getTypeReference( ComponentHandle handle, String interfaceURIPart) {
+ protected static URI getTypeReference( String implementation, String interfaceURIPart) {
- return new URI( "talon:///component/" + handle.getImplementation() + interfaceURIPart );
+ return new URI( "talon:///component/" + implementation + interfaceURIPart );
}
This archive was generated by hypermail 2b30 : Wed Mar 14 2001 - 17:35:11 PST