Author: rfelden
Date: Fri Jul 27 10:28:53 2007
New Revision: 11
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D11&repname=3D=
fix_create
Log:
bindings selection bug fix
removed quit button (useless)
disable .svn highlighting
Modified:
trunk/fixcreator/src/main/java/org/jahia/fixcreator/controller/MyContro=
ller.java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/MainWindow.ja=
va
trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/CoreFi=
lesScreen.java
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=3D11&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 Fri Jul 27 10:28:53 2007
@@ -996,7 +996,7 @@
public void run() {
assert(MyHTMLTrace.channel(Application.TRACE_CHANNEL).ente=
rMethod(MyController.class, "retrieveComparisonDiff")) ;
if (!noCache && changedPaths !=3D null && !diffMethodChang=
ed) {
- uiWindow.onSvnInfoRetrieved(changedPaths) ;
+ uiWindow.onDiffRetrieved(changedPaths) ;
setProgress(100, "fileComparison");
stopThreadTimer() ;
} else {
@@ -1043,7 +1043,7 @@
public void run() {
assert(MyHTMLTrace.channel(Application.TRACE_CHANNEL).ente=
rMethod(MyController.class, "retrieveExistingDiff")) ;
if (!noCache && changedPaths !=3D null && !diffMethodChang=
ed) {
- uiWindow.onSvnInfoRetrieved(changedPaths) ;
+ uiWindow.onDiffRetrieved(changedPaths) ;
setProgress(100, "fileComparison");
stopThreadTimer() ;
} else {
@@ -1304,8 +1304,6 @@
* This has to be done once modified source compile clean.
* This might go wrong if the bindings are not properly configured.
* @return true if everything went well, false otherwise
- *
- * TODO new binding support
*/
public boolean extractCoreFiles() {
assert(MyHTMLTrace.channel(Application.TRACE_CHANNEL).enterMethod(=
getClass(), "extractCoreFiles")) ;
@@ -1422,8 +1420,16 @@
}
}
=
+ // this is a hibernate binding
+ else if (type.equals(Binding.HBM)) {
+ if (fileExtension.equals("java")) {
+ currentBinding =3D binding ;
+ break ; // get out of the loop, the binding was found =
(you filthy loop breaker)
+ }
+ }
+
// this is a java binding (possibly with a hibernate descripto=
r attached)
- else if (type.equals(Binding.JAVA) || type.equals(Binding.HBM)=
) {
+ else if (type.equals(Binding.JAVA)) {
if (fileExtension.equals("java")) {
currentBinding =3D binding ;
break ; // get out of the loop, the binding was found =
(you filthy loop breaker)
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/MainWin=
dow.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/views/MainWindow.java&rev=3D11&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/MainWindow.ja=
va (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/MainWindow.ja=
va Fri Jul 27 10:28:53 2007
@@ -11,16 +11,11 @@
import org.jahia.fixcreator.views.window.About;
=
import javax.swing.*;
+import javax.swing.border.EmptyBorder;
import java.util.ResourceBundle;
import java.util.Locale;
import java.util.ArrayList;
-import java.awt.BorderLayout;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.Toolkit;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowEvent;
@@ -247,45 +242,13 @@
=
// persistent ui setup
content =3D new JPanel(new BorderLayout()) ;
- GridBagLayout gbl =3D new GridBagLayout() ;
- JPanel bottomButtons =3D new JPanel(gbl);
-
- GridBagConstraints c =3D new GridBagConstraints();
- c.fill =3D GridBagConstraints.NONE ;
-
-
-
- c.gridx =3D 0 ;
- c.gridy =3D 1 ;
- c.insets =3D new Insets(8,8,8,0) ;
- gbl.setConstraints(backButton, c);
- bottomButtons.add(backButton) ;
-
- c.gridx =3D 1 ;
- c.gridy =3D 1 ;
- c.insets =3D new Insets(5,250,5,250) ;
- gbl.setConstraints(cancelButton, c);
- bottomButtons.add(cancelButton);
-
- c.gridx =3D 2 ;
- c.gridy =3D 1 ;
- c.insets =3D new Insets(8,0,8,8) ;
- gbl.setConstraints(nextButton, c);
- bottomButtons.add(nextButton);
-
- c.gridx =3D 0 ;
- c.gridy =3D 0 ;
- c.insets =3D new Insets(0,4,0,4) ;
- c.fill =3D GridBagConstraints.HORIZONTAL ;
- c.gridwidth =3D GridBagConstraints.REMAINDER ;
- c.anchor =3D GridBagConstraints.CENTER ;
- JSeparator bottomLine =3D new JSeparator() ;
- Dimension lineDim =3D new Dimension(600, 5) ;
- bottomLine.setMaximumSize(lineDim);
- bottomLine.setPreferredSize(lineDim);
- bottomLine.setPreferredSize(lineDim);
- gbl.setConstraints(bottomLine, c);
- bottomButtons.add(bottomLine) ;
+ JPanel bottomButtons =3D new JPanel(new BorderLayout());
+ bottomButtons.add(backButton, BorderLayout.WEST) ;
+ /*JPanel flow =3D new JPanel(new FlowLayout()) ;
+ flow.add(cancelButton) ;
+ bottomButtons.add(flow, BorderLayout.CENTER) ;*/
+ bottomButtons.add(nextButton, BorderLayout.EAST);
+ bottomButtons.setBorder(new EmptyBorder(5, 10, 10, 10));
=
nextButton.setEnabled(false) ;
backButton.setEnabled(false) ;
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/=
CoreFilesScreen.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/views/screen/CoreFilesScreen.java&rev=3D11&r=
epname=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/CoreFi=
lesScreen.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/CoreFi=
lesScreen.java Fri Jul 27 10:28:53 2007
@@ -230,7 +230,7 @@
File file =3D (File) value;
String name =3D file.getName();
setText(name);
- if (useHighlighting) {
+ if (useHighlighting && !file.getAbsolutePath().contains(".svn"=
)) {
if (Tools.isContainedInPathList(highlightedElements, (File=
)tree.getModel().getRoot(), file)) {
setText("<html><FONT style=3D\"BACKGROUND-COLOR: #a0a0=
a0\">"+name+"</FONT></html>") ;
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
