Skip to content
Snippets Groups Projects

Release 0.11.0

Merged Henrik tom Wörden requested to merge release-0.11.0 into main
37 files
+ 102
101
Compare changes
  • Side-by-side
  • Inline

Files

@@ -152,10 +152,10 @@ public class DatabaseUtils {
public static void parseOverrides(final List<ProtoProperty> properties, final ResultSet rs)
throws SQLException {
while (rs.next()) {
int property_id = rs.getInt("property_id");
if (rs.wasNull()) property_id = rs.getInt("InternalPropertyID");
String property_id = rs.getString("property_id");
if (rs.wasNull()) property_id = rs.getString("InternalPropertyID");
for (final FlatProperty p : properties) {
if (p.id == property_id) {
if (p.id.equals(property_id)) {
final String name = bytes2UTF8(rs.getBytes("name_override"));
if (name != null) {
p.name = name;
@@ -181,9 +181,9 @@ public class DatabaseUtils {
final List<ProtoProperty> ret = new LinkedList<>();
while (rs.next()) {
ProtoProperty pp = new ProtoProperty();
pp.id = rs.getInt("PropertyID");
pp.id = rs.getString("PropertyID");
if (rs.wasNull()) {
pp.id = rs.getInt("InternalPropertyID");
pp.id = rs.getString("InternalPropertyID");
}
pp.value = bytes2UTF8(rs.getBytes("PropertyValue"));
pp.status = bytes2UTF8(rs.getBytes("PropertyStatus"));
@@ -219,7 +219,7 @@ public class DatabaseUtils {
*/
public static SparseEntity parseEntityResultSet(final ResultSet rs) throws SQLException {
final SparseEntity ret = parseNameRoleACL(rs);
ret.id = rs.getInt("EntityID");
ret.id = rs.getString("EntityID");
ret.description = bytes2UTF8(rs.getBytes("EntityDesc"));
ret.datatype = bytes2UTF8(rs.getBytes("Datatype"));
ret.collection = bytes2UTF8(rs.getBytes("Collection"));
@@ -237,7 +237,7 @@ public class DatabaseUtils {
final LinkedList<VerySparseEntity> ret = new LinkedList<>();
while (rs.next()) {
final VerySparseEntity vsp = new VerySparseEntity();
vsp.id = rs.getInt("ParentID");
vsp.id = rs.getString("ParentID");
vsp.name = bytes2UTF8(rs.getBytes("ParentName"));
vsp.description = bytes2UTF8(rs.getBytes("ParentDescription"));
vsp.role = bytes2UTF8(rs.getBytes("ParentRole"));
@@ -251,7 +251,7 @@ public class DatabaseUtils {
EntityInterface entity, List<ProtoProperty> protos) {
final ArrayList<Property> ret = new ArrayList<Property>();
for (final ProtoProperty pp : protos) {
if (pp.id.equals(entity.getId().toInteger())) {
if (pp.id.equals(entity.getId().toString())) {
if (pp.value != null) {
entity.setValue(new GenericValue(pp.value));
}
Loading