Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve formatting #156

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve formatting #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
29 changes: 13 additions & 16 deletions orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/CopierManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,46 +18,43 @@
* Classpath-exception-2.0
*/

package com.sun.corba.ee.impl.copyobject ;
package com.sun.corba.ee.impl.copyobject;

import com.sun.corba.ee.spi.copyobject.CopierManager;
import org.glassfish.pfl.basic.contain.DenseIntMapImpl;
import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopierFactory;

public class CopierManagerImpl implements CopierManager
{
private int defaultId ;
private final DenseIntMapImpl<ObjectCopierFactory> map ;
public class CopierManagerImpl implements CopierManager {
private int defaultId;
private final DenseIntMapImpl<ObjectCopierFactory> map;

public CopierManagerImpl()
{
defaultId = 0 ;
map = new DenseIntMapImpl<>() ;
public CopierManagerImpl() {
defaultId = 0;
map = new DenseIntMapImpl<>();
}

@Override
public void setDefaultId( int id ) {
defaultId = id ;
public void setDefaultId(int id) {
defaultId = id;
}

@Override
public int getDefaultId() {
return defaultId ;
return defaultId;
}

@Override
public ObjectCopierFactory getObjectCopierFactory(int id) {
return map.get( id ) ;
return map.get(id);
}

@Override
public ObjectCopierFactory getDefaultObjectCopierFactory() {
return map.get( defaultId ) ;
return map.get(defaultId);
}

@Override
public void registerObjectCopierFactory(ObjectCopierFactory factory, int id) {
map.set( id, factory ) ;
map.set(id, factory);
}
}

21 changes: 10 additions & 11 deletions orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/JavaStreamORBObjectCopierImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,35 @@
* Classpath-exception-2.0
*/

package com.sun.corba.ee.impl.copyobject ;
package com.sun.corba.ee.impl.copyobject;

import java.rmi.Remote;

import org.omg.CORBA.ORB ;
import org.omg.CORBA.ORB;

import com.sun.corba.ee.impl.util.Utility;

import org.glassfish.pfl.dynamic.copyobject.impl.JavaStreamObjectCopierImpl ;

import org.glassfish.pfl.dynamic.copyobject.impl.JavaStreamObjectCopierImpl;

public class JavaStreamORBObjectCopierImpl extends JavaStreamObjectCopierImpl {
private final ORB orb ;
private final ORB orb;

public JavaStreamORBObjectCopierImpl( ORB orb ) {
this.orb = orb ;
public JavaStreamORBObjectCopierImpl(ORB orb) {
this.orb = orb;
}

public Object copy(Object obj, boolean debug ) {
return copy( obj ) ;
public Object copy(Object obj, boolean debug) {
return copy(obj);
}

@Override
public Object copy(Object obj) {
if (obj instanceof Remote) {
// Yes, so make sure it is connected and converted
// to a stub (if needed)...
return Utility.autoConnect(obj,orb,true);
return Utility.autoConnect(obj, orb, true);
}

return super.copy( obj ) ;
return super.copy(obj);
}
}
24 changes: 11 additions & 13 deletions orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/ORBStreamObjectCopierImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,44 +18,42 @@
* Classpath-exception-2.0
*/

package com.sun.corba.ee.impl.copyobject ;

package com.sun.corba.ee.impl.copyobject;

import java.io.Serializable;
import java.rmi.Remote;

import org.omg.CORBA_2_3.portable.InputStream;
import org.omg.CORBA_2_3.portable.OutputStream;
import org.omg.CORBA.ORB ;
import org.omg.CORBA.ORB;

import com.sun.corba.ee.impl.util.Utility;
import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopier;

public class ORBStreamObjectCopierImpl implements ObjectCopier {

private final ORB orb;

public ORBStreamObjectCopierImpl( ORB orb )
{
this.orb = orb ;
public ORBStreamObjectCopierImpl(ORB orb) {
this.orb = orb;
}

public Object copy(Object obj, boolean debug) {
return copy( obj ) ;
return copy(obj);
}

@Override
public Object copy(Object obj) {
if (obj instanceof Remote) {
// Yes, so make sure it is connected and converted
// to a stub (if needed)...
return Utility.autoConnect(obj,orb,true);
return Utility.autoConnect(obj, orb, true);
}

OutputStream out = (OutputStream)orb.create_output_stream();
out.write_value((Serializable)obj);
InputStream in = (InputStream)out.create_input_stream();
OutputStream out = (OutputStream) orb.create_output_stream();
out.write_value((Serializable) obj);
InputStream in = (InputStream) out.create_input_stream();
return in.read_value();
}

}
Loading