[Coser-commits] r883 - in trunk/coser-ui/src/main/java/fr/ifremer/coser/ui: . control option project selection

27 Oct 2011

Author: echatellier
Date: 2011-10-27 16:47:17 +0200 (Thu, 27 Oct 2011)
New Revision: 883

Url: http://forge.codelutin.com/repositories/revision/coser/883

Log:
Update jaxx and jxlayer

Modified:
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/NoCopiedLayerUI.java
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectEditView.jaxx
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectOpenView.jaxx
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx
===================================================================

--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx	2011-10-27 14:47:09 UTC (rev 882)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx	2011-10-27 14:47:17 UTC (rev 883)
@@ -26,6 +26,10 @@
     name="mainFrame" onWindowClosing="getHandler().quit()"
     iconImage='{SwingUtil.createImageIcon("logo.png").getImage()}'>
 
+    <import>
+    java.util.Locale
+    </import>
+
     <CoserFrameHandler id="handler" constructorParams="this" />
     <fr.ifremer.coser.bean.Project id="project" javaBean="null" />
 

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java	2011-10-27 14:47:09 UTC (rev 882)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java	2011-10-27 14:47:17 UTC (rev 883)
@@ -43,6 +43,7 @@
 import javax.swing.JTextArea;
 import javax.swing.filechooser.FileFilter;
 
+import jaxx.runtime.JAXXContext;
 import jaxx.runtime.swing.editor.config.ConfigUI;
 import jaxx.runtime.swing.editor.config.ConfigUIHelper;
 
