Merge pull request #39 from nitta-lab-2020/CategoryRest

Fork: 0

nitta-lab-2020 / org.ntlab.amaryllis.client

Browse code Merge pull request #39 from nitta-lab-2020/CategoryRest entitiesにCategory，resourcesにCategoriesRestを作りました． 1008 10261 10262 10263 1029 10291 10292 1110 11101 2020 Dialog(Category) PLM PLM2 PlayListManager Playbutton Shinji_1105 acfrag category crrentlocation master miyazaki1110 miyazaki1112 miyazaki1112_2 set_category shinji10_26 shinji11_12 shinji_1013 shinji_1022_ test test11/12 voice_location ...voicememo_1112
commit 9b912f5456693dac5c84164b6037e32a4e0e10ed 2 parents 3227f01 + 67aac2f 堀之内雅人 authored on 7 Oct 2020

Browse code

entitiesにCategory，resourcesにCategoriesRestを作りました．

1008 ...voicememo_1112

commit 9b912f5456693dac5c84164b6037e32a4e0e10ed

2 parents 3227f01 + 67aac2f

堀之内雅人 authored on 7 Oct 2020

Patch

Unified Split

Showing 4 changed files

                Ignore Space
               Show notes
              View
            
          
          42 ■■■■■
          app/src/main/java/org/ntlab/amaryllis/client/entities/Category.java
        
        
        
          0 → 100644
             package org.ntlab.amaryllis.client.entities;
 
 
 
public class Category {
    private String cid;
    private String name;
    /**
     * 文字列表現された色情報
     */
    private String color;
    public Category(String cid,String name,String color){
        this.cid=cid;
        this.name=name;
        this.color=color;
    }
 
    public String getcId() {
        return cid;
    }
 
    public String getName() {
        return name;
    }
    public String getColor(){
        return color;
    }
    public void setCid(String cid) {
        this.cid = cid;
    }
 
    public void setName(String name) {
        this.name = name;
    }
 
    public void setColor(String color) {
        this.color = color;
    }
 
 
}
+package org.ntlab.amaryllis.client.entities;
+public class Category {
+    private String cid;
+    private String name;
+    /**
+     * 文字列表現された色情報
+     */
+    private String color;
+    public Category(String cid,String name,String color){
+        this.cid=cid;
+        this.name=name;
+        this.color=color;
+    }
+    public String getcId() {
+        return cid;
+    }
+    public String getName() {
+        return name;
+    }
+    public String getColor(){
+        return color;
+    }
+    public void setCid(String cid) {
+        this.cid = cid;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public void setColor(String color) {
+        this.color = color;
+    }
+}

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/org/ntlab/amaryllis/client/entities/Voicememo.java
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
import org.w3c.dom.Comment;
 
import java.io.File;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.HashMap;
import java.util.UUID;
 
public class Voicememo {
    private String vid;
    private String uid;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.w3c.dom.Comment;
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.UUID;
 public class Voicememo {
     private String vid;
     private String uid;

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/resources/CategoriesRest.java 0 → 100644

Ignore Space Show notes View build.gradle

Show line notes below