Skip to content
Browse files

[Chance-core] align with changes in master

  • Loading branch information...
1 parent 24e3101 commit ac53de0d5759ffdbb8e48034f1eb067945c16a57 @sotty sotty committed Dec 31, 2013
View
4 ...rc/main/java/org/drools/chance/factmodel/ChanceTriplePropertyWrapperClassBuilderImpl.java
@@ -27,6 +27,8 @@
import org.mvel2.asm.MethodVisitor;
import org.mvel2.asm.Type;
+import java.util.BitSet;
+
public class ChanceTriplePropertyWrapperClassBuilderImpl extends TraitTriplePropertyWrapperClassBuilderImpl {
@@ -48,7 +50,7 @@ protected boolean mustSkip( FieldDefinition field ) {
- protected int initSoftFields( MethodVisitor mv, String wrapperName, ClassDefinition trait, ClassDefinition core, long mask ) {
+ protected int initSoftFields( MethodVisitor mv, String wrapperName, ClassDefinition trait, ClassDefinition core, BitSet mask ) {
int stackSize = super.initSoftFields( mv, wrapperName, trait, core, mask );
for ( FieldDefinition field : trait.getFieldsDefinitions() ) {
View
9 ...s-chance-core/src/main/java/org/drools/chance/factmodel/ChanceTripleProxyBuilderImpl.java
@@ -31,6 +31,7 @@
import org.mvel2.asm.*;
import java.lang.reflect.Method;
+import java.util.BitSet;
import java.util.List;
import java.util.Map;
@@ -98,7 +99,7 @@ protected int buildConstructorCore( ClassWriter cw, MethodVisitor mv, String int
- protected void buildProxyAccessor(long mask, ClassWriter cw, String masterName, ClassDefinition core, Map<String, Method> mixinGetSet, FieldDefinition field, boolean isSoftField ) {
+ protected void buildProxyAccessor(BitSet mask, ClassWriter cw, String masterName, ClassDefinition core, Map<String, Method> mixinGetSet, FieldDefinition field, boolean isSoftField ) {
if ( field instanceof VirtualFieldDefinition) return;
if ( ! ( field instanceof ImperfectFieldDefinition) ) {
@@ -152,7 +153,7 @@ protected void buildProxyAccessor(long mask, ClassWriter cw, String masterName,
- private void buildSupportFieldAccessors( long mask, ClassWriter cw, String masterName, ClassDefinition core, Map<String, Method> mixinGetSet, FieldDefinition supportField, boolean isSoftField ) {
+ private void buildSupportFieldAccessors( BitSet mask, ClassWriter cw, String masterName, ClassDefinition core, Map<String, Method> mixinGetSet, FieldDefinition supportField, boolean isSoftField ) {
ImperfectFieldDefinition lingField = findSupportingField( getTrait(), supportField );
MethodVisitor mv;
@@ -247,7 +248,7 @@ private void buildSupportFieldAccessors( long mask, ClassWriter cw, String maste
}
- protected void buildDirectProxyAccessor( long mask, ClassWriter cw, String masterName, ClassDefinition core, Map<String,Method> mixinGetSet, DirectAccessFieldDefinition field, boolean isSoftField ) {
+ protected void buildDirectProxyAccessor( BitSet mask, ClassWriter cw, String masterName, ClassDefinition core, Map<String,Method> mixinGetSet, DirectAccessFieldDefinition field, boolean isSoftField ) {
FieldVisitor fv;
String getterName = BuildUtils.getterName( field.getName(), field.getTypeName() );
String setterName = BuildUtils.setterName( field.getName(), field.getTypeName() );
@@ -292,7 +293,7 @@ protected void buildDirectProxyAccessor( long mask, ClassWriter cw, String maste
- protected void buildExtendedMethods(ClassWriter cw, ClassDefinition trait, ClassDefinition core, long mask ) {
+ protected void buildExtendedMethods(ClassWriter cw, ClassDefinition trait, ClassDefinition core, BitSet mask ) {
buildSynchFields( cw, TraitFactory.getProxyName(trait, core), core.getName(), getTrait() );
}

0 comments on commit ac53de0

Please sign in to comment.
Something went wrong with that request. Please try again.