From 67ba101edb960ae93264bf20c65973556154c193 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 11 Dec 2018 10:41:22 +0100
Subject: Redesign preset* handling to aim for backwards compat

---
 .../org/openslx/bwlp/thrift/iface/LectureRead.java | 496 +++++++++++++++++----
 src/main/thrift/bwlp.thrift                        |   2 +
 2 files changed, 406 insertions(+), 92 deletions(-)

diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java b/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java
index a60e316..b2a183f 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.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 = "2018-12-08")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-12-11")
 public class LectureRead implements org.apache.thrift.TBase<LectureRead, LectureRead._Fields>, java.io.Serializable, Cloneable, Comparable<LectureRead> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LectureRead");
 
@@ -66,7 +66,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   private static final org.apache.thrift.protocol.TField LIMIT_TO_ALLOWED_USERS_FIELD_DESC = new org.apache.thrift.protocol.TField("limitToAllowedUsers", org.apache.thrift.protocol.TType.BOOL, (short)27);
   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)28);
   private static final org.apache.thrift.protocol.TField NETWORK_SHARES_FIELD_DESC = new org.apache.thrift.protocol.TField("networkShares", org.apache.thrift.protocol.TType.LIST, (short)29);
+  private static final org.apache.thrift.protocol.TField PRESET_NETWORK_SHARES_FIELD_DESC = new org.apache.thrift.protocol.TField("presetNetworkShares", org.apache.thrift.protocol.TType.LIST, (short)32);
   private static final org.apache.thrift.protocol.TField LDAP_FILTERS_FIELD_DESC = new org.apache.thrift.protocol.TField("ldapFilters", org.apache.thrift.protocol.TType.LIST, (short)30);
+  private static final org.apache.thrift.protocol.TField PRESET_LDAP_FILTERS_FIELD_DESC = new org.apache.thrift.protocol.TField("presetLdapFilters", org.apache.thrift.protocol.TType.LIST, (short)33);
   private static final org.apache.thrift.protocol.TField PRESET_SCRIPT_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("presetScriptIds", org.apache.thrift.protocol.TType.LIST, (short)31);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
@@ -103,7 +105,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   public boolean limitToAllowedUsers; // required
   public boolean hasUsbAccess; // required
   public List<NetShare> networkShares; // optional
+  public List<Integer> presetNetworkShares; // optional
   public List<LdapFilter> ldapFilters; // optional
+  public List<Integer> presetLdapFilters; // optional
   public List<Integer> presetScriptIds; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -136,7 +140,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     LIMIT_TO_ALLOWED_USERS((short)27, "limitToAllowedUsers"),
     HAS_USB_ACCESS((short)28, "hasUsbAccess"),
     NETWORK_SHARES((short)29, "networkShares"),
+    PRESET_NETWORK_SHARES((short)32, "presetNetworkShares"),
     LDAP_FILTERS((short)30, "ldapFilters"),
+    PRESET_LDAP_FILTERS((short)33, "presetLdapFilters"),
     PRESET_SCRIPT_IDS((short)31, "presetScriptIds");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -208,8 +214,12 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           return HAS_USB_ACCESS;
         case 29: // NETWORK_SHARES
           return NETWORK_SHARES;
+        case 32: // PRESET_NETWORK_SHARES
+          return PRESET_NETWORK_SHARES;
         case 30: // LDAP_FILTERS
           return LDAP_FILTERS;
+        case 33: // PRESET_LDAP_FILTERS
+          return PRESET_LDAP_FILTERS;
         case 31: // PRESET_SCRIPT_IDS
           return PRESET_SCRIPT_IDS;
         default:
@@ -266,7 +276,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   private static final int __LIMITTOALLOWEDUSERS_ISSET_ID = 11;
   private static final int __HASUSBACCESS_ISSET_ID = 12;
   private short __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.USER_PERMISSIONS,_Fields.NETWORK_SHARES,_Fields.LDAP_FILTERS,_Fields.PRESET_SCRIPT_IDS};