@@ -305,7 +306,7 @@
      */
     public void showValidatorsConfiguration() {
         CoserConfig config = view.getContextValue(CoserConfig.class);
-        ValidatorDialog validatorDialog = new ValidatorDialog(view);
+        ValidatorDialog validatorDialog = new ValidatorDialog((JAXXContext)view);
         validatorDialog.setHandler(new OptionHandler());
 
         // layer si non copié

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx	2011-10-27 14:47:09 UTC (rev 882)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx	2011-10-27 14:47:17 UTC (rev 883)
@@ -24,6 +24,10 @@
   -->
 <JPanel layout="{new BorderLayout()}">
 
+    <import>
+    javax.swing.SwingConstants
+    </import>
+
     <CoserFrameHandler id="handler" javaBean="null" />
 
     <Table constraints="BorderLayout.CENTER">

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx	2011-10-27 14:47:09 UTC (rev 882)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx	2011-10-27 14:47:17 UTC (rev 883)
@@ -23,7 +23,11 @@
   #L%
   -->
 <Table name="controlView">
-    <import>fr.ifremer.coser.CoserConstants.Category</import>
+    <import>
+    java.awt.GridBagLayout
+    fr.ifremer.coser.CoserConstants.Category
+    </import>
+
     <script><![CDATA[
     void $afterCompleteSetup() {
         // bean validation

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/NoCopiedLayerUI.java
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/NoCopiedLayerUI.java	2011-10-27 14:47:09 UTC (rev 882)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/NoCopiedLayerUI.java	2011-10-27 14:47:17 UTC (rev 883)
@@ -49,6 +49,9 @@
  */
 public class NoCopiedLayerUI extends LockableUI implements ActionListener {
 
+    /** serialVersionUID. */
+    private static final long serialVersionUID = -616755266651462912L;
+
     protected ValidatorDialog view;
     protected JButton copyToDiskButton;
 
@@ -68,7 +71,7 @@
     }
     
     @Override
-    protected void paintLayer(Graphics2D g2, JXLayer<JComponent> l) {
+    protected void paintLayer(Graphics2D g2, JXLayer<? extends JComponent> l) {
         super.paintLayer(g2, l);
         g2.setColor(new Color(150, 150, 150, 128));
         g2.fillRect(0, 0, l.getWidth(), l.getHeight());

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java	2011-10-27 14:47:09 UTC (rev 882)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java	2011-10-27 14:47:17 UTC (rev 883)
@@ -32,6 +32,8 @@
 import javax.swing.JOptionPane;
 import javax.swing.tree.TreePath;
 
+import jaxx.runtime.JAXXContext;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
@@ -139,7 +141,7 @@
         //view.getNoCopiedToDiskLayer().setUI(null);
         // FIXME gros hack, j'arrive pas a enlever le layer
         view.dispose();
-        ValidatorDialog newView = new ValidatorDialog(view);
+        ValidatorDialog newView = new ValidatorDialog((JAXXContext)view);
         newView.setHandler(this);
         newView.setLocationRelativeTo(view);
         newView.setVisible(true);

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx	2011-10-27 14:47:09 UTC (rev 882)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx	2011-10-27 14:47:17 UTC (rev 883)
@@ -23,6 +23,9 @@
   #L%
   -->
 <Table>
+    <import>
+    javax.swing.JCheckBox
+    </import>
     <ProjectHandler id="handler" javaBean="null" />
 
     <!-- Validation -->
@@ -60,7 +63,7 @@
                         <JLabel text="coser.ui.project.projectname" />
                     </cell>
                     <cell>
-                        <JLabel text='{getContextValue(fr.ifremer.coser.CoserConfig.class).getProjectsDirectory().getAbsolutePath() + File.separator}' />
+                        <JLabel text='{getContextValue(fr.ifremer.coser.CoserConfig.class).getProjectsDirectory().getAbsolutePath() + java.io.File.separator}' />
                     </cell>
                     <cell anchor="west" weightx="1" fill="horizontal">
                         <JTextField id="projectProjectName" text="{getProject().getName()}" />

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectEditView.jaxx
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectEditView.jaxx	2011-10-27 14:47:09 UTC (rev 882)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectEditView.jaxx	2011-10-27 14:47:17 UTC (rev 883)
@@ -44,7 +44,7 @@
                         <JLabel text="coser.ui.project.projectname" />
                     </cell>
                     <cell>
-                        <JLabel text='{getContextValue(fr.ifremer.coser.CoserConfig.class).getProjectsDirectory().getAbsolutePath() + File.separator}' />
+                        <JLabel text='{getContextValue(fr.ifremer.coser.CoserConfig.class).getProjectsDirectory().getAbsolutePath() + java.io.File.separator}' />
                     </cell>
                     <cell anchor="west" weightx="1" fill="horizontal">
                         <JTextField id="projectProjectName" enabled="false" text="{getProject().getName()}" />

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectOpenView.jaxx
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectOpenView.jaxx	2011-10-27 14:47:09 UTC (rev 882)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectOpenView.jaxx	2011-10-27 14:47:17 UTC (rev 883)
@@ -33,7 +33,7 @@
                         <JLabel text="coser.ui.project.project" />
                     </cell>
                     <cell>
-                        <JLabel text='{getContextValue(fr.ifremer.coser.CoserConfig.class).getProjectsDirectory().getAbsolutePath() + File.separator}' />
+                        <JLabel text='{getContextValue(fr.ifremer.coser.CoserConfig.class).getProjectsDirectory().getAbsolutePath() + java.io.File.separator}' />
                     </cell>
                     <cell anchor="west" weightx="1">
                         <JComboBox id="projectsComboBox" model="{new fr.ifremer.coser.ui.project.ProjectNamesListModel(this)}" />

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx	2011-10-27 14:47:09 UTC (rev 882)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx	2011-10-27 14:47:17 UTC (rev 883)
@@ -35,7 +35,7 @@
                         <JLabel text="coser.ui.project.summary.path" />
                     </cell>
                     <cell anchor="west" weightx="1" fill="horizontal">
-                        <JLabel text='{getContextValue(fr.ifremer.coser.CoserConfig.class).getProjectsDirectory().getAbsolutePath() + File.separator + getProject().getName()}' />
+                        <JLabel text='{getContextValue(fr.ifremer.coser.CoserConfig.class).getProjectsDirectory().getAbsolutePath() + java.io.File.separator + getProject().getName()}' />
                     </cell>
                 </row>
                 <row>

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx	2011-10-27 14:47:09 UTC (rev 882)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx	2011-10-27 14:47:17 UTC (rev 883)
@@ -24,11 +24,19 @@
   -->
 <Table>
 
+    <import>
+    java.awt.Dimension
+    java.awt.GridBagLayout
+    fr.ifremer.coser.ui.selection.model.SpeciesListModel
+    fr.ifremer.coser.ui.selection.model.SpeciesTypesListModel
+    fr.ifremer.coser.ui.selection.model.StrataListModel
+    fr.ifremer.coser.ui.selection.model.YearListModel
+    fr.ifremer.coser.ui.util.CoserListSelectionModel
+    fr.ifremer.coser.ui.widgets.AccordionPane
+    fr.ifremer.coser.ui.widgets.AccordionPaneSubPanel
+    </import>
+
     <script><![CDATA[
-        import fr.ifremer.coser.ui.selection.model.*;
-        import fr.ifremer.coser.ui.util.*;
-        import fr.ifremer.coser.ui.widgets.*;
-        
         void $afterCompleteSetup() {
             // modification (species -> selection model)
             filteredSpeciesListModel.addListDataListener((CoserListSelectionModel)filteredSpeciesList.getSelectionModel());

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx	2011-10-27 14:47:09 UTC (rev 882)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx	2011-10-27 14:47:17 UTC (rev 883)
@@ -23,13 +23,18 @@
   #L%
   -->
 <Table>
+    <import>
+    fr.ifremer.coser.ui.selection.model.SpeciesListModel
+    fr.ifremer.coser.ui.selection.model.OccurrenceDensitySpeciesListModel
+    fr.ifremer.coser.ui.selection.model.SizeAllYearSpeciesListModel
+    fr.ifremer.coser.ui.selection.model.MaturitySpeciesListModel
+    fr.ifremer.coser.ui.util.CoserListSelectionModel
+    </import>
+
     <SelectionHandler id="handler" javaBean="null" />
     <fr.ifremer.coser.bean.Selection id="selection" javaBean="null" />
 
     <script><![CDATA[
-        import fr.ifremer.coser.ui.selection.model.*;
-        import fr.ifremer.coser.ui.util.*;
-
         // le modele de la liste est allimenté par la selection de la précédente liste
         // la selection est mise à jour par la modification du model de la liste
         

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx
===================================================================
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx	2011-10-27 14:47:09 UTC (rev 882)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx	2011-10-27 14:47:17 UTC (rev 883)
@@ -23,6 +23,11 @@
   #L%
   -->
 <JTabbedPane>
+    <import>
+    javax.swing.event.ChangeEvent
+    javax.swing.event.ChangeListener
+    </import>
+
     <fr.ifremer.coser.bean.Selection id="selection" javaBean="null" />
 
     <Boolean id="creationState" javaBean="false" />

    

[Coser-commits] r883 - in trunk/coser-ui/src/main/java/fr/ifremer/coser/ui: . control option project selection

echatellier＠users.forge.codelutin.com