r2738 - in trunk/lima-main: . src/main/java/org/chorem/lima src/main/java/org/chorem/lima/export src/main/java/org/chorem/lima/ui - Lima-commits

8 Nov 2009

Author: tchemit
Date: 2009-11-08 15:18:56 +0100 (Sun, 08 Nov 2009)
New Revision: 2738

Modified:
   trunk/lima-main/pom.xml
   trunk/lima-main/src/main/java/org/chorem/lima/LimaAction.java
   trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java
   trunk/lima-main/src/main/java/org/chorem/lima/Main.java
   trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java
   trunk/lima-main/src/main/java/org/chorem/lima/ui/AccountForm.jaxx
   trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java
   trunk/lima-main/src/main/java/org/chorem/lima/ui/CriteriaWidget.jaxx
   trunk/lima-main/src/main/java/org/chorem/lima/ui/FileChooseView.jaxx
   trunk/lima-main/src/main/java/org/chorem/lima/ui/MyTabHeader.jaxx
   trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBar.jaxx
   trunk/lima-main/src/main/java/org/chorem/lima/ui/ReportsView.jaxx
   trunk/lima-main/src/main/java/org/chorem/lima/ui/SearchTransactionView.jaxx
Log:
use JAXX-2.0
clean poms

Modified: trunk/lima-main/pom.xml
===================================================================

--- trunk/lima-main/pom.xml	2009-11-08 14:17:50 UTC (rev 2737)
+++ trunk/lima-main/pom.xml	2009-11-08 14:18:56 UTC (rev 2738)
@@ -47,7 +47,7 @@
 
         <dependency>
             <groupId>org.nuiton.jaxx</groupId>
-            <artifactId>jaxx-runtime-swing</artifactId>
+            <artifactId>jaxx-runtime</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>javax.help</groupId>
@@ -58,10 +58,10 @@
 
         <dependency>
             <groupId>org.nuiton.jaxx</groupId>
-            <artifactId>jaxx-runtime-swing-widget</artifactId>
+            <artifactId>jaxx-widgets</artifactId>
         </dependency>
 
-        <dependency>
+        <!--dependency>
             <groupId>org.nuiton</groupId>
             <artifactId>nuiton-widgets</artifactId>
             <exclusions>
@@ -70,7 +70,7 @@
                     <artifactId>sdoc</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency-->
 
         <!-- other dependencies -->
         <dependency>
@@ -91,8 +91,6 @@
         <dependency>
             <groupId>jdom</groupId>
             <artifactId>jdom</artifactId>
-            <version>1.0</version>
-            <scope>compile</scope>
         </dependency>
 
     </dependencies>
@@ -243,19 +241,19 @@
                     </configuration>
                 </plugin>
 
-                <!--plugin>
+                <plugin>
                     <groupId>org.nuiton.thirdparty</groupId>
                     <artifactId>webstart-maven-plugin</artifactId>
                     <configuration>
                         <jnlpExtensions>
-                            <jnlpExtension>
+                            <!--jnlpExtension>
                                 <name>sun</name>
                                 <title>Sun MicroSystems</title>
                                 <vendor>Sun MicroSystems, Inc.</vendor>
                                 <includes>
                                     <include>javax.help:javahelp</include>
                                 </includes>
-                            </jnlpExtension>
+                            </jnlpExtension-->
                             <jnlpExtension>
                                 <name>jxlayer</name>
                                 <title>Swing labs JXLayer</title>
@@ -266,7 +264,7 @@
                             </jnlpExtension>
                         </jnlpExtensions>
                     </configuration>
-                </plugin-->
+                </plugin>
 
                 <plugin>
                     <groupId>org.nuiton</groupId>

Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaAction.java
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/LimaAction.java	2009-11-08 14:17:50 UTC (rev 2737)
+++ trunk/lima-main/src/main/java/org/chorem/lima/LimaAction.java	2009-11-08 14:18:56 UTC (rev 2738)
@@ -4,20 +4,15 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
+ * Les actions appellables via {@link Main}.
  *
- * Les actions appellables via {@link ObserveMain}.
- *
- * Consulter la classe {@link fr.ird.observe.ObserveConfig.Action} pour
- * connaitre les actions possibles.
- * 
  * @author tony
- * @see ObserveConfig
- * @see ObserveMain
  */