+  private static final _Fields optionals[] = {_Fields.USER_PERMISSIONS,_Fields.NETWORK_SHARES,_Fields.PRESET_NETWORK_SHARES,_Fields.LDAP_FILTERS,_Fields.PRESET_LDAP_FILTERS,_Fields.PRESET_SCRIPT_IDS};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -331,9 +341,15 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     tmpMap.put(_Fields.NETWORK_SHARES, new org.apache.thrift.meta_data.FieldMetaData("networkShares", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NetShare.class))));
+    tmpMap.put(_Fields.PRESET_NETWORK_SHARES, new org.apache.thrift.meta_data.FieldMetaData("presetNetworkShares", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
     tmpMap.put(_Fields.LDAP_FILTERS, new org.apache.thrift.meta_data.FieldMetaData("ldapFilters", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LdapFilter.class))));
+    tmpMap.put(_Fields.PRESET_LDAP_FILTERS, new org.apache.thrift.meta_data.FieldMetaData("presetLdapFilters", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
     tmpMap.put(_Fields.PRESET_SCRIPT_IDS, new org.apache.thrift.meta_data.FieldMetaData("presetScriptIds", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
@@ -488,6 +504,10 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       this.networkShares = __this__networkShares;
     }
+    if (other.isSetPresetNetworkShares()) {
+      List<Integer> __this__presetNetworkShares = new ArrayList<Integer>(other.presetNetworkShares);
+      this.presetNetworkShares = __this__presetNetworkShares;
+    }
     if (other.isSetLdapFilters()) {
       List<LdapFilter> __this__ldapFilters = new ArrayList<LdapFilter>(other.ldapFilters.size());
       for (LdapFilter other_element : other.ldapFilters) {
@@ -495,6 +515,10 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       this.ldapFilters = __this__ldapFilters;
     }
+    if (other.isSetPresetLdapFilters()) {
+      List<Integer> __this__presetLdapFilters = new ArrayList<Integer>(other.presetLdapFilters);
+      this.presetLdapFilters = __this__presetLdapFilters;
+    }
     if (other.isSetPresetScriptIds()) {
       List<Integer> __this__presetScriptIds = new ArrayList<Integer>(other.presetScriptIds);
       this.presetScriptIds = __this__presetScriptIds;
@@ -548,7 +572,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     setHasUsbAccessIsSet(false);
     this.hasUsbAccess = false;
     this.networkShares = null;
+    this.presetNetworkShares = null;
     this.ldapFilters = null;
+    this.presetLdapFilters = null;
     this.presetScriptIds = null;
   }
 
@@ -1286,6 +1312,45 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     }
   }
 
+  public int getPresetNetworkSharesSize() {
+    return (this.presetNetworkShares == null) ? 0 : this.presetNetworkShares.size();
+  }
+
+  public java.util.Iterator<Integer> getPresetNetworkSharesIterator() {
+    return (this.presetNetworkShares == null) ? null : this.presetNetworkShares.iterator();
+  }
+
+  public void addToPresetNetworkShares(int elem) {
+    if (this.presetNetworkShares == null) {
+      this.presetNetworkShares = new ArrayList<Integer>();
+    }
+    this.presetNetworkShares.add(elem);
+  }
+
+  public List<Integer> getPresetNetworkShares() {
+    return this.presetNetworkShares;
+  }
+
+  public LectureRead setPresetNetworkShares(List<Integer> presetNetworkShares) {
+    this.presetNetworkShares = presetNetworkShares;
+    return this;
+  }
+
+  public void unsetPresetNetworkShares() {
+    this.presetNetworkShares = null;
+  }
+
+  /** Returns true if field presetNetworkShares is set (has been assigned a value) and false otherwise */
+  public boolean isSetPresetNetworkShares() {
+    return this.presetNetworkShares != null;
+  }
+
+  public void setPresetNetworkSharesIsSet(boolean value) {
+    if (!value) {
+      this.presetNetworkShares = null;
+    }
+  }
+
   public int getLdapFiltersSize() {
     return (this.ldapFilters == null) ? 0 : this.ldapFilters.size();
   }
@@ -1325,6 +1390,45 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     }
   }
 
