diff options
Diffstat (limited to 'dozentenmodulserver/src')
-rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java | 6 | ||||
-rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java (renamed from dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbNetshare.java) | 4 | ||||
-rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java index ec96dd3c..d79b4fdf 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java @@ -120,7 +120,7 @@ public class DbLecture { stmt.executeUpdate(); writeLocations(connection, lectureId, lecture.locationIds); if (lecture.isSetNetworkShares()) { - DbNetshare.writeNetworkShares(connection, lectureId, lecture.networkShares); + DbLectureNetshare.writeNetworkShares(connection, lectureId, lecture.networkShares); } if (lecture.isSetLdapFilters()) { DbLectureFilter.writeLdapFilters(connection, lectureId, lecture.ldapFilters); @@ -147,7 +147,7 @@ public class DbLecture { setWriteFields(stmt, lectureId, lecture, user); writeLocations(connection, lectureId, lecture.locationIds); if (lecture.isSetNetworkShares()) { - DbNetshare.writeNetworkShares(connection, lectureId, lecture.networkShares); + DbLectureNetshare.writeNetworkShares(connection, lectureId, lecture.networkShares); } if (lecture.isSetLdapFilters()) { DbLectureFilter.writeLdapFilters(connection, lectureId, lecture.ldapFilters); @@ -338,7 +338,7 @@ public class DbLecture { lecture.setUserPermissions(DbLecturePermissions.fromResultSetUser(rs)); User.setCombinedUserPermissions(lecture, user); lecture.setLocationIds(DbLocation.getLectureLocations(connection, lectureId)); - lecture.setNetworkShares(DbNetshare.getLectureNetshares(connection, lectureId)); + lecture.setNetworkShares(DbLectureNetshare.getLectureNetshares(connection, lectureId)); lecture.setLdapFilters(DbLectureFilter.getLectureLdapFilters(connection, lectureId)); return lecture; } catch (SQLException e) { diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbNetshare.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java index 8377993c..1629178b 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbNetshare.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java @@ -12,9 +12,9 @@ import org.openslx.bwlp.sat.database.MysqlStatement; import org.openslx.bwlp.thrift.iface.NetShare; import org.openslx.util.Json; -public class DbNetshare { +public class DbLectureNetshare { - private static final Logger LOGGER = Logger.getLogger(DbNetshare.class); + private static final Logger LOGGER = Logger.getLogger(DbLectureNetshare.class); public static void writeNetworkShares(MysqlConnection connection, String lectureId, List<NetShare> shares) throws SQLException { diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java index e87ffdc8..2f742420 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java @@ -9,7 +9,7 @@ import java.util.Map; import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.log4j.Logger; import org.openslx.bwlp.sat.database.mappers.DbLecture; -import org.openslx.bwlp.sat.database.mappers.DbNetshare; +import org.openslx.bwlp.sat.database.mappers.DbLectureNetshare; import org.openslx.bwlp.sat.fileserv.FileServer; import org.openslx.bwlp.thrift.iface.LectureRead; import org.openslx.bwlp.thrift.iface.NetRule; @@ -199,7 +199,7 @@ public class WebServer extends NanoHTTPD { private Response serveLectureNetshares(String lectureId) { List<NetShare> list = null; try { - list = DbNetshare.getLectureNetshares(lectureId); + list = DbLectureNetshare.getLectureNetshares(lectureId); // TODO handling not found necessary? } catch (SQLException e) { return internalServerError(); |