From bc3c51bdd82c1155b26eebcb5bdc032bec919b77 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Fri, 7 Sep 2018 04:05:40 +0200
Subject: [PATCH] fixed compile errors.
---
.../storage/graphdb/model/FloorModelData.java | 9 ++---
.../storage/graphdb/model/RoomModelData.java | 33 ++++++++++---------
.../storage/graphdb/model/WorldModelData.java | 10 +++---
.../aethermud/world/model/RoomModel.java | 3 ++
4 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/syncleus/aethermud/storage/graphdb/model/FloorModelData.java b/src/main/java/com/syncleus/aethermud/storage/graphdb/model/FloorModelData.java
index 6512f12a..cad2a95e 100644
--- a/src/main/java/com/syncleus/aethermud/storage/graphdb/model/FloorModelData.java
+++ b/src/main/java/com/syncleus/aethermud/storage/graphdb/model/FloorModelData.java
@@ -19,6 +19,7 @@ import com.google.common.collect.Sets;
import com.syncleus.aethermud.storage.graphdb.DataUtils;
import com.syncleus.ferma.annotations.Adjacency;
import com.syncleus.ferma.annotations.GraphElement;
+import com.syncleus.ferma.annotations.Property;
import com.syncleus.ferma.ext.AbstractInterceptingVertexFrame;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.tinkerpop.gremlin.structure.Direction;
@@ -49,7 +50,7 @@ public abstract class FloorModelData extends AbstractInterceptingVertexFrame {
public RoomModelData createRoomModelData() {
final RoomModelData roomModel = this.getGraph().addFramedVertex(RoomModelData.class);
- this.addEffectData(roomModel);
+ this.addRoomModelData(roomModel);
return roomModel;
}
@@ -77,9 +78,9 @@ public abstract class FloorModelData extends AbstractInterceptingVertexFrame {
for(RoomModelData data : dest.getRoomModelDatas())
data.remove();
- if( src.getRoomModelDatas() != null )
- for(RoomModelData roomModelData : src.getRoomModelDatas())
- RoomModelData.copyFloorModel(dest.createRoomModelData(), roomModelData);
+ if( src.getRoomModels() != null )
+ for(RoomModel roomModel : src.getRoomModels())
+ RoomModelData.copyRoomModel(dest.createRoomModelData(), roomModel);
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
throw new IllegalStateException("Could not copy properties", e);
}
diff --git a/src/main/java/com/syncleus/aethermud/storage/graphdb/model/RoomModelData.java b/src/main/java/com/syncleus/aethermud/storage/graphdb/model/RoomModelData.java
index 6364310f..431a3886 100644
--- a/src/main/java/com/syncleus/aethermud/storage/graphdb/model/RoomModelData.java
+++ b/src/main/java/com/syncleus/aethermud/storage/graphdb/model/RoomModelData.java
@@ -17,6 +17,7 @@ package com.syncleus.aethermud.storage.graphdb.model;
import com.syncleus.aethermud.storage.graphdb.DataUtils;
import com.syncleus.ferma.annotations.GraphElement;
+import com.syncleus.ferma.annotations.Property;
import com.syncleus.ferma.ext.AbstractInterceptingVertexFrame;
import org.apache.commons.beanutils.PropertyUtils;
import com.syncleus.aethermud.world.model.*;
@@ -30,52 +31,52 @@ import java.util.Set;
public abstract class RoomModelData extends AbstractInterceptingVertexFrame {
@Property("areaNames")
- public Set<String> getAreaNames();
+ public abstract Set<String> getAreaNames();
@Property("areaNames")
- public void setAreaNames(Set<String> areaNames);
+ public abstract void setAreaNames(Set<String> areaNames);
@Property("floorId")
- public int getFloorId();
+ public abstract int getFloorId();
@Property("floorId")
- public void setFloorId(int floorId);
+ public abstract void setFloorId(int floorId);
@Property("roomTags")
- public Set<String> getRoomTags();
+ public abstract Set<String> getRoomTags();
@Property("roomTags")
- public void setRoomTags(Set<String> roomTags);
+ public abstract void setRoomTags(Set<String> roomTags);
@Property("roomId")
- public int getRoomId();
+ public abstract int getRoomId();
@Property("roomId")
- public void setRoomId(int roomId);
+ public abstract void setRoomId(int roomId);
@Property("roomDescription")
- public String getRoomDescription();
+ public abstract String getRoomDescription();
@Property("roomDescription")
- public void setRoomDescription(String roomDescription);
+ public abstract void setRoomDescription(String roomDescription);
@Property("roomTitle")
- public String getRoomTitle();
+ public abstract String getRoomTitle();
@Property("roomTitle")
- public void setRoomTitle(String roomTitle);
+ public abstract void setRoomTitle(String roomTitle);
@Property("enterExitNames")
- public Map<String, String> getEnterExitNames();
+ public abstract Map<String, String> getEnterExitNames();
@Property("enterExitNames")
- public void setEnterExitNames(Map<String, String> enterExitNames);
+ public abstract void setEnterExitNames(Map<String, String> enterExitNames);
@Property("notables")
- public Map<String, String> getNotables();
+ public abstract Map<String, String> getNotables();
@Property("notables")
- public void setNotables(Map<String, String> notables);
+ public abstract void setNotables(Map<String, String> notables);
public static void copyRoomModel(RoomModelData dest, RoomModel src) {
diff --git a/src/main/java/com/syncleus/aethermud/storage/graphdb/model/WorldModelData.java b/src/main/java/com/syncleus/aethermud/storage/graphdb/model/WorldModelData.java
index 4be02adf..09193535 100644
--- a/src/main/java/com/syncleus/aethermud/storage/graphdb/model/WorldModelData.java
+++ b/src/main/java/com/syncleus/aethermud/storage/graphdb/model/WorldModelData.java
@@ -48,7 +48,7 @@ public abstract class WorldModelData extends AbstractInterceptingVertexFrame {
public FloorModelData createFloorModelData() {
final FloorModelData floorModel = this.getGraph().addFramedVertex(FloorModelData.class);
- this.addEffectData(floorModel);
+ this.addFloorModelData(floorModel);
return floorModel;
}
@@ -58,9 +58,9 @@ public abstract class WorldModelData extends AbstractInterceptingVertexFrame {
for(FloorModelData data : dest.getFloorModelDatas())
data.remove();
- if( src.getFloorModelDatas() != null )
- for(FloorModelData floorModelData : src.getFloorModelDatas())
- FloorModelData.copyFloorModel(dest.createFloorModelData(), floorModelData);
+ if( src.getFloorModelList() != null )
+ for(FloorModel floorModel : src.getFloorModelList())
+ FloorModelData.copyFloorModel(dest.createFloorModelData(), floorModel);
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
throw new IllegalStateException("Could not copy properties", e);
}
@@ -75,7 +75,7 @@ public abstract class WorldModelData extends AbstractInterceptingVertexFrame {
if( src.getFloorModelDatas() != null )
for(FloorModelData floorModelData : src.getFloorModelDatas())
floorModels.add(FloorModelData.copyFloorModel(floorModelData));
- retVal.setFloorModels(Collections.unmodifiableSet(floorModels));
+ retVal.setFloorModelList(Collections.unmodifiableSet(floorModels));
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
throw new IllegalStateException("Could not copy properties", e);
diff --git a/src/main/java/com/syncleus/aethermud/world/model/RoomModel.java b/src/main/java/com/syncleus/aethermud/world/model/RoomModel.java
index e72c9038..72bf1eb9 100644
--- a/src/main/java/com/syncleus/aethermud/world/model/RoomModel.java
+++ b/src/main/java/com/syncleus/aethermud/world/model/RoomModel.java
@@ -30,6 +30,9 @@ public class RoomModel {
Set<String> areaNames;
Map<String, String> enterExitNames;
Map<String, String> notables;
+
+ public RoomModel() {
+ }
public RoomModel(int roomId, int floorId, String roomDescription, String roomTitle, Map<String, String> notables, Set<String> roomTags, Set<String> areaNames, Map<String, String> enterExitNames) {
this.roomId = roomId;
--
GitLab