+  public int getPresetLdapFiltersSize() {
+    return (this.presetLdapFilters == null) ? 0 : this.presetLdapFilters.size();
+  }
+
+  public java.util.Iterator<Integer> getPresetLdapFiltersIterator() {
+    return (this.presetLdapFilters == null) ? null : this.presetLdapFilters.iterator();
+  }
+
+  public void addToPresetLdapFilters(int elem) {
+    if (this.presetLdapFilters == null) {
+      this.presetLdapFilters = new ArrayList<Integer>();
+    }
+    this.presetLdapFilters.add(elem);
+  }
+
+  public List<Integer> getPresetLdapFilters() {
+    return this.presetLdapFilters;
+  }
+
+  public LectureRead setPresetLdapFilters(List<Integer> presetLdapFilters) {
+    this.presetLdapFilters = presetLdapFilters;
+    return this;
+  }
+
+  public void unsetPresetLdapFilters() {
+    this.presetLdapFilters = null;
+  }
+
+  /** Returns true if field presetLdapFilters is set (has been assigned a value) and false otherwise */
+  public boolean isSetPresetLdapFilters() {
+    return this.presetLdapFilters != null;
+  }
+
+  public void setPresetLdapFiltersIsSet(boolean value) {
+    if (!value) {
+      this.presetLdapFilters = null;
+    }
+  }
+
   public int getPresetScriptIdsSize() {
     return (this.presetScriptIds == null) ? 0 : this.presetScriptIds.size();
   }
@@ -1590,6 +1694,14 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       break;
 
+    case PRESET_NETWORK_SHARES:
+      if (value == null) {
+        unsetPresetNetworkShares();
+      } else {
+        setPresetNetworkShares((List<Integer>)value);
+      }
+      break;
+
     case LDAP_FILTERS:
       if (value == null) {
         unsetLdapFilters();
@@ -1598,6 +1710,14 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       break;
 
+    case PRESET_LDAP_FILTERS:
+      if (value == null) {
+        unsetPresetLdapFilters();
+      } else {
+        setPresetLdapFilters((List<Integer>)value);
+      }
+      break;
+
     case PRESET_SCRIPT_IDS:
       if (value == null) {
         unsetPresetScriptIds();
@@ -1695,9 +1815,15 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     case NETWORK_SHARES:
       return getNetworkShares();
 
+    case PRESET_NETWORK_SHARES:
+      return getPresetNetworkShares();
+
     case LDAP_FILTERS:
       return getLdapFilters();
 
+    case PRESET_LDAP_FILTERS:
+      return getPresetLdapFilters();
+
     case PRESET_SCRIPT_IDS:
       return getPresetScriptIds();
 
@@ -1768,8 +1894,12 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       return isSetHasUsbAccess();
     case NETWORK_SHARES:
       return isSetNetworkShares();
+    case PRESET_NETWORK_SHARES:
+      return isSetPresetNetworkShares();
     case LDAP_FILTERS:
       return isSetLdapFilters();
+    case PRESET_LDAP_FILTERS:
+      return isSetPresetLdapFilters();
     case PRESET_SCRIPT_IDS:
       return isSetPresetScriptIds();
     }
@@ -2041,6 +2171,15 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return false;
     }
 
+    boolean this_present_presetNetworkShares = true && this.isSetPresetNetworkShares();
+    boolean that_present_presetNetworkShares = true && that.isSetPresetNetworkShares();
+    if (this_present_presetNetworkShares || that_present_presetNetworkShares) {
+      if (!(this_present_presetNetworkShares && that_present_presetNetworkShares))
+        return false;
+      if (!this.presetNetworkShares.equals(that.presetNetworkShares))
+        return false;
+    }
+
     boolean this_present_ldapFilters = true && this.isSetLdapFilters();
     boolean that_present_ldapFilters = true && that.isSetLdapFilters();
     if (this_present_ldapFilters || that_present_ldapFilters) {
@@ -2050,6 +2189,15 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return false;
     }
 