-@jaxx.runtime.DefaultApplicationContext.AutoLoad
 public class LimaAction {
 
-    /** to use log facility, just put in your code: log.info(\"...\"); */
+    /**
+     * to use log facility, just put in your code: log.info(\"...\");
+     */
     static private Log log = LogFactory.getLog(LimaAction.class);
     /**
      * La configuration de l'application.

Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java	2009-11-08 14:17:50 UTC (rev 2737)
+++ trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java	2009-11-08 14:18:56 UTC (rev 2738)
@@ -32,7 +32,8 @@
  */
 package org.chorem.lima;
 
-import jaxx.runtime.JAXXContextEntryDef;
+import jaxx.runtime.Util;
+import jaxx.runtime.context.JAXXContextEntryDef;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.chorem.lima.dto.util.DTOHelper;
@@ -47,7 +48,7 @@
 /**
  * @author chemit
  */
-public class LimaContext extends jaxx.runtime.DefaultApplicationContext {
+public class LimaContext extends jaxx.runtime.context.DefaultApplicationContext {
 
     /**
      * to use log facility, just put in your code: log.info(\"...\");
@@ -58,7 +59,7 @@
      * {@link #init()}
      */
     protected static LimaContext instance;
-    public static JAXXContextEntryDef<MainView> MAIN_UI_ENTRY_DEF = JAXXContextEntryDef.newDef("mainUI", MainView.class);
+    public static JAXXContextEntryDef<MainView> MAIN_UI_ENTRY_DEF = Util.newContextEntryDef("mainUI", MainView.class);
 
     /**
      * @return <code>true</code> si le context a été initialisé via la méthode

Modified: trunk/lima-main/src/main/java/org/chorem/lima/Main.java
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/Main.java	2009-11-08 14:17:50 UTC (rev 2737)
+++ trunk/lima-main/src/main/java/org/chorem/lima/Main.java	2009-11-08 14:18:56 UTC (rev 2738)
@@ -193,7 +193,7 @@
                 b.getProgressBar().setString("70% : " + _("lima.progressBar.load.etape5"));
                 b.getProgressBar().setValue(70);
                 dataManager.getTransactionModel(b.getProgressBar());
-                b.getProgressBarFrame().dispose();
+                b.dispose();
             }
         }.start();
 

Modified: trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java	2009-11-08 14:17:50 UTC (rev 2737)
+++ trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java	2009-11-08 14:18:56 UTC (rev 2738)
@@ -70,7 +70,7 @@
     /**
      * Cete méthode permet d'exporter des données de Callao vers un fichier au
      * format xml.
-     * @param namefile
+     * @param pathFile
      * @return
      */
     public String exportFile(String pathFile)
@@ -153,7 +153,7 @@
                     progressBar.getProgressBar().setString("100% : "+_("lima.progressBar.export.etape7"));
                     progressBar.getProgressBar().setValue(100);
                     enregistre(file);
-                    progressBar.getProgressBarFrame().dispose();
+                    progressBar.dispose();
                 
             }
         }.start();
@@ -213,7 +213,7 @@
                     progressBar.getProgressBar().setString("100% : "+_("lima.progressBar.export.etape7"));
                     progressBar.getProgressBar().setValue(100);
                     enregistre(file);
-                    progressBar.getProgressBarFrame().dispose();
+                    progressBar.dispose();
             }
         }.start();
         return ServiceHelper.RESPOND_SUCCESS;

Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/AccountForm.jaxx
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/ui/AccountForm.jaxx	2009-11-08 14:17:50 UTC (rev 2737)
+++ trunk/lima-main/src/main/java/org/chorem/lima/ui/AccountForm.jaxx	2009-11-08 14:18:56 UTC (rev 2738)
@@ -1,5 +1,5 @@
 <JFrame locationRelativeTo="{null}" defaultCloseOperation="dispose_on_close">
-    <style source="css/lima.css" />
+    <style source="css/lima.css"/>
     <Table insets='5,5,5,5'>
         <row>
             <cell>
@@ -22,13 +22,13 @@
                 <JLabel text="lima.account.type"/>
             </cell>
             <cell>
-                <JComboBox id="typeComboBox">
+                <JAXXComboBox id="typeComboBox">
                     <item value='{null}' label=' ' selected="true"/>
                     <item value='{_("lima.actif")}'/>
                     <item value='{_("lima.passif")}'/>
                     <item value='{_("lima.produit")}'/>
                     <item value='{_("lima.charge")}'/>
-                </JComboBox>
+                </JAXXComboBox>
             </cell>
         </row>
         <row>

Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java	2009-11-08 14:17:50 UTC (rev 2737)
+++ trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java	2009-11-08 14:18:56 UTC (rev 2738)
@@ -439,7 +439,7 @@
                 progressBar.getProgressBar().setValue(95);
                 modelBilanPassif.fireTableDataChanged();
                 progressBar.getProgressBar().setValue(100);
-                progressBar.getProgressBarFrame().dispose();
+                progressBar.dispose();
             }
         }.start();
 

Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/CriteriaWidget.jaxx
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/ui/CriteriaWidget.jaxx	2009-11-08 14:17:50 UTC (rev 2737)
+++ trunk/lima-main/src/main/java/org/chorem/lima/ui/CriteriaWidget.jaxx	2009-11-08 14:18:56 UTC (rev 2738)
@@ -1,10 +1,10 @@
 <Table insets='5,5,5,5'>
     <script>
-        protected void removeCriteriaWidget() {};
+        protected void removeCriteriaWidget(){}
     </script>
     <row>
         <cell>
