jprojecttimer-commits — autogenerated CVS commits from JProjectTimer

[Jprojecttimer-commits] CVS: jprojecttimer JProjectTimerResource.properties,1.4,1.5 JProjectTimerResource_ja_JP.properties,1.2,1.3

[Remi P. <pno...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv8841/jprojecttimer

Modified Files:
	JProjectTimerResource.properties 
	JProjectTimerResource_ja_JP.properties 
Log Message:
New texts for V0.0.7

Index: JProjectTimerResource.properties
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/JProjectTimerResource.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JProjectTimerResource.properties	25 Jan 2002 17:34:22 -0000	1.4
--- JProjectTimerResource.properties	6 Jun 2002 14:13:20 -0000	1.5
***************
*** 57,58 ****
--- 57,67 ----
  taskList=task list
  warningDialogTitle=Warning
+ projectName=Project Name
+ author=Author
+ backColor=Background Color
+ headColor=Header Color
+ linesColor=Lines Color
+ textColor=Text Color
+ arrowColor=Arrows Color
+ taskDoneColor=Completed Task Color
+ taskToDoColor=Not Completed Task Color
\ No newline at end of file

Index: JProjectTimerResource_ja_JP.properties
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/JProjectTimerResource_ja_JP.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JProjectTimerResource_ja_JP.properties	30 Jan 2002 14:27:49 -0000	1.2
--- JProjectTimerResource_ja_JP.properties	6 Jun 2002 14:13:20 -0000	1.3
***************
*** 57,58 ****
--- 57,67 ----
  taskList=\u30bf\u30b9\u30af\u4e00\u89a7
  warningDialogTitle=\u8b66\u544a
+ projectName=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d
+ author=\u4f5c\u6210\u8005
+ backColor=\u30d0\u30c3\u30af\u306e\u8272
+ headColor=\u30d8\u30c3\u30c0\u30fc\u306e\u8272
+ linesColor=\u7dda\u306e\u8272
+ textColor=\u30c6\u30ad\u30b9\u30c8\u306e\u8272
+ arrowColor=\u77e2\u5370\u306e\u8272
+ taskDoneColor=\u5b8c\u6210\u30bf\u30b9\u30af\u306e\u8272
+ taskToDoColor=\u672a\u5b8c\u6210\u30bf\u30b9\u30af\u306e\u8272

[Jprojecttimer-commits] CVS: jprojecttimer/de/cgarbs/apps/jprojecttimer GanttDiagram.java,1.9,1.10

[Remi P. <pno...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv2471/jprojecttimer/de/cgarbs/apps/jprojecttimer

Modified Files:
	GanttDiagram.java 
Log Message:
Cosmetics and JavaDoc

Index: GanttDiagram.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/GanttDiagram.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GanttDiagram.java	10 Feb 2002 13:26:00 -0000	1.9
--- GanttDiagram.java	2 Apr 2002 15:00:23 -0000	1.10
***************
*** 26,29 ****
--- 26,30 ----
  import java.awt.event.MouseEvent;
  import javax.swing.JFrame;
+ import java.lang.Math;
  
  
***************
*** 31,35 ****
  /** @author Christian Garbs <mi...@cg...>
   * @author Jochen Luell <jo...@lu...>
!  * @author Remi POUJEAUX <pou...@mb...>
   * @version $Id$
   */
--- 32,36 ----
  /** @author Christian Garbs <mi...@cg...>
   * @author Jochen Luell <jo...@lu...>
!  * @author Remi Poujeaux <pou...@mb...>
   * @version $Id$
   */
***************
*** 78,97 ****
  
      }
! 
      public void refresh()
      {
      repaint();
      }
! 
      public void paint(Graphics graph)
      {
      drawGantt(graph, getSize().width, getSize().height);
      }
! 
      public void drawGantt(Graphics graph, int width, int height)
      {
          Graphics2D g = (Graphics2D) graph;
          TaskList tasks = project.getTaskList();
!         int textWidth = 70;
          int headerHeight = 30;
          int taskYMargin = 7;  // top/bottom margin of each task bar
--- 79,101 ----
  
      }
! /** Refreshes the Gantt diagram
! */
      public void refresh()
      {
      repaint();
      }
! /** Draws the Gantt diagram full screen
! */
      public void paint(Graphics graph)
      {
      drawGantt(graph, getSize().width, getSize().height);
      }
! /** Draws the Gantt diagram with a specified size
! */
      public void drawGantt(Graphics graph, int width, int height)
      {
          Graphics2D g = (Graphics2D) graph;
          TaskList tasks = project.getTaskList();
!         int textWidth = 0;
          int headerHeight = 30;
          int taskYMargin = 7;  // top/bottom margin of each task bar
***************
*** 108,111 ****
--- 112,122 ----
                  cols = 1;
              }
+             // Calculating textWidth by parsing all tasks texts
+             for (int row = 0; row < tasks.size(); row++) {
+                 Task task = (Task) tasks.elementAt(row);
+                 textWidth = Math.max (textWidth,
+                                       g.getFontMetrics().stringWidth(task.getName()));
+             }
+             textWidth = textWidth + 10; 
              // Headings coloring
              g.setColor(Color.yellow);
***************
*** 190,194 ****
      }
  
! 
      public int print(Graphics g, PageFormat pageFormat, int page)
      {
--- 201,206 ----
      }
  