+    boolean this_present_presetLdapFilters = true && this.isSetPresetLdapFilters();
+    boolean that_present_presetLdapFilters = true && that.isSetPresetLdapFilters();
+    if (this_present_presetLdapFilters || that_present_presetLdapFilters) {
+      if (!(this_present_presetLdapFilters && that_present_presetLdapFilters))
+        return false;
+      if (!this.presetLdapFilters.equals(that.presetLdapFilters))
+        return false;
+    }
+
     boolean this_present_presetScriptIds = true && this.isSetPresetScriptIds();
     boolean that_present_presetScriptIds = true && that.isSetPresetScriptIds();
     if (this_present_presetScriptIds || that_present_presetScriptIds) {
@@ -2206,11 +2354,21 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     if (present_networkShares)
       list.add(networkShares);
 
+    boolean present_presetNetworkShares = true && (isSetPresetNetworkShares());
+    list.add(present_presetNetworkShares);
+    if (present_presetNetworkShares)
+      list.add(presetNetworkShares);
+
     boolean present_ldapFilters = true && (isSetLdapFilters());
     list.add(present_ldapFilters);
     if (present_ldapFilters)
       list.add(ldapFilters);
 
+    boolean present_presetLdapFilters = true && (isSetPresetLdapFilters());
+    list.add(present_presetLdapFilters);
+    if (present_presetLdapFilters)
+      list.add(presetLdapFilters);
+
     boolean present_presetScriptIds = true && (isSetPresetScriptIds());
     list.add(present_presetScriptIds);
     if (present_presetScriptIds)
@@ -2507,6 +2665,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetPresetNetworkShares()).compareTo(other.isSetPresetNetworkShares());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetPresetNetworkShares()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.presetNetworkShares, other.presetNetworkShares);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     lastComparison = Boolean.valueOf(isSetLdapFilters()).compareTo(other.isSetLdapFilters());
     if (lastComparison != 0) {
       return lastComparison;
@@ -2517,6 +2685,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetPresetLdapFilters()).compareTo(other.isSetPresetLdapFilters());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetPresetLdapFilters()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.presetLdapFilters, other.presetLdapFilters);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     lastComparison = Boolean.valueOf(isSetPresetScriptIds()).compareTo(other.isSetPresetScriptIds());
     if (lastComparison != 0) {
       return lastComparison;
@@ -2722,6 +2900,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       first = false;
     }
+    if (isSetPresetNetworkShares()) {
+      if (!first) sb.append(", ");
+      sb.append("presetNetworkShares:");
+      if (this.presetNetworkShares == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.presetNetworkShares);
+      }
+      first = false;
+    }
     if (isSetLdapFilters()) {
       if (!first) sb.append(", ");
       sb.append("ldapFilters:");
@@ -2732,6 +2920,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       first = false;
     }
+    if (isSetPresetLdapFilters()) {
+      if (!first) sb.append(", ");
+      sb.append("presetLdapFilters:");
+      if (this.presetLdapFilters == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.presetLdapFilters);
+      }
+      first = false;
+    }
     if (isSetPresetScriptIds()) {
       if (!first) sb.append(", ");
       sb.append("presetScriptIds:");
@@ -3071,35 +3269,71 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 30: // LDAP_FILTERS
+          case 32: // PRESET_NETWORK_SHARES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list201 = iprot.readListBegin();
-                struct.ldapFilters = new ArrayList<LdapFilter>(_list201.size);
-                LdapFilter _elem202;
+                struct.presetNetworkShares = new ArrayList<Integer>(_list201.size);
+                int _elem202;
                 for (int _i203 = 0; _i203 < _list201.size; ++_i203)
                 {
-                  _elem202 = new LdapFilter();
-                  _elem202.read(iprot);
-                  struct.ldapFilters.add(_elem202);
+                  _elem202 = iprot.readI32();
+                  struct.presetNetworkShares.add(_elem202);
                 }
                 iprot.readListEnd();
               }
