- Isis-fish-commits - mailman.cloud.codelutin.com

r1699 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by tchemit＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: tchemit Date: 2008-12-18 17:08:40 +0000 (Thu, 18 Dec 2008) New Revision: 1699 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: ajout d'un r?\195?\169pertoire dans le zip Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-18 16:55:10 UTC (rev 1698) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-18 17:08:40 UTC (rev 1699) @@ -75,7 +75,7 @@ zoneCellsModel.addElement(c); } zoneCells.setModel(zoneCellsModel); - zoneCells.getSelectionModel().setValueIsAdjusting(false); + zoneCells.getSelectionModel().setValueIsAdjusting(true); java.util.List<Cell> cellsSelected = z.getCell(); if (cellsSelected != null){ int[] indexs = new int[cellsSelected.size()];

1 0

r1698 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: chatellier Date: 2008-12-18 16:55:10 +0000 (Thu, 18 Dec 2008) New Revision: 1698 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx Log: Correction de l'avtivation du bouton view log Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2008-12-18 16:53:05 UTC (rev 1697) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2008-12-18 16:55:10 UTC (rev 1698) @@ -61,11 +61,6 @@ Binding binding = Bindings.createAutoBinding(AutoBinding.UpdateStrategy.READ_WRITE, SimulationService.getService(), ELProperty.create("${autoLaunch}"),autoLaunchButton, BeanProperty.create("selected")); bindingGroup.addBinding(binding); - binding = Bindings.createAutoBinding(AutoBinding.UpdateStrategy.READ,queueTable, ELProperty.create("${selectedElement != null}"),stopSimuButton, BeanProperty.create("enabled")); - binding.setSourceNullValue(false); - binding.setSourceUnreadableValue(false); - bindingGroup.addBinding(binding); - binding = Bindings.createAutoBinding(AutoBinding.UpdateStrategy.READ, queueTableDone, ELProperty.create("${selectedElement != null}"), showLogButton, BeanProperty.create("enabled")); binding.setSourceNullValue(false); binding.setSourceUnreadableValue(false); @@ -91,8 +86,8 @@ } } protected void viewLog(){ - if (queueTable.getSelectedRow() >= 0){ - getContextValue(SimulAction.class).viewLog(getContextValue(SimulationServiceTableModel.class, "done").getJob(queueTable.getSelectedRow())); + if (queueTableDone.getSelectedRow() >= 0){ + getContextValue(SimulAction.class).viewLog(getContextValue(SimulationServiceTableModel.class, "done").getJob(queueTableDone.getSelectedRow())); } } protected void clearDoneJobs(){

1 0

r1697 - isis-fish/trunk/src/main/assembly
by tchemit＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: tchemit Date: 2008-12-18 16:53:05 +0000 (Thu, 18 Dec 2008) New Revision: 1697 Modified: isis-fish/trunk/src/main/assembly/bin.xml Log: ajout d'un r?\195?\169pertoire dans le zip Modified: isis-fish/trunk/src/main/assembly/bin.xml =================================================================== --- isis-fish/trunk/src/main/assembly/bin.xml 2008-12-18 16:52:45 UTC (rev 1696) +++ isis-fish/trunk/src/main/assembly/bin.xml 2008-12-18 16:53:05 UTC (rev 1697) @@ -18,7 +18,7 @@ <fileSet> <directory>target/lib</directory> - <outputDirectory>lib</outputDirectory> + <outputDirectory>isis-fish/lib</outputDirectory> <includes> <include>*.jar</include> </includes> @@ -26,12 +26,13 @@ <fileSet> <directory>target</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory>isis-fish</outputDirectory> <includes> <include>*.jar</include> </includes> </fileSet> <fileSet> + <outputDirectory>isis-fish</outputDirectory> <includes> <include>README*</include> <include>LICENSE*</include> @@ -41,7 +42,7 @@ <fileSet> <directory>src/main/assembly</directory> <filtered>true</filtered> - <outputDirectory>/</outputDirectory> + <outputDirectory>isis-fish</outputDirectory> <fileMode>0755</fileMode> <includes> <include>go.sh</include>

1 0

