Author: rfelden
Date: Tue May 29 17:38:48 2007
New Revision: 47
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D47&repname=3D=
jahia_upgrade
Log:
fix creator :
gui updated (icons added)
fixed CopyingScreen bug
Added:
trunk/create/fixcreator/src/main/resources/org/jahia/fixcreator/resourc=
es/back.png (with props)
trunk/create/fixcreator/src/main/resources/org/jahia/fixcreator/resourc=
es/cancel.png (with props)
trunk/create/fixcreator/src/main/resources/org/jahia/fixcreator/resourc=
es/finish.png (with props)
trunk/create/fixcreator/src/main/resources/org/jahia/fixcreator/resourc=
es/next.png (with props)
Modified:
trunk/create/fixcreator/src/main/java/org/jahia/fixcreator/controller/M=
yController.java
trunk/create/fixcreator/src/main/java/org/jahia/fixcreator/views/MainWi=
ndow.java
Modified: trunk/create/fixcreator/src/main/java/org/jahia/fixcreator/contro=
ller/MyController.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/create/fixcreat=
or/src/main/java/org/jahia/fixcreator/controller/MyController.java&rev=3D47=
&repname=3Djahia_upgrade
=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/create/fixcreator/src/main/java/org/jahia/fixcreator/controller/M=
yController.java (original)
+++ trunk/create/fixcreator/src/main/java/org/jahia/fixcreator/controller/M=
yController.java Tue May 29 17:38:48 2007
@@ -1160,6 +1160,10 @@
* This method is not used when generating a 'quick fix'.
*/
public void replaceFiles() {
+ if (!isDiffFix()) {
+ uiWindow.onCopyCompleted(true);
+ return ;
+ }
startThreadTimer();
setProgress(33, "copyingFiles");
new Thread() {
Modified: trunk/create/fixcreator/src/main/java/org/jahia/fixcreator/views/=
MainWindow.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/create/fixcreat=
or/src/main/java/org/jahia/fixcreator/views/MainWindow.java&rev=3D47&repnam=
e=3Djahia_upgrade
=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/create/fixcreator/src/main/java/org/jahia/fixcreator/views/MainWi=
ndow.java (original)
+++ trunk/create/fixcreator/src/main/java/org/jahia/fixcreator/views/MainWi=
ndow.java Tue May 29 17:38:48 2007
@@ -117,12 +117,15 @@
this.setPreferredSize(new Dimension(width, height));
=
// create buttons
- Dimension bottomButtonDimension =3D new Dimension(90,30);
- backButton =3D new JButton(resources.getString("bottomButtons.back=
")) ;
+ Dimension bottomButtonDimension =3D new Dimension(90,40);
+ backButton =3D new JButton() ;
+ backButton.setIcon(new ImageIcon(getClass().getResource("/org/jahi=
a/fixcreator/resources/back.png")));
backButton.setPreferredSize(bottomButtonDimension);
- cancelButton =3D new JButton(resources.getString("bottomButtons.ca=
ncel")) ;
+ cancelButton =3D new JButton() ;
+ cancelButton.setIcon(new ImageIcon(getClass().getResource("/org/ja=
hia/fixcreator/resources/cancel.png")));
cancelButton.setPreferredSize(bottomButtonDimension);
- nextButton =3D new JButton(resources.getString("bottomButtons.next=
")) ;
+ nextButton =3D new JButton() ;
+ nextButton.setIcon(new ImageIcon(getClass().getResource("/org/jahi=
a/fixcreator/resources/next.png")));
nextButton.setPreferredSize(bottomButtonDimension);
=
// add listeners
@@ -353,8 +356,8 @@
if (currentStep =3D=3D 0) backButton.setEnabled(false);
else backButton.setEnabled(true) ;
=
- if (currentStep =3D=3D screens.size()-1) nextButton.setText(resour=
ces.getString("bottomButtons.finish"));
- else nextButton.setText(resources.getString("bottomButtons.next"));
+ if (currentStep =3D=3D screens.size()-1) nextButton.setIcon(new Im=
ageIcon(getClass().getResource("/org/jahia/fixcreator/resources/finish.png"=
)));
+ else nextButton.setIcon(new ImageIcon(getClass().getResource("/org=
/jahia/fixcreator/resources/next.png")));
=
if (screens.get(currentStep).isDone()) nextButton.setEnabled(true);
else nextButton.setEnabled(false);
Added: trunk/create/fixcreator/src/main/resources/org/jahia/fixcreator/reso=
urces/back.png
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/create/f=
ixcreator/src/main/resources/org/jahia/fixcreator/resources/back.png&rev=3D=
47&repname=3Djahia_upgrade
=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
Binary file - no diff available.
Added: trunk/create/fixcreator/src/main/resources/org/jahia/fixcreator/reso=
urces/cancel.png
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/create/f=
ixcreator/src/main/resources/org/jahia/fixcreator/resources/cancel.png&rev=
=3D47&repname=3Djahia_upgrade
=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
Binary file - no diff available.
Added: trunk/create/fixcreator/src/main/resources/org/jahia/fixcreator/reso=
urces/finish.png
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/create/f=
ixcreator/src/main/resources/org/jahia/fixcreator/resources/finish.png&rev=
=3D47&repname=3Djahia_upgrade
=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
Binary file - no diff available.
Added: trunk/create/fixcreator/src/main/resources/org/jahia/fixcreator/reso=
urces/next.png
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/create/f=
ixcreator/src/main/resources/org/jahia/fixcreator/resources/next.png&rev=3D=
47&repname=3Djahia_upgrade
=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
Binary file - no diff available.
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
