Author: rfelden
Date: Mon Nov 26 12:38:57 2007
New Revision: 16
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D16&repname=3D=
fix_create
Log:
bigs fixed :
- fix info description edition
- quick fix exception when using a maven descriptor
Modified:
trunk/fixcreator/pom.xml
trunk/fixcreator/src/main/java/org/jahia/fixcreator/controller/MyContro=
ller.java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/InfoSc=
reen.java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/EditBi=
nding.java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/PrefFo=
rm.java
Modified: trunk/fixcreator/pom.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/pom.=
xml&rev=3D16&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/pom.xml (original)
+++ trunk/fixcreator/pom.xml Mon Nov 26 12:38:57 2007
@@ -78,7 +78,7 @@
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifes=
tFile>
</archive>
</configuration>
- </plugin> =
+ </plugin>
=
</plugins>
</build>
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/controller/My=
Controller.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/controller/MyController.java&rev=3D16&repnam=
e=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/controller/MyContro=
ller.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/controller/MyContro=
ller.java Mon Nov 26 12:38:57 2007
@@ -1681,7 +1681,7 @@
// copy also libraries from maven descriptor if any
// and add the summary to fix.xml
File descriptor =3D new File(dataModel.getPatchedProjectLocation()=
.getAbsolutePath() + File.separator + getProperty("maven.descriptor")) ;
- if (descriptor.exists()) {
+ if (descriptor.exists() && !getFixType().equals(FixType.QUICK)) { =
// don't seek the old descriptor in case of a quick fix
MavenHandler mvn =3D new MavenHandler(descriptor) ;
ArrayList<File> mvnLibs =3D mvn.getNewDependencies(new File(da=
taModel.getOriginalProjectLocation().getAbsolutePath() + File.separator + g=
etProperty("maven.descriptor"))) ;
Binding libBinding =3D null ;
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/=
InfoScreen.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/views/screen/InfoScreen.java&rev=3D16&repnam=
e=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/InfoSc=
reen.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/InfoSc=
reen.java Mon Nov 26 12:38:57 2007
@@ -252,7 +252,7 @@
}
=
public void onFixInfoSaved(Fix fix) {
- fillFields(fix);
+ //fillFields(fix);
}
=
/**
@@ -292,9 +292,7 @@
(keyEvent.getSource() =3D=3D targetField) ||
(keyEvent.getSource() =3D=3D dateField) ||
(keyEvent.getSource() =3D=3D descriptionField)) {
- if (isDone()) {
- saveFields() ;
- }
+ saveFields() ;
}
}
}
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/=
EditBinding.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/views/window/EditBinding.java&rev=3D16&repna=
me=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/window/EditBi=
nding.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/EditBi=
nding.java Mon Nov 26 12:38:57 2007
@@ -32,6 +32,7 @@
private JTextField target;
=
public EditBinding(final PrefForm callback, Component c, final Binding=
binding) {
+ $$$setupUI$$$();
type.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
linked.setEnabled(type.getSelectedIndex() > 3);
@@ -109,13 +110,6 @@
type =3D new JComboBox(TYPES);
}
=
- {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
- $$$setupUI$$$();
- }
-
/**
* Method generated by IntelliJ IDEA GUI Designer
* >>> IMPORTANT!! <<<
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/=
PrefForm.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/views/window/PrefForm.java&rev=3D16&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/window/PrefFo=
rm.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/PrefFo=
rm.java Mon Nov 26 12:38:57 2007
@@ -69,6 +69,7 @@
private PrefForm callback =3D this;
=
public PrefForm() {
+ $$$setupUI$$$();
addBinding.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
Binding b =3D new Binding();
@@ -252,13 +253,6 @@
return panel1;
}
=
- {
-// GUI initializer generated by IntelliJ IDEA GUI Designer
-// >>> IMPORTANT!! <<<
-// DO NOT EDIT OR ADD ANY CODE HERE!
- $$$setupUI$$$();
- }
-
/**
* Method generated by IntelliJ IDEA GUI Designer
* >>> IMPORTANT!! <<<
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