r1696 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by tchemit＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: tchemit Date: 2008-12-18 16:52:45 +0000 (Thu, 18 Dec 2008) New Revision: 1696 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: selection des zones a partir des map :) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-18 16:29:33 UTC (rev 1695) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-18 16:52:45 UTC (rev 1696) @@ -75,6 +75,7 @@ zoneCellsModel.addElement(c); } zoneCells.setModel(zoneCellsModel); + zoneCells.getSelectionModel().setValueIsAdjusting(false); java.util.List<Cell> cellsSelected = z.getCell(); if (cellsSelected != null){ int[] indexs = new int[cellsSelected.size()]; @@ -88,6 +89,7 @@ } zoneCells.setSelectedIndices(indexs); } + zoneCells.getSelectionModel().setValueIsAdjusting(false); fieldZoneName.setText(z.getName()); fieldZoneComment.setText(getContextValue(InputAction.class).getZone().getComment()); }

1 0

r1695 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 16:29:33 +0000 (Thu, 18 Dec 2008) New Revision: 1695 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: Look and feel Nimbus Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2008-12-18 16:28:45 UTC (rev 1694) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2008-12-18 16:29:33 UTC (rev 1695) @@ -76,6 +76,8 @@ import fr.ifremer.isisfish.vcs.VCSException; import fr.ifremer.isisfish.vcs.VCSFactory; import fr.ifremer.isisfish.vcs.VetoableActionListener; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; /** * This is the main class of <code>IsisFish</code> application. @@ -128,7 +130,7 @@ // after init vcs and local data config.doAction(IsisConfig.Step.AfterInitVCS.ordinal()); - + initLoookAndFeel(); launchUI(); // action after ui launched @@ -138,7 +140,15 @@ quit(); } } - + private static void initLoookAndFeel() throws InstantiationException, IllegalAccessException, UnsupportedLookAndFeelException { + try { + Class.forName("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel"); + UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel"); + } catch (ClassNotFoundException e) { + // could not fin nimbus look-and-feel + log.warn(_("cant start nimbus")); + } + } /** * Start daemon that monitor quit value, if value is true, quit isis. Ce * mecanisme permet de faire des actions avant de quitter l'application

1 0

r1694 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 16:28:45 +0000 (Thu, 18 Dec 2008) New Revision: 1694 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx Log: Debug final ! Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2008-12-18 16:07:11 UTC (rev 1693) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2008-12-18 16:28:45 UTC (rev 1694) @@ -92,7 +92,7 @@ } protected void viewLog(){ if (queueTable.getSelectedRow() >= 0){ - getContextValue(SimulAction.class).viewLog(getContextValue(SimulationServiceTableModel.class, "new").getJob(queueTable.getSelectedRow())); + getContextValue(SimulAction.class).viewLog(getContextValue(SimulationServiceTableModel.class, "done").getJob(queueTable.getSelectedRow())); } } protected void clearDoneJobs(){

1 0

r1693 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 16:07:11 +0000 (Thu, 18 Dec 2008) New Revision: 1693 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Log: All frames in 800x600 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-12-18 15:59:28 UTC (rev 1692) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-12-18 16:07:11 UTC (rev 1693) @@ -30,7 +30,7 @@ * by : $Author: sletellier $ */ --> -<JFrame id='isisfishFrame' title="isisfish.welcome.title" width='800' height='600' resizable="true" location='{new Point(0,23)}' layout='{new BorderLayout()}'> +<JFrame id='isisfishFrame' title="isisfish.welcome.title" width='874' height='736' resizable="true" location='{new Point(0,23)}' layout='{new BorderLayout()}'> <script><![CDATA[ import static org.codelutin.i18n.I18n._; import fr.ifremer.isisfish.ui.simulator.SimulAction; @@ -55,8 +55,8 @@ welcome.setContent(c); f.add(welcome, BorderLayout.CENTER); f.setTitle(title); + f.setSize(new Dimension(800, 600)); f.setVisible(true); - f.pack(); } protected void close() { this.dispose();

1 0

r1692 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 15:59:28 +0000 (Thu, 18 Dec 2008) New Revision: 1692 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: Debug final ! Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2008-12-18 15:29:52 UTC (rev 1691) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2008-12-18 15:59:28 UTC (rev 1692) @@ -56,7 +56,7 @@ import org.codelutin.topia.persistence.TopiaEntity; import org.codelutin.topia.TopiaException; - protected IsisMapBean portMap = new IsisMapBean(); + protected IsisMapBean portMap = null; protected OpenMapToolPanel toolMap = new OpenMapToolPanel(); protected OMToolSet toolSet = new OMToolSet(); protected OpenMapEvents mapListener = null; @@ -93,15 +93,17 @@ } - portMap = new IsisMapBean(); - portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); - portMap.setActiveMouseMode(new SelectMouseMode()); - portMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion()); - toolSet.setupListeners(portMap); - toolMap.add((Component)toolSet); - setMapListener(); - portMapPanel.add(toolMap, BorderLayout.NORTH); - portMapPanel.add(portMap, BorderLayout.CENTER); + if(portMap == null){ + portMap = new IsisMapBean(); + portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); + portMap.setActiveMouseMode(new SelectMouseMode()); + portMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion()); + toolSet.setupListeners(portMap); + toolMap.add((Component)toolSet); + setMapListener(); + portMapPanel.add(toolMap, BorderLayout.NORTH); + portMapPanel.add(portMap, BorderLayout.CENTER); + } refreshMap(); } protected void refreshMap(){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-18 15:29:52 UTC (rev 1691) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-18 15:59:28 UTC (rev 1692) @@ -77,7 +77,7 @@ zoneCells.setModel(zoneCellsModel); java.util.List<Cell> cellsSelected = z.getCell(); if (cellsSelected != null){ - int[] indexs = new int[zoneCellsModel.size()]; + int[] indexs = new int[cellsSelected.size()]; int i = 0; for (Cell c : cellsSelected){ indexs[i] = zoneCellsModel.indexOf(c); @@ -129,6 +129,7 @@ return false; } }; + zoneMap.addMapMouseListener(mapListener); } } protected void refreshMap(){

1 0

r1691 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 15:29:52 +0000 (Thu, 18 Dec 2008) New Revision: 1691 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Log: UI in 800x600 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-12-18 14:49:50 UTC (rev 1690) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-12-18 15:29:52 UTC (rev 1691) @@ -30,7 +30,7 @@ * by : $Author: sletellier $ */ --> -<JFrame id='isisfishFrame' title="isisfish.welcome.title" size='{new Dimension(800,600)}' resizable="true" location='{new Point(0,23)}' layout='{new BorderLayout()}'> +<JFrame id='isisfishFrame' title="isisfish.welcome.title" width='800' height='600' resizable="true" location='{new Point(0,23)}' layout='{new BorderLayout()}'> <script><![CDATA[ import static org.codelutin.i18n.I18n._; import fr.ifremer.isisfish.ui.simulator.SimulAction; @@ -104,7 +104,7 @@ id="menuBar" --> <JMenu text='isisfish.welcome.menu.file'> - <JMenuItem text="isisfish.welcome.menu.synchro" onActionPerformed='updateVCS()'/> + <JMenuItem text="isisfish.welcome.menu.synchro" enabled='false' onActionPerformed='updateVCS()'/> <JSeparator/> <JMenuItem text="isisfish.welcome.menu.close" onActionPerformed='close()'/> </JMenu> @@ -117,8 +117,8 @@ <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new QueueUI(), _("isisfish.queue.title"))'/> <JSeparator/> <JMenu text="isisfish.welcome.menu.configuration"> - <JMenuItem text="isisfish.welcome.menu.configuration" onActionPerformed='config()'/> - <JMenuItem text="isisfish.welcome.menu.vcs.configuration" onActionPerformed='configVCS()'/> + <JMenuItem text="isisfish.welcome.menu.configuration" enabled='false' onActionPerformed='config()'/> + <JMenuItem text="isisfish.welcome.menu.vcs.configuration" enabled='false' onActionPerformed='configVCS()'/> </JMenu> </JMenu> <JMenu text="isisfish.welcome.menu.help">

1 0

r1690 - isis-fish/trunk/src/main/resources
by chatellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: chatellier Date: 2008-12-18 14:49:50 +0000 (Thu, 18 Dec 2008) New Revision: 1690 Modified: isis-fish/trunk/src/main/resources/log4j.properties Log: Back to info log level Modified: isis-fish/trunk/src/main/resources/log4j.properties =================================================================== --- isis-fish/trunk/src/main/resources/log4j.properties 2008-12-18 14:44:56 UTC (rev 1689) +++ isis-fish/trunk/src/main/resources/log4j.properties 2008-12-18 14:49:50 UTC (rev 1690) @@ -6,11 +6,11 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.fr.ifremer.isisfish=DEBUG +log4j.logger.fr.ifremer.isisfish=INFO log4j.logger.org.codelutin=INFO -log4j.logger.analyseplans=DEBUG -log4j.logger.exports=DEBUG -log4j.logger.formules=DEBUG -log4j.logger.rules=DEBUG -log4j.logger.scripts=DEBUG -log4j.logger.simulators=DEBUG +log4j.logger.analyseplans=INFO +log4j.logger.exports=INFO +log4j.logger.formules=INFO +log4j.logger.rules=INFO +log4j.logger.scripts=INFO +log4j.logger.simulators=INFO

1 0