! /** Prints the Gantt Diagram on a printer
! */
      public int print(Graphics g, PageFormat pageFormat, int page)
      {

[Jprojecttimer-commits] CVS: jprojecttimer/misc/logo JPT.png,1.2,1.3

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer/misc/logo
In directory usw-pr-cvs1:/tmp/cvs-serv25336

Added Files:
	JPT.png 
Log Message:
first JProjectTimer logo by Remi

[Jprojecttimer-commits] CVS: jprojecttimer/misc/logo JPT.png,1.1,NONE

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer/misc/logo
In directory usw-pr-cvs1:/tmp/cvs-serv24945

Removed Files:
	JPT.png 
Log Message:
JPT.png checked in without binary flag, trying again


--- JPT.png DELETED ---

[Jprojecttimer-commits] CVS: jprojecttimer/misc/logo JPT.png,NONE,1.1

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer/misc/logo
In directory usw-pr-cvs1:/tmp/cvs-serv24047

Added Files:
	JPT.png 
Log Message:
first JProjectTimer logo by Remi


--- NEW FILE: JPT.png ---
‰PNG


Û¸ÛAò‰O‹Û¸ÛbɂÂã6nãv|âÓâ6nã¶X² ð¸Û¸$Ÿø´¸Û¸-–,(<nã6nÉ'>-nã6n‹%
Û¸ÛAò‰O‹Û¸ÛbɂÂã6nãv|âÓâ6nã¶X² ð¸Û¸$Ÿø´¸Û¸-–,(<nã6nÉ'>-nã6n‹%
Û¸ÛAò‰O‹Û¸ÛbɂÂã6nãv|âÓâ6nã¶X² ð¸Û¸$Ÿø´¸Û¸-–,(<nã6nÉ'>-nã6n‹%
Û¸ÛAò‰O‹Û¸ÛbɂÂã6nãv|âÓâ6nã¶X² ð¸Û¸$Ÿø´¸Û¸-–,(<nã6nÉ'>-nã6n‹%
Û¸]pûÔðunöj˜TÓP-Ým™XlžJþ_ó×­q×M`ùË©îBõµdòrlöJÞö=຿Y¡}o»S³B~>Éh_»‰ãös:”†ö¸]qh'¥}QÜÊÚyi_Jº	8´3Ó¶
íä´MÚéixC{
ÚCÒþp=Ú#ÒþtñÚÒþx§
´‡£]Z»Ü>$´G£ýí"hFûëýbЋö÷›¡=í/CöåcB{ Ú?ïú…ö0´‰Ûˋ/ɟñü)6´‡¡]!6´¡]ǚYÚwÚJ^ËÚùi׳†vvÚÖÐNM{ú†DÛÝa¬·Ó®·­¨™“g“Ïß{jӚÓ×öÊ2'w’fŸüwڗ¯2v8}KöqûöUÎMþ±í‰å»[>¿Ýä£Ýƒ4|z e^ë\ìÕ
}lÇú|nJ{ƒËïoÍîvKFíbAÛÔEKÏ0ŸjG¨e$hCÛó4×íç_L÷ù`*yK§ï±pÛÔ=©äB°eÅÅ,Máò{LÜÆmÆí} º’ïsÁÛ·¡mi×ìsrhC»ÇLìË9Ü?¶Yٙ“?ï@Ø¥ÛжœéªÚ«"ж4löqûo¸qÛÒ
nCÛÒ°¸Ý~Fwúc½méƒõãö݆¶‰uòJmíÊ
íўVŒÛ&ÞÕëí©eÛO³¶E„¶	õt0´¹›¡°Á6÷Œm*67nÝÞí¹,1n›€*ùÞ䆶‰ô|0´·Ëãö¾Jù¥ŸRÉM~›ÜÞnh›@_NKûš8n›ÛhïHnh›8_ÎJû–7n›˜iïFnh›0ßNJûž6n› C›õö‡õöe o¾Ýí	ˆÛ&§ï[ÝÞîGÖTrõ”´ŸIC[L{µÚ&ÆσínÇÓ^äŒÛ&îÚḡmB¼8ØC;÷2eÜ6ÏGû%chëi‡Ê
mà—ƒ]nG.º_Æmúl´ßò…vÚQµü½sB»í ÜÐ6Ñ}?ØYɃ.¬²Åm}?í
lµ
[w”Û‡ïÿ×L_kíŠ)~Û4ŠËÛ
jRþ«Ztðp¸]n:Õ"my³í®Ý;ð¯d+:Õ"mùé¡£ÇÖÂÛi¦S-ҖŸvàˆÓí£D;ÚQÿÒñõ¶q܇
ÒK§Z¤­HRÑñ+A´M{@8$loó™iØý¦rZ (¢Y!îÅìÉVtªEڊ‘C8‚h;öY;ªÂæÆ/ÒG§Z¤­X¶ƒG
´Ws'[Ñ©i+Ê
õ`_ëaIj‘¶¢´ÃÇÙɖ*E›íŸY
]sÆQ¿Æ$MtªEڊgua£ý=$i¢S-ÒVœvő6¶_U…y“­èT‹´UÃõq¼JÑ:Õ"mÕЮ:ö˜îª¢8k²j‘¶êˆ¡Nöù—‡"
tªEÚª£]y´#ßs&[Ñ©i«–êe›þÖ0äðj‘¶jiWoÊ÷æŒÉVtªEÚª§…~³l™ýö„ÉVtªEÚª§{‰ÜéWÑÎ|ÉVtªEÚ"h#Ûo)ٛ.يNµH[)Ôђû¾49p§Z¤-†öí­=[³£ö@—¶S-ÒD;éä}¸ˆÈVtªEÚÂhgÄûx¢Çö}¤S-ÒG÷a°o ÉVtªEÚbû:³°mûÎõ¬
ÝÕ 9«4Þ	Ð(EÓfx[Y³îɶ‚Z Û¯×nQéÏΚu_i{±©‚Z Û¯ß	{x­Ï<¾cÉVtªEڂÏÛoÞ!“?>ÖìZ
9Þ¸Lµ@)¶_ËÍÌK.r‰G¶¢S-ÒVR¶Ïàf«·T›k?U䘭»–NµH[©´·dÇ-5ù;&Ú	(•¸“¿ùÜi–™oÿãc²j‘¶Ð½‹èIvùgdº]V
ÿ[µ›õ;YÚjG›4-­`Ѝ"èA‡µê€h·êtãˆvZyíVîaÑîB+¢ÝªÓ=Œ#Ú=PhåA´[uº‡qD»
­<ˆv«N÷0Žh÷@¡•ÑnÕéÆí(´ò Ú­:ÝÃ8¢Ý…VD»U§{G´{ Ðʃh·êtãˆvZyíVîaÑîB+¢ÝªÓ=Œ#Ú=PhåA´[uº‡qD»
­<ˆv«N÷0Žh÷@¡•ÑnÕéÆí(´ò Ú­:ÝÃ8¢Ý…VD»U§{G´{ Ðʃh·êtãˆvZyíVîaÑîB+¢ÝªÓ=Œ#Ú=PhåA´[uº‡qD»
­<ˆv«N÷0Žh÷@¡•ÑnÕéÆí(´ò Ú­:ÝÃ8¢Ý…VD»U§{G´{ Ðʃh·êtãˆvZyíVîaÑîB+¢ÝªÓ=Œ#Ú=Phåù…2©ŒÒVëJãœÞ
ϪžîQ¨ˆ6ÕÉtD{J”GѦ:9‚Žh@‰ò(ÚT'GÐí(QE›êä:¢=%Ê£hSAG´G Dymª“#èˆö”(¢MurсåQ´©NŽ #Ú#P¢<iò®ùÜíÀ÷)Óþwú?ò͗ (õ_AK´ëwI(%Úï-+¹­Ñ%”lKَ‚y"¥”me»t2Ÿþ"íßäE7Œd[ÚÉ£`´“³'$‡(º„’m)ÛQ0ʶ²]¹v”í”%”ÜÖ(ôd[ÚÉ£`´“§Ä0E49DÑ%”lKَ‚Q¶Sb˜"š¢èJ¶¥lGÁ(Û)1LMQt	%ÛR¶£`”픦ˆ&‡(º„’m)ÛQ0ÊvJSD“C]Bɶ”í(e;%†)¢É!Š.¡d[ÊvŒ²ÃÑäE—P²-e;
FÙN‰aŠhrˆ¢K(ٖ²£l§Ä0E49DÑ%”lKَ‚Q¶Sb˜"š¢èJ¶¥lGÁ(Û)1LMQt	%ÛR¶£`”픦ˆ&‡(º„’m)ÛQ0ÊvJSD“C]Bɶ”í(e;%†)¢É!Š.¡d[ÊvŒ²ÃÑäE—P²-e;
FÙN‰aŠhrˆ¢K(ٖ²£l§Ä0E49DÑ%”lKَ‚Q¶Sb˜"š¢èJ¶¥lGÁ(Û)1LMQt	%ÛR¶£`”픦ˆ&‡(º„’m)ÛQ0ÊvJSD“C]Bɶ”í(e;%†)¢É!Š.¡d[ÊvŒ²ÃÑäE—P²-e;
FÙN‰aŠhrˆ¢K(ٖ²£l§Ä0E49DÑ%”lKَ‚Q¶Sb˜"š¢èJ¶¥lGÁ(Û)1LMQt	%ÛR¶£`”픦ˆ&‡(º„’m)ÛQ0ÊvJSD“C]Bɶ”í(e;%†)¢É!Š.¡d[ÊvŒ²ÃÑäE—P²-e;
fžlßÖ
EÿiÈ×·}/ƒi'×N
ü);y4È¥WŠ;ÞÉw§i>oèLw`¡hë½+ï½Áœ6ãõÕî¶iLÙ?Û¢9zM.Ú¢]:Gh'~'·GûÑm]“WÞz;òfº*ß»&wŒ¥lžmlíäWúô€>+2:mW´õ‰Þ±wrìÛ7Ûê5°¡_íȓ•ÇËĕâ™ïfؘ“¶²ýÙÅñh{ak'ø¼íƒ}ÿBz·‡=o;a‹öât8ØNî…-ÚӎÀÖN>æy;ð
åúVÛQ³íöë›zt•6ÞUZ دßíÁhGFF¿4±|BÕÿ5yÅODé¢V#{¦]÷c`߯§|„Üô—Ý"e{œlWÓÖoô®_Wêx'í,ô“†ý¾âYKû·M:o_á¼-Ú_o˜w'ÿÛ
•íd[´¿ßû3m¶?~Ï9ö¹n¾e'ú&´Âq¢íYèõq!zþ–ªkò.:oOÞíÒ	`ҝüsËU¶'Ïöâü*Ú¢í¹8û«ÕUZÚoįҖP”í©³½J h‹¶vòº×Ã"ï	ïÖÛG®O®ÊöÄÙþº’íyi_6‹ö´´K_ç:EÒXWw`%Êö¬ÙíÝ×GçzN^Üi•í9³]>­Šö”´7®¡D{FÚ[Ì¢=íқ|ž³íéhïÜ	‹öl´÷{ˆöd´wŸq‰öT´·OÙ:o/¶Lðtåèáµ²=Q¶`ëšüïѳ}°‹ël±•MÛÀZ÷Û¼‡¦}¸‰ë*mš«4S°õ,í“÷°Ù¶²ÖN>þNng-Ú£Óö°í¡iß¾!q÷Ý8_ÿQOWF}ºâF­«´Q¯Ò"¨E{DÚ÷o¸õmàïíKï'ÿíEÿw`Ïo2’žáÉé³
Ì_Ý'ý>&?õÇÌí¥f›ôõ½€‹«Ì#ÇúßQÚY^:ú59ɈÓm×-}b­ø}i!RI´E;öyüš«2íäd†·´”me[ÙÞXæóvŸåÊvN¶EÛÓ×ÑïÀD[´[\‰í¡Ü³K¿T~–¦l{úª<aýˆîÖ»î·ß/áu™mÑöl8Å_uh'í$ÚÿõnÑíØ£´tÞ~Ÿ·•mOŒF¿&ï‘öϺßö¬Aûýöí‚.áªNR´]¬×ä¢íéìð;¹²íÀ-Úu»váèÛE´Îێ%èÚÉ»·h»Pß?Âb}‡ñ½Og h_ˆö}¡j'w
÷d»³p‹¶‹ô½X´ÿž³êÉéǓÓÞNÜ8ÚÉ]ùve»«­\´] ÅÃÒ~W¶]È}´;
·h»8?‹G¥ýò­l»˜;iwnÑva~Jû׶²í‚î¥ÝI¸EÛEù·xLÚ®•mu7í.Â-Ú.ÈËgdËCËï'Q÷Âqô{‰*Û.ìþlwnÑv1~hŸŽûó²íâ> íOË¢Nûäp‹¶‹ðgq$ÛçÒ^8V¶]äC´ÏĽ4,Ú
hŸˆ[´]|W7×ßÇÜo¿^;#½HÙv±í䧽ÛxmW´›Ð>i/mÝuq4Ûç¤ûË­²í¢§}Bº¿ÍŠv+ÚÍq—Vfð[7J‡ä]­\<Æ

[Jprojecttimer-commits] CVS: jprojecttimer/misc/logo - New directory

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer/misc/logo
In directory usw-pr-cvs1:/tmp/cvs-serv23919/logo

Log Message:
Directory /cvsroot/jprojecttimer/jprojecttimer/misc/logo added to the repository

[Jprojecttimer-commits] CVS: jprojecttimer/misc - New directory

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer/misc
In directory usw-pr-cvs1:/tmp/cvs-serv23814/misc

Log Message:
Directory /cvsroot/jprojecttimer/jprojecttimer/misc added to the repository

[Jprojecttimer-commits] CVS: jprojecttimer/de/cgarbs/apps/jprojecttimer Task.java,1.6,1.7 GanttDiagram.java,1.8,1.9

[Remi P. <pno...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv9434/jprojecttimer/de/cgarbs/apps/jprojecttimer

Modified Files:
	Task.java GanttDiagram.java 
Log Message:
Gantt diagram: centering of columns numbers + click to edit tasks

Index: Task.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/Task.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Task.java	4 Feb 2002 22:53:53 -0000	1.6
--- Task.java	10 Feb 2002 13:26:00 -0000	1.7
***************
*** 15,18 ****
--- 15,19 ----
  import java.awt.Color;
  import java.awt.Graphics;
+ import java.awt.Rectangle;
  import java.util.Enumeration;
  import javax.swing.JFrame;
***************
*** 54,57 ****
--- 55,60 ----
      private TaskList dependencies;
  
+     Rectangle taskBar = new Rectangle(0,0,0,0);; // for representation on Gantt Chart-> object?
+ 
      /** Creates a new task with no dependencies, the name "new" and no duration.
       */
***************
*** 293,332 ****
  
  	// Task
  	if (getLength() > 0){
  	    g.setColor(Color.lightGray);
! 	    g.fillRect(x + textWidth + getStart() * ((width - textWidth) / cols),
! 		             y + taskYMargin,
! 		             getLength() * ((width - textWidth) / cols) + 1,
! 		             height + 1 - 2 * taskYMargin
  		            );
  	    if (completion > 0) {
  	    g.setColor(Color.green);
! 	    g.fillRect(x + textWidth + getStart() * ((width - textWidth) / cols),
! 		             y + taskYMargin,
! 		             getLength() * completion*((width - textWidth) / cols) / 100+1,
! 		             height + 1 - 2 * taskYMargin
  		            );
  	    }
  	    g.setColor(Color.black);
! 	    g.drawRect(x + textWidth + getStart() * ((width - textWidth) / cols),
! 		                y + taskYMargin,
! 		                getLength() * ((width - textWidth) / cols),
! 		                height - 2 * taskYMargin
  		               );
     }
!    else // draw a losange for milestones
     {
! 	     int xPoints[] = new int[4];
           int yPoints[] = new int[4];
!          int startX = x + textWidth + getStart() * ((width - textWidth) / cols);
!          int startY = y + taskYMargin;
!          xPoints[0] = startX;
!          yPoints[0] = startY;
!          xPoints[1] = xPoints[0] - (height/2 - taskYMargin);
!          yPoints[1] = yPoints[0] + height/2 - taskYMargin;
!          xPoints[3] = xPoints[0] + height/2 - taskYMargin;
!          yPoints[3] = yPoints[0] + height/2 - taskYMargin;
           xPoints[2] = xPoints[0];
!          yPoints[2] = yPoints[0] + height - 2 * taskYMargin-1;
        if (completion==0){
     	     g.setColor(Color.lightGray);
--- 296,346 ----
  
  	// Task
+ 	int taskX = x + textWidth + getStart() * ((width - textWidth) / cols);
+ 	int taskY = y + taskYMargin;
+ 	int taskWidth = getLength() * ((width - textWidth) / cols);
+ 	int taskHeight = height - 2 * taskYMargin;
+ 	if (taskWidth>0){
+ 	    taskBar.setBounds(taskX,taskY,taskWidth,taskHeight);
+ 	}
+ 	else{// diamond for 0 null duration task
+             taskBar.setBounds(taskX-taskHeight/2,taskY,taskHeight,taskHeight);
+ 	}
+ 	 
  	if (getLength() > 0){
  	    g.setColor(Color.lightGray);
! 	    g.fillRect(taskX,
! 		             taskY,
! 		             taskWidth + 1,
! 		             taskHeight + 1
  		            );
  	    if (completion > 0) {
  	    g.setColor(Color.green);
! 	    g.fillRect(taskX,
! 		         taskY,
! 		             taskWidth * completion / 100+1,
! 		             taskHeight
  		            );
  	    }
  	    g.setColor(Color.black);
! 	    g.drawRect(taskX,
! 		            taskY,
! 		            taskWidth,
! 		            taskHeight
  		               );
     }
!    else // draw a diamond for milestones
     {
! 	 int xPoints[] = new int[4];
           int yPoints[] = new int[4];
! //         int startX = x + textWidth + getStart() * ((width - textWidth) / cols);
! //         int startY = y + taskYMargin;
!          xPoints[0] = taskX;
!          yPoints[0] = taskY;
!          xPoints[1] = xPoints[0] - taskHeight/2;
!          yPoints[1] = yPoints[0] + taskHeight/2;
!          xPoints[3] = xPoints[0] + taskHeight/2;
!          yPoints[3] = yPoints[0] + taskHeight/2;
           xPoints[2] = xPoints[0];
!          yPoints[2] = yPoints[0] + taskHeight-1;
        if (completion==0){
     	     g.setColor(Color.lightGray);
***************
*** 337,341 ****
   	  }
            g.fillPolygon(xPoints,yPoints,4);  
!           	    g.setColor(Color.black);
          g.drawPolygon(xPoints,yPoints,4);
              
--- 351,355 ----
   	  }
            g.fillPolygon(xPoints,yPoints,4);  
!           g.setColor(Color.black);
          g.drawPolygon(xPoints,yPoints,4);
              

Index: GanttDiagram.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/GanttDiagram.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** GanttDiagram.java	3 Feb 2002 15:35:42 -0000	1.8
--- GanttDiagram.java	10 Feb 2002 13:26:00 -0000	1.9
***************
*** 17,24 ****
--- 17,31 ----
  import java.awt.Graphics;
  import java.awt.Graphics2D;
+ import java.awt.Cursor;
  import java.awt.print.PageFormat;
  import java.awt.print.Printable;
  import java.util.Enumeration;
  import java.util.Iterator;
+ import java.awt.event.MouseAdapter;
+ import java.awt.event.MouseMotionAdapter;
+ import java.awt.event.MouseEvent;
+ import javax.swing.JFrame;
+ 
+ 
  
  /** @author Christian Garbs <mi...@cg...>
***************
*** 30,47 ****
  {
      Project project;
  
      GanttDiagram(Project project)
      {
! 	this.project = project;
      }
  
      public void refresh()
      {
! 	repaint();
      }
  
      public void paint(Graphics graph)
      {
! 	drawGantt(graph, getSize().width, getSize().height);
      }
  
--- 37,90 ----
  {
      Project project;
+     // to detect click on task bar
+     private MouseAdapter GanttDiagramMouseAdapter = new MouseAdapter()
+     {
+         public void mouseClicked(MouseEvent e) {
+             if (e.getClickCount() == 1) {   
+                 TaskList tasks = project.getTaskList();
+                 for (int row = 0; row < tasks.size(); row++) {
+                     Task task = (Task) tasks.elementAt(row);
+                     if (task.taskBar.contains(e.getX(),e.getY())){                 
+                         task.showEditDialog(gui,tasks);
+                         row = tasks.size(); // to finish the loop (dirty!)
+                         repaint();
+                     }
+                 }
+             }
+         }
+      };
+     // to change the cursor appearance
+     private MouseMotionAdapter GanttDiagramMouseMotionAdapter = new MouseMotionAdapter(){
+         public void mouseMoved(MouseEvent e){
+             int cursor= Cursor.DEFAULT_CURSOR;
+             TaskList tasks = project.getTaskList();
+             for (int row = 0; row < tasks.size(); row++) {
+                 Task task = (Task) tasks.elementAt(row);
+                 if (task.taskBar.contains(e.getX(),e.getY())){                
+                     cursor = Cursor.HAND_CURSOR;
+                     row = tasks.size(); // to finish the loop (dirty)
+                 }
+             }
+              setCursor(new Cursor(cursor));
+         }
+     };
+     JFrame gui;
  
      GanttDiagram(Project project)
      {
!     this.project = project;
!         this.addMouseListener(GanttDiagramMouseAdapter);
!         this.addMouseMotionListener(GanttDiagramMouseMotionAdapter);
! 
      }
  
      public void refresh()
      {
!     repaint();
      }
  
      public void paint(Graphics graph)
      {
!     drawGantt(graph, getSize().width, getSize().height);
      }
  
***************
*** 49,169 ****
      {
          Graphics2D g = (Graphics2D) graph;
!     	TaskList tasks = project.getTaskList();
!   	int textWidth = 70;
!   	int headerHeight = 30;
!   	int taskYMargin = 7;  // top/bottom margin of each task bar
!   	int rightMargin = 10; // mainly for task with lenght 0
!   	int colStep = 5;// step to write column text
!   	g.setColor(Color.white);
!   	g.fillRect(0, 0, width + 1, height + 1);
!       
!       width = width - rightMargin;
!       
!       if (tasks.size() > 0) {
!   	    tasks.recalculate();
!   	    int cols = tasks.projectEnd();
!   	    if (cols == 0) {
!   		// avoid div by zero
!   		cols = 1;
!   	}
!   
!       // Headings coloring
!       g.setColor(Color.yellow);
!       g.fillRect(0,0,textWidth,height);
!       g.fillRect(0,0,width,headerHeight);
!   	// Header
!   	g.setColor(Color.black);
!   	g.drawString(Resource.get("task"), 5, headerHeight-3);
!   	g.drawString("1", textWidth + 3, headerHeight - 3);
!   	for (int col = -1; col <= cols-colStep; col+=colStep) {
!   		if (col > 0) {
!   		    g.drawString(Integer.toString(col+1), textWidth + col * ((width - textWidth) / cols) + 3, headerHeight - 3);
!   	    }
!       }
!       int rowHeight = (height - headerHeight)/ tasks.size();
!       // Horizontal lines to separate tasks
!       g.setColor(Color.lightGray);
!       for (int row = 0; row < tasks.size(); row++) {
!           g.drawLine(0,row*rowHeight + headerHeight,width,row*rowHeight + headerHeight);
!       }
!       // Vertical lines for time scale
!       for (int col=0;col<=cols;col+=1){
!           if (col % colStep == 0){ // standard line
!               g.drawLine(textWidth + col * ((width - textWidth) / cols),headerHeight,
!                                    textWidth + col * ((width - textWidth) / cols),height);
!           }
!           else{// dotted line
!               for (int y=headerHeight;y<height;y+=10){
!                   g.drawLine( textWidth + col * ((width - textWidth) / cols),y,
!                                  textWidth + col * ((width - textWidth) / cols),y+5);
!               }  
!           }
!       }
!   	// Links between tasks
!       g.setColor(Color.red);
!       for (int row = 0; row < tasks.size(); row++) {
!           Task task = (Task) tasks.elementAt(row);
!           for (Iterator i = task.getDependencies().iterator(); i.hasNext();) {
!   	        Task prevTask = (Task) i.next();
!   	        int prevRow = tasks.indexOf(prevTask);
!   	        int startX = textWidth + task.getStart() * ((width - textWidth) / cols);
!   	        int endX   = textWidth + (prevTask.getStart()+prevTask.getLength()) * ((width - textWidth) / cols);
!               int startY = row*rowHeight + headerHeight + taskYMargin;
!               int endY = prevRow*rowHeight + headerHeight + taskYMargin + rowHeight/2;
!               int midY;
!               if (row>prevRow){ // under its predecessor
!                   midY = (prevRow+1)*rowHeight + headerHeight;
!               }
!               else {    // above its predecessor
!                  midY = prevRow*rowHeight + headerHeight;
!               }
!               g.drawLine (startX, startY,startX,midY);
!               g.drawLine (startX,midY,endX,midY);
!               g.drawLine (endX,midY,endX,endY);
!               // arrow 
!               int xPoints[] = new int[3];
!               int yPoints[] = new int[3];
!               xPoints[0] = startX;
!               yPoints[0] = startY;
!               xPoints[1] = xPoints[0] -4;
!               yPoints[1] = yPoints[0] -4;
!               xPoints[2] = xPoints[0] +5;
!               yPoints[2] = yPoints[0] -4;
!               g.fillPolygon(xPoints,yPoints,3);              
!           }
!       }
!   	// Tasks
!   	int size = tasks.size();
!   	if (size == 0) {
!   	    // avoid div by zero
!   		size = 1;
!   	}
!   	for (int row = 0; row < tasks.size(); row++) {
!   	    ((Task) tasks.elementAt(row)).paint(g,
!   						    0,
!   						    width,
!   						    row * ((height - headerHeight) / tasks.size()) + headerHeight,
!   						    (height - headerHeight) / tasks.size(),
!   						    cols,
!   						    textWidth,
!   						    taskYMargin
!   						    );
!   	    }
!   	}
!    
! }
  
  
      public int print(Graphics g, PageFormat pageFormat, int page)
      {
! 	if (page != 0) {
! 	    return Printable.NO_SUCH_PAGE;
! 	}
  
          g.translate((int) pageFormat.getImageableX() + 2, (int) pageFormat.getImageableY());
  
! 	drawGantt(g, (int) pageFormat.getImageableWidth(), (int) pageFormat.getImageableHeight());
                       
! 	return Printable.PAGE_EXISTS;
      }
  }
--- 92,205 ----
      {
          Graphics2D g = (Graphics2D) graph;
!         TaskList tasks = project.getTaskList();
!         int textWidth = 70;
!         int headerHeight = 30;
!         int taskYMargin = 7;  // top/bottom margin of each task bar
!         int rightMargin = 10; // mainly for task with lenght 0
!         int colStep = 5;// step to write column text
!         g.setColor(Color.white);
!         g.fillRect(0, 0, width + 1, height + 1);
!         width = width - rightMargin;
!         if (tasks.size() > 0) {
!             tasks.recalculate();
!             int cols = tasks.projectEnd();
!             if (cols == 0) {
!                 // avoid div by zero
!                 cols = 1;
!             }
!             // Headings coloring
!             g.setColor(Color.yellow);
!             g.fillRect(0,0,textWidth,height);
!             g.fillRect(0,0,width+rightMargin,headerHeight);
!             // Header
!             g.setColor(Color.black);
!             String colNumber = "1";
!             int colNumberMetric = g.getFontMetrics().stringWidth( colNumber );
!             g.drawString(Resource.get("task"), 5, headerHeight-3);
!             g.drawString(colNumber, textWidth + 1 * (width - textWidth) / cols - colNumberMetric/2, headerHeight - 3);
!             for (int col = colStep; col <= cols; col+=colStep) {
!                 colNumber = Integer.toString(col);
!                 colNumberMetric = g.getFontMetrics().stringWidth( colNumber );
!                 g.drawString(colNumber, textWidth + col * ((width - textWidth) / cols) - colNumberMetric/2, headerHeight - 3);
!             }
!             int rowHeight = (height - headerHeight)/ tasks.size();
!             // Horizontal lines to separate tasks
!             g.setColor(Color.lightGray);
!             for (int row = 0; row < tasks.size(); row++) {
!                 g.drawLine(0,row*rowHeight + headerHeight,width+rightMargin,row*rowHeight + headerHeight);
!             }
!             // Vertical lines for time scale
!             for (int col=0;col<=cols;col+=1){
!                 if (col % colStep == 0){ // standard line
!                     g.drawLine(textWidth + col * ((width - textWidth) / cols),headerHeight,
!                                textWidth + col * ((width - textWidth) / cols),height);
!                 }
!                 else{// dotted line
!                     for (int y=headerHeight;y<height;y+=10){
!                         g.drawLine( textWidth + col * ((width - textWidth) / cols),y,
!                                     textWidth + col * ((width - textWidth) / cols),y+5);
!                     }  
!                 }
!             }
!             // Links between tasks
!             g.setColor(Color.red);
!             for (int row = 0; row < tasks.size(); row++) {
!                 Task task = (Task) tasks.elementAt(row);
!                 for (Iterator i = task.getDependencies().iterator(); i.hasNext();) {
!                     Task prevTask = (Task) i.next();
!                     int prevRow = tasks.indexOf(prevTask);
!                     int startX = textWidth + task.getStart() * ((width - textWidth) / cols);
!                     int endX   = textWidth + (prevTask.getStart()+prevTask.getLength()) * ((width - textWidth) / cols);
!                     int startY = row*rowHeight + headerHeight + taskYMargin;
!                     int endY = prevRow*rowHeight + headerHeight + taskYMargin + rowHeight/2;
!                     int midY;
!                     if (row>prevRow){ // under its predecessor
!                         midY = (prevRow+1)*rowHeight + headerHeight;
!                     }
!                     else {    // above its predecessor
!                         midY = prevRow*rowHeight + headerHeight;
!                     }
!                     g.drawLine (startX, startY,startX,midY);
!                     g.drawLine (startX,midY,endX,midY);
!                     g.drawLine (endX,midY,endX,endY);
!                     // arrow 
!                     int xPoints[] = new int[3];
!                     int yPoints[] = new int[3];
!                     xPoints[0] = startX;
!                     yPoints[0] = startY;
!                     xPoints[1] = xPoints[0] -4;
!                     yPoints[1] = yPoints[0] -4;
!                     xPoints[2] = xPoints[0] +5;
!                     yPoints[2] = yPoints[0] -4;
!                     g.fillPolygon(xPoints,yPoints,3);
!                 }
!             }
!             // Tasks
!             for (int row = 0; row < tasks.size(); row++) {
!                 ((Task) tasks.elementAt(row)).paint(g,
!                             0,
!                             width,
!                             row * rowHeight + headerHeight,
!                             rowHeight,
!                             cols,
!                             textWidth,
!                             taskYMargin
!                             );
!             }
!         }
!     }
  
  
      public int print(Graphics g, PageFormat pageFormat, int page)
      {
!     if (page != 0) {
!         return Printable.NO_SUCH_PAGE;
!     }
  
          g.translate((int) pageFormat.getImageableX() + 2, (int) pageFormat.getImageableY());
  
!     drawGantt(g, (int) pageFormat.getImageableWidth(), (int) pageFormat.getImageableHeight());
                       
!     return Printable.PAGE_EXISTS;
      }
  }

[Jprojecttimer-commits] CVS: jprojecttimer README,1.14,1.15

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv9815

Modified Files:
	README 
Log Message:
location of license files corrected


Index: README
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/README,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** README	7 Feb 2002 22:24:29 -0000	1.14
--- README	7 Feb 2002 22:43:19 -0000	1.15
***************
*** 26,30 ****
    Copyright (C) 2000-2002 Brett McLaughlin & Jason Hunter.
    All rights reserved.
!   See lib/jdom.license for details.
  
  * This product includes software developed by the
--- 26,30 ----
    Copyright (C) 2000-2002 Brett McLaughlin & Jason Hunter.
    All rights reserved.
!   See jdom.license for details.
  
  * This product includes software developed by the
***************
*** 32,36 ****
    Copyright (c) 1999 The Apache Software Foundation.
    All rights reserved.
!   See lib/xerces.license for details.
  
  
--- 32,36 ----
    Copyright (c) 1999 The Apache Software Foundation.
    All rights reserved.
!   See xerces.license for details.
  
  

[Jprojecttimer-commits] CVS: jprojecttimer Changelog,1.1,1.2 build.xml,1.4,1.5

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv8731

Modified Files:
	Changelog build.xml 
Log Message:
update to version 0.0.6


Index: Changelog
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/Changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Changelog	18 Jan 2002 21:39:45 -0000	1.1
--- Changelog	7 Feb 2002 22:39:32 -0000	1.2
***************
*** 1,2 ****
--- 1,22 ----
+ $Id$
+ 
+ Changelog for JProjectTimer
+ http://www.sourceforge.net/projects/jprojecttimer
+ 
+ v0.0.6:
+ 
+ - New XML file format is used. If you want to load your old files, you
+   can use the command line switch "-jprojectfile" followed by a
+   file name.
+ 
+ - New translations: Spanish and Japanese
+ 
+ - A shiny new and better looking Gantt Diagram.
+ 
+ - File dialogs are localized.
+ 
+ - Cancelling the creation of a new task doesn't add it to the list of
+   tasks any more.
+ 
  v0.0.5:
  

Index: build.xml
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build.xml	7 Feb 2002 22:32:49 -0000	1.4
--- build.xml	7 Feb 2002 22:39:32 -0000	1.5
***************
*** 9,13 ****
   <!-- Global Properties -->
   <property name="project.name" value="JProjectTimer"/>
!  <property name="project.version" value="0.0.6-pre1"/>
  
   <!-- Directory properties -->
--- 9,13 ----
   <!-- Global Properties -->
   <property name="project.name" value="JProjectTimer"/>
!  <property name="project.version" value="0.0.6"/>
  
   <!-- Directory properties -->

[Jprojecttimer-commits] CVS: jprojecttimer Makefile,1.8,1.9

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv8229

Modified Files:
	Makefile 
Log Message:
distribution targets updated


Index: Makefile
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	20 Jan 2002 12:01:29 -0000	1.8
--- Makefile	7 Feb 2002 22:37:00 -0000	1.9
***************
*** 7,11 ****
  
  # this is the current version
! VERSION=0.0.5
  
  # this is the main project class
--- 7,14 ----
  
  # this is the current version
! VERSION=0.0.6
! 
! # this is the corresponding CVS tag
! REV=v0_0_6
  
  # this is the main project class
***************
*** 93,97 ****
--- 96,102 ----
  	cp README $(PREFIX)
  	cp COPYING $(PREFIX)
+ 	cp Changelog $(PREFIX)
  	cp $(JAR) $(PREFIX)
+ 	cp lib/*.jar lib/*.license $(PREFIX)
  	tar -c $(PREFIX) -zvf $(TGZ)
  	zip -r9 $(ZIP) $(PREFIX)
***************
*** 100,105 ****
  srcdist:
  	rm -rf $(PREFIX)
! 	mkdir $(PREFIX)
! 	cp -r de COPYING *.properties Makefile README checkTranslation.pl $(PREFIX)
  	tar -c $(PREFIX) -zvf $(SRC)
  	rm -rf $(PREFIX)
--- 105,109 ----
  srcdist:
  	rm -rf $(PREFIX)
! 	cvs export -d $(PREFIX) -r $(REV) jprojecttimer
  	tar -c $(PREFIX) -zvf $(SRC)
  	rm -rf $(PREFIX)

[Jprojecttimer-commits] CVS: jprojecttimer MANIFEST,1.3,1.4

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv7820

Modified Files:
	MANIFEST 
Log Message:
using Xerces instead of SAX


Index: MANIFEST
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/MANIFEST,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MANIFEST	27 Jan 2002 18:29:33 -0000	1.3
--- MANIFEST	7 Feb 2002 22:35:15 -0000	1.4
***************
*** 1,5 ****
  Manifest-Version: 1.0
  Main-Class: de.cgarbs.apps.jprojecttimer.JProjectTimer
! Class-Path: sax.jar jdom.jar ./lib/sax.jar ./lib/jdom.jar
  
  
--- 1,5 ----
  Manifest-Version: 1.0
  Main-Class: de.cgarbs.apps.jprojecttimer.JProjectTimer
! Class-Path: jdom.jar xerces.jar
  
  

[Jprojecttimer-commits] CVS: jprojecttimer build.xml,1.3,1.4

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv7053

Modified Files:
	build.xml 
Log Message:
using Xerces instead of Sax


Index: build.xml
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml	27 Jan 2002 18:29:33 -0000	1.3
--- build.xml	7 Feb 2002 22:32:49 -0000	1.4
***************
*** 21,25 ****
   <path id="classpath">
    <pathelement location="${lib.dir}/jdom.jar"/>
!   <pathelement location="${lib.dir}/sax.jar"/>
    <pathelement location="${project.name}-${project.version}.jar"/>
   </path>
--- 21,25 ----
   <path id="classpath">
    <pathelement location="${lib.dir}/jdom.jar"/>
!   <pathelement location="${lib.dir}/xerces.jar"/>
    <pathelement location="${project.name}-${project.version}.jar"/>
   </path>

[Jprojecttimer-commits] CVS: jprojecttimer/lib xerces.jar,NONE,1.1 xerces.license,NONE,1.1

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer/lib
In directory usw-pr-cvs1:/tmp/cvs-serv3973/lib

Added Files:
	xerces.jar xerces.license 
Log Message:
Added Xerces libraries


--- NEW FILE: xerces.jar ---
PK


Created-By: 1.2.2 (Sun Microsystems Inc.)

PK

PK






SourceFile

*·

á

[...14733 lines suppressed...]




















--- NEW FILE: xerces.license ---
This product includes Xerces software developed by the Apache Software
Foundation (http://www.apache.org/).  It is redistributed in accordance with
the license below.  For more information, see http://xml.apache.org.

/*
 * The Apache Software License, Version 1.1
 *
 *
 * Copyright (c) 1999 The Apache Software Foundation.  All rights 
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer. 
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:  
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Xerces" and "Apache Software Foundation" must
 *    not be used to endorse or promote products derived from this
 *    software without prior written permission. For written 
 *    permission, please contact ap...@ap....
 *
 * 5. Products derived from this software may not be called "Apache",
 *    nor may "Apache" appear in their name, without prior written
 *    permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation and was
 * originally based on software copyright (c) 1999, International
 * Business Machines, Inc., http://www.ibm.com.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */

[Jprojecttimer-commits] CVS: jprojecttimer README,1.13,1.14

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv3973

Modified Files:
	README 
Log Message:
Added Xerces libraries


Index: README
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/README,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** README	7 Feb 2002 22:17:22 -0000	1.13
--- README	7 Feb 2002 22:24:29 -0000	1.14
***************
*** 28,31 ****
--- 28,37 ----
    See lib/jdom.license for details.
  
+ * This product includes software developed by the
+   Apache Software Foundation (http://www.apache.org/).
+   Copyright (c) 1999 The Apache Software Foundation.
+   All rights reserved.
+   See lib/xerces.license for details.
+ 
  
  

[Jprojecttimer-commits] CVS: jprojecttimer/lib sax.jar,1.1,NONE sax.license,1.1,NONE

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer/lib
In directory usw-pr-cvs1:/tmp/cvs-serv3158

Removed Files:
	sax.jar sax.license 
Log Message:
removed SAX libraries


--- sax.jar DELETED ---

--- sax.license DELETED ---

[Jprojecttimer-commits] CVS: jprojecttimer README,1.12,1.13

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv2716

Modified Files:
	README 
Log Message:
removed SAX libraries


Index: README
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/README,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** README	7 Feb 2002 21:24:13 -0000	1.12
--- README	7 Feb 2002 22:17:22 -0000	1.13
***************
*** 28,35 ****
    See lib/jdom.license for details.
  
- * We use the SAX parser from http://xml.apache.org
-   SAX is public domain.
-   See lib/sax.license for details.
- 
  
  
--- 28,31 ----

[Jprojecttimer-commits] CVS: jprojecttimer JProjectTimerResource_es.properties,NONE,1.1 JProjectTimerResource_es_ES.properties,NONE,1.1 README,1.11,1.12

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv19827

Modified Files:
	README 
Added Files:
	JProjectTimerResource_es.properties 
	JProjectTimerResource_es_ES.properties 
Log Message:
Added Spanish translation by Oliver Kalkofen


--- NEW FILE: JProjectTimerResource_es.properties ---
CVS_TAG=$Id: JProjectTimerResource_es.properties,v 1.1 2002/02/07 21:24:13 mastermitch Exp $
FileChooser.cancelButtonText=Cancelar
FileChooser.cancelButtonToolTipText=Cancelar
FileChooser.detailsViewButtonToolTipText=Detalles
FileChooser.fileNameLabelText=Nombre del fichero:
FileChooser.filesOfTypeLabelText=Ficheros del tipo:
FileChooser.helpButtonText=Ayuda
FileChooser.helpButtonToolTipText=Ayuda
FileChooser.homeFolderToolTipText=Home
FileChooser.listViewButtonToolTipText=Lista
FileChooser.lookInLabelText=Ver en:
FileChooser.newFolderToolTipText=Crear nueva carpeta
FileChooser.openButtonText=Abrir
FileChooser.openButtonToolTipText=Abrir
FileChooser.saveButtonText=Guardar
FileChooser.saveButtonToolTipText=Guardar
FileChooser.upFolderToolTipText=Subir una capa
FileChooser.updateButtonText=Acualizar
FileChooser.updateButtonToolTipText=Actualizar
JProjectTimer=JProjectTimer
LANGUAGE=Espa\u00f1ol
MAINTAINER=Oliver Kalkofen <OKa...@we...>
OptionPane.cancelButtonText=Cancelar
OptionPane.noButtonText=No
OptionPane.okButtonText=OK
OptionPane.yesButtonText=S\u00ed
cancelButton=Cancelar
confirmTitle=Confirmaci\u00f3n
defaultTaskName=nueva tarea
deleteTask=borrar
duration=duraci\u00f3n
editTask=editar...
editTaskDialogTitle=editar tarea
fileMenu=Fichero
finished=terminado
ganttDiagram=Diagrama Gantt
helpMenu=Ayuda
loadDialogTitle=abrir proyecto
menuAbout=Acerca de...
menuLoad=Abrir proyecto...
menuNew=Nuevo proyecto
menuPrint=Imprimir proyecto...
menuQuit=Cerrar
menuSave=Guardar proyecto
menuSaveAs=Guardar proyect como...
newTask=nuevo...
no.=no.
okButton=OK
predecessors=porcesadores
project=proyecto
reallyLoad=Hay cambios no guardados.\n\u00bfSin embargo quiere abrir otro
fichero?
reallyNew=Hay cambios no guardados.\n\u00bfSin embargo quiere dejarlas?
reallyQuit=Hay cambios no guardados.\n\u00bfSin embargo quiere cerrar?
recursionWarning=Este procesador procudir\u00eda un bucle.\nEstar\u00e9 ignorado.
saveAsDialogTitle=Guardar proyecto como
task=tarea
taskList=lista de tareas
warningDialogTitle=Aviso

--- NEW FILE: JProjectTimerResource_es_ES.properties ---
CVS_TAG=$Id: JProjectTimerResource_es_ES.properties,v 1.1 2002/02/07 21:24:13 mastermitch Exp $
FileChooser.cancelButtonText=Cancelar
FileChooser.cancelButtonToolTipText=Cancelar
FileChooser.detailsViewButtonToolTipText=Detalles
FileChooser.fileNameLabelText=Nombre del fichero:
FileChooser.filesOfTypeLabelText=Ficheros del tipo:
FileChooser.helpButtonText=Ayuda
FileChooser.helpButtonToolTipText=Ayuda
FileChooser.homeFolderToolTipText=Home
FileChooser.listViewButtonToolTipText=Lista
FileChooser.lookInLabelText=Ver en:
FileChooser.newFolderToolTipText=Crear nueva carpeta
FileChooser.openButtonText=Abrir
FileChooser.openButtonToolTipText=Abrir
FileChooser.saveButtonText=Guardar
FileChooser.saveButtonToolTipText=Guardar
FileChooser.upFolderToolTipText=Subir una capa
FileChooser.updateButtonText=Acualizar
FileChooser.updateButtonToolTipText=Actualizar
JProjectTimer=JProjectTimer
LANGUAGE=Espa\u00f1ol
MAINTAINER=Oliver Kalkofen <OKa...@we...>
OptionPane.cancelButtonText=Cancelar
OptionPane.noButtonText=No
OptionPane.okButtonText=OK
OptionPane.yesButtonText=S\u00ed
cancelButton=Cancelar
confirmTitle=Confirmaci\u00f3n
defaultTaskName=nueva tarea
deleteTask=borrar
duration=duraci\u00f3n
editTask=editar...
editTaskDialogTitle=editar tarea
fileMenu=Fichero
finished=terminado
ganttDiagram=Diagrama Gantt
helpMenu=Ayuda
loadDialogTitle=abrir proyecto
menuAbout=Acerca de...
menuLoad=Abrir proyecto...
menuNew=Nuevo proyecto
menuPrint=Imprimir proyecto...
menuQuit=Cerrar
menuSave=Guardar proyecto
menuSaveAs=Guardar proyect como...
newTask=nuevo...
no.=no.
okButton=OK
predecessors=porcesadores
project=proyecto
reallyLoad=Hay cambios no guardados.\n\u00bfSin embargo quiere abrir otro
fichero?
reallyNew=Hay cambios no guardados.\n\u00bfSin embargo quiere dejarlas?
reallyQuit=Hay cambios no guardados.\n\u00bfSin embargo quiere cerrar?
recursionWarning=Este procesador procudir\u00eda un bucle.\nEstar\u00e9 ignorado.
saveAsDialogTitle=Guardar proyecto como
task=tarea
taskList=lista de tareas
warningDialogTitle=Aviso

Index: README
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/README,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** README	3 Feb 2002 15:35:42 -0000	1.11
--- README	7 Feb 2002 21:24:13 -0000	1.12
***************
*** 51,58 ****
    code submissions
  
- * Jochen Luell <jo...@lu...>
-   code submission
- 
  * Oliver Kalkofen <OKa...@we...>
    code submission
  
--- 51,58 ----
    code submissions
  
  * Oliver Kalkofen <OKa...@we...>
+   code submission, Spanish translation
+ 
+ * Jochen Luell <jo...@lu...>
    code submission
  

[Jprojecttimer-commits] CVS: jprojecttimer/de/cgarbs/util Resource.java,1.2,1.3

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/util
In directory usw-pr-cvs1:/tmp/cvs-serv19611/de/cgarbs/util

Modified Files:
	Resource.java 
Log Message:
Language in effect is printed at startup


Index: Resource.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/util/Resource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Resource.java	25 Jan 2002 20:41:15 -0000	1.2
--- Resource.java	7 Feb 2002 21:23:43 -0000	1.3
***************
*** 42,45 ****
--- 42,46 ----
  	    try {
  		messages = ResourceBundle.getBundle(resourceFile, currentLocale);
+ 		System.err.println("Resource file language is: " + Resource.get("LANGUAGE"));
  		System.err.println("Resource file maintained by: " + Resource.get("MAINTAINER"));
  	    } catch ( MissingResourceException e ) {

[Jprojecttimer-commits] CVS: jprojecttimer/de/cgarbs/apps/jprojecttimer Task.java,1.5,1.6 TaskListPane.java,1.7,1.8

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv12062

Modified Files:
	Task.java TaskListPane.java 
Log Message:
New method Task.showEditDialog() to open the TaskListEdit dialog.


Index: Task.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/Task.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Task.java	2002/02/03 15:35:42	1.5
--- Task.java	2002/02/04 22:53:53	1.6
***************
*** 16,19 ****
--- 16,20 ----
  import java.awt.Graphics;
  import java.util.Enumeration;
+ import javax.swing.JFrame;
  import javax.swing.JLabel;
  
***************
*** 228,232 ****
      }
  
!     /** Recursively checks if a list
       * 
       * @param parent 
--- 229,233 ----
      }
  
!     /** Recursively checks if a task depends on itself
       * 
       * @param parent 
***************
*** 259,262 ****
--- 260,274 ----
      }
  
+ 
+     /** Open a dialog to let the user edit this task's properties.
+      *
+      * @param owner The GUI element that the parent of the new dialog.
+      * @param dependencies The list of tasks that can be selected as
+      * dependencies (propably all tasks in project).
+      */
+     public void showEditDialog(JFrame owner, TaskList dependencies)
+     {
+ 	new TaskEditDialog(owner, dependencies, this);
+     }
  
      /**      */

Index: TaskListPane.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/TaskListPane.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TaskListPane.java	2002/02/03 15:33:22	1.7
--- TaskListPane.java	2002/02/04 22:53:53	1.8
***************
*** 120,124 ****
  
  	    t.calculate(); // mustn't be dirty
! 	    new TaskEditDialog(gui, tasks, t);
  	    if (t.isDirty()) { // only add if edited and not cancelled
  		tasks.addElement(t);
--- 120,124 ----
  
  	    t.calculate(); // mustn't be dirty
! 	    t.showEditDialog(gui, tasks);
  	    if (t.isDirty()) { // only add if edited and not cancelled
  		tasks.addElement(t);
***************
*** 131,135 ****
  	    int row = table.getSelectedRow();
  	    if (row > -1) {
! 		new TaskEditDialog(gui, tasks, (Task) tasks.elementAt(row));
  		model.fireTableRowsUpdated(row, row);
  	    }
--- 131,135 ----
  	    int row = table.getSelectedRow();
  	    if (row > -1) {
! 		((Task) tasks.elementAt(row)).showEditDialog(gui, tasks);
  		model.fireTableRowsUpdated(row, row);
  	    }

[Jprojecttimer-commits] CVS: jprojecttimer/de/cgarbs/apps/jprojecttimer GanttDiagram.java,1.7,1.8 Task.java,1.4,1.5

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv19334/de/cgarbs/apps/jprojecttimer

Modified Files:
	GanttDiagram.java Task.java 
Log Message:
kudos to Remi


Index: GanttDiagram.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/GanttDiagram.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GanttDiagram.java	2002/02/03 13:17:13	1.7
--- GanttDiagram.java	2002/02/03 15:35:42	1.8
***************
*** 4,7 ****
--- 4,8 ----
   *  2001,2002 (C) by Christian Garbs <mi...@cg...>
   *                   Jochen Luell <jo...@lu...>
+  *                   Remi POUJEAUX <pou...@mb...>
   *
   *  Licensed under GNU GPL (see COPYING for details)
***************
*** 23,26 ****
--- 24,28 ----
  /** @author Christian Garbs <mi...@cg...>
   * @author Jochen Luell <jo...@lu...>
+  * @author Remi POUJEAUX <pou...@mb...>
   * @version $Id$
   */

Index: Task.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/Task.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Task.java	2002/02/03 13:17:13	1.4
--- Task.java	2002/02/03 15:35:42	1.5
***************
*** 2,7 ****
   *  $Id$ 
   *
!  *  2001 (C) by Christian Garbs <mi...@cg...>
   *
   *  Licensed under GNU GPL (see COPYING for details)
   *
--- 2,9 ----
   *  $Id$ 
   *
!  *  2001,2002 (C) by Christian Garbs <mi...@cg...>
!  *                   Remi POUJEAUX <pou...@mb...>
   *
+  *
   *  Licensed under GNU GPL (see COPYING for details)
   *
***************
*** 19,22 ****
--- 21,25 ----
   * 
   * @author Christian Garbs <mi...@cg...>
+  * @author Remi POUJEAUX <pou...@mb...>
   * @version $Id$
   */
***************
*** 272,288 ****
      public void paint(Graphics g, int x, int width, int y, int height, int cols, int textWidth, int taskYMargin)
      {
- 	//g.setColor(Color.black);
- 
- 	// Linie oben-> moved to GanttDiagram
- 	// g.drawLine(x,y,x+width,y);
- 
- 	// Spalten -> moved to GanttDiagram
- 	//for (int c = 0; c < cols; c++) {
- 	//    g.drawLine((int)( x + textWidth + (c * (width - textWidth)) / cols),
- 	//	       y,
- 	//	       (int) (x + textWidth + (c * (width - textWidth)) / cols),
- 	//	       y+height
- 	//	       );
- 	//}
  
  	// Text
--- 275,278 ----

[Jprojecttimer-commits] CVS: jprojecttimer README,1.10,1.11

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv19334

Modified Files:
	README 
Log Message:
kudos to Remi


Index: README
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/README,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** README	2002/01/27 18:45:15	1.10
--- README	2002/02/03 15:35:42	1.11
***************
*** 39,42 ****
--- 39,45 ----
    project administration, core development
  
+ * Remi POUJEAUX <pou...@mb...>
+   core development, Japanese translation
+ 
  * Boris Unckel <b.u...@gm...>
    core development
***************
*** 47,53 ****
  * Tim O'Brien <to...@ie...>
    code submissions
- 
- * Remi POUJEAUX <pou...@mb...>
-   Japanese translation
  
  * Jochen Luell <jo...@lu...>
--- 50,53 ----

[Jprojecttimer-commits] CVS: jprojecttimer/de/cgarbs/apps/jprojecttimer TaskListPane.java,1.6,1.7

[Christian G. [M. Mitch] <mas...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv18885/de/cgarbs/apps/jprojecttimer

Modified Files:
	TaskListPane.java 
Log Message:
removed debug output


Index: TaskListPane.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/TaskListPane.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TaskListPane.java	2002/01/25 20:41:15	1.6
--- TaskListPane.java	2002/02/03 15:33:22	1.7
***************
*** 120,127 ****
  
  	    t.calculate(); // mustn't be dirty
- 	    System.out.println("before " + t.isDirty());
  	    new TaskEditDialog(gui, tasks, t);
! 	    System.out.println("after  " + t.isDirty());
! 	    if (t.isDirty()) {
  		tasks.addElement(t);
  		model.fireTableRowsInserted(tasks.size()-1, tasks.size()-1);
--- 120,125 ----
  
  	    t.calculate(); // mustn't be dirty
  	    new TaskEditDialog(gui, tasks, t);
! 	    if (t.isDirty()) { // only add if edited and not cancelled
  		tasks.addElement(t);
  		model.fireTableRowsInserted(tasks.size()-1, tasks.size()-1);

[Jprojecttimer-commits] CVS: jprojecttimer/de/cgarbs/apps/jprojecttimer Task.java,1.3,1.4 GanttDiagram.java,1.6,1.7

[Remi P. <pno...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv19335/jprojecttimer/de/cgarbs/apps/jprojecttimer

Modified Files:
	Task.java GanttDiagram.java 
Log Message:
Improvement of Gantt Diagram

Index: Task.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/Task.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Task.java	2002/01/25 20:41:15	1.3
--- Task.java	2002/02/03 13:17:13	1.4
***************
*** 270,315 ****
  
      /**      */
!     public void paint(Graphics g, int x, int width, int y, int height, int cols, int textWidth)
      {
! 	g.setColor(Color.black);
  
! 	// Linie oben
! 	g.drawLine(x,y,x+width,y);
  
! 	// Spalten
! 	for (int c = 0; c < cols; c++) {
! 	    g.drawLine((int)( x + textWidth + (c * (width - textWidth)) / cols),
! 		       y,
! 		       (int) (x + textWidth + (c * (width - textWidth)) / cols),
! 		       y+height
! 		       );
! 	}
  
  	// Text
! 	g.setColor(Color.blue);
  	g.drawString(getName(), x+5, y+height/2);
  
  	// Task
! 	g.setColor(Color.darkGray);
! 	g.fillRect((int) (x + textWidth + (getStart() * (width - textWidth)) / cols),
! 		   y,
! 		   (int) ((getLength() * (width - textWidth)) / cols + 1),
! 		   height + 1
! 		   );
! 	if (completion > 0) {
  	    g.setColor(Color.lightGray);
! 	    g.fillRect((int) (x + textWidth + (getStart() * (width - textWidth)) / cols),
! 		       y,
! 		       (int) (((getLength() * (width - textWidth)) / cols + 1) * (completion / 100.0)),
! 		       height + 1
! 		   );
! 	}
! 	g.setColor(Color.black);
! 	g.drawRect((int) (x + textWidth + (getStart() * (width - textWidth)) / cols),
! 		   y,
! 		   (int) ((getLength() * (width - textWidth)) / cols),
! 		   height
! 		   );
!     }
  
  }
--- 270,343 ----
  
      /**      */
!     public void paint(Graphics g, int x, int width, int y, int height, int cols, int textWidth, int taskYMargin)
      {
! 	//g.setColor(Color.black);
  
! 	// Linie oben-> moved to GanttDiagram
! 	// g.drawLine(x,y,x+width,y);
  
! 	// Spalten -> moved to GanttDiagram
! 	//for (int c = 0; c < cols; c++) {
! 	//    g.drawLine((int)( x + textWidth + (c * (width - textWidth)) / cols),
! 	//	       y,
! 	//	       (int) (x + textWidth + (c * (width - textWidth)) / cols),
! 	//	       y+height
! 	//	       );
! 	//}
  
  	// Text
! 	g.setColor(Color.black);
  	g.drawString(getName(), x+5, y+height/2);
  
  	// Task
! 	if (getLength() > 0){
  	    g.setColor(Color.lightGray);
! 	    g.fillRect(x + textWidth + getStart() * ((width - textWidth) / cols),
! 		             y + taskYMargin,
! 		             getLength() * ((width - textWidth) / cols) + 1,
! 		             height + 1 - 2 * taskYMargin
! 		            );
! 	    if (completion > 0) {
! 	    g.setColor(Color.green);
! 	    g.fillRect(x + textWidth + getStart() * ((width - textWidth) / cols),
! 		             y + taskYMargin,
! 		             getLength() * completion*((width - textWidth) / cols) / 100+1,
! 		             height + 1 - 2 * taskYMargin
! 		            );
! 	    }
! 	    g.setColor(Color.black);
! 	    g.drawRect(x + textWidth + getStart() * ((width - textWidth) / cols),
! 		                y + taskYMargin,
! 		                getLength() * ((width - textWidth) / cols),
! 		                height - 2 * taskYMargin
! 		               );
!    }
!    else // draw a losange for milestones
!    {
! 	     int xPoints[] = new int[4];
!          int yPoints[] = new int[4];
!          int startX = x + textWidth + getStart() * ((width - textWidth) / cols);
!          int startY = y + taskYMargin;
!          xPoints[0] = startX;
!          yPoints[0] = startY;
!          xPoints[1] = xPoints[0] - (height/2 - taskYMargin);
!          yPoints[1] = yPoints[0] + height/2 - taskYMargin;
!          xPoints[3] = xPoints[0] + height/2 - taskYMargin;
!          yPoints[3] = yPoints[0] + height/2 - taskYMargin;
!          xPoints[2] = xPoints[0];
!          yPoints[2] = yPoints[0] + height - 2 * taskYMargin-1;
!       if (completion==0){
!    	     g.setColor(Color.lightGray);
!        
! 	  }
! 	  else{
! 	 	    g.setColor(Color.green);
!  	  }
!           g.fillPolygon(xPoints,yPoints,4);  
!           	    g.setColor(Color.black);
!         g.drawPolygon(xPoints,yPoints,4);
!             
!      }
!      }
  
  }

Index: GanttDiagram.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/GanttDiagram.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GanttDiagram.java	2002/01/25 20:41:15	1.6
--- GanttDiagram.java	2002/02/03 13:17:13	1.7
***************
*** 19,22 ****
--- 19,23 ----
  import java.awt.print.Printable;
  import java.util.Enumeration;
+ import java.util.Iterator;
  
  /** @author Christian Garbs <mi...@cg...>
***************
*** 46,93 ****
      {
          Graphics2D g = (Graphics2D) graph;
! 
! 	TaskList tasks = project.getTaskList();
! 	int textWidth = 70;
! 	int headerHeight = 30;
! 	int step=5;
! 	g.setColor(Color.white);
! 	g.fillRect(0, 0, width + 1, height + 1);
! 
!         if (tasks.size() > 0) {
! 	    tasks.recalculate();
! 	    int cols = tasks.projectEnd();
! 	    if (cols == 0) {
! 		// avoid div by zero
! 		cols = 1;
! 	    }
! 
! 	    // Header
! 	    g.setColor(Color.blue);
! 	    g.drawString(Resource.get("task"), 5, headerHeight-3);
! 	    g.drawString("1", textWidth + 3, headerHeight - 3);
! 	    for (int col = -1; col < cols; col+=3) {
! 		if (col > 0) {
! 		    g.drawString(Integer.toString(col+1), (int) (textWidth + (col * (width - textWidth)) / cols + 3), headerHeight - 3);
! 		}
! 	    }
! 	    // Tasks
! 	    int size = tasks.size();
! 	    if (size == 0) {
! 		// avoid div by zero
! 		size = 1;
! 	    }
! 	    for (int row = 0; row < tasks.size(); row++) {
! 		((Task) tasks.elementAt(row)).paint(g,
! 						    0,
! 						    width,
! 						    (row * (height - headerHeight)) / tasks.size() + headerHeight,
! 						    (height - headerHeight) / tasks.size(),
! 						    cols,
! 						    textWidth
! 						    );
! 	    }
! 	}
!  
!     }
  
  
--- 47,154 ----
      {
          Graphics2D g = (Graphics2D) graph;
!     	TaskList tasks = project.getTaskList();
!   	int textWidth = 70;
!   	int headerHeight = 30;
!   	int taskYMargin = 7;  // top/bottom margin of each task bar
!   	int rightMargin = 10; // mainly for task with lenght 0
!   	int colStep = 5;// step to write column text
!   	g.setColor(Color.white);
!   	g.fillRect(0, 0, width + 1, height + 1);
!       
!       width = width - rightMargin;
!       
!       if (tasks.size() > 0) {
!   	    tasks.recalculate();
!   	    int cols = tasks.projectEnd();
!   	    if (cols == 0) {
!   		// avoid div by zero
!   		cols = 1;
!   	}
!   
!       // Headings coloring
!       g.setColor(Color.yellow);
!       g.fillRect(0,0,textWidth,height);
!       g.fillRect(0,0,width,headerHeight);
!   	// Header
!   	g.setColor(Color.black);
!   	g.drawString(Resource.get("task"), 5, headerHeight-3);
!   	g.drawString("1", textWidth + 3, headerHeight - 3);
!   	for (int col = -1; col <= cols-colStep; col+=colStep) {
!   		if (col > 0) {
!   		    g.drawString(Integer.toString(col+1), textWidth + col * ((width - textWidth) / cols) + 3, headerHeight - 3);
!   	    }
!       }
!       int rowHeight = (height - headerHeight)/ tasks.size();
!       // Horizontal lines to separate tasks
!       g.setColor(Color.lightGray);
!       for (int row = 0; row < tasks.size(); row++) {
!           g.drawLine(0,row*rowHeight + headerHeight,width,row*rowHeight + headerHeight);
!       }
!       // Vertical lines for time scale
!       for (int col=0;col<=cols;col+=1){
!           if (col % colStep == 0){ // standard line
!               g.drawLine(textWidth + col * ((width - textWidth) / cols),headerHeight,
!                                    textWidth + col * ((width - textWidth) / cols),height);
!           }
!           else{// dotted line
!               for (int y=headerHeight;y<height;y+=10){
!                   g.drawLine( textWidth + col * ((width - textWidth) / cols),y,
!                                  textWidth + col * ((width - textWidth) / cols),y+5);
!               }  
!           }
!       }
!   	// Links between tasks
!       g.setColor(Color.red);
!       for (int row = 0; row < tasks.size(); row++) {
!           Task task = (Task) tasks.elementAt(row);
!           for (Iterator i = task.getDependencies().iterator(); i.hasNext();) {
!   	        Task prevTask = (Task) i.next();
!   	        int prevRow = tasks.indexOf(prevTask);
!   	        int startX = textWidth + task.getStart() * ((width - textWidth) / cols);
!   	        int endX   = textWidth + (prevTask.getStart()+prevTask.getLength()) * ((width - textWidth) / cols);
!               int startY = row*rowHeight + headerHeight + taskYMargin;
!               int endY = prevRow*rowHeight + headerHeight + taskYMargin + rowHeight/2;
!               int midY;
!               if (row>prevRow){ // under its predecessor
!                   midY = (prevRow+1)*rowHeight + headerHeight;
!               }
!               else {    // above its predecessor
!                  midY = prevRow*rowHeight + headerHeight;
!               }
!               g.drawLine (startX, startY,startX,midY);
!               g.drawLine (startX,midY,endX,midY);
!               g.drawLine (endX,midY,endX,endY);
!               // arrow 
!               int xPoints[] = new int[3];
!               int yPoints[] = new int[3];
!               xPoints[0] = startX;
!               yPoints[0] = startY;
!               xPoints[1] = xPoints[0] -4;
!               yPoints[1] = yPoints[0] -4;
!               xPoints[2] = xPoints[0] +5;
!               yPoints[2] = yPoints[0] -4;
!               g.fillPolygon(xPoints,yPoints,3);              
!           }
!       }
!   	// Tasks
!   	int size = tasks.size();
!   	if (size == 0) {
!   	    // avoid div by zero
!   		size = 1;
!   	}
!   	for (int row = 0; row < tasks.size(); row++) {
!   	    ((Task) tasks.elementAt(row)).paint(g,
!   						    0,
!   						    width,
!   						    row * ((height - headerHeight) / tasks.size()) + headerHeight,
!   						    (height - headerHeight) / tasks.size(),
!   						    cols,
!   						    textWidth,
!   						    taskYMargin
!   						    );
!   	    }
!   	}
!    
! }
  
  

[Jprojecttimer-commits] CVS: jprojecttimer JProjectTimerResource_ja.properties,1.1,1.2

[Remi P. <pno...@us...>]

Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv5706/jprojecttimer

Modified Files:
	JProjectTimerResource_ja.properties 
Log Message:
Adding new entries (for file chooser and option pane)

Index: JProjectTimerResource_ja.properties
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/JProjectTimerResource_ja.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JProjectTimerResource_ja.properties	2002/01/27 18:01:25	1.1
--- JProjectTimerResource_ja.properties	2002/01/30 14:35:06	1.2
***************
*** 1,6 ****
--- 1,29 ----
  CVS_TAG=$Id$
+ FileChooser.cancelButtonText=\u30ad\u30e3\u30f3\u30bb\u30eb
+ FileChooser.cancelButtonToolTipText=\u30ad\u30e3\u30f3\u30bb\u30eb
+ FileChooser.detailsViewButtonToolTipText=\u8a73\u7d30
+ FileChooser.fileNameLabelText=\u30d5\u30a1\u30a4\u30eb\u540d:
+ FileChooser.filesOfTypeLabelText=\u30d5\u30a1\u30a4\u30eb\u306e\u7a2e\u985e:
+ FileChooser.helpButtonText=\u30d8\u30eb\u30d7
+ FileChooser.helpButtonToolTipText=\u30d8\u30eb\u30d7
+ FileChooser.homeFolderToolTipText=\u30db\u30fc\u30e0
+ FileChooser.listViewButtonToolTipText=\u4e00\u89a7
+ FileChooser.lookInLabelText=\u30d5\u30a1\u30a4\u30eb\u306e\u5834\u6240:
+ FileChooser.newFolderToolTipText=\u65b0\u3057\u3044\u30d5\u30a9\u30eb\u30c0\u306e\u4f5c\u6210
+ FileChooser.openButtonText=\u958b\u304f
+ FileChooser.openButtonToolTipText=\u958b\u304f
+ FileChooser.saveButtonText=\u4fdd\u5b58
+ FileChooser.saveButtonToolTipText=\u4fdd\u5b58
+ FileChooser.upFolderToolTipText=\uff11\u3064\u4e0a\u306e\u30d5\u30a9\u30eb\u30c0\u3078
+ FileChooser.updateButtonText=\u66f4\u65b0
+ FileChooser.updateButtonToolTipText=\u66f4\u65b0
  JProjectTimer=JProjectTimer
  LANGUAGE=\u65e5\u672c\u8a9e
  MAINTAINER=Remi POUJEAUX <pou...@mb...>
+ OptionPane.cancelButtonText=\u30ad\u30e3\u30f3\u30bb\u30eb
+ OptionPane.noButtonText=\u3044\u3044\u3048
+ OptionPane.okButtonText=OK
+ OptionPane.yesButtonText=\u306f\u3044
+ cancelButton=\u30ad\u30e3\u30f3\u30bb\u30eb
  confirmTitle=\u78ba\u8a8d
  defaultTaskName=\u65b0\u898f\u30bf\u30b9\u30af
***************
*** 29,33 ****
  reallyNew=\u4fdd\u5b58\u3055\u308c\u3061\u306a\u3044\u5909\u66f4\u304c\u3042\u308a\u307e\u3059\u3002\n\u53d6\u308a\u6d88\u3057\u307e\u3059\u304b?
  reallyQuit=\u4fdd\u5b58\u3055\u308c\u3061\u306a\u3044\u5909\u66f4\u304c\u3042\u308a\u307e\u3059\u3002\n\u7d42\u4e86\u3057\u307e\u3059\u304b?
! recursionWarning=\u524d\u30bf\u30b9\u30af\u306b\u3088\u3063\u3066\u7121\u9650\u30eb\u30fc\u30d7\u306b\u306a\u308a\u307e\u3059\u3002\n\u524d\u30bf\u30b9\u30af\u3092\u7121\u52b9\u306b\u3057\u307e\u3059\u3002
  saveAsDialogTitle=\u540d\u524d\u3092\u4ed8\u3051\u3066\u4fdd\u5b58...
  task=\u30bf\u30b9\u30af
--- 52,56 ----
  reallyNew=\u4fdd\u5b58\u3055\u308c\u3061\u306a\u3044\u5909\u66f4\u304c\u3042\u308a\u307e\u3059\u3002\n\u53d6\u308a\u6d88\u3057\u307e\u3059\u304b?
  reallyQuit=\u4fdd\u5b58\u3055\u308c\u3061\u306a\u3044\u5909\u66f4\u304c\u3042\u308a\u307e\u3059\u3002\n\u7d42\u4e86\u3057\u307e\u3059\u304b?
! recursionWarning=\u524d\u30bf\u30b9\u30af\u306b\u3088\u3063\u3066\u30eb\u30fc\u30d7\u306b\u306a\u308a\u307e\u3059\u3002\n\u524d\u30bf\u30b9\u30af\u3092\u7121\u52b9\u306b\u3057\u307e\u3059\u3002
  saveAsDialogTitle=\u540d\u524d\u3092\u4ed8\u3051\u3066\u4fdd\u5b58...
  task=\u30bf\u30b9\u30af