X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=21e3699ffa86dc0fb1e2ad2f1f8d4f32fd92af42;hb=ce2c3f10e92b2d97891acd9d427e1c47819547e6;hp=7a970f77b712748f3e0505e35e5201dfadf81c14;hpb=86cb6aeec078272763310d7fa189159c331aa18b;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java index 7a970f7..21e3699 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -244,12 +244,21 @@ public class Core extends AbstractService { /* parse local Sones. */ logger.log(Level.INFO, "Loading %d Sones…", allSoneNames.size()); for (String soneName : allSoneNames) { - String id = configuration.getStringValue("Sone/Name." + soneName + "/ID").getValue(null); - String insertUri = configuration.getStringValue("Sone/Name." + soneName + "/InsertURI").getValue(null); - String requestUri = configuration.getStringValue("Sone/Name." + soneName + "/RequestURI").getValue(null); - long modificationCounter = configuration.getLongValue("Sone/Name." + soneName + "/ModificationCounter").getValue((long) 0); + String sonePrefix = "Sone/Name." + soneName; + String id = configuration.getStringValue(sonePrefix + "/ID").getValue(null); + String insertUri = configuration.getStringValue(sonePrefix + "/InsertURI").getValue(null); + String requestUri = configuration.getStringValue(sonePrefix + "/RequestURI").getValue(null); + long modificationCounter = configuration.getLongValue(sonePrefix + "/ModificationCounter").getValue((long) 0); + String firstName = configuration.getStringValue(sonePrefix + "/Profile/FirstName").getValue(null); + String middleName = configuration.getStringValue(sonePrefix + "/Profile/MiddleName").getValue(null); + String lastName = configuration.getStringValue(sonePrefix + "/Profile/LastName").getValue(null); try { + Profile profile = new Profile(); + profile.setFirstName(firstName); + profile.setMiddleName(middleName); + profile.setLastName(lastName); Sone sone = new Sone(UUID.fromString(id), soneName, new FreenetURI(requestUri), new FreenetURI(insertUri)); + sone.setProfile(profile); sone.setModificationCounter(modificationCounter); addSone(sone); } catch (MalformedURLException mue1) { @@ -279,10 +288,15 @@ public class Core extends AbstractService { /* store all Sones. */ for (Sone sone : localSones) { - configuration.getStringValue("Sone/Name." + sone.getName() + "/ID").setValue(sone.getId()); - configuration.getStringValue("Sone/Name." + sone.getName() + "/RequestURI").setValue(sone.getRequestUri().toString()); - configuration.getStringValue("Sone/Name." + sone.getName() + "/InsertURI").setValue(sone.getInsertUri().toString()); - configuration.getLongValue("Sone/Name." + sone.getName() + "/ModificationCounter").setValue(sone.getModificationCounter()); + String sonePrefix = "Sone/Name." + sone.getName(); + configuration.getStringValue(sonePrefix + "/ID").setValue(sone.getId()); + configuration.getStringValue(sonePrefix + "/RequestURI").setValue(sone.getRequestUri().toString()); + configuration.getStringValue(sonePrefix + "/InsertURI").setValue(sone.getInsertUri().toString()); + configuration.getLongValue(sonePrefix + "/ModificationCounter").setValue(sone.getModificationCounter()); + Profile profile = sone.getProfile(); + configuration.getStringValue(sonePrefix + "/Profile/FirstName").setValue(profile.getFirstName()); + configuration.getStringValue(sonePrefix + "/Profile/MiddleName").setValue(profile.getMiddleName()); + configuration.getStringValue(sonePrefix + "/Profile/LastName").setValue(profile.getLastName()); } } catch (ConfigurationException ce1) { logger.log(Level.WARNING, "Could not store configuration!", ce1);