added hasUsbAccess field to Lecture* Struct

* TODO refactor NetRules

1 files changed, 105 insertions, 6 deletions

diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/LectureSummary.java b/src/main/java/org/openslx/bwlp/thrift/iface/LectureSummary.java
index d2edeab..d63885e 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/LectureSummary.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/LectureSummary.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-02")
 public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, LectureSummary._Fields>, java.io.Serializable, Cloneable, Comparable<LectureSummary> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LectureSummary");
 
@@ -54,6 +54,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   private static final org.apache.thrift.protocol.TField DEFAULT_PERMISSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultPermissions", org.apache.thrift.protocol.TType.STRUCT, (short)14);
   private static final org.apache.thrift.protocol.TField USER_PERMISSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("userPermissions", org.apache.thrift.protocol.TType.STRUCT, (short)15);
   private static final org.apache.thrift.protocol.TField IS_IMAGE_VERSION_USABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("isImageVersionUsable", org.apache.thrift.protocol.TType.BOOL, (short)16);
+  private static final org.apache.thrift.protocol.TField HAS_USB_ACCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("hasUsbAccess", org.apache.thrift.protocol.TType.BOOL, (short)17);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -77,6 +78,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   public LecturePermissions defaultPermissions; // required
   public LecturePermissions userPermissions; // optional
   public boolean isImageVersionUsable; // required
+  public boolean hasUsbAccess; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -95,7 +97,8 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     HAS_INTERNET_ACCESS((short)13, "hasInternetAccess"),
     DEFAULT_PERMISSIONS((short)14, "defaultPermissions"),
     USER_PERMISSIONS((short)15, "userPermissions"),
-    IS_IMAGE_VERSION_USABLE((short)16, "isImageVersionUsable");
+    IS_IMAGE_VERSION_USABLE((short)16, "isImageVersionUsable"),
+    HAS_USB_ACCESS((short)17, "hasUsbAccess");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -142,6 +145,8 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
           return USER_PERMISSIONS;
         case 16: // IS_IMAGE_VERSION_USABLE
           return IS_IMAGE_VERSION_USABLE;
+        case 17: // HAS_USB_ACCESS
+          return HAS_USB_ACCESS;
         default:
           return null;
       }
@@ -190,7 +195,8 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   private static final int __ISEXAM_ISSET_ID = 5;
   private static final int __HASINTERNETACCESS_ISSET_ID = 6;
   private static final int __ISIMAGEVERSIONUSABLE_ISSET_ID = 7;
-  private byte __isset_bitfield = 0;
+  private static final int __HASUSBACCESS_ISSET_ID = 8;
+  private short __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.USER_PERMISSIONS};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
@@ -227,6 +233,8 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LecturePermissions.class)));
     tmpMap.put(_Fields.IS_IMAGE_VERSION_USABLE, new org.apache.thrift.meta_data.FieldMetaData("isImageVersionUsable", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.HAS_USB_ACCESS, new org.apache.thrift.meta_data.FieldMetaData("hasUsbAccess", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LectureSummary.class, metaDataMap);
   }
@@ -249,7 +257,8 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     boolean isExam,
     boolean hasInternetAccess,
     LecturePermissions defaultPermissions,
-    boolean isImageVersionUsable)
+    boolean isImageVersionUsable,
+    boolean hasUsbAccess)
   {
     this();
     this.lectureId = lectureId;
@@ -275,6 +284,8 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     this.defaultPermissions = defaultPermissions;
     this.isImageVersionUsable = isImageVersionUsable;
     setIsImageVersionUsableIsSet(true);
+    this.hasUsbAccess = hasUsbAccess;
+    setHasUsbAccessIsSet(true);
   }
 
   /**
@@ -314,6 +325,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       this.userPermissions = new LecturePermissions(other.userPermissions);
     }
     this.isImageVersionUsable = other.isImageVersionUsable;
+    this.hasUsbAccess = other.hasUsbAccess;
   }
 
   public LectureSummary deepCopy() {
@@ -346,6 +358,8 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     this.userPermissions = null;
     setIsImageVersionUsableIsSet(false);
     this.isImageVersionUsable = false;
+    setHasUsbAccessIsSet(false);
+    this.hasUsbAccess = false;
   }
 
   public String getLectureId() {
@@ -724,6 +738,29 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISIMAGEVERSIONUSABLE_ISSET_ID, value);
   }
 
+  public boolean isHasUsbAccess() {
+    return this.hasUsbAccess;
+  }
+
+  public LectureSummary setHasUsbAccess(boolean hasUsbAccess) {
+    this.hasUsbAccess = hasUsbAccess;
+    setHasUsbAccessIsSet(true);
+    return this;
+  }
+
+  public void unsetHasUsbAccess() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID);
+  }
+
+  /** Returns true if field hasUsbAccess is set (has been assigned a value) and false otherwise */
+  public boolean isSetHasUsbAccess() {
+    return EncodingUtils.testBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID);
+  }
+
+  public void setHasUsbAccessIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID, value);
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case LECTURE_ID:
@@ -854,6 +891,14 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       }
       break;
 
