Author: rfelden
Date: Thu Aug 2 18:04:38 2007
New Revision: 12
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D12&repname=3D=
fix_create
Log:
code cleanup
Modified:
trunk/README.txt
trunk/fixcreator/changelog.txt
trunk/fixcreator/src/main/java/org/jahia/fixcreator/jiraconnector/JiraC=
onnector.java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/svnconnector/SVNCon=
nector.java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/svnconnector/SVNDir=
TreeModel.java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/svnconnector/versio=
ntree/VersionTreeView.java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/CoreFi=
lesScreen.java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/OtherF=
ilesScreen.java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/Remove=
dScreen.java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/About.=
java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/Bindin=
gWidget.java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/PrefFo=
rm.java
trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/prefFo=
rm.form
Modified: trunk/README.txt
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/README.txt&rev=
=3D12&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/README.txt (original)
+++ trunk/README.txt Thu Aug 2 18:04:38 2007
@@ -6,12 +6,12 @@
To build it, you first have to download and install maven 2:
http://maven.apache.org/download.html
=
-As it uses a commercial jdbc driver (restricted distribution), you have to=
download and install it manually into maven.
+As it may use a commercial jdbc driver instead of the embedded HSQL databa=
se, you have to download and install it manually into maven.
To do so, with mysql jdbc connector for instance, type (anywhere):
mvn install:install-file -DgroupId=3Dcom.mysql.jdbc
-DartifactId=3Dmysql-=
connector-java -Dversion=3D5.0.5-bin -Dpackaging=3Djar -Dfile=3Dpath/to/mys=
ql-connector-java-5.0.5-bin.jar
=
Then juste type (in this very 'create' directory):
- mvn package
+ mvn install
You will find the executable jar (JVM 1.5) inside the 'fixcreator/target' =
directory.
=
That's it, don't forget to read the manual!
@@ -22,7 +22,7 @@
#######################
=
Maven allows you to generate project files for most IDEs.
-(once 'mvn install' has been done)
+(once 'mvn install' is done)
=
Using IntelliJ IDEA, type (in this very 'create' directory):
mvn idea:idea
Modified: trunk/fixcreator/changelog.txt
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/chan=
gelog.txt&rev=3D12&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 2 18:04:38 2007
@@ -102,3 +102,19 @@
appcast generator
=
##########################################################
+
+/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+ Version 1.0 : 2007-08-02
+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/
+
+New features
+ precompiled JSP support
+ Hibernate mapping files support
+ =
+Improvements
+ new bindings management
+ =
+TODO
+ appcast generator (FTP ?)
+
+##########################################################
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/jiraconnector=
/JiraConnector.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/jiraconnector/JiraConnector.java&rev=3D12&re=
pname=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/jiraconnector/JiraC=
onnector.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/jiraconnector/JiraC=
onnector.java Thu Aug 2 18:04:38 2007
@@ -177,7 +177,7 @@
int cpt =3D issues.length ;
issueList =3D new String[cpt];
for (int i=3D0 ; i<issues.length ; i++) {
- // TODO return more info
+ // TODO return more info (needed ?)
Map issueTable =3D (Map)issues[i] ;
issueList[i]=3D(issueTable.get("key").toString());
cpt-- ;
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/svnconnector/=
SVNConnector.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/svnconnector/SVNConnector.java&rev=3D12&repn=
ame=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/svnconnector/SVNCon=
nector.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/svnconnector/SVNCon=
nector.java Thu Aug 2 18:04:38 2007
@@ -241,17 +241,16 @@
return versions ;
}
=
- // TODO recuperation agglom autre facon (trop long ici)
+ // TODO retrieve aggloms other way
/**
* Retrieve the files attached to each revision of a given file.
*
* @param history the revision list
* @return the file list (collection of FileVersionAgglom)
- * @param margin
- * @throws org.tmatesoft.svn.core.SVNException
- * @throws java.text.ParseException
+ * @param margin margin around the file's date
+ * @throws org.tmatesoft.svn.core.SVNException svn connection issue
*/
- public ArrayList<FileVersionAgglom> getAttachedRevisions(ArrayList<Fil=
eVersion> history, int margin) throws SVNException, ParseException {
+ public ArrayList<FileVersionAgglom> getAttachedRevisions(ArrayList<Fil=
eVersion> history, int margin) throws SVNException {
// enrichedHistory will contain all the file version aggloms
ArrayList<FileVersionAgglom> enrichedHistory =3D new ArrayList<Fil=
eVersionAgglom>() ;
// construction of a single file version agglom within each step
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/svnconnector/=
SVNDirTreeModel.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/svnconnector/SVNDirTreeModel.java&rev=3D12&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/svnconnector/SVNDir=
TreeModel.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/svnconnector/SVNDir=
TreeModel.java Thu Aug 2 18:04:38 2007
@@ -1,7 +1,6 @@
package org.jahia.fixcreator.svnconnector;
=
import org.tmatesoft.svn.core.SVNException;
-import org.jahia.fixcreator.svnconnector.SVNConnector;
import org.jahia.fixcreator.svnconnector.version.RemoteSvnFile;
=
import javax.swing.tree.TreeModel;
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/svnconnector/=
versiontree/VersionTreeView.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/svnconnector/versiontree/VersionTreeView.jav=
a&rev=3D12&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/svnconnector/versio=
ntree/VersionTreeView.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/svnconnector/versio=
ntree/VersionTreeView.java Thu Aug 2 18:04:38 2007
@@ -2,7 +2,6 @@
=
import org.jahia.fixcreator.svnconnector.version.FileVersionAgglom;
import org.jahia.fixcreator.svnconnector.version.FileVersion;
-import org.jahia.fixcreator.svnconnector.versiontree.VersionTreeModel;
=
import javax.swing.JComponent;
import javax.swing.JScrollPane;
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=3D12&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 Thu Aug 2 18:04:38 2007
@@ -60,7 +60,7 @@
label.setHorizontalTextPosition(11);
=
// data
- javaFileListModel =3D new ArrayListModel(m_controller.getCoreFileN=
ames());
+ javaFileListModel =3D new ArrayListModel<String>(m_controller.getC=
oreFileNames());
=
// ui
// create the file list (right)
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/=
OtherFilesScreen.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/views/screen/OtherFilesScreen.java&rev=3D12&=
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/OtherF=
ilesScreen.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/OtherF=
ilesScreen.java Thu Aug 2 18:04:38 2007
@@ -61,7 +61,7 @@
=
// data
otherFileTreeModel =3D new FileTreeModel(getSelectedRoot());
- otherFileListModel =3D new ArrayListModel(m_controller.getOtherFil=
esNames());
+ otherFileListModel =3D new ArrayListModel<String>(m_controller.get=
OtherFilesNames());
=
// ui
label =3D new JLabel(resources.getString("display.otherFileSelecti=
on"));
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/=
RemovedScreen.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/views/screen/RemovedScreen.java&rev=3D12&rep=
name=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/Remove=
dScreen.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/screen/Remove=
dScreen.java Thu Aug 2 18:04:38 2007
@@ -46,7 +46,7 @@
public void build() {
=
pathListData =3D m_controller.getRemovedPaths() ;
- pathListModel =3D new ArrayListModel(pathListData) ;
+ pathListModel =3D new ArrayListModel<String>(pathListData) ;
pathList =3D new JList((pathListModel)) ;
pathList.getSelectionModel().setSelectionMode(ListSelectionModel.M=
ULTIPLE_INTERVAL_SELECTION);
=
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/=
About.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/views/window/About.java&rev=3D12&repname=3Df=
ix_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/About.=
java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/About.=
java Thu Aug 2 18:04:38 2007
@@ -17,7 +17,7 @@
private static ResourceBundle resources =3D MainWindow.resources ;
=
public final static String VERSION =3D "1.0" ;
- public final static String DATE =3D "2007-07-19" ;
+ public final static String DATE =3D "2007-08-02" ;
=
/**
* Display a nice about box.
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/=
BindingWidget.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/views/window/BindingWidget.java&rev=3D12&rep=
name=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/Bindin=
gWidget.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/Bindin=
gWidget.java Thu Aug 2 18:04:38 2007
@@ -2,7 +2,6 @@
=
=
import org.jahia.fixcreator.model.configuration.Binding;
-import org.jahia.fixcreator.views.MainWindow;
import org.jahia.fixcreator.views.listmodel.ArrayListModel;
=
import javax.swing.*;
@@ -21,8 +20,6 @@
private JList bindings ;
private ArrayListModel<Binding> bindingsList ;
=
- private GridBagLayout gbl =3D new GridBagLayout() ;
-
=
public BindingWidget() {
// panel creation + layout assignation
@@ -33,8 +30,6 @@
bindings =3D new JList() ;
=
// add components
- =
-
addBinding(null);
}
=
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=3D12&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 Thu Aug 2 18:04:38 2007
@@ -184,7 +184,6 @@
controller.setProjectName(projectName.getText());
controller.setIncludeSourceCode(includeSource.isSelected());
=
-
// bindings
controller.setBindings(bindings.getContent());
=
@@ -848,6 +847,7 @@
gbc.anchor =3D GridBagConstraints.WEST;
gbc.insets =3D new Insets(6, 10, 6, 10);
panel9.add(enableFTP, gbc);
+ label2.setLabelFor(workingDir);
}
=
/**
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/=
prefForm.form
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/views/window/prefForm.form&rev=3D12&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.form (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/views/window/prefFo=
rm.form Thu Aug 2 18:04:38 2007
@@ -48,6 +48,7 @@
<gridbag top=3D"10" left=3D"20" bottom=3D"10" right=3D"1=
0" weightx=3D"0.0" weighty=3D"0.0"/>
</constraints>
<properties>
+ <labelFor value=3D"15811"/>
<text resource-bundle=3D"org/jahia/fixcreator/resources/=
ui" key=3D"preferences.gen.workingDir"/>
</properties>
</component>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
