Author: michiel
Date: 2009-05-13 10:00:05 +0200 (Wed, 13 May 2009)
New Revision: 35130
Modified:
mmbase/trunk/applications/rmmci/src/org/mmbase/bridge/remote/RemoteBridgeList.java
mmbase/trunk/applications/rmmci/src/org/mmbase/bridge/remote/proxy/RemoteBridgeList_Proxy.java
mmbase/trunk/applications/rmmci/src/org/mmbase/bridge/remote/rmi/RemoteBridgeList_Rmi.java
Log:
Didn't compile any more. MMB-1818
Modified:
mmbase/trunk/applications/rmmci/src/org/mmbase/bridge/remote/RemoteBridgeList.java
===================================================================
---
mmbase/trunk/applications/rmmci/src/org/mmbase/bridge/remote/RemoteBridgeList.java
2009-05-13 02:37:43 UTC (rev 35129)
+++
mmbase/trunk/applications/rmmci/src/org/mmbase/bridge/remote/RemoteBridgeList.java
2009-05-13 08:00:05 UTC (rev 35130)
@@ -22,6 +22,7 @@
public interface RemoteBridgeList<E> extends RemoteList<E> {
public void setProperty(java.lang.Object arg0,java.lang.Object arg1) throws
RemoteException;
public java.lang.Object getProperty(java.lang.Object arg0) throws
RemoteException;
+ public java.util.Map<Object, Object> getProperties() throws RemoteException;
public RemoteBridgeList<E> subList(int arg0,int arg1) throws RemoteException;
public void sort(java.util.Comparator<? super E> arg0) throws
RemoteException;
public void sort() throws RemoteException;
Modified:
mmbase/trunk/applications/rmmci/src/org/mmbase/bridge/remote/proxy/RemoteBridgeList_Proxy.java
===================================================================
---
mmbase/trunk/applications/rmmci/src/org/mmbase/bridge/remote/proxy/RemoteBridgeList_Proxy.java
2009-05-13 02:37:43 UTC (rev 35129)
+++
mmbase/trunk/applications/rmmci/src/org/mmbase/bridge/remote/proxy/RemoteBridgeList_Proxy.java
2009-05-13 08:00:05 UTC (rev 35130)
@@ -1,16 +1,17 @@
/*
-This software is OSI Certified Open Source Software.
-OSI Certified is a certification mark of the Open Source Initiative.
+ This software is OSI Certified Open Source Software.
+ OSI Certified is a certification mark of the Open Source Initiative.
-The license (Mozilla version 1.0) can be read at the MMBase site.
-See http://www.MMBase.org/license
+ The license (Mozilla version 1.0) can be read at the MMBase site.
+ See http://www.MMBase.org/license
*/
package org.mmbase.bridge.remote.proxy;
import java.util.Collections;
+import java.util.Map;
import org.mmbase.bridge.*;
import org.mmbase.bridge.remote.*;
@@ -23,64 +24,74 @@
public class RemoteBridgeList_Proxy<L extends Comparable<? super L>,E> extends
RemoteList_Proxy<L,E> implements BridgeList<L>, MappedObject {
- public RemoteBridgeList_Proxy(RemoteBridgeList<E> remoteObject) {
- super(remoteObject);
- }
+ public RemoteBridgeList_Proxy(RemoteBridgeList<E> remoteObject) {
+ super(remoteObject);
+ }
- public void setProperty(java.lang.Object arg0,java.lang.Object arg1) {
- try {
-
getWrappedObject().setProperty(ObjectWrapper.remoteProxyToRMIObject(arg0),
ObjectWrapper.remoteProxyToRMIObject(arg1));
- } catch (RuntimeException e) {
- throw e ;
- } catch(Exception e) {
- throw new BridgeException(e.getMessage(), e);
+ public void setProperty(Object arg0,Object arg1) {
+ try {
+
getWrappedObject().setProperty(ObjectWrapper.remoteProxyToRMIObject(arg0),
ObjectWrapper.remoteProxyToRMIObject(arg1));
+ } catch (RuntimeException e) {
+ throw e ;
+ } catch(Exception e) {
+ throw new BridgeException(e.getMessage(), e);
+ }
}
- }
- public java.lang.Object getProperty(java.lang.Object arg0) {
- try {
- java.lang.Object retval =
ObjectWrapper.rmiObjectToRemoteProxy(getWrappedObject().getProperty(ObjectWrapper.remoteProxyToRMIObject(arg0)));
- return retval;
- } catch (RuntimeException e) {
- throw e ;
- } catch(Exception e) {
- throw new BridgeException(e.getMessage(), e);
+ public Object getProperty(Object arg0) {
+ try {
+ Object retval =
ObjectWrapper.rmiObjectToRemoteProxy(getWrappedObject().getProperty(ObjectWrapper.remoteProxyToRMIObject(arg0)));
+ return retval;
+ } catch (RuntimeException e) {
+ throw e ;
+ } catch(Exception e) {
+ throw new BridgeException(e.getMessage(), e);
+ }
}
- }
+ public Map<Object, Object> getProperties() {
+ try {
+ Map<Object, Object> retval = (Map<Object, Object>)
ObjectWrapper.rmiObjectToRemoteProxy(getWrappedObject().getProperties());
+ return retval;
+ } catch (RuntimeException e) {
+ throw e ;
+ } catch(Exception e) {
+ throw new BridgeException(e.getMessage(), e);
+ }
+ }
- public org.mmbase.bridge.BridgeList<L> subList(int arg0,int arg1) {
- try {
- RemoteBridgeList<E> list = getWrappedObject().subList(arg0, arg1);
- org.mmbase.bridge.BridgeList<L> retval =
(org.mmbase.bridge.BridgeList<L>) ObjectWrapper.rmiObjectToRemoteProxy(list);
- return retval;
- } catch (RuntimeException e) {
- throw e ;
- } catch(Exception e) {
- throw new BridgeException(e.getMessage(), e);
+ public org.mmbase.bridge.BridgeList<L> subList(int arg0,int arg1) {
+ try {
+ RemoteBridgeList<E> list = getWrappedObject().subList(arg0, arg1);
+ org.mmbase.bridge.BridgeList<L> retval =
(org.mmbase.bridge.BridgeList<L>) ObjectWrapper.rmiObjectToRemoteProxy(list);
+ return retval;
+ } catch (RuntimeException e) {
+ throw e ;
+ } catch(Exception e) {
+ throw new BridgeException(e.getMessage(), e);
+ }
}
- }
- public void sort(java.util.Comparator<? super L> arg0) {
- // This is heavy for RMI. many remote compareTo calls will happen.
- Collections.sort(this, arg0);
- }
+ public void sort(java.util.Comparator<? super L> arg0) {
+ // This is heavy for RMI. many remote compareTo calls will happen.
+ Collections.sort(this, arg0);
+ }
- public void sort() {
- try {
- // Let the server compare the items in the list.
- // only one call to the server
- getWrappedObject().sort();
+ public void sort() {
+ try {
+ // Let the server compare the items in the list.
+ // only one call to the server
+ getWrappedObject().sort();
+ }
+ catch (RuntimeException e) {
+ throw e;
+ }
+ catch (Exception e) {
+ throw new BridgeException(e.getMessage(), e);
+ }
}
- catch (RuntimeException e) {
- throw e;
+
+ public RemoteBridgeList<E> getWrappedObject() {
+ return (RemoteBridgeList<E>) super.getWrappedObject();
}
- catch (Exception e) {
- throw new BridgeException(e.getMessage(), e);
- }
- }
- public RemoteBridgeList<E> getWrappedObject() {
- return (RemoteBridgeList<E>) super.getWrappedObject();
- }
-
}
Modified:
mmbase/trunk/applications/rmmci/src/org/mmbase/bridge/remote/rmi/RemoteBridgeList_Rmi.java
===================================================================
---
mmbase/trunk/applications/rmmci/src/org/mmbase/bridge/remote/rmi/RemoteBridgeList_Rmi.java
2009-05-13 02:37:43 UTC (rev 35129)
+++
mmbase/trunk/applications/rmmci/src/org/mmbase/bridge/remote/rmi/RemoteBridgeList_Rmi.java
2009-05-13 08:00:05 UTC (rev 35130)
@@ -30,14 +30,18 @@
super(originalObject);
log.debug("new RemoteBridgeList_Rmi");
}
- public void setProperty(java.lang.Object arg0,java.lang.Object arg1)
throws RemoteException {
+ public void setProperty(Object arg0,Object arg1) throws RemoteException {
getOriginalObject().setProperty(ObjectWrapper.rmiObjectToLocal(arg0),
ObjectWrapper.rmiObjectToLocal(arg1));
}
- public java.lang.Object getProperty(java.lang.Object arg0) throws
RemoteException {
- java.lang.Object retval =
ObjectWrapper.localToRMIObject(getOriginalObject().getProperty(ObjectWrapper.rmiObjectToLocal(arg0)));
+ public Object getProperty(Object arg0) throws RemoteException {
+ Object retval =
ObjectWrapper.localToRMIObject(getOriginalObject().getProperty(ObjectWrapper.rmiObjectToLocal(arg0)));
return retval;
}
+ public java.util.Map<Object, Object> getProperties() throws
RemoteException {
+ Object retval =
ObjectWrapper.localToRMIObject(getOriginalObject().getProperties());
+ return (java.util.Map<Object, Object>) retval;
+ }
public RemoteBridgeList<R> subList(int arg0,int arg1) throws
RemoteException {
BridgeList<L> list = getOriginalObject().subList(arg0, arg1);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
