• R/O
  • SSH
  • HTTPS

freegantt: Commit


Commit MetaInfo

Révision135 (tree)
l'heure2012-09-19 01:14:18
Auteurmonolith52

Message de Log

マイルストーン周りの描画がおかしくなったのでrev131まで差し戻し

Change Summary

Modification

--- trunk/freegantt-launch4j.xml (revision 134)
+++ trunk/freegantt-launch4j.xml (revision 135)
@@ -1,8 +1,8 @@
11 <launch4jConfig>
22 <dontWrapJar>false</dontWrapJar>
33 <headerType>gui</headerType>
4- <jar>C:\project\freegantt\workspace\freegantt-0.0.6\freegantt-0.0.6.jar</jar>
5- <outfile>C:\project\freegantt\workspace\freegantt-0.0.6\freegantt-0.0.6.exe</outfile>
4+ <jar>C:\project\freegantt\workspace\freegantt-0.0.5\freegantt-0.0.5.jar</jar>
5+ <outfile>C:\project\freegantt\workspace\freegantt-0.0.5\freegantt-0.0.5.exe</outfile>
66 <errTitle></errTitle>
77 <cmdLine></cmdLine>
88 <chdir></chdir>
--- trunk/src/jp/sourceforge/freegantt/data/Task.java (revision 134)
+++ trunk/src/jp/sourceforge/freegantt/data/Task.java (revision 135)
@@ -115,7 +115,7 @@
115115 this.group = flag;
116116 }
117117 public boolean isMilestone() {
118- return (period == null || period == 0);
118+ return (period == null || period == 0) && (realPeriod == null || realPeriod == 0);
119119 }
120120 public boolean isDrawable() {
121121 return startDate != null;
--- trunk/src/jp/sourceforge/freegantt/data/Project.java (revision 134)
+++ trunk/src/jp/sourceforge/freegantt/data/Project.java (revision 135)
@@ -282,11 +282,6 @@
282282 }
283283
284284 public void update() {
285-
286- // グループフラグを更新する
287- for (Task task: tasks) {
288- getController().setTaskGroup(!getChildTasks(task).isEmpty(), getIndexByTask(task));
289- }
290285
291286 // タスクをlevelの降順にソートする
292287 List<Task> sortedTasks = new ArrayList<Task>(tasks);
@@ -400,8 +395,8 @@
400395 Calendar startDate = Calendar.getInstance();
401396 startDate.setTimeInMillis(from);
402397 updateTask.setStartDate(startDate);
403- updateTask.setPeriod(0);
404- updateTask.setRealPeriod(CalendarUtil.subDate(CalendarUtil.toDateCalendar(to), CalendarUtil.toDateCalendar(from)));
398+ updateTask.setPeriod(CalendarUtil.subDate(CalendarUtil.toDateCalendar(to), CalendarUtil.toDateCalendar(from)));
399+ updateTask.setRealPeriod(updateTask.getPeriod());
405400 }
406401
407402 { // 達成率の計算
Afficher sur ancien navigateur de dépôt.