回答編集履歴
2
weekNameのNumの値が間違っていた問題を修正
answer
CHANGED
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
```
|
|
41
41
|
```java
|
|
42
42
|
public enum WeekName {
|
|
43
|
-
Sunday(
|
|
43
|
+
Sunday(7," 日"),Monday(1," 月"),Tuesday(2," 火"),Wednesday(3," 水"),Thursday(4," 木"),Friday(5," 金"),Saturday(6," 土");
|
|
44
44
|
private final int num;
|
|
45
45
|
private final String name;
|
|
46
46
|
WeekName(int num,String name){
|
1
DayOfWeekに対応させました
answer
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
```java
|
|
2
2
|
public class Main {
|
|
3
|
-
|
|
3
|
+
private static String[][] data(int week,int lastday){
|
|
4
|
-
|
|
4
|
+
if(week==7){
|
|
5
|
+
week=0;
|
|
6
|
+
}
|
|
5
7
|
String[][] data=new String[7][7];//初期化
|
|
6
8
|
data[0]=WeekName.getAllName();//曜日を全部代入
|
|
7
9
|
int day=1;
|
|
@@ -9,7 +11,6 @@
|
|
|
9
11
|
data[week/7+1][week%7]=String.format("%2s", String.valueOf(day))+" ";
|
|
10
12
|
day++;week++;
|
|
11
13
|
}
|
|
12
|
-
//文の整形
|
|
13
14
|
for(String[] d2:data){
|
|
14
15
|
for(int i=0;i<d2.length;i++){
|
|
15
16
|
if(d2[i]==null){
|
|
@@ -20,8 +21,15 @@
|
|
|
20
21
|
}
|
|
21
22
|
return data;
|
|
22
23
|
}
|
|
24
|
+
public static String[][] data(DayOfWeek dow,int last){
|
|
25
|
+
return data(dow.getValue(),last);
|
|
26
|
+
}
|
|
27
|
+
public static String[][] data(WeekName wn,int last){
|
|
28
|
+
return data(wn.getNum(),last);
|
|
29
|
+
}
|
|
23
30
|
public static void main(String[] args){
|
|
31
|
+
String[][] data=data(DayOfWeek.SUNDAY,29);
|
|
24
|
-
String[][] data=data(WeekName.Sunday,
|
|
32
|
+
//String[][] data=data(WeekName.Sunday,29);
|
|
25
33
|
for(String[] d:data){
|
|
26
34
|
for(String d2:d){
|
|
27
35
|
System.out.print(d2);
|