-            <JComboBox id="criteriaComboBox" width="200">
+            <JAXXComboBox id="criteriaComboBox" width="200">
                 <item value='date' label='{_("lima.date")}' selected="true"/>
                 <item value='voucher' label='{_("lima.voucher")}'/>
                 <item value='account' label='{_("lima.account")}'/>
@@ -12,7 +12,7 @@
                 <item value='debit' label='{_("lima.debit")}'/>
                 <item value='credit' label='{_("lima.credit")}'/>
                 <item value='amount' label='{_("lima.amount")}'/>
-            </JComboBox>
+            </JAXXComboBox>
         </cell>
         <cell weightx="0">
             <JPanel id="criteriaPanel"/>

Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/FileChooseView.jaxx
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/ui/FileChooseView.jaxx	2009-11-08 14:17:50 UTC (rev 2737)
+++ trunk/lima-main/src/main/java/org/chorem/lima/ui/FileChooseView.jaxx	2009-11-08 14:18:56 UTC (rev 2738)
@@ -1,6 +1,4 @@
 <JFrame title="lima.export">
-    <style source="css/lima.css" />
-    <JFileChooser id="chooser" width="620" height="400">
-    </JFileChooser>
-
+    <style source="css/lima.css"/>
+    <JFileChooser id="chooser" width="620" height="400"/>
 </JFrame>
\ No newline at end of file

Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/MyTabHeader.jaxx
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/ui/MyTabHeader.jaxx	2009-11-08 14:17:50 UTC (rev 2737)
+++ trunk/lima-main/src/main/java/org/chorem/lima/ui/MyTabHeader.jaxx	2009-11-08 14:18:56 UTC (rev 2738)
@@ -13,7 +13,7 @@
                      focusPainted='false'
                      enabled='true'
                      horizontalTextPosition='0'
-                     icon='{createImageIcon("closeTab.png")}'
+                     actionIcon='closeTab'
                     />
         </cell>
     </row>

Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBar.jaxx
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBar.jaxx	2009-11-08 14:17:50 UTC (rev 2737)
+++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBar.jaxx	2009-11-08 14:18:56 UTC (rev 2738)
@@ -1,9 +1,8 @@
 <JDialog title="lima.loading" width="620" height="70"
-id="progressBarFrame"
-iconImage='{Toolkit.getDefaultToolkit().getImage(getClass().getResource("/icons/lima.png"))}'
->
+         id="progressBarFrame"
+         iconImage='{Toolkit.getDefaultToolkit().getImage(getClass().getResource("/icons/lima.png"))}'>
     <script>
         progressBarFrame.setLocationRelativeTo(null);
     </script>
-    <JProgressBar foreground='{new Color(4, 0, 0)}' value='0' maximum='100' id="progressBar"  />
+    <JProgressBar foreground='{new Color(4, 0, 0)}' value='0' maximum='100' id="progressBar"/>
 </JDialog>
\ No newline at end of file

Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ReportsView.jaxx
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/ui/ReportsView.jaxx	2009-11-08 14:17:50 UTC (rev 2737)
+++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ReportsView.jaxx	2009-11-08 14:18:56 UTC (rev 2738)
@@ -5,11 +5,11 @@
             <JLabel text="lima.reports"/>
         </cell>
         <cell>
-            <JComboBox>
+            <JAXXComboBox>
                 <item value='{_("lima.balance")}'/>
                 <item value='{_("lima.journal")}'/>
                 <item value='{_("lima.grand.livre")}'/>
-            </JComboBox>
+            </JAXXComboBox>
         </cell>
     </row>
     <row>
@@ -22,10 +22,10 @@
             <JLabel text="lima.period"/>
         </cell>
         <cell>
-            <JComboBox>
+            <JAXXComboBox>
                 <item value='{null}' label=' '/>
                 <item value='Exercice 08'/>
-            </JComboBox>
+            </JAXXComboBox>
         </cell>
     </row>
     <row>

Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/SearchTransactionView.jaxx
===================================================================
--- trunk/lima-main/src/main/java/org/chorem/lima/ui/SearchTransactionView.jaxx	2009-11-08 14:17:50 UTC (rev 2737)
+++ trunk/lima-main/src/main/java/org/chorem/lima/ui/SearchTransactionView.jaxx	2009-11-08 14:18:56 UTC (rev 2738)
@@ -17,10 +17,10 @@
                     <JLabel text="lima.search.items.where" width="200"/>
                 </cell>
                 <cell>
-                    <JComboBox id="criteriaAllAnyComboBox" width="200">
+                    <JAXXComboBox id="criteriaAllAnyComboBox" width="200">
                         <item value='all' label='{_("lima.all.criteria")}' selected="true"/>
                         <item value='any' label='{_("lima.any.criteria")}'/>
-                    </JComboBox>
+                    </JAXXComboBox>
                 </cell>
             </row>
             <row>

    

r2738 - in trunk/lima-main: . src/main/java/org/chorem/lima src/main/java/org/chorem/lima/export src/main/java/org/chorem/lima/ui

tchemit＠users.chorem.org

tags

participants (1)