-              struct.setLdapFiltersIsSet(true);
+              struct.setPresetNetworkSharesIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 31: // PRESET_SCRIPT_IDS
+          case 30: // LDAP_FILTERS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list204 = iprot.readListBegin();
-                struct.presetScriptIds = new ArrayList<Integer>(_list204.size);
-                int _elem205;
+                struct.ldapFilters = new ArrayList<LdapFilter>(_list204.size);
+                LdapFilter _elem205;
                 for (int _i206 = 0; _i206 < _list204.size; ++_i206)
                 {
-                  _elem205 = iprot.readI32();
-                  struct.presetScriptIds.add(_elem205);
+                  _elem205 = new LdapFilter();
+                  _elem205.read(iprot);
+                  struct.ldapFilters.add(_elem205);
+                }
+                iprot.readListEnd();
+              }
+              struct.setLdapFiltersIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 33: // PRESET_LDAP_FILTERS
+            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list207 = iprot.readListBegin();
+                struct.presetLdapFilters = new ArrayList<Integer>(_list207.size);
+                int _elem208;
+                for (int _i209 = 0; _i209 < _list207.size; ++_i209)
+                {
+                  _elem208 = iprot.readI32();
+                  struct.presetLdapFilters.add(_elem208);
+                }
+                iprot.readListEnd();
+              }
+              struct.setPresetLdapFiltersIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 31: // PRESET_SCRIPT_IDS
+            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list210 = iprot.readListBegin();
+                struct.presetScriptIds = new ArrayList<Integer>(_list210.size);
+                int _elem211;
+                for (int _i212 = 0; _i212 < _list210.size; ++_i212)
+                {
+                  _elem211 = iprot.readI32();
+                  struct.presetScriptIds.add(_elem211);
                 }
                 iprot.readListEnd();
               }
@@ -3175,9 +3409,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         oprot.writeFieldBegin(NICS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.nics.size()));
-          for (String _iter207 : struct.nics)
+          for (String _iter213 : struct.nics)
           {
-            oprot.writeString(_iter207);
+            oprot.writeString(_iter213);
           }
           oprot.writeListEnd();
         }
@@ -3187,9 +3421,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         oprot.writeFieldBegin(ALLOWED_USERS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.allowedUsers.size()));
-          for (String _iter208 : struct.allowedUsers)
+          for (String _iter214 : struct.allowedUsers)
           {
-            oprot.writeString(_iter208);
+            oprot.writeString(_iter214);
           }
           oprot.writeListEnd();
         }
@@ -3199,9 +3433,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         oprot.writeFieldBegin(NETWORK_EXCEPTIONS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.networkExceptions.size()));
-          for (NetRule _iter209 : struct.networkExceptions)
+          for (NetRule _iter215 : struct.networkExceptions)
           {
-            _iter209.write(oprot);
+            _iter215.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -3245,9 +3479,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         oprot.writeFieldBegin(LOCATION_IDS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.locationIds.size()));
-          for (int _iter210 : struct.locationIds)
+          for (int _iter216 : struct.locationIds)
           {
-            oprot.writeI32(_iter210);
+            oprot.writeI32(_iter216);
           }
           oprot.writeListEnd();
         }
@@ -3267,9 +3501,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           oprot.writeFieldBegin(NETWORK_SHARES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.networkShares.size()));
-            for (NetShare _iter211 : struct.networkShares)
+            for (NetShare _iter217 : struct.networkShares)
             {
-              _iter211.write(oprot);
+              _iter217.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -3281,9 +3515,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           oprot.writeFieldBegin(LDAP_FILTERS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.ldapFilters.size()));
-            for (LdapFilter _iter212 : struct.ldapFilters)
+            for (LdapFilter _iter218 : struct.ldapFilters)
             {
-              _iter212.write(oprot);
+              _iter218.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -3295,9 +3529,37 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           oprot.writeFieldBegin(PRESET_SCRIPT_IDS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetScriptIds.size()));
-            for (int _iter213 : struct.presetScriptIds)
+            for (int _iter219 : struct.presetScriptIds)
             {
-              oprot.writeI32(_iter213);
+              oprot.writeI32(_iter219);
+            }
+            oprot.writeListEnd();
+          }
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.presetNetworkShares != null) {
+        if (struct.isSetPresetNetworkShares()) {
+          oprot.writeFieldBegin(PRESET_NETWORK_SHARES_FIELD_DESC);
+          {
+            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetNetworkShares.size()));
+            for (int _iter220 : struct.presetNetworkShares)
+            {
+              oprot.writeI32(_iter220);
+            }
+            oprot.writeListEnd();
+          }
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.presetLdapFilters != null) {
+        if (struct.isSetPresetLdapFilters()) {
+          oprot.writeFieldBegin(PRESET_LDAP_FILTERS_FIELD_DESC);
+          {
+            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetLdapFilters.size()));
+            for (int _iter221 : struct.presetLdapFilters)
+            {
+              oprot.writeI32(_iter221);
             }
             oprot.writeListEnd();
           }