+    case HAS_USB_ACCESS:
+      if (value == null) {
+        unsetHasUsbAccess();
+      } else {
+        setHasUsbAccess((Boolean)value);
+      }
+      break;
+
     }
   }
 
@@ -907,6 +952,9 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     case IS_IMAGE_VERSION_USABLE:
       return isIsImageVersionUsable();
 
+    case HAS_USB_ACCESS:
+      return isHasUsbAccess();
+
     }
     throw new IllegalStateException();
   }
@@ -950,6 +998,8 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       return isSetUserPermissions();
     case IS_IMAGE_VERSION_USABLE:
       return isSetIsImageVersionUsable();
+    case HAS_USB_ACCESS:
+      return isSetHasUsbAccess();
     }
     throw new IllegalStateException();
   }
@@ -1111,6 +1161,15 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return false;
     }
 
+    boolean this_present_hasUsbAccess = true;
+    boolean that_present_hasUsbAccess = true;
+    if (this_present_hasUsbAccess || that_present_hasUsbAccess) {
+      if (!(this_present_hasUsbAccess && that_present_hasUsbAccess))
+        return false;
+      if (this.hasUsbAccess != that.hasUsbAccess)
+        return false;
+    }
+
     return true;
   }
 
@@ -1198,6 +1257,11 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     if (present_isImageVersionUsable)
       list.add(isImageVersionUsable);
 
+    boolean present_hasUsbAccess = true;
+    list.add(present_hasUsbAccess);
+    if (present_hasUsbAccess)
+      list.add(hasUsbAccess);
+
     return list.hashCode();
   }
 
@@ -1369,6 +1433,16 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetHasUsbAccess()).compareTo(other.isSetHasUsbAccess());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetHasUsbAccess()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hasUsbAccess, other.hasUsbAccess);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -1486,6 +1560,10 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     sb.append("isImageVersionUsable:");
     sb.append(this.isImageVersionUsable);
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("hasUsbAccess:");
+    sb.append(this.hasUsbAccess);
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -1667,6 +1745,14 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 17: // HAS_USB_ACCESS
+            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+              struct.hasUsbAccess = iprot.readBool();
+              struct.setHasUsbAccessIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -1748,6 +1834,9 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       oprot.writeFieldBegin(IS_IMAGE_VERSION_USABLE_FIELD_DESC);
       oprot.writeBool(struct.isImageVersionUsable);
       oprot.writeFieldEnd();
+      oprot.writeFieldBegin(HAS_USB_ACCESS_FIELD_DESC);
+      oprot.writeBool(struct.hasUsbAccess);
+      oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -1814,7 +1903,10 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (struct.isSetIsImageVersionUsable()) {
         optionals.set(15);
       }
-      oprot.writeBitSet(optionals, 16);
+      if (struct.isSetHasUsbAccess()) {
+        optionals.set(16);
+      }
+      oprot.writeBitSet(optionals, 17);
       if (struct.isSetLectureId()) {
         oprot.writeString(struct.lectureId);
       }
@@ -1863,12 +1955,15 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (struct.isSetIsImageVersionUsable()) {
         oprot.writeBool(struct.isImageVersionUsable);
       }
+      if (struct.isSetHasUsbAccess()) {
+        oprot.writeBool(struct.hasUsbAccess);
+      }
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LectureSummary struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(16);
+      BitSet incoming = iprot.readBitSet(17);
       if (incoming.get(0)) {
         struct.lectureId = iprot.readString();
         struct.setLectureIdIsSet(true);
@@ -1935,6 +2030,10 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         struct.isImageVersionUsable = iprot.readBool();
         struct.setIsImageVersionUsableIsSet(true);
       }
+      if (incoming.get(16)) {
+        struct.hasUsbAccess = iprot.readBool();
+        struct.setHasUsbAccessIsSet(true);
+      }
     }
   }