Author: rfelden
Date: Thu Aug 9 16:57:32 2007
New Revision: 14
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D14&repname=3D=
fix_create
Log:
default diff method
logging to text file
changelog updated (todolist)
Modified:
trunk/fixcreator/changelog.txt
trunk/fixcreator/src/main/java/org/jahia/fixcreator/Application.java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/model/MyDataModel.j=
ava
trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/DiffMe=
thodScreen.java
Modified: trunk/fixcreator/changelog.txt
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/chan=
gelog.txt&rev=3D14&repname=3Dfix_create
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/fixcreator/changelog.txt (original)
+++ trunk/fixcreator/changelog.txt Thu Aug 9 16:57:32 2007
@@ -116,5 +116,7 @@
=
TODO
appcast generator (FTP ?)
+ contextual help
+ step indicator
=
##########################################################
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/Application.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/Application.java&rev=3D14&repname=3Dfix_crea=
te
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/fixcreator/src/main/java/org/jahia/fixcreator/Application.java (o=
riginal)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/Application.java Th=
u Aug 9 16:57:32 2007
@@ -58,8 +58,8 @@
log.createNewFile() ;
}
logStream =3D new PrintStream(new FileOutputStream(log, true), tru=
e) ;
- //System.setOut(logStream) ;
- //System.setErr(logStream);
+ System.setOut(logStream) ;
+ System.setErr(logStream);
logStream.println("###############################################=
#########################") ;
logStream.println(" Session started") ;
logStream.println(" Timestamp: " + new Timestamp(System.currentTi=
meMillis()).toString());
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/model/MyDataM=
odel.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/model/MyDataModel.java&rev=3D14&repname=3Dfi=
x_create
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/fixcreator/src/main/java/org/jahia/fixcreator/model/MyDataModel.j=
ava (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/model/MyDataModel.j=
ava Thu Aug 9 16:57:32 2007
@@ -33,7 +33,7 @@
// patched source location (left untouched)
private File patchedProjectLocation =3D null ;
// diff method used
- private int diffMethod =3D NO_DIFF_METHOD ;
+ private int diffMethod =3D DEFAULT_DIFF_METHOD ;
// original folder used for diff (folder diff case)
private File originalDiffFolder =3D null ;
// modified folder used for diff (folder diff case)
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/=
DiffMethodScreen.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/views/screen/DiffMethodScreen.java&rev=3D14&=
repname=3Dfix_create
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/DiffMe=
thodScreen.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/DiffMe=
thodScreen.java Thu Aug 9 16:57:32 2007
@@ -18,6 +18,7 @@
=
/**
* Specifying the diff method you want to use is this screen's essence.
+ * =
* @version 2007-03-15
* @author Romain Felden
*/
@@ -103,6 +104,10 @@
chooseExisting.addActionListener(buttonListener);
specify.addActionListener(buttonListener);
=
+ // not implemented yet
+ existing.setEnabled(false);
+ chooseExisting.setEnabled(false);
+
built =3D true ;
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