@@ -3406,13 +3668,19 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (struct.isSetNetworkShares()) {
         optionals.set(27);
       }
-      if (struct.isSetLdapFilters()) {
+      if (struct.isSetPresetNetworkShares()) {
         optionals.set(28);
       }
-      if (struct.isSetPresetScriptIds()) {
+      if (struct.isSetLdapFilters()) {
         optionals.set(29);
       }
-      oprot.writeBitSet(optionals, 30);
+      if (struct.isSetPresetLdapFilters()) {
+        optionals.set(30);
+      }
+      if (struct.isSetPresetScriptIds()) {
+        optionals.set(31);
+      }
+      oprot.writeBitSet(optionals, 32);
       if (struct.isSetLectureId()) {
         oprot.writeString(struct.lectureId);
       }
@@ -3464,27 +3732,27 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (struct.isSetNics()) {
         {
           oprot.writeI32(struct.nics.size());
-          for (String _iter214 : struct.nics)
+          for (String _iter222 : struct.nics)
           {
-            oprot.writeString(_iter214);
+            oprot.writeString(_iter222);
           }
         }
       }
       if (struct.isSetAllowedUsers()) {
         {
           oprot.writeI32(struct.allowedUsers.size());
-          for (String _iter215 : struct.allowedUsers)
+          for (String _iter223 : struct.allowedUsers)
           {
-            oprot.writeString(_iter215);
+            oprot.writeString(_iter223);
           }
         }
       }
       if (struct.isSetNetworkExceptions()) {
         {
           oprot.writeI32(struct.networkExceptions.size());
-          for (NetRule _iter216 : struct.networkExceptions)
+          for (NetRule _iter224 : struct.networkExceptions)
           {
-            _iter216.write(oprot);
+            _iter224.write(oprot);
           }
         }
       }
@@ -3503,9 +3771,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (struct.isSetLocationIds()) {
         {
           oprot.writeI32(struct.locationIds.size());
-          for (int _iter217 : struct.locationIds)
+          for (int _iter225 : struct.locationIds)
           {
-            oprot.writeI32(_iter217);
+            oprot.writeI32(_iter225);
           }
         }
       }
@@ -3521,27 +3789,45 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (struct.isSetNetworkShares()) {
         {
           oprot.writeI32(struct.networkShares.size());
-          for (NetShare _iter218 : struct.networkShares)
+          for (NetShare _iter226 : struct.networkShares)
           {
-            _iter218.write(oprot);
+            _iter226.write(oprot);
+          }
+        }
+      }
+      if (struct.isSetPresetNetworkShares()) {
+        {
+          oprot.writeI32(struct.presetNetworkShares.size());
+          for (int _iter227 : struct.presetNetworkShares)
+          {
+            oprot.writeI32(_iter227);
           }
         }
       }
       if (struct.isSetLdapFilters()) {
         {
           oprot.writeI32(struct.ldapFilters.size());
-          for (LdapFilter _iter219 : struct.ldapFilters)
+          for (LdapFilter _iter228 : struct.ldapFilters)
+          {
+            _iter228.write(oprot);
+          }
+        }
+      }
+      if (struct.isSetPresetLdapFilters()) {
+        {
+          oprot.writeI32(struct.presetLdapFilters.size());
+          for (int _iter229 : struct.presetLdapFilters)
           {
-            _iter219.write(oprot);
+            oprot.writeI32(_iter229);
           }
         }
       }
       if (struct.isSetPresetScriptIds()) {
         {
           oprot.writeI32(struct.presetScriptIds.size());
-          for (int _iter220 : struct.presetScriptIds)
+          for (int _iter230 : struct.presetScriptIds)
           {
-            oprot.writeI32(_iter220);
+            oprot.writeI32(_iter230);
           }
         }
       }
@@ -3550,7 +3836,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LectureRead struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(30);
+      BitSet incoming = iprot.readBitSet(32);
       if (incoming.get(0)) {
         struct.lectureId = iprot.readString();
         struct.setLectureIdIsSet(true);
@@ -3617,40 +3903,40 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       if (incoming.get(16)) {
         {
-          org.apache.thrift.protocol.TList _list221 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.nics = new ArrayList<String>(_list221.size);
-          String _elem222;
-          for (int _i223 = 0; _i223 < _list221.size; ++_i223)
+          org.apache.thrift.protocol.TList _list231 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.nics = new ArrayList<String>(_list231.size);
+          String _elem232;
+          for (int _i233 = 0; _i233 < _list231.size; ++_i233)
           {
-            _elem222 = iprot.readString();
-            struct.nics.add(_elem222);
+            _elem232 = iprot.readString();
+            struct.nics.add(_elem232);
           }
         }
         struct.setNicsIsSet(true);
       }
       if (incoming.get(17)) {
         {
-          org.apache.thrift.protocol.TList _list224 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.allowedUsers = new ArrayList<String>(_list224.size);
-          String _elem225;
-          for (int _i226 = 0; _i226 < _list224.size; ++_i226)
+          org.apache.thrift.protocol.TList _list234 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.allowedUsers = new ArrayList<String>(_list234.size);
+          String _elem235;
+          for (int _i236 = 0; _i236 < _list234.size; ++_i236)
           {
-            _elem225 = iprot.readString();
-            struct.allowedUsers.add(_elem225);
+            _elem235 = iprot.readString();
+            struct.allowedUsers.add(_elem235);
           }
         }
         struct.setAllowedUsersIsSet(true);
       }
       if (incoming.get(18)) {
         {
-          org.apache.thrift.protocol.TList _list227 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.networkExceptions = new ArrayList<NetRule>(_list227.size);
-          NetRule _elem228;
-          for (int _i229 = 0; _i229 < _list227.size; ++_i229)
+          org.apache.thrift.protocol.TList _list237 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.networkExceptions = new ArrayList<NetRule>(_list237.size);
+          NetRule _elem238;
+          for (int _i239 = 0; _i239 < _list237.size; ++_i239)
           {
-            _elem228 = new NetRule();
-            _elem228.read(iprot);
-            struct.networkExceptions.add(_elem228);
+            _elem238 = new NetRule();
+            _elem238.read(iprot);
+            struct.networkExceptions.add(_elem238);
           }
         }
         struct.setNetworkExceptionsIsSet(true);
@@ -3675,13 +3961,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       if (incoming.get(23)) {
         {
-          org.apache.thrift.protocol.TList _list230 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.locationIds = new ArrayList<Integer>(_list230.size);
-          int _elem231;
-          for (int _i232 = 0; _i232 < _list230.size; ++_i232)
+          org.apache.thrift.protocol.TList _list240 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+          struct.locationIds = new ArrayList<Integer>(_list240.size);
+          int _elem241;
+          for (int _i242 = 0; _i242 < _list240.size; ++_i242)
           {
-            _elem231 = iprot.readI32();
-            struct.locationIds.add(_elem231);
+            _elem241 = iprot.readI32();
+            struct.locationIds.add(_elem241);
           }
         }
         struct.setLocationIdsIsSet(true);
@@ -3700,41 +3986,67 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       if (incoming.get(27)) {
         {
-          org.apache.thrift.protocol.TList _list233 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.networkShares = new ArrayList<NetShare>(_list233.size);
-          NetShare _elem234;
-          for (int _i235 = 0; _i235 < _list233.size; ++_i235)
+          org.apache.thrift.protocol.TList _list243 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.networkShares = new ArrayList<NetShare>(_list243.size);
+          NetShare _elem244;
+          for (int _i245 = 0; _i245 < _list243.size; ++_i245)
           {
-            _elem234 = new NetShare();
-            _elem234.read(iprot);
-            struct.networkShares.add(_elem234);
+            _elem244 = new NetShare();
+            _elem244.read(iprot);
+            struct.networkShares.add(_elem244);
           }
         }
         struct.setNetworkSharesIsSet(true);
       }
       if (incoming.get(28)) {
         {
-          org.apache.thrift.protocol.TList _list236 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.ldapFilters = new ArrayList<LdapFilter>(_list236.size);
-          LdapFilter _elem237;
-          for (int _i238 = 0; _i238 < _list236.size; ++_i238)
+          org.apache.thrift.protocol.TList _list246 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+          struct.presetNetworkShares = new ArrayList<Integer>(_list246.size);
+          int _elem247;
+          for (int _i248 = 0; _i248 < _list246.size; ++_i248)
           {
-            _elem237 = new LdapFilter();
-            _elem237.read(iprot);
-            struct.ldapFilters.add(_elem237);
+            _elem247 = iprot.readI32();
+            struct.presetNetworkShares.add(_elem247);
           }
         }
-        struct.setLdapFiltersIsSet(true);
+        struct.setPresetNetworkSharesIsSet(true);
       }
       if (incoming.get(29)) {
         {
-          org.apache.thrift.protocol.TList _list239 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.presetScriptIds = new ArrayList<Integer>(_list239.size);
-          int _elem240;
-          for (int _i241 = 0; _i241 < _list239.size; ++_i241)
+          org.apache.thrift.protocol.TList _list249 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.ldapFilters = new ArrayList<LdapFilter>(_list249.size);
+          LdapFilter _elem250;
+          for (int _i251 = 0; _i251 < _list249.size; ++_i251)
+          {
+            _elem250 = new LdapFilter();
+            _elem250.read(iprot);
+            struct.ldapFilters.add(_elem250);
+          }
+        }
+        struct.setLdapFiltersIsSet(true);
+      }
+      if (incoming.get(30)) {
+        {
+          org.apache.thrift.protocol.TList _list252 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+          struct.presetLdapFilters = new ArrayList<Integer>(_list252.size);
+          int _elem253;
+          for (int _i254 = 0; _i254 < _list252.size; ++_i254)
+          {
+            _elem253 = iprot.readI32();
+            struct.presetLdapFilters.add(_elem253);
+          }
+        }
+        struct.setPresetLdapFiltersIsSet(true);
+      }
+      if (incoming.get(31)) {
+        {
+          org.apache.thrift.protocol.TList _list255 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+          struct.presetScriptIds = new ArrayList<Integer>(_list255.size);
+          int _elem256;
+          for (int _i257 = 0; _i257 < _list255.size; ++_i257)
           {
-            _elem240 = iprot.readI32();
-            struct.presetScriptIds.add(_elem240);
+            _elem256 = iprot.readI32();
+            struct.presetScriptIds.add(_elem256);
           }
         }
         struct.setPresetScriptIdsIsSet(true);
diff --git a/src/main/thrift/bwlp.thrift b/src/main/thrift/bwlp.thrift
index 8b7af3f..bed99f8 100644
--- a/src/main/thrift/bwlp.thrift
+++ b/src/main/thrift/bwlp.thrift
@@ -348,7 +348,9 @@ struct LectureRead {
 	27: bool limitToAllowedUsers,
 	28: bool hasUsbAccess,
 	29: optional list<NetShare> networkShares,
+	32: optional list<i32> presetNetworkShares,
 	30: optional list<LdapFilter> ldapFilters,
+	33: optional list<i32> presetLdapFilters,
 	31: optional list<i32> presetScriptIds,
 }
 
-- 
cgit v1.2.3-55-g7522