#331: Change step templete get in step data

autyzm-pg · Aug 12, 2018 · 2b74934 · 2b74934
1 parent a764894
commit 2b74934
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/...p/src/main/java/pg/autyzm/friendly_plans/manager_app/view/step_create/StepCreateData.java b/...p/src/main/java/pg/autyzm/friendly_plans/manager_app/view/step_create/StepCreateData.java
@@ -35,7 +35,7 @@ public void setStepName(String stepName) {
 
     @Bindable
     public String getPictureName() {
-        return getAssetFileName(stepTemplate.getPicture());
+        return getAssetFileName(stepTemplate.getPictureId());
     }
 
     public void setPictureName(String pictureName) {
@@ -45,7 +45,7 @@ public void setPictureName(String pictureName) {
 
     @Bindable
     public String getSoundName() {
-        return getAssetFileName(stepTemplate.getSound());
+        return getAssetFileName(stepTemplate.getSoundId());
     }
 
     public void setSoundName(String soundName) {
@@ -79,16 +79,17 @@ private Asset getAsset(String fileName, Asset asset) {
         if (asset == null) {
             asset = new Asset();
         }
+
         asset.setFilename(fileName);
 
         return asset;
     }
 
-    private String getAssetFileName(Asset asset) {
-        if (asset == null) {
+    private String getAssetFileName(Long assetId) {
+        if (assetId == null) {
             return EMPTY_VALUE;
         }
 
-        return asset.getFilename().replace(REGEX_TRIM_NAME, "");
+        return stepTemplate.getSound().getFilename().replace(REGEX_TRIM_NAME, "");
     }
 }