Projects >> Goson >>709cb89fab0f4dc9c5aa4ed206c3660d00baed0b

Chunk
Conflicting content 
package org.jschema.rpc;

<<<<<<< HEAD
import gw.lang.reflect.IMethodInfo;
import gw.lang.reflect.IParameterInfo;
import gw.lang.reflect.IType;
import gw.lang.reflect.TypeSystem;
=======
import com.sun.imageio.plugins.common.I18N;
import gw.lang.reflect.*;
import gw.lang.reflect.java.IJavaArrayType;
>>>>>>> 478388070c78258d154ae1bb94ce447a95ceb999
import gw.lang.reflect.java.IJavaType;
import org.jschema.typeloader.rpc.IJSchemaRPCType;
import org.jschema.typeloader.rpc.JSchemaRPCTypeInfoBase;
Solution content 
package org.jschema.rpc;

import gw.lang.reflect.IMethodInfo;
import gw.lang.reflect.IParameterInfo;
import gw.lang.reflect.IType;
import gw.lang.reflect.ITypeInfo;
import gw.lang.reflect.TypeSystem;
import gw.lang.reflect.java.IJavaType;
import org.jschema.typeloader.rpc.IJSchemaRPCType;
import org.jschema.typeloader.rpc.JSchemaRPCTypeInfoBase;
File
RPCEndPoint.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
public abstract class JSchemaRPCTypeInfoBase extends TypeInfoBase {
  private JSchemaRPCTypeBase _owner;
  private List _methods;
<<<<<<< HEAD
  private List _properties;
  private Map _propertiesMap;
=======
  private List _jsonDeclaredMethods;
>>>>>>> 478388070c78258d154ae1bb94ce447a95ceb999

  public JSchemaRPCTypeInfoBase(JSchemaRPCTypeBase owner) {
    _owner = owner;
Solution content 
public abstract class JSchemaRPCTypeInfoBase extends TypeInfoBase {
  private JSchemaRPCTypeBase _owner;
  private List _methods;
  private List _properties;
  private Map _propertiesMap;
  private List _jsonDeclaredMethods;

  public JSchemaRPCTypeInfoBase(JSchemaRPCTypeBase owner) {
    _owner = owner;
File
JSchemaRPCTypeInfoBase.java
Developer's decision
Concatenation
Kind of conflict
Attribute