Menu
▾
▴
jprojecttimer-commits — autogenerated CVS commits from JProjectTimer
You can subscribe to this list here.
| 2002 |
Jan
(45) |
Feb
(22) |
Mar
|
Apr
(1) |
May
|
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(35) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-11-12 18:58:02
|
Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv25503
Modified Files:
Project.java
Log Message:
removed "deprecated" warning
Index: Project.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/Project.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Project.java 11 Jun 2002 14:05:40 -0000 1.5
--- Project.java 12 Nov 2002 18:57:58 -0000 1.6
***************
*** 234,238 ****
Element root = new Element("project");
! root.addAttribute("version", "1.0");
Document aDocument = new Document(root);
--- 234,238 ----
Element root = new Element("project");
! root.setAttribute("version", "1.0");
Document aDocument = new Document(root);
***************
*** 242,246 ****
{
root.addContent(new Element(GanttDesign.colorTechName[i]).addContent(ganttDesign.ganttColor[i].getRGB()+""));
! }
root.addContent(new Element("timeScale").addContent(timeScale + ""));
root.addContent(new Element("anchored").addContent(anchored + ""));
--- 242,246 ----
{
root.addContent(new Element(GanttDesign.colorTechName[i]).addContent(ganttDesign.ganttColor[i].getRGB()+""));
! }
root.addContent(new Element("timeScale").addContent(timeScale + ""));
root.addContent(new Element("anchored").addContent(anchored + ""));
|
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-11-11 22:43:10
|
Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv27447
Modified Files:
build.xml
Log Message:
"clean" target did not remove "docs" subdirectory
Index: build.xml
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** build.xml 12 Jun 2002 14:26:22 -0000 1.6
--- build.xml 11 Nov 2002 22:43:08 -0000 1.7
***************
*** 68,71 ****
--- 68,72 ----
<delete dir="${classes.dir}"/>
<delete dir="${javadoc.dir}"/>
+ <delete dir="${docs.dir}"/>
<delete file="${project.name}-${project.version}.jar"/>
</target>
|
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-11-11 22:14:16
|
Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/util In directory usw-pr-cvs1:/tmp/cvs-serv14940/de/cgarbs/util Removed Files: Makefile Log Message: Removed the Makefiles. The ANT build.xms works fine while the Makefiles were broken. --- Makefile DELETED --- |
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-11-11 22:14:15
|
Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/swing In directory usw-pr-cvs1:/tmp/cvs-serv14940/de/cgarbs/swing Removed Files: Makefile Log Message: Removed the Makefiles. The ANT build.xms works fine while the Makefiles were broken. --- Makefile DELETED --- |
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-11-11 22:14:15
|
Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer In directory usw-pr-cvs1:/tmp/cvs-serv14940/de/cgarbs/apps/jprojecttimer Removed Files: Makefile Log Message: Removed the Makefiles. The ANT build.xms works fine while the Makefiles were broken. --- Makefile DELETED --- |
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-11-11 22:14:14
|
Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps In directory usw-pr-cvs1:/tmp/cvs-serv14940/de/cgarbs/apps Removed Files: Makefile Log Message: Removed the Makefiles. The ANT build.xms works fine while the Makefiles were broken. --- Makefile DELETED --- |
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-11-11 22:14:13
|
Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs In directory usw-pr-cvs1:/tmp/cvs-serv14940/de/cgarbs Removed Files: Makefile Log Message: Removed the Makefiles. The ANT build.xms works fine while the Makefiles were broken. --- Makefile DELETED --- |
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-11-11 22:14:13
|
Update of /cvsroot/jprojecttimer/jprojecttimer/de In directory usw-pr-cvs1:/tmp/cvs-serv14940/de Removed Files: Makefile Log Message: Removed the Makefiles. The ANT build.xms works fine while the Makefiles were broken. --- Makefile DELETED --- |
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-11-11 22:14:13
|
Update of /cvsroot/jprojecttimer/jprojecttimer In directory usw-pr-cvs1:/tmp/cvs-serv14940 Removed Files: Makefile Log Message: Removed the Makefiles. The ANT build.xms works fine while the Makefiles were broken. --- Makefile DELETED --- |
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-11-11 20:32:54
|
Update of /cvsroot/jprojecttimer/jprojecttimer In directory usw-pr-cvs1:/tmp/cvs-serv8346 Modified Files: checkTranslation.pl Log Message: URL updated Index: checkTranslation.pl =================================================================== RCS file: /cvsroot/jprojecttimer/jprojecttimer/checkTranslation.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** checkTranslation.pl 20 Jan 2002 13:37:17 -0000 1.5 --- checkTranslation.pl 11 Nov 2002 20:32:50 -0000 1.6 *************** *** 6,10 **** # 2001 (c) by Christian Garbs <mi...@un...> # ! # part of JProjectTimer - http://jprojecttimer.cgarbs.de # Licensed under GNU GPL # --- 6,10 ---- # 2001 (c) by Christian Garbs <mi...@un...> # ! # part of JProjectTimer - http://jprojecttimer.sourceforge.net # Licensed under GNU GPL # |
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-11-11 19:25:42
|
Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv17450
Modified Files:
Changelog
Log Message:
Visual updates (breaking long lines etc.)
Index: Changelog
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/Changelog,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Changelog 4 Nov 2002 12:57:12 -0000 1.3
--- Changelog 11 Nov 2002 19:25:39 -0000 1.4
***************
*** 6,13 ****
v0.0.7:
! - For each task, adding a WBS field. Tasks are sorted according to this field on the Gantt
! - Project name and author fields
! - All the colors of the Gantt can be changed
! - About box with the JPT logo
v0.0.6:
--- 6,17 ----
v0.0.7:
! - For each task, adding a WBS field. Tasks are sorted according to
! this field on the Gantt.
!
! - Project name and author fields.
!
! - All the colors of the Gantt can be changed.
!
! - About box with the JPT logo.
v0.0.6:
***************
*** 17,21 ****
file name.
! - New translations: Spanish and Japanese
- A shiny new and better looking Gantt Diagram.
--- 21,25 ----
file name.
! - New translations: Spanish and Japanese.
- A shiny new and better looking Gantt Diagram.
***************
*** 28,41 ****
v0.0.5:
! - Printing works
- Projects with total duration of 0 don't cause "div by zero"
! exceptions any more
- Deleting a task keeps dependencies between predecessing and
! following tasks
! - Creation of a new project works
! - Tasks can be edited by double-clicking on them
--- 32,45 ----
v0.0.5:
! - Printing works.
- Projects with total duration of 0 don't cause "div by zero"
! exceptions any more.
- Deleting a task keeps dependencies between predecessing and
! following tasks.
! - Creation of a new project works.
! - Tasks can be edited by double-clicking on them.
|
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-11-11 19:23:43
|
Update of /cvsroot/jprojecttimer/jprojecttimer In directory usw-pr-cvs1:/tmp/cvs-serv16635 Modified Files: README Log Message: Updated information, moved Remi to project leader (some people still mail _me_ about JProjectTimer :-) Index: README =================================================================== RCS file: /cvsroot/jprojecttimer/jprojecttimer/README,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** README 4 Nov 2002 12:58:06 -0000 1.16 --- README 11 Nov 2002 19:23:40 -0000 1.17 *************** *** 38,46 **** People involved: - * Christian Garbs <mi...@cg...> - project administration, core development - * Remi POUJEAUX <pou...@mb...> ! core development, Japanese translation * Boris Unckel <b.u...@gm...> --- 38,46 ---- People involved: * Remi POUJEAUX <pou...@mb...> ! project leader, core development, Japanese translation ! ! * Christian Garbs <mi...@cg...> ! supporting development and project administration * Boris Unckel <b.u...@gm...> |
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-11-11 19:19:07
|
Update of /cvsroot/jprojecttimer/jprojecttimer In directory usw-pr-cvs1:/tmp/cvs-serv14928 Modified Files: JProjectTimerResource_ja.properties Log Message: Added missing translations (copied from JProjectTimerResource_ja_JP.properties). Index: JProjectTimerResource_ja.properties =================================================================== RCS file: /cvsroot/jprojecttimer/jprojecttimer/JProjectTimerResource_ja.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JProjectTimerResource_ja.properties 30 Jan 2002 14:35:06 -0000 1.2 --- JProjectTimerResource_ja.properties 11 Nov 2002 19:19:04 -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 |
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-11-11 19:14:48
|
Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv12516
Added Files:
buildPackages.sh
Log Message:
Initial revision.
This is a shell script to automate package build of arbitrary versions
of JProjectTimer. Automatically builds .zip, .tar.gz and -src.tar.gz.
Can build older versions as well and is independent of your currently
checked out version (does an extra check out to the desired version).
--- NEW FILE: buildPackages.sh ---
#!/bin/sh
# $Id: buildPackages.sh,v 1.1 2002/11/11 19:14:43 mastermitch Exp $
# Use this script to generate new file releases of JProjectTimer. It
# will build the .tar.gz and .zip binary packages as well as a
# -src.tar.gz source archive.
# Pass the version number to build as a commandline parameter
# (e.g. "0.0.7").
# Be sure that all files are properly tagged in CVS (e.g. "v0_0_7").
# This script will do a fresh checkout of all files in a temporary
# directory.
# Example for version 0.0.7:
#
# * CVS tag the current code with the version tag "v0_0_7"
# =>> DON'T DO THIS TWICE WHEN THIS TAG IS ALREADY IN USE! <<=
#
# * run "./buildPackages.sh 0.0.7"
#
# * you will get:
# - JProjectTimer-0.0.7.tar.gz
# - JProjectTimer-0.0.7.zip
# - JProjectTimer-0.0.7-src.tar.gz
# ToDo:
# - allow package build with a date instead of a version tag (or
# something like "current")
VERSION=$1
if [ -z "$VERSION" ] ; then
echo "$0: no version number given!"
exit 1
fi
REVISION="v$(echo $VERSION|sed s/\\./_/g)"
DIR=JProjectTimer-$VERSION
SRCFILE=JProjectTimer-$VERSION-src.tar.gz
TGZFILE=JProjectTimer-$VERSION.tar.gz
ZIPFILE=JProjectTimer-$VERSION.zip
echo "version number is $VERSION"
echo "CVS tag is $REVISION"
# don't use this directory name for anything else!
rm -rf buildPackages.tmp
mkdir buildPackages.tmp
cd buildPackages.tmp
echo "login to CVS"
echo "press enter on password prompt"
cvs -d:pserver:ano...@cv...:/cvsroot/jprojecttimer login
echo "exporting source code..."
cvs -z3 -d:pserver:ano...@cv...:/cvsroot/jprojecttimer export -r $REVISION -d $DIR jprojecttimer
echo "building source archive"
tar -c $DIR -zvf $SRCFILE
echo "renaming source directory"
mv $DIR source
echo "building JProjectTimer .jar"
cd source
ant jar
cd ..
echo "building binary packages"
mkdir $DIR
while read FILE; do
echo "copying $FILE"
cp source/$FILE $DIR
done <<EOF
JProjectTimer-0.0.7.jar
README
Changelog
lib/jdom.jar
lib/jdom.license
lib/xerces.jar
lib/xerces.license
EOF
echo "building .tar.gz"
tar -c $DIR -zvf $TGZFILE
echo "building .zip"
zip -r $ZIPFILE $DIR
echo "cleaning up"
rm -rf source
rm -rf $DIR
echo "these files have been generated in ./buildPackages.tmp:"
ls -l
|
|
From: Remi P. <pno...@us...> - 2002-11-04 12:58:09
|
Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv2870/jprojecttimer
Modified Files:
README
Log Message:
Adding my name !
Index: README
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/README,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** README 7 Feb 2002 22:43:19 -0000 1.15
--- README 4 Nov 2002 12:58:06 -0000 1.16
***************
*** 8,12 ****
Jochen Luell <jo...@lu...>
Oliver Kalkofen <OKa...@we...>
!
Licensed under GNU GPL - see COPYING for details
--- 8,12 ----
Jochen Luell <jo...@lu...>
Oliver Kalkofen <OKa...@we...>
! Remi Poujeaux <rem...@ni...>
Licensed under GNU GPL - see COPYING for details
|
|
From: Remi P. <pno...@us...> - 2002-11-04 12:57:15
|
Update of /cvsroot/jprojecttimer/jprojecttimer In directory usw-pr-cvs1:/tmp/cvs-serv2588a/jprojecttimer Modified Files: Changelog Log Message: Content of 0.0.7 Index: Changelog =================================================================== RCS file: /cvsroot/jprojecttimer/jprojecttimer/Changelog,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Changelog 7 Feb 2002 22:39:32 -0000 1.2 --- Changelog 4 Nov 2002 12:57:12 -0000 1.3 *************** *** 4,7 **** --- 4,14 ---- http://www.sourceforge.net/projects/jprojecttimer + v0.0.7: + + - For each task, adding a WBS field. Tasks are sorted according to this field on the Gantt + - Project name and author fields + - All the colors of the Gantt can be changed + - About box with the JPT logo + v0.0.6: |
|
From: Remi P. <pno...@us...> - 2002-11-04 12:42:18
|
Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv28566/jprojecttimer/de/cgarbs/apps/jprojecttimer
Modified Files:
MainWindow.java
Log Message:
Correct display of JPT logo
Index: MainWindow.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/MainWindow.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MainWindow.java 13 Jun 2002 12:56:20 -0000 1.8
--- MainWindow.java 4 Nov 2002 12:42:15 -0000 1.9
***************
*** 254,258 ****
"JProjectTimer V0.0.7", "JProjectTimer",
JOptionPane.INFORMATION_MESSAGE,
! new ImageIcon("jptlogo.gif","LOGO"));
}
--- 254,258 ----
"JProjectTimer V0.0.7", "JProjectTimer",
JOptionPane.INFORMATION_MESSAGE,
! new ImageIcon (this.getClass().getResource("/jptlogo.gif")));
}
|
|
From: Remi P. <pno...@us...> - 2002-07-03 13:17:54
|
Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv21184/jprojecttimer/de/cgarbs/apps/jprojecttimer
Modified Files:
ProjectPane.java
Log Message:
Bug correction (color refreshing)
Index: ProjectPane.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/ProjectPane.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ProjectPane.java 18 Jun 2002 12:56:22 -0000 1.4
--- ProjectPane.java 3 Jul 2002 13:17:51 -0000 1.5
***************
*** 121,125 ****
{
project.setGanttColor (i, col);
! colorLabel[i].setBackground(col);
}
--- 121,125 ----
{
project.setGanttColor (i, col);
! colorButton[i].setBackground(col);
}
|
|
From: Remi P. <pno...@us...> - 2002-06-18 12:56:25
|
Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv15691/jprojecttimer/de/cgarbs/apps/jprojecttimer
Modified Files:
ProjectPane.java
Log Message:
Design change for color settings
Index: ProjectPane.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/ProjectPane.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ProjectPane.java 11 Jun 2002 14:05:40 -0000 1.3
--- ProjectPane.java 18 Jun 2002 12:56:22 -0000 1.4
***************
*** 71,94 ****
{
buildConstraints(constraints, 0, i+2,1, 1, 10,40);
! constraints.fill = GridBagConstraints.HORIZONTAL;
constraints.anchor = GridBagConstraints.EAST;
! colorButton[i] = new JButton (Resource.get(GanttDesign.colorTechName[i]));
! colorButton[i].setActionCommand(String.valueOf(i));
! colorButton[i].addActionListener(this);
! colorButton[i].setForeground(Color.black);
!
! gridbag.setConstraints(colorButton[i], constraints);
! this.add(colorButton[i]);
buildConstraints(constraints, 1, i+2,1, 1, 10,40);
constraints.fill = GridBagConstraints.NONE;
constraints.anchor = GridBagConstraints.WEST;
! colorLabel[i] = new JLabel (" ");// to have a colored square...
! colorLabel[i].setOpaque (true);
! colorLabel[i].setBackground(project.getGanttColor(i));
! colorLabel[i].setBorder(BorderFactory.createLineBorder(Color.black));
! gridbag.setConstraints(colorLabel[i], constraints);
! this.add(colorLabel[i]);
}
--- 71,91 ----
{
buildConstraints(constraints, 0, i+2,1, 1, 10,40);
! constraints.fill = GridBagConstraints.NONE;
constraints.anchor = GridBagConstraints.EAST;
! colorLabel[i] = new JLabel (Resource.get(GanttDesign.colorTechName[i])+": ");
! gridbag.setConstraints(colorLabel[i], constraints);
! this.add(colorLabel[i]);
buildConstraints(constraints, 1, i+2,1, 1, 10,40);
constraints.fill = GridBagConstraints.NONE;
constraints.anchor = GridBagConstraints.WEST;
! colorButton[i] = new JButton (" ");
! colorButton[i].setBackground(project.getGanttColor(i));
! colorButton[i].setForeground(project.getGanttColor(i));
! colorButton[i].setActionCommand(String.valueOf(i));
! colorButton[i].addActionListener(this);
! gridbag.setConstraints(colorButton[i], constraints);
! this.add(colorButton[i]);
}
|
|
From: Remi P. <pno...@us...> - 2002-06-13 12:56:23
|
Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv2919/jprojecttimer/de/cgarbs/apps/jprojecttimer
Modified Files:
MainWindow.java
Log Message:
Change of name and path of logo image
Index: MainWindow.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/MainWindow.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MainWindow.java 11 Jun 2002 14:05:40 -0000 1.7
--- MainWindow.java 13 Jun 2002 12:56:20 -0000 1.8
***************
*** 254,258 ****
"JProjectTimer V0.0.7", "JProjectTimer",
JOptionPane.INFORMATION_MESSAGE,
! new ImageIcon("images/jptbmp.gif","LOGO"));
}
--- 254,258 ----
"JProjectTimer V0.0.7", "JProjectTimer",
JOptionPane.INFORMATION_MESSAGE,
! new ImageIcon("jptlogo.gif","LOGO"));
}
|
|
From: Remi P. <pno...@us...> - 2002-06-13 12:54:23
|
Update of /cvsroot/jprojecttimer/jprojecttimer In directory usw-pr-cvs1:/tmp/cvs-serv2440/jprojecttimer Added Files: jptlogo.gif Log Message: Logo for JPT --- NEW FILE: jptlogo.gif --- GIF87a) |
|
From: Remi P. <pno...@us...> - 2002-06-12 14:26:25
|
Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv11065/jprojecttimer
Modified Files:
build.xml
Log Message:
for version 0.0.7 (with JPT logo)
Index: build.xml
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build.xml 7 Feb 2002 22:39:32 -0000 1.5
--- build.xml 12 Jun 2002 14:26:22 -0000 1.6
***************
*** 9,13 ****
<!-- Global Properties -->
<property name="project.name" value="JProjectTimer"/>
! <property name="project.version" value="0.0.6"/>
<!-- Directory properties -->
--- 9,13 ----
<!-- Global Properties -->
<property name="project.name" value="JProjectTimer"/>
! <property name="project.version" value="0.0.7"/>
<!-- Directory properties -->
***************
*** 42,45 ****
--- 42,46 ----
<copy todir="${classes.dir}">
<fileset dir="${base.dir}" includes="*.properties"/>
+ <fileset dir="${base.dir}" includes="*.gif"/>
</copy>
</target>
|
|
From: Remi P. <pno...@us...> - 2002-06-12 14:25:43
|
Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv10846/jprojecttimer/de/cgarbs/apps/jprojecttimer
Modified Files:
GanttDesign.java
Log Message:
To prevent resource check errors
Index: GanttDesign.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/GanttDesign.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GanttDesign.java 11 Jun 2002 14:05:40 -0000 1.1
--- GanttDesign.java 12 Jun 2002 14:25:40 -0000 1.2
***************
*** 56,59 ****
--- 56,68 ----
ganttColor[i] = c;
}
+ // These lines are necessary for resource files checking
+ // DO NOT REMOVE
+ // Resource.get("backColor")
+ // Resource.get("headColor")
+ // Resource.get("linesColor")
+ // Resource.get("textColor")
+ // Resource.get("arrowColor")
+ // Resource.get("taskDoneColor")
+ // Resource.get("taskToDoColor")
}
|
|
From: Christian G. [M. Mitch] <mas...@us...> - 2002-06-11 20:17:21
|
Update of /cvsroot/jprojecttimer/jprojecttimer In directory usw-pr-cvs1:/tmp/cvs-serv12841 Modified Files: JProjectTimerResource_de.properties JProjectTimerResource_de_DE.properties Log Message: Updated translations to 0.0.7 Index: JProjectTimerResource_de.properties =================================================================== RCS file: /cvsroot/jprojecttimer/jprojecttimer/JProjectTimerResource_de.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JProjectTimerResource_de.properties 25 Jan 2002 17:34:22 -0000 1.5 --- JProjectTimerResource_de.properties 11 Jun 2002 20:17:17 -0000 1.6 *************** *** 25,28 **** --- 25,31 ---- OptionPane.okButtonText=OK OptionPane.yesButtonText=Ja + arrowColor=Farbe Pfeile + author=Verfasser + backColor=Farbe Hintergrund cancelButton=Abbruch confirmTitle=Best\u00e4tigung *************** *** 35,39 **** --- 38,44 ---- finished=erledigt ganttDiagram=Gantt-Diagramm + headColor=Farbe Kopfzeile helpMenu=Hilfe + linesColor=Farbe Linien loadDialogTitle=Projekt laden menuAbout=\u00dcber... *************** *** 49,52 **** --- 54,58 ---- predecessors=Vorg\u00e4nger project=Projekt + projectName=Projektname reallyLoad=Sie haben \u00c4nderungen vorgenommen, die noch nicht gespeichert sind.\nWollen Sie wirklich ein anderes Projekt laden? reallyNew=Sie haben \u00c4nderungen vorgenommen, die noch nicht gespeichert sind.\nWollen Sie wirklich ein neues Projekt beginnen? *************** *** 55,58 **** --- 61,67 ---- saveAsDialogTitle=Projekt speichern task=Vorgang + taskDoneColor=Farbe abgeschlossener Vorgang taskList=Vorgangsliste + taskToDoColor=Farbe offener Vorgang + textColor=Farbe Text warningDialogTitle=Warnung Index: JProjectTimerResource_de_DE.properties =================================================================== RCS file: /cvsroot/jprojecttimer/jprojecttimer/JProjectTimerResource_de_DE.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JProjectTimerResource_de_DE.properties 25 Jan 2002 17:34:22 -0000 1.5 --- JProjectTimerResource_de_DE.properties 11 Jun 2002 20:17:17 -0000 1.6 *************** *** 25,28 **** --- 25,31 ---- OptionPane.okButtonText=OK OptionPane.yesButtonText=Ja + arrowColor=Farbe Pfeile + author=Verfasser + backColor=Farbe Hintergrund cancelButton=Abbruch confirmTitle=Best\u00e4tigung *************** *** 35,39 **** --- 38,44 ---- finished=erledigt ganttDiagram=Gantt-Diagramm + headColor=Farbe Kopfzeile helpMenu=Hilfe + linesColor=Farbe Linien loadDialogTitle=Projekt laden menuAbout=\u00dcber... *************** *** 49,52 **** --- 54,58 ---- predecessors=Vorg\u00e4nger project=Projekt + projectName=Projektname reallyLoad=Sie haben \u00c4nderungen vorgenommen, die noch nicht gespeichert sind.\nWollen Sie wirklich ein anderes Projekt laden? reallyNew=Sie haben \u00c4nderungen vorgenommen, die noch nicht gespeichert sind.\nWollen Sie wirklich ein neues Projekt beginnen? *************** *** 55,58 **** --- 61,67 ---- saveAsDialogTitle=Projekt speichern task=Vorgang + taskDoneColor=Farbe abgeschlossener Vorgang taskList=Vorgangsliste + taskToDoColor=Farbe offener Vorgang + textColor=Farbe Text warningDialogTitle=Warnung |
|
From: Remi P. <pno...@us...> - 2002-06-11 14:05:44
|
Update of /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv25059/jprojecttimer/de/cgarbs/apps/jprojecttimer
Modified Files:
GanttDiagram.java MainWindow.java ProjectPane.java
Project.java TaskEditDialog.java Task.java TaskListPane.java
TaskList.java TaskListTableModel.java
Added Files:
GanttDesign.java
Log Message:
Beta for version 0.0.7
--- NEW FILE: GanttDesign.java ---
/*
* $Id: GanttDesign.java,v 1.1 2002/06/11 14:05:40 pnovdenx Exp $
*
* 2001,2002 (C) by Remi Poujeaux <pou...@mb...>
*
* Licensed under GNU GPL (see COPYING for details)
*
*/
package de.cgarbs.apps.jprojecttimer;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.PrintStream;
import java.util.Date;
import org.jdom.*;
import org.jdom.input.*;
import org.jdom.output.*;
import java.awt.Color;
import java.lang.Integer;
/** @author Remi Poujeaux <pou...@mb...>
* @version $Id: GanttDesign.java,v 1.1 2002/06/11 14:05:40 pnovdenx Exp $
*/
public class GanttDesign
{
// tables describing the Gantt chart settings (colors. sizes...)
Color [] ganttColor = {Color.white,Color.yellow,Color.lightGray,Color.black,
Color.red, Color.green, Color.lightGray};
final static String [] colorTechName = {"backColor","headColor","linesColor","textColor",
"arrowColor", "taskDoneColor", "taskToDoColor"};
final static int BACKCOLOR = 0;
final static int HEADERCOLOR = 1;
final static int LINESCOLOR = 2;
final static int TEXTCOLOR = 3;
final static int ARROWCOLOR = 4;
final static int TASKDONECOLOR = 5;
final static int TASKTODOCOLOR = 6;
final static int NBCOLORS = 7; // number of colors
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
public Color getGanttColor(int i)
{
return ganttColor [i];
}
public void setGanttColor(int i, Color c)
{
ganttColor[i] = c;
}
}
Index: GanttDiagram.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/GanttDiagram.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GanttDiagram.java 2 Apr 2002 15:00:23 -0000 1.10
--- GanttDiagram.java 11 Jun 2002 14:05:40 -0000 1.11
***************
*** 22,25 ****
--- 22,27 ----
import java.util.Enumeration;
import java.util.Iterator;
+ import java.util.LinkedList;
+
import java.awt.event.MouseAdapter;
import java.awt.event.MouseMotionAdapter;
***************
*** 97,106 ****
Graphics2D g = (Graphics2D) graph;
TaskList tasks = project.getTaskList();
int textWidth = 0;
! 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;
--- 99,109 ----
Graphics2D g = (Graphics2D) graph;
TaskList tasks = project.getTaskList();
+ LinkedList sortedTasks = new LinkedList();
int textWidth = 0;
! int headerHeight = project.ganttDesign.headerHeight;
! int taskYMargin = project.ganttDesign.taskYMargin; // top/bottom margin of each task bar
! int rightMargin = project.ganttDesign.rightMargin; // mainly for task with lenght 0
! int colStep = project.ganttDesign.colStep; // step to write column text
! g.setColor(project.getGanttColor(GanttDesign.BACKCOLOR));
g.fillRect(0, 0, width + 1, height + 1);
width = width - rightMargin;
***************
*** 112,115 ****
--- 115,157 ----
cols = 1;
}
+ // Sorting the tasks by WBS (quick and dirty...)
+ sortedTasks.add ((Task)tasks.elementAt(0));
+ int j,insertPos=0; // index to lookup in already sorted tasks
+ for (int row = 1; row < tasks.size();row++)
+ {
+ Task task = (Task) tasks.elementAt(row);
+ if (sortedTasks.size() == 1)
+ {
+ if (task.getWBS().compareTo(((Task) sortedTasks.get(0)).getWBS()) <0)
+ {
+ insertPos=0;
+ }
+ else
+ {
+ insertPos=1;
+ }
+ }
+ else
+ {
+ for (j = 0; j <= sortedTasks.size();j++)
+ {
+ if (j == sortedTasks.size())
+ {
+ insertPos = j;
+ }
+ else
+ {
+ if (task.getWBS().compareTo(((Task) sortedTasks.get(j)).getWBS()) < 0)
+ {
+ insertPos = j;
+ j=sortedTasks.size();
+ }
+ }
+ }
+ }
+ sortedTasks.add(insertPos,task);
+ }
+
+
// Calculating textWidth by parsing all tasks texts
for (int row = 0; row < tasks.size(); row++) {
***************
*** 120,128 ****
textWidth = textWidth + 10;
// 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 );
--- 162,170 ----
textWidth = textWidth + 10;
// Headings coloring
! g.setColor(project.getGanttColor(GanttDesign.HEADERCOLOR));
g.fillRect(0,0,textWidth,height);
g.fillRect(0,0,width+rightMargin,headerHeight);
// Header
! g.setColor(project.getGanttColor(GanttDesign.TEXTCOLOR));
String colNumber = "1";
int colNumberMetric = g.getFontMetrics().stringWidth( colNumber );
***************
*** 136,140 ****
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);
--- 178,182 ----
int rowHeight = (height - headerHeight)/ tasks.size();
// Horizontal lines to separate tasks
! g.setColor(project.getGanttColor(GanttDesign.LINESCOLOR));
for (int row = 0; row < tasks.size(); row++) {
g.drawLine(0,row*rowHeight + headerHeight,width+rightMargin,row*rowHeight + headerHeight);
***************
*** 154,173 ****
}
// 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);
--- 196,216 ----
}
// Links between tasks
! g.setColor(project.getGanttColor(GanttDesign.ARROWCOLOR));
for (int row = 0; row < tasks.size(); row++) {
! Task task = (Task) sortedTasks.get(row);
for (Iterator i = task.getDependencies().iterator(); i.hasNext();) {
Task prevTask = (Task) i.next();
! int prevRow = sortedTasks.indexOf(prevTask);
int startX = textWidth + task.getStart() * ((width - textWidth) / cols);
int endX = textWidth + (prevTask.getStart()+prevTask.getLength()) * ((width - textWidth) / cols);
! int endY = prevRow*rowHeight + headerHeight + rowHeight/2;
! int startY,midY;
if (row>prevRow){ // under its predecessor
midY = (prevRow+1)*rowHeight + headerHeight;
+ startY = row*rowHeight + headerHeight + taskYMargin;
}
else { // above its predecessor
midY = prevRow*rowHeight + headerHeight;
+ startY = (row+1)*rowHeight + headerHeight - taskYMargin;
}
g.drawLine (startX, startY,startX,midY);
***************
*** 177,186 ****
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);
}
--- 220,239 ----
int xPoints[] = new int[3];
int yPoints[] = new int[3];
! if (row>prevRow){ // under its predecessor
! xPoints[0] = startX;
! yPoints[0] = startY;
! xPoints[1] = xPoints[0] -5;
! yPoints[1] = yPoints[0] -5;
! xPoints[2] = xPoints[0] +6;
! yPoints[2] = yPoints[0] -5;
! }
! else { // above its predecessor
! xPoints[0] = startX;
! yPoints[0] = startY;
! xPoints[1] = xPoints[0] +6;
! yPoints[1] = yPoints[0] +6;
! xPoints[2] = xPoints[0] -7;
! yPoints[2] = yPoints[0] +6;
! }
g.fillPolygon(xPoints,yPoints,3);
}
***************
*** 188,199 ****
// Tasks
for (int row = 0; row < tasks.size(); row++) {
! ((Task) tasks.elementAt(row)).paint(g,
0,
width,
row * rowHeight + headerHeight,
rowHeight,
cols,
! textWidth,
! taskYMargin
);
}
--- 241,253 ----
// Tasks
for (int row = 0; row < tasks.size(); row++) {
! ((Task) sortedTasks.get(row)).paint(g,
0,
width,
row * rowHeight + headerHeight,
+ project.ganttDesign,
rowHeight,
cols,
! textWidth
! // taskYMargin
);
}
Index: MainWindow.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/MainWindow.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MainWindow.java 25 Jan 2002 20:41:15 -0000 1.6
--- MainWindow.java 11 Jun 2002 14:05:40 -0000 1.7
***************
*** 29,32 ****
--- 29,35 ----
import javax.swing.JOptionPane;
import javax.swing.JTabbedPane;
+ import javax.swing.ImageIcon;
+
+
/** @author Christian Garbs <mi...@cg...>
***************
*** 204,207 ****
--- 207,211 ----
try {
//project.writeToStream(new PrintStream(new FileOutputStream(project.getFile())));
+ //project.setName(pp.name.getText());
project.writeToXML(new PrintStream(new FileOutputStream(project.getFile())));
project.hasBeenSaved();
***************
*** 247,250 ****
--- 251,259 ----
public void performAbout()
{
+ JOptionPane.showMessageDialog(null,
+ "JProjectTimer V0.0.7", "JProjectTimer",
+ JOptionPane.INFORMATION_MESSAGE,
+ new ImageIcon("images/jptbmp.gif","LOGO"));
+
}
}
Index: ProjectPane.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/ProjectPane.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ProjectPane.java 25 Jan 2002 20:41:15 -0000 1.2
--- ProjectPane.java 11 Jun 2002 14:05:40 -0000 1.3
***************
*** 10,29 ****
package de.cgarbs.apps.jprojecttimer;
import javax.swing.JPanel;
/** @author Christian Garbs <mi...@cg...>
* @version $Id$
*/
! public class ProjectPane extends JPanel
{
Project project;
!
public ProjectPane(Project project)
{
! this.project = project;
}
public void refresh()
{
}
}
--- 10,131 ----
package de.cgarbs.apps.jprojecttimer;
+ import de.cgarbs.util.Resource;
+
import javax.swing.JPanel;
+ import javax.swing.JButton;
+ import javax.swing.event.*;
+ import javax.swing.JTextField;
+ import javax.swing.JLabel;
+ import java.awt.GridBagConstraints;
+ import java.awt.GridBagLayout;
+ import java.awt.event.*;
+ import java.awt.*;
+ import javax.swing.*;
+
/** @author Christian Garbs <mi...@cg...>
* @version $Id$
*/
! public class ProjectPane extends JPanel implements FocusListener, ActionListener
{
Project project;
! JTextField name, author;
! JButton [] colorButton = new JButton[GanttDesign.NBCOLORS];
! JLabel [] colorLabel = new JLabel[GanttDesign.NBCOLORS];
public ProjectPane(Project project)
{
! GridBagLayout gridbag = new GridBagLayout();
! this.setLayout(gridbag);
! GridBagConstraints constraints = new GridBagConstraints();
! this.project = project;
!
! buildConstraints(constraints, 0, 0, 1, 1, 10, 40);
! constraints.fill = GridBagConstraints.NONE;
! constraints.anchor = GridBagConstraints.EAST;
! JLabel label1 = new JLabel(Resource.get("projectName")+": ");
! gridbag.setConstraints(label1, constraints);
! this.add(label1);
!
! buildConstraints(constraints, 0, 1, 1, 1, 10, 40);
! constraints.fill = GridBagConstraints.NONE;
! constraints.anchor = GridBagConstraints.EAST;
! JLabel label2 = new JLabel(Resource.get("author")+": ");
! gridbag.setConstraints(label2, constraints);
! this.add(label2);
!
! buildConstraints(constraints, 1, 0, 1, 1, 90, 0);
! constraints.fill = GridBagConstraints.HORIZONTAL;
! name = new JTextField(project.getName());
! gridbag.setConstraints(name, constraints);
! name.addFocusListener(this);
! this.add(name);
!
! buildConstraints(constraints, 1, 1, 1, 1, 90, 0);
! constraints.fill = GridBagConstraints.HORIZONTAL;
! author = new JTextField(project.getAuthor());
! gridbag.setConstraints(author, constraints);
! author.addFocusListener(this);
! this.add(author);
!
! for (int i = 0; i < GanttDesign.NBCOLORS; i++)
! {
! buildConstraints(constraints, 0, i+2,1, 1, 10,40);
! constraints.fill = GridBagConstraints.HORIZONTAL;
! constraints.anchor = GridBagConstraints.EAST;
! colorButton[i] = new JButton (Resource.get(GanttDesign.colorTechName[i]));
! colorButton[i].setActionCommand(String.valueOf(i));
! colorButton[i].addActionListener(this);
! colorButton[i].setForeground(Color.black);
!
! gridbag.setConstraints(colorButton[i], constraints);
! this.add(colorButton[i]);
!
! buildConstraints(constraints, 1, i+2,1, 1, 10,40);
! constraints.fill = GridBagConstraints.NONE;
! constraints.anchor = GridBagConstraints.WEST;
! colorLabel[i] = new JLabel (" ");// to have a colored square...
! colorLabel[i].setOpaque (true);
! colorLabel[i].setBackground(project.getGanttColor(i));
! colorLabel[i].setBorder(BorderFactory.createLineBorder(Color.black));
!
! gridbag.setConstraints(colorLabel[i], constraints);
! this.add(colorLabel[i]);
!
! }
}
public void refresh()
{
+ }
+ void buildConstraints(GridBagConstraints gbc, int gx, int gy, int gw, int gh, int wx, int wy)
+ {
+ gbc.gridx = gx;
+ gbc.gridy = gy;
+ gbc.gridwidth = gw;
+ gbc.gridheight = gh;
+ gbc.weightx = wx;
+ gbc.weighty = wy;
+ }
+
+ public void focusLost(FocusEvent e)
+ {
+ project.setName(name.getText());
+ project.setAuthor(author.getText());
+ }
+ public void focusGained(FocusEvent e)
+ {
+ }
+
+ public void actionPerformed(ActionEvent e)
+ {
+ int i = Integer.parseInt(e.getActionCommand());
+ Color col = JColorChooser.showDialog(this,GanttDesign.colorTechName[i],project.getGanttColor(i));
+ if (col != null)
+ {
+ project.setGanttColor (i, col);
+ colorLabel[i].setBackground(col);
+
+ }
+
}
}
Index: Project.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/Project.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Project.java 25 Jan 2002 20:41:15 -0000 1.4
--- Project.java 11 Jun 2002 14:05:40 -0000 1.5
***************
*** 20,23 ****
--- 20,25 ----
import org.jdom.input.*;
import org.jdom.output.*;
+ import java.awt.Color;
+ import java.lang.Integer;
/** @author Christian Garbs <mi...@cg...>
***************
*** 30,33 ****
--- 32,39 ----
String name;
+ String author;
+
+ GanttDesign ganttDesign = new GanttDesign();
+
int timeScale;
boolean anchored;
***************
*** 91,95 ****
--- 97,135 ----
this.file = file;
}
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ needsToBeSaved = true;
+
+ }
+ public String getAuthor()
+ {
+ return author;
+ }
+
+ public void setAuthor(String author)
+ {
+ this.author = author;
+ needsToBeSaved = true;
+ }
+ public Color getGanttColor(int i)
+ {
+ return ganttDesign.ganttColor [i];
+ }
+
+ public void setGanttColor(int i, Color c)
+ {
+ ganttDesign.ganttColor[i] = c;
+ needsToBeSaved = true;
+
+ }
+
public boolean needsToBeSaved()
{
***************
*** 154,157 ****
--- 194,205 ----
{
name = root.getChild("name").getText();
+ author = root.getChild("author").getText();
+ for (int i = 0; i < GanttDesign.NBCOLORS ; i++)
+ {
+ ganttDesign.ganttColor[i] = new Color (Integer
+ .parseInt(root.getChild(GanttDesign.colorTechName[i]).getText()));
+ }
+ //
+
timeScale =
Integer.parseInt(root.getChild("timeScale")
***************
*** 175,179 ****
else
System.err.println(
! "File not readable. Check input format for XML and prject type");
}
--- 223,227 ----
else
System.err.println(
! "File not readable. Check input format for XML and project type");
}
***************
*** 190,193 ****
--- 238,246 ----
root.addContent(new Element("name").addContent(name));
+ root.addContent(new Element("author").addContent(author));
+ for (int i = 0;i <GanttDesign.NBCOLORS;i++)
+ {
+ root.addContent(new Element(GanttDesign.colorTechName[i]).addContent(ganttDesign.ganttColor[i].getRGB()+""));
+ }
root.addContent(new Element("timeScale").addContent(timeScale + ""));
root.addContent(new Element("anchored").addContent(anchored + ""));
Index: TaskEditDialog.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/TaskEditDialog.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TaskEditDialog.java 25 Jan 2002 20:41:15 -0000 1.5
--- TaskEditDialog.java 11 Jun 2002 14:05:40 -0000 1.6
***************
*** 37,41 ****
Task t;
TaskList tasks;
! JTextField name, length, completion;
JList list;
--- 37,41 ----
Task t;
TaskList tasks;
! JTextField name, WBS, length, completion;
JList list;
***************
*** 95,103 ****
constraints.fill = GridBagConstraints.NONE;
constraints.anchor = GridBagConstraints.EAST;
JLabel label2 = new JLabel(" "+Resource.get("duration")+": ");
gridbag.setConstraints(label2, constraints);
panel.add(label2);
! buildConstraints(constraints, 0, 2, 1, 1, 10, 40);
constraints.fill = GridBagConstraints.NONE;
constraints.anchor = GridBagConstraints.NORTHEAST;
--- 95,110 ----
constraints.fill = GridBagConstraints.NONE;
constraints.anchor = GridBagConstraints.EAST;
+ JLabel label5 = new JLabel(" WBS: ");
+ gridbag.setConstraints(label5, constraints);
+ panel.add(label5);
+
+ buildConstraints(constraints, 0, 2, 1, 1, 10, 40);
+ constraints.fill = GridBagConstraints.NONE;
+ constraints.anchor = GridBagConstraints.EAST;
JLabel label2 = new JLabel(" "+Resource.get("duration")+": ");
gridbag.setConstraints(label2, constraints);
panel.add(label2);
! buildConstraints(constraints, 0, 3, 1, 1, 10, 40);
constraints.fill = GridBagConstraints.NONE;
constraints.anchor = GridBagConstraints.NORTHEAST;
***************
*** 106,110 ****
panel.add(label3);
! buildConstraints(constraints, 0, 3, 1, 1, 10, 40);
constraints.fill = GridBagConstraints.NONE;
constraints.anchor = GridBagConstraints.NORTHEAST;
--- 113,117 ----
panel.add(label3);
! buildConstraints(constraints, 0, 4, 1, 1, 10, 40);
constraints.fill = GridBagConstraints.NONE;
constraints.anchor = GridBagConstraints.NORTHEAST;
***************
*** 122,130 ****
buildConstraints(constraints, 1, 1, 1, 1, 90, 0);
constraints.fill = GridBagConstraints.HORIZONTAL;
length = new JTextField(Integer.toString(t.getLength()));
gridbag.setConstraints(length, constraints);
panel.add(length);
! buildConstraints(constraints, 1, 2, 1, 1, 90, 0);
constraints.fill = GridBagConstraints.HORIZONTAL;
completion = new JTextField(Integer.toString(t.getCompletion()));
--- 129,143 ----
buildConstraints(constraints, 1, 1, 1, 1, 90, 0);
constraints.fill = GridBagConstraints.HORIZONTAL;
+ WBS = new JTextField(t.getWBS());
+ gridbag.setConstraints(WBS, constraints);
+ panel.add(WBS);
+
+ buildConstraints(constraints, 1, 2, 1, 1, 90, 0);
+ constraints.fill = GridBagConstraints.HORIZONTAL;
length = new JTextField(Integer.toString(t.getLength()));
gridbag.setConstraints(length, constraints);
panel.add(length);
! buildConstraints(constraints, 1, 3, 1, 1, 90, 0);
constraints.fill = GridBagConstraints.HORIZONTAL;
completion = new JTextField(Integer.toString(t.getCompletion()));
***************
*** 133,137 ****
// Listbox
! buildConstraints(constraints, 1, 3, 1, 1, 90, 0);
constraints.fill = GridBagConstraints.HORIZONTAL;
JScrollPane listScrollPane = new JScrollPane(list);
--- 146,150 ----
// Listbox
! buildConstraints(constraints, 1, 4, 1, 1, 90, 0);
constraints.fill = GridBagConstraints.HORIZONTAL;
JScrollPane listScrollPane = new JScrollPane(list);
***************
*** 152,156 ****
buttons.add(cancel);
! buildConstraints(constraints, 0, 4, 2, 1, 10, 40);
constraints.fill = GridBagConstraints.NONE;
constraints.anchor = GridBagConstraints.CENTER;
--- 165,169 ----
buttons.add(cancel);
! buildConstraints(constraints, 0, 5, 2, 1, 10, 40);
constraints.fill = GridBagConstraints.NONE;
constraints.anchor = GridBagConstraints.CENTER;
***************
*** 187,191 ****
}
t.setName(name.getText());
!
int[] indices = list.getSelectedIndices();
--- 200,204 ----
}
t.setName(name.getText());
! t.setWBS(WBS.getText());
int[] indices = list.getSelectedIndices();
Index: Task.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/Task.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Task.java 10 Feb 2002 13:26:00 -0000 1.7
--- Task.java 11 Jun 2002 14:05:40 -0000 1.8
***************
*** 51,54 ****
--- 51,59 ----
private String name = " ";
+ /** This is a string containing the Work Breakdown Structure (WBS)
+ */
+
+ private String WBS = " ";
+
/** This is a list of Tasks that must be finished before this task can start.
*/
***************
*** 90,93 ****
--- 95,109 ----
needsToBeSaved = true;
}
+
+ public Task(String name, String WBS, int length, int completion, TaskList dependencies)
+ {
+ setName(name);
+ setWBS(WBS);
+ setLength(length);
+ setCompletion(completion);
+ setDependencies(dependencies);
+ needsToBeSaved = true;
+ }
+
/** Tags this task as dirty (meaning it's contents have changed and it has to be recalculated).
***************
*** 162,165 ****
--- 178,189 ----
return name;
}
+ /** Returns the WBS of this task.
+ *
+ * @return WBS of this task
+ */
+ public String getWBS()
+ {
+ return WBS;
+ }
/** Returns a list of all tasks that have to be finished before this task can begin.
***************
*** 181,184 ****
--- 205,217 ----
needsToBeSaved = true;
}
+ /** Changes the WBS of this task.
+ *
+ * @param WBS New WBS of task
+ */
+ public void setWBS(String WBS)
+ {
+ this.WBS = WBS;
+ needsToBeSaved = true;
+ }
/** Changes the duration of this task.
***************
*** 288,296 ****
/** */
! public void paint(Graphics g, int x, int width, int y, int height, int cols, int textWidth, int taskYMargin)
{
!
// Text
! g.setColor(Color.black);
g.drawString(getName(), x+5, y+height/2);
--- 321,330 ----
/** */
! public void paint(Graphics g, int x, int width, int y, GanttDesign ganttDesign, int height, int cols, int textWidth)
{
! int taskYMargin = ganttDesign.taskYMargin;
// Text
! g.setColor(ganttDesign.ganttColor[GanttDesign.TEXTCOLOR]);
! // g.setColor(Color.black);
g.drawString(getName(), x+5, y+height/2);
***************
*** 308,312 ****
if (getLength() > 0){
! g.setColor(Color.lightGray);
g.fillRect(taskX,
taskY,
--- 342,346 ----
if (getLength() > 0){
! g.setColor(ganttDesign.ganttColor[GanttDesign.TASKTODOCOLOR]);
g.fillRect(taskX,
taskY,
***************
*** 315,319 ****
);
if (completion > 0) {
! g.setColor(Color.green);
g.fillRect(taskX,
taskY,
--- 349,353 ----
);
if (completion > 0) {
! g.setColor(ganttDesign.ganttColor[GanttDesign.TASKDONECOLOR]);
g.fillRect(taskX,
taskY,
***************
*** 322,326 ****
);
}
! g.setColor(Color.black);
g.drawRect(taskX,
taskY,
--- 356,360 ----
);
}
! g.setColor(Color.black); // task bar outline is always black
g.drawRect(taskX,
taskY,
***************
*** 344,352 ****
yPoints[2] = yPoints[0] + taskHeight-1;
if (completion==0){
! g.setColor(Color.lightGray);
}
else{
! g.setColor(Color.green);
}
g.fillPolygon(xPoints,yPoints,4);
--- 378,386 ----
yPoints[2] = yPoints[0] + taskHeight-1;
if (completion==0){
! g.setColor(ganttDesign.ganttColor[GanttDesign.TASKTODOCOLOR]);
}
else{
! g.setColor(ganttDesign.ganttColor[GanttDesign.TASKDONECOLOR]);
}
g.fillPolygon(xPoints,yPoints,4);
Index: TaskListPane.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/TaskListPane.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TaskListPane.java 4 Feb 2002 22:53:53 -0000 1.8
--- TaskListPane.java 11 Jun 2002 14:05:40 -0000 1.9
***************
*** 75,81 ****
table.getColumnModel().getColumn(0).setPreferredWidth(50);
table.getColumnModel().getColumn(1).setPreferredWidth(250);
! table.getColumnModel().getColumn(2).setPreferredWidth(50);
! table.getColumnModel().getColumn(3).setPreferredWidth(150);
! table.getColumnModel().getColumn(4).setPreferredWidth(35);
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
--- 75,82 ----
table.getColumnModel().getColumn(0).setPreferredWidth(50);
table.getColumnModel().getColumn(1).setPreferredWidth(250);
! table.getColumnModel().getColumn(2).setPreferredWidth(150);
! table.getColumnModel().getColumn(3).setPreferredWidth(50);
! table.getColumnModel().getColumn(4).setPreferredWidth(150);
! table.getColumnModel().getColumn(5).setPreferredWidth(35);
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
Index: TaskList.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/TaskList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TaskList.java 25 Jan 2002 20:41:15 -0000 1.4
--- TaskList.java 11 Jun 2002 14:05:40 -0000 1.5
***************
*** 239,242 ****
--- 239,244 ----
Integer.parseInt(taskElement.getChildText("id"));
String name = taskElement.getChildText("name");
+ String WBS = taskElement.getChildText("WBS");
+
int length =
Integer.parseInt(taskElement.getChildText("length"));
***************
*** 244,248 ****
Integer.parseInt(taskElement.getChildText("completion"));
! addElement(new Task(name, length, completion,
new TaskList()));
--- 246,250 ----
Integer.parseInt(taskElement.getChildText("completion"));
! addElement(new Task(name, WBS, length, completion,
new TaskList()));
***************
*** 315,318 ****
--- 317,324 ----
.addContent(new Element("name")
.addContent(aTask.getName() + ""));
+ taskElement
+ .addContent(new Element("WBS")
+ .addContent(aTask.getWBS() + ""));
+
taskElement
.addContent(new Element("completion")
Index: TaskListTableModel.java
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/de/cgarbs/apps/jprojecttimer/TaskListTableModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TaskListTableModel.java 25 Jan 2002 20:41:15 -0000 1.3
--- TaskListTableModel.java 11 Jun 2002 14:05:40 -0000 1.4
***************
*** 24,27 ****
--- 24,28 ----
Resource.get("no."),
Resource.get("task"),
+ "WBS",
Resource.get("duration"),
Resource.get("predecessors"),
***************
*** 60,65 ****
return ((Task) tasks.elementAt(row)).getName();
case 2:
! return new Integer(((Task) tasks.elementAt(row)).getLength());
case 3:
String s = null;
for (Enumeration e = ((Task) tasks.elementAt(row)).getDependencies().elements(); e.hasMoreElements(); ) {
--- 61,68 ----
return ((Task) tasks.elementAt(row)).getName();
case 2:
! return ((Task) tasks.elementAt(row)).getWBS();
case 3:
+ return new Integer(((Task) tasks.elementAt(row)).getLength());
+ case 4:
String s = null;
for (Enumeration e = ((Task) tasks.elementAt(row)).getDependencies().elements(); e.hasMoreElements(); ) {
***************
*** 76,81 ****
return s;
}
! case 4:
return new Integer(((Task) tasks.elementAt(row)).getCompletion());
}
return null;
--- 79,85 ----
return s;
}
! case 5:
return new Integer(((Task) tasks.elementAt(row)).getCompletion());
+
}
return null;
***************
*** 84,88 ****
public int getColumnCount()
{
! return 5;
}
--- 88,92 ----
public int getColumnCount()
{
! return 6;
}
|
