annotated tag v2.0.0-beta-2 created (now b185182)
This is an automated email from the git hooks/post-receive script. New change to annotated tag v2.0.0-beta-2 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git at b185182 (tag) tagging 914b114c69699ec6c7f4df9521683c1a7118ae39 (commit) replaces jaxx-1.6.0-alpha-1@1425 tagged by Tony Chemit on Wed Dec 2 09:39:54 2009 +0000 - Log ----------------------------------------------------------------- minor release before big storm on bindings ----------------------------------------------------------------------- This annotated tag includes the following new commits: new b42200f create version 2.X of jaxx, with non compatible api with jaxx > 1.7.2 new b127410 simplify modules + refactor NavigationTree and Decorator api + add real JComboBox tag handler (incompatible with JAXX 1.X) new 92bf054 simplify modules + refactor NavigationTree and Decorator api + add real JComboBox tag handler (incompatible with JAXX 1.X) new a3d4ea3 [Evolution #74] : pouvoir generer les classes swing (JComboBox, JList,...) new 8f386d6 refactor jaxx 2.x new 6f521a8 refactor jaxx 2.x new d401452 fix javadocs + improve messages in goal new 045c2e4 debut doc de migration 2.0 new 4d9797b changement logs (on veut pas voir nuiton-util en console :)) new 659716f ending migration new 9747dbc evolution #78 : rendre le système d'aide multi-langue + JAXXContext is returned to jaxx.runtime package new 52a8238 - add encoding on goals (should be in JAXXCompiler) - simplify helpIdsStore (only store ids, path will be computed if needed) - maven-helper-plugin common code new a81de5b generate help search index (still does not works everywhere, a shame the code is from com.sun we do not have the source...) new 32d6e7a fix javadoc + documentation new 267de1b utilisation de mavenpom 1.1.0, maven-license-plugin new 1cce9a1 use VelocityTemplateGenerator from maven-helper-plugin new fbdd0b4 no using maven.src.dir in src default-value (this is not a maven property) new bd9a48e Syntax highlighting in demo sources new 380205f use nuiton thirdparty rsyntaxtextarea... It seems somebody does not listen what I said :) new 6ade2c2 do not expose jaxx files new ca721ba Bug categorie item in ItemTreeNavigation fixed new 63569fd Adding helper to return typed selected node new 74a248b fix generics on Class new d105bce fix generics on List new a8119ef do not make equals on class, prefer use method isAssignableFrom new 00bf8b1 move context entry def static methods to jaxx.runtime.Util new 06c2367 Adding repaint node mathods new c9ccdc2 - add a contract NavigationContentUI and use it in NavigationTreeHandler new 56fdd48 - add a contract NavigationContentUI and use it in NavigationTreeHandler - improve demo new bea7197 add gotoChildNode in NavigationTreeHelper new 3177389 Evolution #100: amélioration du design du compilateur new 1a7edad - Evolution #100: amélioration du design du compilateur - Evolution #99: Améliorer le code généré - Evolution #98: les objets JAXX sont serializable new c5fef28 amelioration demo du NavigationTreeHandler new 092ed9f - Evolution #100: amélioration du design du compilateur - Evolution #99: Améliorer le code généré - Evolution #98: les objets JAXX sont serializable new 15a6bbe clean code new 2b1b175 remover verbose flag on tests new 8c4f66c - Evolution #100: amélioration du design du compilateur - Evolution #99: Améliorer le code généré - amelioration des test dans le plugin new 9be82c2 - Evolution #100: amélioration du design du compilateur - Evolution #99: Améliorer le code généré - amelioration des test dans le plugin new e142a7a remove commented unused code new f0c338a remove commented unused code clean code new 1f08b92 remove commented unused code clean code add javadoc new ff7a0b4 - remove commented unused code, clean code, add javadoc - improve warning and error management in JAXXEngine and plugin - improve databinding generation (do not test nullity on root object) - remove when possible the root object prefix in method invocation new 3520056 update license header new a74f64d update jaxx files license header new ee16396 update java files license header new 667ba30 put the Generated By JavaCC comment line at top of file new 0006802 in Util.initContext add a entry in ui context when parentContext is a JAXXOBbject (it will make possible to walk into UI ancestor without using the getParentContainer method new c71ec82 - Evolution #105: permettre l'initialisation des objets sans JavaBean - Evolution #100: amélioration du design du compilateur - Evolution #99: Améliorer le code généré new 8571111 amelioration des renderer sur Decorator (et deplacement vers jaxx.runtime.swing.renderer) new 67318a5 - ajout test sur bindings - les fichiers generes sont dans target/generated-sources new 26dbf5e update demo from changes in compiler and runtime new 0845b8b add multi table decorator new 526a1f8 ajout license new 8560e74 remove a old empty package new dbc2ade ajout license new ebd8813 remove binding from jaxx.compiler package new 0156041 - add a DecoratorProvider to store your decorators - deprecate all states in DecoratorUtils (use a DecoratorProvider to store decorators) new 8d98187 add a DecoratorProviderListCellRenderer new fe25968 add a DecoratorProviderTableCellRenderer new 25b43e3 - use DecoratorProviderListCellRenderer new a5e0262 svn:ingore idea files new 5a2a7f3 fix context error new 12fc47f Evolution #106: Amélioration de l'api des Decorator new 5abed97 use maven-helper-plugin 1.1.0 new test dir layout new d86ecc0 svn ignore idea files new 6b2c33a use mavenpom 1.1.0 new 01cdb08 fix javadoc new f6544f0 add selected-ui in context accessible via helper.getSelectedUi() new e34f786 new icons new 7711568 add fillList + deprecated some code new 6953eed fix error message new ef6a13f Anomalie #120: NPE sur un removeDataBinding new 89dd54b use generics (avoid to generate cast :)) new db92c17 add HidorButton widget, prefer of JXCollapsePanel since it does not works very well out of the JX framework... This widget does not modify any layout new c206fcb add getSimpleName method to obtain the simple name of the class new b5e93d9 - review JAXXContext api (remove getParentContainer methods) - improve JAXXObject api (add getParentContainer + make it javaBeans compatible for PropertyChange events) - improve generation code (avoid use of FQN when possible) - fix bug of name collisions on event generated method from css - the maven-jaxx-plugin tests are all compiling, we should compile them on integration-test - add getSimpleName on class descriptor - clean code, add javadoc, reformat, ... - add L [...] new 891a8fc remove import of SwingUtil in jaxx scripts (auto-import) new ccc92ef add hidor on ListSelector (must finish the ui refresh, still problems) new 437016f multi-selection + double click pour supprimer des elements sur un ListSelector new 863f267 - remove selectUI from context, it is too messy (can not know exactly where it is stored...) - add getParentNode to obtain the first ancestor with a matching internalClass - open api new e20de57 fix NPE if object is root new 2b1c73a remove unused import and code new e74596b fix i18n label new f578cfa fix i18n label new 875cd54 stay for the moment on i18n 1.0.1 new 2acd55d patch pom since can't use at the moment mavenpom 1.1.1 (not released... new 1281dda prepare beta release new 03b93ab prepare beta release new 7a9a1dd [maven-release-plugin] prepare release jaxx-2.0.0-beta-1 new fda0a64 [maven-release-plugin] prepare for next development iteration new aefcdd6 [maven-release-plugin] rollback the release of jaxx-2.0.0-beta-1 new c925772 prepare a false release fro Vradi (not a true release since we are on a branch) new 9b05a9a life continues on 2.0.0-beta-2-SNAPSHOT :) new d2ee328 append new f7b3961 use maven-changes-plugin 2.2 (with french translations :)) new e844549 amelioration de l'éditeur de nombre : - on peut specifier le type du nombre a editer (modelType) - on gère plus de type de Nombre (Integer,Float,Double,BigInteger,BigDecimal) new 125005f goto mavenpom in snapshot new bb03989 change names new 54f69e8 - This MUST be a convention in JAXX : all specialized constructor must a second constructor with extra first parameter as parentContext - add toString of FieldDescriptor new 74de155 add log and do not break build when a binding is bad (since it can not be for the moment...) new 916f70d fix lost binding new fabd7b4 prepare beta-2 before merging branche to trunk + fix wbestart link in jaxx-demo new 914b114 minor release before big storm on bindings The 103 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 914b114c69699ec6c7f4df9521683c1a7118ae39 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Dec 2 09:39:54 2009 +0000 minor release before big storm on bindings commit fabd7b4e22ca7dcf42902a06cb7df6b16d1942e2 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Dec 2 09:38:32 2009 +0000 prepare beta-2 before merging branche to trunk + fix wbestart link in jaxx-demo commit 916f70de19284dd98881110a8dc39024599996a2 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Dec 2 09:11:27 2009 +0000 fix lost binding commit 74de155771fe1111c35055baca8e80ece7d04491 Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 27 01:43:31 2009 +0000 add log and do not break build when a binding is bad (since it can not be for the moment...) commit 54f69e81077e24a6e497b2a48a6ff4ad3f5b7838 Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 27 01:29:37 2009 +0000 - This MUST be a convention in JAXX : all specialized constructor must a second constructor with extra first parameter as parentContext - add toString of FieldDescriptor commit bb0398957e80c4ccf4da86c401a4a66b4af31c6f Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 26 20:41:21 2009 +0000 change names commit 125005ffaa645b1bc85b167b3e7261bbad4997ce Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 26 20:17:09 2009 +0000 goto mavenpom in snapshot commit e844549041d9ca0fd86e93882e909ef859b77cd1 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 26 20:05:15 2009 +0000 amelioration de l'éditeur de nombre : - on peut specifier le type du nombre a editer (modelType) - on gère plus de type de Nombre (Integer,Float,Double,BigInteger,BigDecimal) - Qui enlève les svn:ignore ??? commit f7b3961475b6bcffc7c8fd6b140643936db006f5 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 26 20:03:21 2009 +0000 use maven-changes-plugin 2.2 (with french translations :)) commit d2ee3284a872cc5c3979397e8aceeb78de38bf96 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 26 20:01:51 2009 +0000 append commit 9b05a9aef0ce607d75381f80007ad192124a9fb5 Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 13 10:58:57 2009 +0000 life continues on 2.0.0-beta-2-SNAPSHOT :) commit c9257727d4557add830d4e0b1e9277d7de3dcfcc Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 13 10:27:16 2009 +0000 prepare a false release fro Vradi (not a true release since we are on a branch) commit aefcdd65ad582d1b5a51e23659d7438f0ddcd67b Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 13 10:10:27 2009 +0000 [maven-release-plugin] rollback the release of jaxx-2.0.0-beta-1 commit fda0a64eae767cb3776ec5b61f1ee36b107d3ad9 Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 13 09:35:04 2009 +0000 [maven-release-plugin] prepare for next development iteration commit 7a9a1dd17f3c5647ee9a4a2b18e66994d2294d46 Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 13 09:34:56 2009 +0000 [maven-release-plugin] prepare release jaxx-2.0.0-beta-1 commit 03b93abf1eaa984c52d69610114e8e1df789d7ba Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 13 09:21:35 2009 +0000 prepare beta release commit 1281dda773a17ef82866ef35716951d2c7e6811f Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 13 09:21:03 2009 +0000 prepare beta release commit 2acd55dfcc387609dd75ad809e0fadb5439afdcf Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 13 09:09:54 2009 +0000 patch pom since can't use at the moment mavenpom 1.1.1 (not released... commit 875cd5450c492cf881b4de482925a0854339dfdc Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 13 09:07:03 2009 +0000 stay for the moment on i18n 1.0.1 commit f578cfa2db55c847da9d655e7c594c14729e88df Author: Tony Chemit <chemit@codelutin.com> Date: Mon Nov 9 10:41:36 2009 +0000 fix i18n label commit e74596b01dbb55e383ef4577e93efa92d1d79d33 Author: Tony Chemit <chemit@codelutin.com> Date: Mon Nov 9 10:01:17 2009 +0000 fix i18n label commit 2b1c73a53464d6bcb1b2eed349c5e76237a7ef06 Author: Tony Chemit <chemit@codelutin.com> Date: Sat Nov 7 13:26:40 2009 +0000 remove unused import and code commit e20de57c885b38c1fefdf9bd15cf51c55da601e8 Author: Tony Chemit <chemit@codelutin.com> Date: Sat Nov 7 12:39:42 2009 +0000 fix NPE if object is root commit 863f26763e703a6d27cf76cf2b3d43a79093e2c4 Author: Tony Chemit <chemit@codelutin.com> Date: Sat Nov 7 06:12:53 2009 +0000 - remove selectUI from context, it is too messy (can not know exactly where it is stored...) - add getParentNode to obtain the first ancestor with a matching internalClass - open api commit 437016fe76115c3de844b494264fe9eb9a70f381 Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 6 11:36:48 2009 +0000 multi-selection + double click pour supprimer des elements sur un ListSelector commit ccc92ef37718a3fe00172371635cc0b8984b9950 Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 6 01:00:03 2009 +0000 add hidor on ListSelector (must finish the ui refresh, still problems) commit 891a8fc0068d5f888c946b69a2d529f88857b0ab Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 5 22:25:07 2009 +0000 remove import of SwingUtil in jaxx scripts (auto-import) commit b5e93d99cf400e3e55cf53d4403f61acf85501fe Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 5 20:44:42 2009 +0000 - review JAXXContext api (remove getParentContainer methods) - improve JAXXObject api (add getParentContainer + make it javaBeans compatible for PropertyChange events) - improve generation code (avoid use of FQN when possible) - fix bug of name collisions on event generated method from css - the maven-jaxx-plugin tests are all compiling, we should compile them on integration-test - add getSimpleName on class descriptor - clean code, add javadoc, reformat, ... - add ListSelectorUI widget commit c206fcb8de8166194f412f0ced990eba01e2b611 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 5 17:02:40 2009 +0000 add getSimpleName method to obtain the simple name of the class commit db92c1700d5fa2005818e18aa16a5c858947cf66 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 5 02:25:48 2009 +0000 add HidorButton widget, prefer of JXCollapsePanel since it does not works very well out of the JX framework... This widget does not modify any layout commit 89dd54ba4dda09bd07a6ea4517c2952738741887 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 5 02:22:45 2009 +0000 use generics (avoid to generate cast :)) commit ef6a13f60052daff7718c8d310d481a84fc490e1 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 5 02:21:58 2009 +0000 Anomalie #120: NPE sur un removeDataBinding commit 6953eeda1d47b08b0e959267a4e296e50c58a4f3 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Nov 4 21:13:46 2009 +0000 fix error message commit 7711568c4363aa8135cfd415ccd264b9d9a98852 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Nov 4 20:35:40 2009 +0000 add fillList + deprecated some code commit e34f786fc61ba040710b7e35961920ab5eb64471 Author: Tony Chemit <chemit@codelutin.com> Date: Tue Nov 3 23:15:39 2009 +0000 new icons commit f6544f0e320083a01050e0c4dcd2449556025112 Author: Tony Chemit <chemit@codelutin.com> Date: Tue Nov 3 21:02:20 2009 +0000 add selected-ui in context accessible via helper.getSelectedUi() commit 01cdb0852e8043ff63d6a815829153880594d7d0 Author: Tony Chemit <chemit@codelutin.com> Date: Mon Nov 2 07:52:03 2009 +0000 fix javadoc commit 6b2c33ae69cd2a3e774e6006f46c091ec62a5d53 Author: Tony Chemit <chemit@codelutin.com> Date: Mon Nov 2 03:47:28 2009 +0000 use mavenpom 1.1.0 commit d86ecc08d7978251ed7c7555f8b253b5b8af2da5 Author: Tony Chemit <chemit@codelutin.com> Date: Mon Nov 2 03:38:30 2009 +0000 svn ignore idea files commit 5abed9713a9d4aca9da5e61fa7c74a9fa966c5a6 Author: Tony Chemit <chemit@codelutin.com> Date: Sun Nov 1 16:21:04 2009 +0000 use maven-helper-plugin 1.1.0 new test dir layout commit 12fc47f2cea51f9fa5a2feea2dd20e082615955f Author: Tony Chemit <chemit@codelutin.com> Date: Fri Oct 30 11:09:43 2009 +0000 Evolution #106: Amélioration de l'api des Decorator commit 5a2a7f3a339b04c6eb88c88c924a231b0cc3c927 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Oct 29 18:21:10 2009 +0000 fix context error commit a5e0262dd45cfc4c454379842e72bd645a72b825 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Oct 29 17:06:25 2009 +0000 svn:ingore idea files commit 25b43e3c7686e768bbe685fa3638bd631b9486b6 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Oct 29 16:48:10 2009 +0000 - use DecoratorProviderListCellRenderer commit fe25968fa478801f14330ced814999792543e1c0 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Oct 29 14:55:21 2009 +0000 add a DecoratorProviderTableCellRenderer commit 8d981876146bbd02d1c4cac22e1653531db466f8 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Oct 29 02:08:58 2009 +0000 add a DecoratorProviderListCellRenderer commit 0156041f3e0e8ab1b651b74538dfcdd7a080f3d4 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Oct 29 01:42:54 2009 +0000 - add a DecoratorProvider to store your decorators - deprecate all states in DecoratorUtils (use a DecoratorProvider to store decorators) commit ebd88138a62a203b1b5796432e87eba5a461b054 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 28 07:54:21 2009 +0000 remove binding from jaxx.compiler package commit dbc2adeddaa0ac612b959ee0a868fedbd23fd6a7 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 28 07:51:37 2009 +0000 ajout license commit 8560e7448a08cb70c1a181bbf64f63a771de2259 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 28 07:44:28 2009 +0000 remove a old empty package commit 526a1f84e6da375665ab29fcb6bc3b492f0f46c3 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 28 07:42:33 2009 +0000 ajout license commit 0845b8bca264c90df225b77b2d038dd7c89befad Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 28 07:38:25 2009 +0000 add multi table decorator commit 26dbf5e85e8f5b8059a8ae23b3a91030e34d9f48 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 28 07:29:27 2009 +0000 update demo from changes in compiler and runtime commit 67318a5c95a436da6a48edbba40ac2264210fe38 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 28 07:20:17 2009 +0000 - ajout test sur bindings - les fichiers generes sont dans target/generated-sources commit 85711119c038ed63927a522afbca45d8c755cc48 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 28 07:19:17 2009 +0000 amelioration des renderer sur Decorator (et deplacement vers jaxx.runtime.swing.renderer) commit c71ec82f3031a32f51a660be4bc2b2a4870a6fc0 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 28 07:18:13 2009 +0000 - Evolution #105: permettre l'initialisation des objets sans JavaBean - Evolution #100: amélioration du design du compilateur - Evolution #99: Améliorer le code généré commit 00068020f877dc881ed42d1d01a61f9440677db8 Author: Tony Chemit <chemit@codelutin.com> Date: Tue Oct 27 10:46:23 2009 +0000 in Util.initContext add a entry in ui context when parentContext is a JAXXOBbject (it will make possible to walk into UI ancestor without using the getParentContainer method commit 667ba30e052c7b08c15d32db3097784895523aac Author: Tony Chemit <chemit@codelutin.com> Date: Tue Oct 27 00:40:30 2009 +0000 put the Generated By JavaCC comment line at top of file commit ee163961bdd380b7630ed209d619d0b8845b363d Author: Tony Chemit <chemit@codelutin.com> Date: Mon Oct 26 19:13:36 2009 +0000 update java files license header commit a74f64d5d0b7fed2b39bcbd518330c2430dd1de2 Author: Tony Chemit <chemit@codelutin.com> Date: Mon Oct 26 19:11:57 2009 +0000 update jaxx files license header commit 352005675825bde3344d3039683740c7e813170a Author: Tony Chemit <chemit@codelutin.com> Date: Mon Oct 26 19:08:21 2009 +0000 update license header commit ff7a0b4aa621f2fd21228f200442531c15f2f757 Author: Tony Chemit <chemit@codelutin.com> Date: Mon Oct 26 02:47:48 2009 +0000 - remove commented unused code, clean code, add javadoc - improve warning and error management in JAXXEngine and plugin - improve databinding generation (do not test nullity on root object) - remove when possible the root object prefix in method invocation commit 1f08b928326b9be4549c292825db1ae07f0fba3b Author: Tony Chemit <chemit@codelutin.com> Date: Mon Oct 26 02:45:10 2009 +0000 remove commented unused code clean code add javadoc commit f0c338a9532b1770514a9026245a2790b5a055ad Author: Tony Chemit <chemit@codelutin.com> Date: Mon Oct 26 02:40:51 2009 +0000 remove commented unused code clean code commit e142a7a6a1fa7306253dd9bedbd3041908f55833 Author: Tony Chemit <chemit@codelutin.com> Date: Mon Oct 26 02:36:35 2009 +0000 remove commented unused code commit 9be82c2570dc176f1b4bdd4ae6923959f32541de Author: Tony Chemit <chemit@codelutin.com> Date: Sun Oct 25 19:49:15 2009 +0000 - Evolution #100: amélioration du design du compilateur - Evolution #99: Améliorer le code généré - amelioration des test dans le plugin commit 8c4f66cdb64c946efcb1149741422681d723dde1 Author: Tony Chemit <chemit@codelutin.com> Date: Sun Oct 25 19:48:54 2009 +0000 - Evolution #100: amélioration du design du compilateur - Evolution #99: Améliorer le code généré - amelioration des test dans le plugin commit 2b1b1756e88120fb26b9bb8b890f87e32cf2af57 Author: Tony Chemit <chemit@codelutin.com> Date: Sat Oct 24 13:56:24 2009 +0000 remover verbose flag on tests commit 15a6bbe22a694c9924fd9efdf877888a34b4c859 Author: Tony Chemit <chemit@codelutin.com> Date: Sat Oct 24 11:36:16 2009 +0000 clean code commit 092ed9fc20fee8930c452de63305cb844af03723 Author: Tony Chemit <chemit@codelutin.com> Date: Sat Oct 24 11:34:52 2009 +0000 - Evolution #100: amélioration du design du compilateur - Evolution #99: Améliorer le code généré - Evolution #98: les objets JAXX sont serializable commit c5fef28ab28ff91f4833cb7d377cb956c436d0b1 Author: Tony Chemit <chemit@codelutin.com> Date: Sat Oct 24 11:32:31 2009 +0000 amelioration demo du NavigationTreeHandler commit 1a7edadc94dddc6f49b61c6e29834545e8454aa5 Author: Tony Chemit <chemit@codelutin.com> Date: Sat Oct 24 11:31:57 2009 +0000 - Evolution #100: amélioration du design du compilateur - Evolution #99: Améliorer le code généré - Evolution #98: les objets JAXX sont serializable commit 3177389c7e3bc88f388160bde4f5ead8c13a1cf8 Author: Tony Chemit <chemit@codelutin.com> Date: Sat Oct 24 11:30:36 2009 +0000 Evolution #100: amélioration du design du compilateur commit bea7197f9fc62c151cf500db64e972ab4a77571a Author: Tony Chemit <chemit@codelutin.com> Date: Fri Oct 23 18:01:04 2009 +0000 add gotoChildNode in NavigationTreeHelper commit 56fdd488dbc233b71e28d28f22680f7ff8e8761c Author: Tony Chemit <chemit@codelutin.com> Date: Fri Oct 23 16:44:44 2009 +0000 - add a contract NavigationContentUI and use it in NavigationTreeHandler - improve demo commit c9ccdc2cccb135412543975b7a25aaf59c0ef2cc Author: Tony Chemit <chemit@codelutin.com> Date: Fri Oct 23 16:42:17 2009 +0000 - add a contract NavigationContentUI and use it in NavigationTreeHandler commit 06c236729dfbf929cd9ccc53ce1227395c52f5f1 Author: Sylvain Letellier <???> Date: Fri Oct 23 14:30:44 2009 +0000 Adding repaint node mathods commit 00bf8b1f6bcaa1ee8cfd2db4b5095edd330d8d8b Author: Tony Chemit <chemit@codelutin.com> Date: Thu Oct 22 10:57:40 2009 +0000 move context entry def static methods to jaxx.runtime.Util commit a8119eff3328884bd0848d4647c090c02a402a1d Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 21 13:16:51 2009 +0000 do not make equals on class, prefer use method isAssignableFrom commit d105bce77e02f9d47bee567098a409bd44f24e50 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 21 12:56:13 2009 +0000 fix generics on List commit 74a248bad84816b51ecf80b0258f3066fd42feaf Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 21 12:54:56 2009 +0000 fix generics on Class commit 63569fd6bc3af0e7f11823bb1a6859c7ac166c49 Author: Sylvain Letellier <???> Date: Tue Oct 20 12:59:39 2009 +0000 Adding helper to return typed selected node commit ca721bafbe101b6ffd494ee722f1e787d73e88c7 Author: Sylvain Letellier <???> Date: Tue Oct 20 12:58:57 2009 +0000 Bug categorie item in ItemTreeNavigation fixed commit 6ade2c28beb3873fb08161b0edd4f82968411744 Author: Tony Chemit <chemit@codelutin.com> Date: Fri Oct 16 14:05:07 2009 +0000 do not expose jaxx files commit 380205f49e1b0c295975480f75502c354d78212c Author: Tony Chemit <chemit@codelutin.com> Date: Fri Oct 16 12:47:28 2009 +0000 use nuiton thirdparty rsyntaxtextarea... It seems somebody does not listen what I said :) commit bd9a48e4f9cc96fbd2c6feab7d4354dc0e00d35e Author: Sylvain Letellier <???> Date: Wed Oct 14 10:04:28 2009 +0000 Syntax highlighting in demo sources commit fbdd0b4da7951107fea2b46b33da7374b5744bf9 Author: Tony Chemit <chemit@codelutin.com> Date: Tue Oct 13 09:07:59 2009 +0000 no using maven.src.dir in src default-value (this is not a maven property) commit 1cce9a1da829847ccea5323dfd1e47e223805b2c Author: Tony Chemit <chemit@codelutin.com> Date: Sun Oct 11 13:10:37 2009 +0000 use VelocityTemplateGenerator from maven-helper-plugin commit 267de1be5f39e97aab41dd5cb9ef10888b6fbb3b Author: Tony Chemit <chemit@codelutin.com> Date: Sat Oct 10 16:48:11 2009 +0000 utilisation de mavenpom 1.1.0, maven-license-plugin commit 32d6e7a0ee5a7dbb06daf5c89df842cda5dbbbf4 Author: Tony Chemit <chemit@codelutin.com> Date: Fri Oct 9 07:23:00 2009 +0000 fix javadoc + documentation commit a81de5ba45fb8d709e5fe7f937e1843dc6d92d47 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Oct 8 21:10:15 2009 +0000 generate help search index (still does not works everywhere, a shame the code is from com.sun we do not have the source...) commit 52a8238fb5c6e2693c04a31bb3d3fe3daa225edc Author: Tony Chemit <chemit@codelutin.com> Date: Thu Oct 8 19:10:44 2009 +0000 - add encoding on goals (should be in JAXXCompiler) - simplify helpIdsStore (only store ids, path will be computed if needed) - maven-helper-plugin common code commit 9747dbc86ffa84cb7177af414923bba6e40157c2 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Oct 8 16:48:27 2009 +0000 evolution #78 : rendre le système d'aide multi-langue + JAXXContext is returned to jaxx.runtime package commit 659716f65625a1aaf5794ee345219c366b8f892d Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 7 21:03:42 2009 +0000 ending migration commit 4d9797bc53f07ef53c076af980212b69474073f6 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 7 18:15:26 2009 +0000 changement logs (on veut pas voir nuiton-util en console :)) commit 045c2e4959e5dcb11270fb57bdab111d790f2223 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 7 17:57:38 2009 +0000 debut doc de migration 2.0 commit d4014526f7d0a901a33c55f755f81a326485b179 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 7 17:37:55 2009 +0000 fix javadocs + improve messages in goal commit 6f521a81dce0d63a33c34c01b87c1cdc3912e4c5 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 7 14:23:35 2009 +0000 refactor jaxx 2.x commit 8f386d69ffeeb5c6b247c4134cc4376c8f9922e0 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 7 14:22:07 2009 +0000 refactor jaxx 2.x commit a3d4ea33ae86725e76b7d4a832e366b0b48fa5bd Author: Tony Chemit <chemit@codelutin.com> Date: Tue Oct 6 04:59:00 2009 +0000 [Evolution #74] : pouvoir generer les classes swing (JComboBox, JList,...) commit 92bf054b4edf6d7188c9af9b4ba1b9598915e885 Author: Tony Chemit <chemit@codelutin.com> Date: Mon Oct 5 19:16:52 2009 +0000 simplify modules + refactor NavigationTree and Decorator api + add real JComboBox tag handler (incompatible with JAXX 1.X) commit b12741015a10ab8044ec7e29dbadc94fe7814b8a Author: Tony Chemit <chemit@codelutin.com> Date: Mon Oct 5 19:15:44 2009 +0000 simplify modules + refactor NavigationTree and Decorator api + add real JComboBox tag handler (incompatible with JAXX 1.X) commit b42200fd21ebbcc53fb3096272a3c9042e840b3c Author: Tony Chemit <chemit@codelutin.com> Date: Mon Oct 5 13:18:45 2009 +0000 create version 2.X of jaxx, with non compatible api with jaxx > 1.7.2 -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-2 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 9b05a9aef0ce607d75381f80007ad192124a9fb5 Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 13 10:58:57 2009 +0000 life continues on 2.0.0-beta-2-SNAPSHOT :) --- jaxx-compiler/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-swing-action/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- maven-jaxx-plugin/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 212a09f..68f4013 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 2400245..133d20b 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index 009224c..ffac357 100644 --- a/jaxx-runtime/pom.xml +++ b/jaxx-runtime/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-swing-action/pom.xml b/jaxx-swing-action/pom.xml index ab52608..2bc5b9d 100644 --- a/jaxx-swing-action/pom.xml +++ b/jaxx-swing-action/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 23b016f..5adaa3b 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/maven-jaxx-plugin/pom.xml b/maven-jaxx-plugin/pom.xml index f09696d..93b15e5 100644 --- a/maven-jaxx-plugin/pom.xml +++ b/maven-jaxx-plugin/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index 0c712c9..8c2de46 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-1</version> + <version>2.0.0-beta-2-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-2 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit d2ee3284a872cc5c3979397e8aceeb78de38bf96 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 26 20:01:51 2009 +0000 append --- .../jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java b/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java index ccd10a3..5e550ee 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java @@ -72,7 +72,7 @@ public class DefaultCompiledObjectDecorator implements CompiledObjectDecorator { String eol = JAXXCompiler.getLineSeparator(); StringBuffer result = new StringBuffer(); if (compiler.getRootObject() == object || compiler.inlineCreation(object)) { - result.append("// inline creation of " + object.getId()); + result.append("// inline creation of ").append(object.getId()); } if (object.isOverride() && object.getOverrideType() == object.getObjectClass()) { //TC-20090309 on utilise le super code quand l'objet est de meme type @@ -120,7 +120,7 @@ public class DefaultCompiledObjectDecorator implements CompiledObjectDecorator { if (object.getId().startsWith("$")) { String additionCode = object.getAdditionCode(); if (!additionCode.isEmpty()) { - code.append("// inline complete setup of " + object.getId()).append(eol); + code.append("// inline complete setup of ").append(object.getId()).append(eol); code.append(additionCode); } } else { @@ -141,7 +141,7 @@ public class DefaultCompiledObjectDecorator implements CompiledObjectDecorator { if (object == root) { String rootCode = root.getInitializationCode(compiler); if (rootCode != null && rootCode.length() > 0) { - code.append("// inline creation of " + object.getId()).append(eol); + code.append("// inline creation of ").append(object.getId()).append(eol); code.append(rootCode); //TC-20091025 generate client properties at creation time (not at setup time) // in some case can save to create a setup method (when there is only client properties @@ -171,7 +171,7 @@ public class DefaultCompiledObjectDecorator implements CompiledObjectDecorator { if (object.hasClientProperties()) { // generate putClientProperty invocations for (Entry<String, String> entry : object.getClientProperties().entrySet()) { - code.append(object.getJavaCode() + ".putClientProperty(\"" + entry.getKey() + "\", " + entry.getValue() + ");").append(eol); + code.append(object.getJavaCode()).append(".putClientProperty(\"").append(entry.getKey()).append("\", ").append(entry.getValue()).append(");").append(eol); } } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-2 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit f7b3961475b6bcffc7c8fd6b140643936db006f5 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 26 20:03:21 2009 +0000 use maven-changes-plugin 2.2 (with french translations :)) --- .../src/main/java/jaxx/compiler/JAXXCompiler.java | 71 ++++++++++++---------- .../src/main/java/jaxx/compiler/java/JavaFile.java | 58 ++++++++++-------- 2 files changed, 71 insertions(+), 58 deletions(-) diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java b/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java index 106d038..22c3978 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java @@ -22,71 +22,47 @@ package jaxx.compiler; import jaxx.compiler.binding.DataBinding; import jaxx.compiler.css.StylesheetHelper; -import jaxx.compiler.script.ScriptManager; -import jaxx.compiler.java.JavaMethod; import jaxx.compiler.java.JavaField; import jaxx.compiler.java.JavaFile; +import jaxx.compiler.java.JavaFileGenerator; +import jaxx.compiler.java.JavaMethod; import jaxx.compiler.java.parser.ParseException; import jaxx.compiler.reflect.ClassDescriptor; import jaxx.compiler.reflect.ClassDescriptorLoader; import jaxx.compiler.reflect.FieldDescriptor; import jaxx.compiler.reflect.MethodDescriptor; +import jaxx.compiler.script.ScriptManager; import jaxx.compiler.tags.DefaultObjectHandler; import jaxx.compiler.tags.TagHandler; import jaxx.compiler.tags.TagManager; +import jaxx.compiler.types.TypeManager; import jaxx.runtime.ComponentDescriptor; import jaxx.runtime.JAXXObjectDescriptor; import jaxx.runtime.css.Rule; import jaxx.runtime.css.Stylesheet; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.xml.sax.Attributes; -import org.xml.sax.InputSource; -import org.xml.sax.Locator; -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; +import org.xml.sax.*; import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.XMLFilterImpl; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import javax.xml.transform.ErrorListener; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; +import javax.xml.transform.*; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.sax.SAXSource; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; +import java.io.*; import java.lang.reflect.Modifier; import java.net.URL; import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.Stack; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import jaxx.compiler.java.JavaFileGenerator; -import jaxx.compiler.types.TypeManager; -import org.apache.commons.lang.StringUtils; - /** * Compiles JAXX files into Java classes. * <p/> @@ -1625,4 +1601,33 @@ public class JAXXCompiler { public JAXXEngine getEngine() { return engine; } + + /** + * Convertit un nom de variable en nom de constante. + * + * @param variableName le nom de variable a convertir + * @return le nom de la constante à partir du nom de la variable + */ + public static String convertVariableNameToConstantName(String variableName) { + //TODO Faire des tests pour savoir si variableName est non null et valide + //TODO Ameliorer l'algo pour tenir compte des caractères non alpha + //TODO pour le moment cela convient, donc... + StringBuilder buffer = new StringBuilder(); + boolean lastCarIsUp = false; + for (int i = 0, j = variableName.length(); i < j; i++) { + char c = variableName.charAt(i); + boolean carIsUp = Character.isUpperCase(c); + if (i > 0 && !lastCarIsUp && carIsUp) { + // ajout d'un _ + buffer.append('_'); + } + if (carIsUp) { + buffer.append(c); + } else { + buffer.append(Character.toUpperCase(c)); + } + lastCarIsUp = carIsUp; + } + return buffer.toString(); + } } diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java b/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java index 1de7de5..099658c 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java @@ -1,30 +1,32 @@ -/* - * *##% - * JAXX Compiler - * Copyright (C) 2008 - 2009 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * ##%* - */ +/* + * *##% + * JAXX Compiler + * Copyright (C) 2008 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ package jaxx.compiler.java; +import jaxx.compiler.JAXXCompiler; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * A Java source file being generated for output. Once the class is completely initialized, use the @@ -38,7 +40,8 @@ public class JavaFile extends JavaElement { static private final Log log = LogFactory.getLog(JavaFile.class); protected static final String GETTER_PATTERN = "return %1$s;"; protected static final String BOOLEAN_GETTER_PATTERN = "return %1$s !=null && %1$s;"; - protected static final String SETTER_PATTERN = "%1$s oldValue = this.%2$s;\nthis.%2$s = newValue;\nfirePropertyChange(\"%2$s\", oldValue, newValue);"; + protected static final String SETTER_PATTERN = "%1$s oldValue = this.%2$s;\nthis.%2$s = newValue;\nfirePropertyChange(%3$s, oldValue, newValue);"; + // protected static final String SETTER_PATTERN = "%1$s oldValue = this.%2$s;\nthis.%2$s = newValue;\nfirePropertyChange(\"%2$s\", oldValue, newValue);"; private List<String> imports = new ArrayList<String>(); private List<JavaField> fields = new ArrayList<JavaField>(); private List<JavaMethod> methods = new ArrayList<JavaMethod>(); @@ -123,12 +126,17 @@ public class JavaFile extends JavaElement { field.getType(), "get" + capitalizedName, null, null, content, field.isOverride())); if (javaBean) { - // add full javabean support + // add full javabean support accessor + mutator + constante with name of property to make it easier to use + // compute the property constante + String constantId = JAXXCompiler.convertVariableNameToConstantName("property" + capitalizedName); + addSimpleField(JavaFileGenerator.newField(Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL, String.class.getSimpleName(), constantId, false, "\"" + id + "\"")); + if (Boolean.class.getName().equals(field.getType())) { content = String.format(BOOLEAN_GETTER_PATTERN, id); addMethod(new JavaMethod(Modifier.PUBLIC, field.getType(), "is" + capitalizedName, null, null, content, field.isOverride())); } - content = String.format(SETTER_PATTERN, field.getType(), id); + content = String.format(SETTER_PATTERN, field.getType(), id, constantId); +// content = String.format(SETTER_PATTERN, field.getType(), id); JavaArgument arg = new JavaArgument(field.getType(), "newValue"); addMethod(new JavaMethod(Modifier.PUBLIC, "void", "set" + capitalizedName, new JavaArgument[]{arg}, null, content, field.isOverride())); } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-2 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit e844549041d9ca0fd86e93882e909ef859b77cd1 Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 26 20:05:15 2009 +0000 amelioration de l'éditeur de nombre : - on peut specifier le type du nombre a editer (modelType) - on gère plus de type de Nombre (Integer,Float,Double,BigInteger,BigDecimal) - Qui enlève les svn:ignore ??? --- .../jaxx/runtime/swing/editor/NumberEditor.jaxx | 3 + .../runtime/swing/editor/NumberEditorHandler.java | 167 +++++++++++++++------ maven-jaxx-plugin/maven-jaxx-plugin.iml | 71 +++++++++ 3 files changed, 196 insertions(+), 45 deletions(-) diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx index 9d08d46..2558bf0 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx @@ -37,6 +37,9 @@ <!-- editor model --> <Number id="model" javaBean='null'/> + <!-- editor model type (specify it when you want to use a special type other than Integer or Float)--> + <Class id="modelType" javaBean='null'/> + <!-- useFloat property --> <Boolean id='useFloat' javaBean='false'/> diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java index a00f95a..8638eaf 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java @@ -20,23 +20,25 @@ */ package jaxx.runtime.swing.editor; -import java.awt.Dimension; -import java.lang.reflect.InvocationTargetException; -import javax.swing.JTextField; +import static jaxx.runtime.swing.editor.NumberEditor.PROPERTY_MODEL; +import static jaxx.runtime.swing.editor.NumberEditor.PROPERTY_POPUP_VISIBLE; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.text.BadLocationException; +import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyDescriptor; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.swing.JToggleButton; +import java.math.BigDecimal; +import java.math.BigInteger; /** * Le handler de l'éditeur graphique de nombres. @@ -47,36 +49,43 @@ import javax.swing.JToggleButton; * @see NumberEditor */ public class NumberEditorHandler { - + /** + * Logger + */ public static final Log log = LogFactory.getLog(NumberEditorHandler.class); - public static final String BEAN_PROPERTY = "bean"; - public static final String PROPERTY_PROPERTY = "property"; - public static final String MODEL_PROPERTY = "model"; - public static final String AUTO_POPUP_PROPERTY = "autoPopup"; - public static final String POPUP_VISIBLE_PROPERTY = "popupVisible"; -// public static final String USE_FLOAT_PROPERTY = "useFloat"; - public static final String USE_SIGN_PROPERTY = "useSign"; public static final String VALIDATE_PROPERTY = "validate"; - /** editor ui */ + /** + * editor ui + */ protected NumberEditor editor; - /** the mutator method on the property of boxed bean in the editor */ + /** + * the mutator method on the property of boxed bean in the editor + */ protected Method mutator; - /** the getter method on the property */ + /** + * the getter method on the property + */ protected Method getter; - /** a flag to known if mutator accept null value */ + /** + * a flag to known if mutator accept null value + */ protected Boolean acceptNull; + protected Class<?> modelType; + public NumberEditorHandler(NumberEditor ui) { this.editor = ui; } - /** initialise l'ui et les listeners d'évènements. */ + /** + * initialise l'ui et les listeners d'évènements. + */ public void init() { try { if (editor.getBean() == null) { throw new NullPointerException("can not have a null bean in ui " + editor); } - editor.addPropertyChangeListener(MODEL_PROPERTY, new PropertyChangeListener() { + editor.addPropertyChangeListener(PROPERTY_MODEL, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -86,7 +95,7 @@ public class NumberEditorHandler { setModel((Number) evt.getOldValue(), (Number) evt.getNewValue()); } }); - editor.addPropertyChangeListener(POPUP_VISIBLE_PROPERTY, new PropertyChangeListener() { + editor.addPropertyChangeListener(PROPERTY_POPUP_VISIBLE, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -94,18 +103,25 @@ public class NumberEditorHandler { } }); editor.getTextField().addMouseListener(new PopupListener()); - + // Determine si c'est un float Class<?> type = getGetter().getReturnType(); + if (editor.getModelType() != null) { + type = editor.getModelType(); + } + modelType = type; + if (log.isDebugEnabled()) { + log.debug("model type to use = " + modelType); + } //FIXME le test n'est pas assez fort (on peut avoir un long, short,...) editor.setUseFloat(!type.equals(Integer.class) && !type.equals(int.class)); // Initialise le model - if (editor.getModel() == null){ - Number num = (Number)getGetter().invoke(editor.getBean()); + if (editor.getModel() == null) { + Number num = (Number) getGetter().invoke(editor.getBean()); editor.setModel(num); } - + /*if (editor.getResetButton().getIcon() == null) { editor.getResetButton().setIcon(SwingUtil.createActionIcon("numbereditor-reset")); } @@ -118,7 +134,7 @@ public class NumberEditorHandler { log.error(ex); } catch (InvocationTargetException ex) { log.error(ex); - } + } } /** @@ -150,7 +166,7 @@ public class NumberEditorHandler { /** * Modifie le modèle de la donnée à éditer à partir d'un evenement clavier - * + * <p/> * TODO utiliser une filtre sur les donnes en entrees pour ne pas a avoir * faire les tests ici. * @@ -205,11 +221,16 @@ public class NumberEditorHandler { } } else { // ok on peut utilise ce modele - if (editor.isUseFloat()) { - newValue = f; - } else { - newValue = f.intValue(); - } + newValue = getRealValue(f); +// if (editor.isUseFloat()) { +// if (getMutator().getParameterTypes()[0] == BigDecimal.class) { +// newValue = BigDecimal.valueOf(f); +// } else { +// newValue = f; +// } +// } else { +// newValue = f.intValue(); +// } canApply = true; } } @@ -227,7 +248,7 @@ public class NumberEditorHandler { if (log.isDebugEnabled()) { log.debug("can apply new model value : " + newValue); } - if (isLess){ + if (isLess) { editor.setModelText("-"); return; } @@ -254,11 +275,37 @@ public class NumberEditorHandler { try { field.setCaretPosition(oldPosition); } - catch(IllegalArgumentException ex){ + catch (IllegalArgumentException ex) { log.debug("CaretPosition is invalid for position : " + oldPosition, ex); } } + private Number getRealValue(Float f) { + if (modelType == Integer.class) { + return f.intValue(); + } + if (modelType == Float.class) { + return f; + } + if (modelType == Double.class) { + return f.doubleValue(); + } + if (modelType == Long.class) { + return f.longValue(); + } + if (modelType == BigInteger.class) { + return BigInteger.valueOf(f.longValue()); + } + if (modelType == BigDecimal.class) { + return BigDecimal.valueOf(f.doubleValue()); + } + if (editor.isUseFloat()) { + // use default float value + return f; + } + return f.intValue(); + } + /** * Ajoute le caractère donné à l'endroit où est le curseur dans la zone de * saisie et met à jour le modèle. @@ -321,7 +368,9 @@ public class NumberEditorHandler { } } - /** @return l'éditeur au quel est rattaché le handler. */ + /** + * @return l'éditeur au quel est rattaché le handler. + */ public NumberEditor getEditor() { return editor; } @@ -336,18 +385,30 @@ public class NumberEditorHandler { } try { + Method mutator = getMutator(); if (newValue == null && !getAcceptNull()) { // valeur nulle sur une propriete primitive // on ne peut pas utiliser la valeur null, mais 0 à la place - if (editor.isUseFloat()) { - getMutator().invoke(editor.getBean(), 0.0f); - } else { - getMutator().invoke(editor.getBean(), 0); - } - - } else { - getMutator().invoke(editor.getBean(), newValue); - } + newValue = getRealValue(0.0f); +// if (editor.isUseFloat()) { +// if (log.isInfoEnabled()) { +// log.info("use float, check mutator default type = " + mutator.getParameterTypes()[0]); +// } +// if (mutator.getParameterTypes()[0] == BigDecimal.class) { +// newValue = BigDecimal.valueOf(0); +// } else { +// newValue = 0.0f; +//// mutator.invoke(editor.getBean(), 0.0f); +// } +// } else { +// newValue = 0; +//// mutator.invoke(editor.getBean(), 0); +// } + + } //else { +// mutator.invoke(editor.getBean(), newValue); +// } + mutator.invoke(editor.getBean(), newValue); String strValue; if (newValue == null) { strValue = ""; @@ -420,7 +481,15 @@ public class NumberEditorHandler { if (property == null) { throw new NullPointerException("could not find property in " + editor); } - + if (log.isDebugEnabled()) { + log.debug("searching mutator for property " + property + " on bean of type " + bean.getClass()); + } + if (log.isTraceEnabled()) { + PropertyDescriptor[] descriptors = PropertyUtils.getPropertyDescriptors(bean); + for (PropertyDescriptor p : descriptors) { + log.trace("property discover " + p.getName() + " writer = " + p.getWriteMethod()); + } + } try { PropertyDescriptor descriptor = PropertyUtils.getPropertyDescriptor(bean, property); mutator = descriptor.getWriteMethod(); @@ -441,7 +510,15 @@ public class NumberEditorHandler { if (property == null) { throw new NullPointerException("could not find property in " + editor); } - + if (log.isDebugEnabled()) { + log.debug("searching accessor for property " + property + " on bean of type " + bean.getClass()); + } + if (log.isTraceEnabled()) { + PropertyDescriptor[] descriptors = PropertyUtils.getPropertyDescriptors(bean); + for (PropertyDescriptor p : descriptors) { + log.trace("property discover " + p.getName() + " reader = " + p.getWriteMethod()); + } + } try { PropertyDescriptor descriptor = PropertyUtils.getPropertyDescriptor(bean, property); getter = descriptor.getReadMethod(); diff --git a/maven-jaxx-plugin/maven-jaxx-plugin.iml b/maven-jaxx-plugin/maven-jaxx-plugin.iml new file mode 100644 index 0000000..0ef667f --- /dev/null +++ b/maven-jaxx-plugin/maven-jaxx-plugin.iml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/plugin" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/target/classes" /> + <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" /> + <excludeFolder url="file://$MODULE_DIR$/target/plexus-home" /> + <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" /> + <excludeFolder url="file://$MODULE_DIR$/target/test-classes" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jaxx-runtime" exported="" /> + <orderEntry type="library" exported="" name="Maven: org.nuiton:nuiton-utils:1.1.0" level="project" /> + <orderEntry type="library" exported="" name="Maven: log4j:log4j:1.2.14" level="project" /> + <orderEntry type="library" exported="" name="Maven: commons-logging:commons-logging:1.1.1" level="project" /> + <orderEntry type="library" exported="" name="Maven: commons-primitives:commons-primitives:1.0" level="project" /> + <orderEntry type="library" exported="" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> + <orderEntry type="library" exported="" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.nuiton.i18n:nuiton-i18n-api:1.0.0" level="project" /> + <orderEntry type="library" exported="" name="Maven: commons-lang:commons-lang:2.4" level="project" /> + <orderEntry type="library" exported="" name="Maven: javax.help:javahelp:2.0.02" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.swinglabs:jxlayer:3.0.3" level="project" /> + <orderEntry type="library" exported="" name="Maven: commons-jxpath:commons-jxpath:1.3" level="project" /> + <orderEntry type="library" exported="" name="Maven: com.opensymphony:xwork:2.1.3" level="project" /> + <orderEntry type="library" exported="" name="Maven: opensymphony:ognl:2.6.11" level="project" /> + <orderEntry type="module" module-name="jaxx-compiler" exported="" /> + <orderEntry type="module" module-name="jaxx-swing-action" exported="" /> + <orderEntry type="library" exported="" name="Maven: jboss:javassist:3.7.ga" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-plugin-api:2.2.1" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-project:2.2.1" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-settings:2.2.1" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-model:2.2.1" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.codehaus.plexus:plexus-utils:1.5.15" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-interpolation:1.11" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.7" level="project" /> + <orderEntry type="library" exported="" name="Maven: classworlds:classworlds:1.1-alpha-2" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-profile:2.2.1" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-artifact-manager:2.2.1" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-repository-metadata:2.2.1" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-artifact:2.2.1" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-6" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: backport-util-concurrent:backport-util-concurrent:3.1" level="project" /> + <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-plugin-registry:2.2.1" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.nuiton:maven-helper-plugin:1.1.0" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.apache.velocity:velocity:1.6.2" level="project" /> + <orderEntry type="library" exported="" name="Maven: oro:oro:2.0.8" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.codehaus.plexus:plexus-velocity:1.1.7" level="project" /> + <orderEntry type="library" name="Maven: com.sun:dt:1.6.0_16" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.shared:maven-verifier:1.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.plugin-testing:maven-plugin-testing-harness:1.2" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-core:2.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-plugin-parameter-documenter:2.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-error-diagnostics:2.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: commons-cli:commons-cli:1.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-plugin-descriptor:2.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-interactivity-api:1.0-alpha-4" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-monitor:2.0" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.nuiton:maven-helper-plugin:tests:1.1.0" level="project" /> + </component> +</module> + -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-2 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 125005ffaa645b1bc85b167b3e7261bbad4997ce Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 26 20:17:09 2009 +0000 goto mavenpom in snapshot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8c2de46..039588c 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0</version> + <version>1.1.1-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-2 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit bb0398957e80c4ccf4da86c401a4a66b4af31c6f Author: Tony Chemit <chemit@codelutin.com> Date: Thu Nov 26 20:41:21 2009 +0000 change names --- jaxx-compiler/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-swing-action/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- maven-jaxx-plugin/maven-jaxx-plugin.iml | 71 --------------------------------- maven-jaxx-plugin/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 7 insertions(+), 78 deletions(-) diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 68f4013..7efcdf5 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -37,7 +37,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>JAXX Compiler</name> + <name>JAXX :: Compiler</name> <description>JAXX Compiler api</description> <!-- ************************************************************* --> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 133d20b..3b5e1e1 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -57,7 +57,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>JAXX Demo</name> + <name>JAXX :: Demo</name> <description>JAXX Demo</description> <!-- ************************************************************* --> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index ffac357..990b078 100644 --- a/jaxx-runtime/pom.xml +++ b/jaxx-runtime/pom.xml @@ -62,7 +62,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>JAXX Runtime</name> + <name>JAXX :: Runtime</name> <description>JAXX Runtime api</description> <!-- ************************************************************* --> diff --git a/jaxx-swing-action/pom.xml b/jaxx-swing-action/pom.xml index 2bc5b9d..fab90f2 100644 --- a/jaxx-swing-action/pom.xml +++ b/jaxx-swing-action/pom.xml @@ -42,7 +42,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>JAXX Action</name> + <name>JAXX :: Swing-Action</name> <description>JAXX Action framework</description> <!-- ************************************************************* --> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 5adaa3b..e959444 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -47,7 +47,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>JAXX Widgets</name> + <name>JAXX :: Widgets</name> <description>Collection of swing widgets wrote with JAXX</description> <!-- ************************************************************* --> diff --git a/maven-jaxx-plugin/maven-jaxx-plugin.iml b/maven-jaxx-plugin/maven-jaxx-plugin.iml deleted file mode 100644 index 0ef667f..0000000 --- a/maven-jaxx-plugin/maven-jaxx-plugin.iml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/plugin" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> - <excludeFolder url="file://$MODULE_DIR$/target/classes" /> - <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" /> - <excludeFolder url="file://$MODULE_DIR$/target/plexus-home" /> - <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" /> - <excludeFolder url="file://$MODULE_DIR$/target/test-classes" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="jaxx-runtime" exported="" /> - <orderEntry type="library" exported="" name="Maven: org.nuiton:nuiton-utils:1.1.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: log4j:log4j:1.2.14" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-logging:commons-logging:1.1.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-primitives:commons-primitives:1.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.nuiton.i18n:nuiton-i18n-api:1.0.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-lang:commons-lang:2.4" level="project" /> - <orderEntry type="library" exported="" name="Maven: javax.help:javahelp:2.0.02" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.swinglabs:jxlayer:3.0.3" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-jxpath:commons-jxpath:1.3" level="project" /> - <orderEntry type="library" exported="" name="Maven: com.opensymphony:xwork:2.1.3" level="project" /> - <orderEntry type="library" exported="" name="Maven: opensymphony:ognl:2.6.11" level="project" /> - <orderEntry type="module" module-name="jaxx-compiler" exported="" /> - <orderEntry type="module" module-name="jaxx-swing-action" exported="" /> - <orderEntry type="library" exported="" name="Maven: jboss:javassist:3.7.ga" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-plugin-api:2.2.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-project:2.2.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-settings:2.2.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-model:2.2.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.codehaus.plexus:plexus-utils:1.5.15" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.plexus:plexus-interpolation:1.11" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: classworlds:classworlds:1.1-alpha-2" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-profile:2.2.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-artifact-manager:2.2.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-repository-metadata:2.2.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-artifact:2.2.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-6" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: backport-util-concurrent:backport-util-concurrent:3.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.maven:maven-plugin-registry:2.2.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.nuiton:maven-helper-plugin:1.1.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.velocity:velocity:1.6.2" level="project" /> - <orderEntry type="library" exported="" name="Maven: oro:oro:2.0.8" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.codehaus.plexus:plexus-velocity:1.1.7" level="project" /> - <orderEntry type="library" name="Maven: com.sun:dt:1.6.0_16" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.shared:maven-verifier:1.0" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.plugin-testing:maven-plugin-testing-harness:1.2" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-core:2.0" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-plugin-parameter-documenter:2.0" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-error-diagnostics:2.0" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: commons-cli:commons-cli:1.0" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-plugin-descriptor:2.0" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-interactivity-api:1.0-alpha-4" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-monitor:2.0" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.nuiton:maven-helper-plugin:tests:1.1.0" level="project" /> - </component> -</module> - diff --git a/maven-jaxx-plugin/pom.xml b/maven-jaxx-plugin/pom.xml index 93b15e5..9cba15b 100644 --- a/maven-jaxx-plugin/pom.xml +++ b/maven-jaxx-plugin/pom.xml @@ -105,7 +105,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>JAXX Maven plugin</name> + <name>JAXX :: Maven plugin</name> <description> Maven 2 plugin to generate java sources from JAXX files. </description> diff --git a/pom.xml b/pom.xml index 039588c..5942601 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>JAXX Project</name> + <name>JAXX</name> <description>JAXX Project</description> <inceptionYear>2008</inceptionYear> <url>http://maven-site.nuiton.org/jaxx</url> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-2 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 54f69e81077e24a6e497b2a48a6ff4ad3f5b7838 Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 27 01:29:37 2009 +0000 - This MUST be a convention in JAXX : all specialized constructor must a second constructor with extra first parameter as parentContext - add toString of FieldDescriptor --- .../jaxx/compiler/finalizers/DefaultFinalizer.java | 18 ++++----- .../jaxx/compiler/reflect/FieldDescriptor.java | 45 ++++++++++++---------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java index 6646eaf..28ab6f5 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java @@ -20,17 +20,14 @@ */ package jaxx.compiler.finalizers; -import jaxx.compiler.JAXXCompilerFinalizer; -import jaxx.compiler.CompilerException; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompiledObjectDecorator; +import jaxx.compiler.*; import jaxx.compiler.binding.DataBinding; -import jaxx.compiler.EventHandler; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.java.JavaMethod; import jaxx.compiler.java.JavaArgument; import jaxx.compiler.java.JavaField; import jaxx.compiler.java.JavaFile; +import static jaxx.compiler.java.JavaFileGenerator.newField; +import static jaxx.compiler.java.JavaFileGenerator.newMethod; +import jaxx.compiler.java.JavaMethod; import jaxx.compiler.reflect.ClassDescriptor; import jaxx.compiler.reflect.ClassDescriptorLoader; import jaxx.compiler.reflect.FieldDescriptor; @@ -45,8 +42,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import static jaxx.compiler.java.JavaFileGenerator.*; - /** * This class is a refactoring of the {@link jaxx.compiler.JAXXCompiler}. * <p/> @@ -525,6 +520,11 @@ public class DefaultFinalizer implements JAXXCompilerFinalizer { String constructorParams = compiler.getRootObject().getConstructorParams(); String eol = JAXXCompiler.getLineSeparator(); if (constructorParams != null) { + if (superclassIsJAXXObject) { + //TODO-TC20091127 This MUST be a convention in JAXX : all specialized constructor must a second + //TODO constructor with extra first parameter as parentContext + constructorParams = "parentContext, " + constructorParams; + } code.append(" super(").append(constructorParams).append(");").append(eol); } else { if (superclassIsJAXXObject) { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/FieldDescriptor.java b/jaxx-compiler/src/main/java/jaxx/compiler/reflect/FieldDescriptor.java index e066836..1dedb31 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/FieldDescriptor.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/reflect/FieldDescriptor.java @@ -1,23 +1,23 @@ -/* - * *##% - * JAXX Compiler - * Copyright (C) 2008 - 2009 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * ##%* - */ +/* + * *##% + * JAXX Compiler + * Copyright (C) 2008 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ package jaxx.compiler.reflect; /** @@ -42,4 +42,9 @@ public class FieldDescriptor extends MemberDescriptor { throw new RuntimeException(e); } } + + @Override + public String toString() { + return super.toString() + " type : [" + type + "]"; + } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-2 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 74de155771fe1111c35055baca8e80ece7d04491 Author: Tony Chemit <chemit@codelutin.com> Date: Fri Nov 27 01:43:31 2009 +0000 add log and do not break build when a binding is bad (since it can not be for the moment...) --- .../java/jaxx/compiler/binding/DataSource.java | 28 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java b/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java index 1e5da72..0874f8c 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java @@ -37,6 +37,8 @@ import jaxx.compiler.reflect.MethodDescriptor; import jaxx.compiler.tags.DefaultObjectHandler; import jaxx.compiler.tags.TagManager; import jaxx.compiler.types.TypeManager; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.beans.Introspector; import java.beans.PropertyChangeListener; @@ -45,9 +47,6 @@ import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * Represents a Java expression which fires a <code>PropertyChangeEvent</code> when it can be * determined that its value may have changed. Events are fired on a "best effort" basis, and events @@ -388,6 +387,9 @@ public class DataSource { * @return the type of the symbol (or null if it could not be determined). */ private ClassDescriptor scanCompoundSymbol(String symbol, ClassDescriptor contextClass, boolean isMethod) { + if (log.isDebugEnabled()) { + log.debug("for symbol " + symbol + " and contextClass " + contextClass + ", isMethod " + isMethod); + } String[] tokens = symbol.split("\\s*\\.\\s*"); StringBuffer currentSymbol = new StringBuffer(); StringBuffer tokensSeenSoFar = new StringBuffer(); @@ -418,7 +420,13 @@ public class DataSource { try { FieldDescriptor field = contextClass.getFieldDescriptor(memberName); trackMemberIfPossible(tokensSeenSoFar.toString(), contextClass, field.getName(), false); - contextClass = field.getType(); + try { + contextClass = field.getType(); + } catch (Exception e) { + log.warn("could not find type for field " + field); + throw new NoSuchFieldException(e.getMessage()); + } + currentSymbol.setLength(0); accepted = true; recognizeClassNames = false; @@ -427,16 +435,26 @@ public class DataSource { FieldDescriptor[] newFields = compiler.getScriptFields(); for (FieldDescriptor newField : newFields) { if (newField.getName().equals(memberName)) { + try { + contextClass = newField.getType(); + } catch (Exception e2) { + // try to get a generic type + CompiledObject compiledObject = compiler.getCompiledObject(newField.getName()); + log.warn("could not find type for field " + newField + " membername " + memberName + ", compiledObject : " + compiledObject); + contextClass = null; + continue; + } addListener(tokensSeenSoFar.toString(), null, "addPropertyChangeListener(\"" + memberName + "\", " + listenerId + ");" + JAXXCompiler.getLineSeparator(), "removePropertyChangeListener(\"" + memberName + "\", " + listenerId + ");" + JAXXCompiler.getLineSeparator()); - contextClass = newField.getType(); + assert contextClass != null : "script field '" + memberName + "' is defined, but has type null"; currentSymbol.setLength(0); accepted = true; recognizeClassNames = false; break; + } } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-2 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 916f70de19284dd98881110a8dc39024599996a2 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Dec 2 09:11:27 2009 +0000 fix lost binding --- jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java b/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java index 0874f8c..e9b09f3 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java @@ -326,7 +326,10 @@ public class DataSource { //TC-20091026 use the getScriptMethod from compiler MethodDescriptor newMethod = compiler.getScriptMethod(methodName); if (newMethod != null) { - addListener(compiler.getRootObject().getId(), + //TC-20091202 must suffix dependency by property, otherwise can not have two bindings + // on the same parent... +// addListener(compiler.getRootObject().getId(), + addListener(compiler.getRootObject().getId()+"."+propertyName, null, "addPropertyChangeListener(\"" + propertyName + "\", " + listenerId + ");" + JAXXCompiler.getLineSeparator(), "removePropertyChangeListener(\"" + propertyName + "\", " + listenerId + ");" + JAXXCompiler.getLineSeparator()); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-2 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit fabd7b4e22ca7dcf42902a06cb7df6b16d1942e2 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Dec 2 09:38:32 2009 +0000 prepare beta-2 before merging branche to trunk + fix wbestart link in jaxx-demo --- jaxx-compiler/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-demo/src/site/rst/index.rst | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-swing-action/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- maven-jaxx-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 7efcdf5..d0085f2 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-2-SNAPSHOT</version> + <version>2.0.0-beta-2</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 3b5e1e1..c43b2f0 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-2-SNAPSHOT</version> + <version>2.0.0-beta-2</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/src/site/rst/index.rst b/jaxx-demo/src/site/rst/index.rst index 44e78be..3c6847f 100644 --- a/jaxx-demo/src/site/rst/index.rst +++ b/jaxx-demo/src/site/rst/index.rst @@ -38,6 +38,6 @@ downloading JAXX, and you can also view the source code for the individual demos .. |webstart| image:: images/webstart.gif -.. _following link: ./launch.jnlp +.. _following link: ./jnlp/launch.jnlp .. _Jaxx Demo webstart: jnlp-report.html diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index 990b078..146fb78 100644 --- a/jaxx-runtime/pom.xml +++ b/jaxx-runtime/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-2-SNAPSHOT</version> + <version>2.0.0-beta-2</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-swing-action/pom.xml b/jaxx-swing-action/pom.xml index fab90f2..10271cb 100644 --- a/jaxx-swing-action/pom.xml +++ b/jaxx-swing-action/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-2-SNAPSHOT</version> + <version>2.0.0-beta-2</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index e959444..7945495 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-2-SNAPSHOT</version> + <version>2.0.0-beta-2</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/maven-jaxx-plugin/pom.xml b/maven-jaxx-plugin/pom.xml index 9cba15b..c669830 100644 --- a/maven-jaxx-plugin/pom.xml +++ b/maven-jaxx-plugin/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-2-SNAPSHOT</version> + <version>2.0.0-beta-2</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index 5942601..66269e8 100644 --- a/pom.xml +++ b/pom.xml @@ -10,11 +10,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.0</version> </parent> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-2-SNAPSHOT</version> + <version>2.0.0-beta-2</version> <modules> <module>jaxx-runtime</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-2 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 914b114c69699ec6c7f4df9521683c1a7118ae39 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Dec 2 09:39:54 2009 +0000 minor release before big storm on bindings -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm